--- trunk/src/applications/staticProps/RadialDistrFunc.cpp	2005/02/15 17:11:35	347
+++ trunk/src/applications/staticProps/RadialDistrFunc.cpp	2005/02/15 19:36:07	351
@@ -63,8 +63,8 @@ RadialDistrFunc::        RadialDistrFunc(SimInfo* info
     if (!evaluator1_.isDynamic() && !evaluator2_.isDynamic()) {
         //if all selections are static,  we can precompute the number of real pairs    
 
-        int nSelected1 = seleMan1_->getSelectionCount();
-        int nSelected2 = seleMan2_->getSelectionCount();
+        int nSelected1 = seleMan1_.getSelectionCount();
+        int nSelected2 = seleMan2_.getSelectionCount();
 
         BitSet bs = seleMan1_.getSelectionSet();
         bs &= seleMan2_.getSelectionSet();
@@ -85,7 +85,8 @@ void RadialDistrFunc::process() {
     
     DumpReader reader(info_, dumpFilename_);    
     int nFrames = reader.getNFrames();
-    nProcessed_ = nFrames / step_ + 1;
+    nProcessed_ = nFrames / step_;
+
     for (int i = 0; i < nFrames; i += step_) {
         reader.readFrame(i);
         currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
@@ -131,10 +132,10 @@ int RadialDistrFunc::getNRealPairs() {
 
 int RadialDistrFunc::getNRealPairs() {
     if (evaluator1_.isDynamic() || evaluator2_.isDynamic()) {
-        //if one of the selection is static,  need to recompute it    
+        //if one of the selection is dynamic,  need to recompute it    
 
-        int nSelected1 = seleMan1_->getSelectionCount();
-        int nSelected2 = seleMan2_->getSelectionCount();
+        int nSelected1 = seleMan1_.getSelectionCount();
+        int nSelected2 = seleMan2_.getSelectionCount();
 
         BitSet bs = seleMan1_.getSelectionSet();
         bs &= seleMan2_.getSelectionSet();
@@ -143,7 +144,7 @@ int RadialDistrFunc::getNRealPairs() {
         nRealPairs_ = nSelected1 * nSelected2 - (nIntersect +1) * nIntersect/2;
     }
 
-    return nRealPairs_
+    return nRealPairs_;
 }
 
 }