--- trunk/src/brains/SimInfo.cpp	2005/02/13 20:05:42	326
+++ trunk/src/brains/SimInfo.cpp	2005/03/07 22:39:33	398
@@ -144,9 +144,13 @@ SimInfo::~SimInfo() {
 }
 
 SimInfo::~SimInfo() {
-    //MemoryUtils::deleteVectorOfPointer(molecules_);
-
-    MemoryUtils::deleteVectorOfPointer(moleculeStamps_);
+    std::map<int, Molecule*>::iterator i;
+    for (i = molecules_.begin(); i != molecules_.end(); ++i) {
+        delete i->second;
+    }
+    molecules_.clear();
+    
+    MemoryUtils::deletePointers(moleculeStamps_);
     
     delete sman_;
     delete simParams_;
@@ -765,9 +769,9 @@ void SimInfo::getCutoff(double& rcut, double& rsw) {
                 "\tfor the cutoffRadius.\n");
             painCave.isFatal = 0;
             simError();
-            rcut_ = 15.0;
+            rcut = 15.0;
         } else{
-            rcut_ = simParams_->getRcut();
+            rcut = simParams_->getRcut();
         }
 
         if (!simParams_->haveRsw()){
@@ -777,9 +781,9 @@ void SimInfo::getCutoff(double& rcut, double& rsw) {
                 "\t0.95 * cutoffRadius for the switchingRadius\n");
             painCave.isFatal = 0;
             simError();
-            rsw_ = 0.95 * rcut_;
+            rsw = 0.95 * rcut;
         } else{
-            rsw_ = simParams_->getRsw();
+            rsw = simParams_->getRsw();
         }
 
     } else {
@@ -787,16 +791,16 @@ void SimInfo::getCutoff(double& rcut, double& rsw) {
         //meta-data file, the maximum cutoff radius calculated from forcefiled will be used
         
         if (simParams_->haveRcut()) {
-            rcut_ = simParams_->getRcut();
+            rcut = simParams_->getRcut();
         } else {
             //set cutoff radius to the maximum cutoff radius based on atom types in the whole system
-            rcut_ = calcMaxCutoffRadius();
+            rcut = calcMaxCutoffRadius();
         }
 
         if (simParams_->haveRsw()) {
-            rsw_  = simParams_->getRsw();
+            rsw  = simParams_->getRsw();
         } else {
-            rsw_ = rcut_;
+            rsw = rcut;
         }
     
     }
@@ -835,6 +839,11 @@ void SimInfo::setSnapshotManager(SnapshotManager* sman
 }
 
 void SimInfo::setSnapshotManager(SnapshotManager* sman) {
+    //if (sman_ == sman_) {
+    //    return;
+    //}
+    
+    //delete sman_;
     sman_ = sman;
 
     Molecule* mol;