--- trunk/src/integrators/RNEMD.cpp	2009/03/14 01:23:53	1329
+++ trunk/src/integrators/RNEMD.cpp	2009/04/02 16:04:52	1331
@@ -59,11 +59,33 @@ namespace oopse {
 
 namespace oopse {
   
-  RNEMD::RNEMD(SimInfo* info) : info_(info) {
+  RNEMD::RNEMD(SimInfo* info) : info_(info), evaluator_(info), seleMan_(info) {
     
     int seedValue;
     Globals * simParams = info->getSimParams();
+
+    stringToEnumMap_["Kinetic"] = rnemdKinetic;
+    stringToEnumMap_["Px"] = rnemdPx;
+    stringToEnumMap_["Py"] = rnemdPy;
+    stringToEnumMap_["Pz"] = rnemdPz;
+    stringToEnumMap_["Unknown"] = rnemdUnknown;
+
+    rnemdObjectSelection_ = simParams->getRNEMD_objectSelection();
+
+    std::cerr << "calling  evaluator with " << rnemdObjectSelection_ << "\n";
+    evaluator_.loadScriptString(rnemdObjectSelection_);
+    std::cerr << "done";
     
+    const std::string st = simParams->getRNEMD_swapType();
+
+    std::map<std::string, RNEMDTypeEnum>::iterator i;
+    i = stringToEnumMap_.find(st);
+    rnemdType_  = (i == stringToEnumMap_.end()) ? RNEMD::rnemdUnknown : i->second;
+
+    set_RNEMD_swapTime(simParams->getRNEMD_swapTime());
+    set_RNEMD_nBins(simParams->getRNEMD_nBins());
+    exchangeSum_ = 0.0;
+    
 #ifndef IS_MPI
     if (simParams->haveSeed()) {
       seedValue = simParams->getSeed();
@@ -84,8 +106,30 @@ namespace oopse {
   RNEMD::~RNEMD() {
     delete randNumGen_;
   }
-  
+
   void RNEMD::doSwap() {
     std::cerr << "in RNEMD!\n";   
+    std::cerr << "nBins = " << nBins_ << "\n";
+    std::cerr << "swapTime = " << swapTime_ << "\n";
+    std::cerr << "exchangeSum = " << exchangeSum_ << "\n";
+    std::cerr << "swapType = " << rnemdType_ << "\n";
+    std::cerr << "selection = " << rnemdObjectSelection_ << "\n";
+
+    seleMan_.setSelectionSet(evaluator_.evaluate());
+
+    std::cerr << "selectionCount = " << seleMan_.getSelectionCount() << "\n\n";
+
+    int i;
+    StuntDouble* sd;
+
+    for (sd = seleMan_.beginSelected(i); sd != NULL; sd = seleMan_.nextSelected(i)) {
+      Vector3d pos = sd->getPos();
+      //wrap the stuntdoubles into a cell      
+      if (usePeriodicBoundaryConditions_)
+        info_->getSnapshotManager()->getCurrentSnapshot()->wrapVector(pos);
+      int binNo = int(nBins_ * (pos.z()) / hmat(2,2));
+      sliceSDLists_[binNo].push_back(sd);
+    }
+
   }   
 }