ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/staticProps/RadialDistrFunc.cpp
(Generate patch)

Comparing trunk/src/applications/staticProps/RadialDistrFunc.cpp (file contents):
Revision 347 by tim, Tue Feb 15 17:11:35 2005 UTC vs.
Revision 351 by tim, Tue Feb 15 19:36:07 2005 UTC

# Line 63 | Line 63 | RadialDistrFunc::        RadialDistrFunc(SimInfo* info
63      if (!evaluator1_.isDynamic() && !evaluator2_.isDynamic()) {
64          //if all selections are static,  we can precompute the number of real pairs    
65  
66 <        int nSelected1 = seleMan1_->getSelectionCount();
67 <        int nSelected2 = seleMan2_->getSelectionCount();
66 >        int nSelected1 = seleMan1_.getSelectionCount();
67 >        int nSelected2 = seleMan2_.getSelectionCount();
68  
69          BitSet bs = seleMan1_.getSelectionSet();
70          bs &= seleMan2_.getSelectionSet();
# Line 85 | Line 85 | void RadialDistrFunc::process() {
85      
86      DumpReader reader(info_, dumpFilename_);    
87      int nFrames = reader.getNFrames();
88 <    nProcessed_ = nFrames / step_ + 1;
88 >    nProcessed_ = nFrames / step_;
89 >
90      for (int i = 0; i < nFrames; i += step_) {
91          reader.readFrame(i);
92          currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
# Line 131 | Line 132 | int RadialDistrFunc::getNRealPairs() {
132  
133   int RadialDistrFunc::getNRealPairs() {
134      if (evaluator1_.isDynamic() || evaluator2_.isDynamic()) {
135 <        //if one of the selection is static,  need to recompute it    
135 >        //if one of the selection is dynamic,  need to recompute it    
136  
137 <        int nSelected1 = seleMan1_->getSelectionCount();
138 <        int nSelected2 = seleMan2_->getSelectionCount();
137 >        int nSelected1 = seleMan1_.getSelectionCount();
138 >        int nSelected2 = seleMan2_.getSelectionCount();
139  
140          BitSet bs = seleMan1_.getSelectionSet();
141          bs &= seleMan2_.getSelectionSet();
# Line 143 | Line 144 | int RadialDistrFunc::getNRealPairs() {
144          nRealPairs_ = nSelected1 * nSelected2 - (nIntersect +1) * nIntersect/2;
145      }
146  
147 <    return nRealPairs_
147 >    return nRealPairs_;
148   }
149  
150   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines