From 70613fc29ca02c6a0885638a0ebf569a64a2110b Mon Sep 17 00:00:00 2001 From: Werner Hahn Date: Thu, 29 Oct 2026 20:05:51 -0700 Subject: [PATCH 1/2] Optimize PairDist using cached Dcalc distance calculations --- src/Action_PairDist.cpp | 20 +++++++++++--------- src/Action_PairDist.h | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/Action_PairDist.cpp b/src/Action_PairDist.cpp index cf94240b53..9948821f38 100644 --- a/src/Action_PairDist.cpp +++ b/src/Action_PairDist.cpp @@ -2,7 +2,7 @@ #include "Action_PairDist.h" #include "CpptrajStdio.h" #include "StringRoutines.h" -#include "DistRoutines.h" +#include "Dcalc.h" #include "DataSet_Mesh.h" #ifdef MPI # include "Stats_Reduce.h" @@ -140,10 +140,9 @@ Action::RetType Action_PairDist::Setup(ActionSetup& setup) { } /** Do histogram binning */ -void Action_PairDist::BinHist( std::vector& tmp, - const double* XYZ1, const double* XYZ2, Box const& box) +void Action_PairDist::BinHist(std::vector& tmp, + double Dist2) { - double Dist2 = DIST2(imageOpt_.ImagingType(), XYZ1, XYZ2, box); double Dist = sqrt(Dist2); unsigned long bin = (unsigned long) (Dist / delta_); @@ -164,21 +163,24 @@ Action::RetType Action_PairDist::DoAction(int frameNum, ActionFrame& frm) { if (imageOpt_.ImagingEnabled()) imageOpt_.SetImageType( frm.Frm().BoxCrd().Is_X_Aligned_Ortho() ); + Cpptraj::Dcalc dcalc(frm.Frm(), imageOpt_.ImagingType()); + if (single_mask_) { // Only 1 mask for (int idx1 = 0; idx1 != mask1_.Nselected(); idx1++) { + dcalc.SetXYZ1(frm.Frm().XYZ(mask1_[idx1])); + for (int idx2 = idx1 + 1; idx2 != mask1_.Nselected(); idx2++) { - //frame_ = frameNum; // DEBUG - //idx1_ = idx1; // DEBUG - //idx2_ = idx2; // DEBUG - BinHist(tmp, frm.Frm().XYZ(mask1_[idx1]), frm.Frm().XYZ(mask1_[idx2]), frm.Frm().BoxCrd()); + BinHist(tmp, dcalc.Dist2(frm.Frm().XYZ(mask1_[idx2]))); } } } else { // 2 non-overlapping masks for (int idx1 = 0; idx1 != mask1_.Nselected(); idx1++) { + dcalc.SetXYZ1(frm.Frm().XYZ(mask1_[idx1])); + for (int idx2 = 0; idx2 != mask2_.Nselected(); idx2++) { - BinHist(tmp, frm.Frm().XYZ(mask1_[idx1]), frm.Frm().XYZ(mask2_[idx2]), frm.Frm().BoxCrd()); + BinHist(tmp, dcalc.Dist2(frm.Frm().XYZ(mask2_[idx2]))); } } } diff --git a/src/Action_PairDist.h b/src/Action_PairDist.h index 8240c571d0..f811fc6bce 100644 --- a/src/Action_PairDist.h +++ b/src/Action_PairDist.h @@ -27,7 +27,7 @@ class Action_PairDist : public Action { # endif void Print(); - inline void BinHist(std::vector&, const double*, const double*, Box const&); + inline void BinHist(std::vector&, double); void UpdateHistogramFrames(); DataSet *Pr_; ///< distance vs P(r) From 9810e1e891024a87de8f1adf9859702a46c53937 Mon Sep 17 00:00:00 2001 From: Werner Hahn Date: Sat, 14 Nov 2026 20:05:12 -0800 Subject: [PATCH 2/2] Update PairDist dependencies for Dcalc --- src/cpptrajdepend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpptrajdepend b/src/cpptrajdepend index d907569172..8170c096f5 100644 --- a/src/cpptrajdepend +++ b/src/cpptrajdepend @@ -63,7 +63,7 @@ Action_NMRrst.o : Action_NMRrst.cpp Action.h ActionState.h Action_NMRrst.h ArgLi Action_NativeContacts.o : Action_NativeContacts.cpp Action.h ActionState.h Action_NativeContacts.h ArgList.h ArrayIterator.h AssociatedData.h Atom.h AtomMask.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h DataFile.h DataFileList.h DataSet.h DataSetList.h DataSet_1D.h DataSet_2D.h DataSet_Coords.h DataSet_Coords_REF.h DataSet_MatrixDbl.h DataSet_integer.h Dimension.h DispatchObject.h DistRoutines.h FileIO.h FileName.h FileTypes.h Frame.h ImageOption.h MaskToken.h Matrix.h Matrix_3x3.h MetaData.h ModXNA_Info.h Molecule.h NameType.h PDBfile.h Parallel.h ParameterTypes.h Range.h ReferenceFrame.h ReplicaDimArray.h Residue.h Segment.h SymbolExporting.h TextFormat.h Timer.h Topology.h Unit.h Vec3.h Action_OrderParameter.o : Action_OrderParameter.cpp Action.h ActionState.h Action_OrderParameter.h ArgList.h AssociatedData.h Atom.h AtomMask.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h DataFile.h DataFileList.h DataSet.h DataSetList.h DataSet_Coords.h DataSet_Coords_REF.h Dimension.h DispatchObject.h DistRoutines.h FileIO.h FileName.h FileTypes.h Frame.h ImageOption.h MaskToken.h Matrix_3x3.h MetaData.h ModXNA_Info.h Molecule.h NameType.h OnlineVarT.h Parallel.h ParameterTypes.h Range.h ReferenceFrame.h ReplicaDimArray.h Residue.h Segment.h StringRoutines.h SymbolExporting.h TextFormat.h Timer.h Topology.h Unit.h Vec3.h Action_Outtraj.o : Action_Outtraj.cpp Action.h ActionFrameCounter.h ActionState.h Action_Outtraj.h ArgList.h AssociatedData.h Atom.h AtomMask.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h DataFile.h DataFileList.h DataSet.h DataSetList.h DataSet_1D.h DataSet_Coords.h DataSet_Coords_REF.h Dimension.h DispatchObject.h FileIO.h FileName.h FileTypes.h Frame.h MaskToken.h Matrix_3x3.h MetaData.h ModXNA_Info.h Molecule.h NameType.h OutputTrajCommon.h Parallel.h ParameterTypes.h Range.h ReferenceFrame.h ReplicaDimArray.h Residue.h Segment.h SymbolExporting.h TextFormat.h Timer.h Topology.h TrajectoryFile.h Trajout_Single.h Unit.h Vec3.h -Action_PairDist.o : Action_PairDist.cpp Action.h ActionState.h Action_PairDist.h ArgList.h AssociatedData.h Atom.h AtomMask.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h DataFile.h DataFileList.h DataSet.h DataSetList.h DataSet_1D.h DataSet_Coords.h DataSet_Coords_REF.h DataSet_Mesh.h Dimension.h DispatchObject.h DistRoutines.h FileIO.h FileName.h FileTypes.h Frame.h ImageOption.h MaskToken.h Matrix_3x3.h MetaData.h ModXNA_Info.h Molecule.h NameType.h OnlineVarT.h Parallel.h ParameterTypes.h Range.h ReferenceFrame.h ReplicaDimArray.h Residue.h Segment.h Spline.h Stats_Reduce.h StringRoutines.h SymbolExporting.h TextFormat.h Timer.h Topology.h Unit.h Vec3.h +Action_PairDist.o : Action_PairDist.cpp Action.h ActionState.h Action_PairDist.h ArgList.h AssociatedData.h Atom.h AtomMask.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h DataFile.h DataFileList.h DataSet.h DataSetList.h DataSet_1D.h DataSet_Coords.h DataSet_Coords_REF.h DataSet_Mesh.h Dcalc.h Dimension.h DispatchObject.h FileIO.h FileName.h FileTypes.h Frame.h ImageOption.h MaskToken.h Matrix_3x3.h MetaData.h ModXNA_Info.h Molecule.h NameType.h OnlineVarT.h Parallel.h ParameterTypes.h Range.h ReferenceFrame.h ReplicaDimArray.h Residue.h Segment.h Spline.h Stats_Reduce.h StringRoutines.h SymbolExporting.h TextFormat.h Timer.h Topology.h Unit.h Vec3.h Action_Pairwise.o : Action_Pairwise.cpp Action.h ActionFrameCounter.h ActionState.h Action_Pairwise.h ArgList.h ArrayIterator.h AssociatedData.h Atom.h AtomMask.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h DataFile.h DataFileList.h DataSet.h DataSetList.h DataSet_2D.h DataSet_Coords.h DataSet_Coords_REF.h DataSet_MatrixDbl.h Dimension.h DispatchObject.h ExclusionArray.h FileIO.h FileName.h FileTypes.h Frame.h MaskToken.h Matrix.h Matrix_3x3.h MetaData.h ModXNA_Info.h Molecule.h NameType.h OutputTrajCommon.h PDBfile.h Parallel.h ParameterTypes.h Range.h ReferenceFrame.h ReplicaDimArray.h Residue.h Segment.h StringRoutines.h SymbolExporting.h TextFormat.h Timer.h Topology.h TrajectoryFile.h Trajout_Single.h Unit.h Vec3.h Action_Principal.o : Action_Principal.cpp Action.h ActionState.h Action_Principal.h ArgList.h ArrayIterator.h AssociatedData.h Atom.h AtomMask.h BaseIOtype.h Box.h ComplexArray.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h DataFile.h DataFileList.h DataSet.h DataSetList.h DataSet_Coords.h DataSet_Coords_REF.h DataSet_Mat3x3.h DataSet_Vector.h Dimension.h DispatchObject.h FileIO.h FileName.h FileTypes.h Frame.h MaskToken.h Matrix_3x3.h MetaData.h ModXNA_Info.h Molecule.h NameType.h Parallel.h ParameterTypes.h Range.h ReferenceFrame.h ReplicaDimArray.h Residue.h Segment.h SymbolExporting.h TextFormat.h Timer.h Topology.h Unit.h Vec3.h Action_Projection.o : Action_Projection.cpp Action.h ActionFrameCounter.h ActionState.h Action_Projection.h ArgList.h Array1D.h AssociatedData.h Atom.h AtomMask.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h DataFile.h DataFileList.h DataSet.h DataSetList.h DataSet_1D.h DataSet_Coords.h DataSet_Coords_REF.h DataSet_Modes.h Dimension.h DispatchObject.h FileIO.h FileName.h FileTypes.h Frame.h MaskToken.h Matrix_3x3.h MetaData.h ModXNA_Info.h Molecule.h NameType.h Parallel.h ParameterTypes.h Range.h ReferenceFrame.h ReplicaDimArray.h Residue.h Segment.h StringRoutines.h SymbolExporting.h TextFormat.h Timer.h Topology.h Unit.h Vec3.h