stop removing results in SAMPLE runs

optimizer/Pilot/Worker.h

@@ -211,6 +211,7 @@ protected:
                 // run simulation in a "blocking" fashion
                 sim->run();
                 sim->collectResults();
+                sim->cleanUp();
                 requested_results = sim->getResults();
             } catch(OptPilotException &ex) {
                 std::cout << "Exception while running simulation: "

src/Optimize/OpalSimulation.cpp

@@ -448,8 +448,6 @@ void OpalSimulation::collectResults() {
         std::cout << "Cannot chdir to "
                   << simulationDirName_.c_str() << std::endl;
     }
-
-    cleanUp();
 }
 
 bool OpalSimulation::getVariableDictionary(variableDictionary_t& dictionary,

src/Optimize/OpalSimulation.h

@@ -55,14 +55,18 @@ public:
     /// Parse SDDS stat file and build up requested variable dictionary.
     void collectResults();
 
+    /// remove temporary simulation files (if Boost filesystem library is not
+    /// available, this call do nothing).
+    void cleanUp();
+
     /// returns container containing all requested variables with results
     reqVarContainer_t getResults() { return requestedVars_; }
-    
+
     /// set job id (SAMPLE command)
     void setFilename(int id) { id_m = id; }
 
 private:
-    
+
     /// identification of the simulation (corresponding to output filename)
     std::string simulationName_;
     /// full path of simulation directory (where simulation will be run)
@@ -91,19 +95,16 @@ private:
 
     /// object to generate simulation input files
     boost::scoped_ptr<GenerateOpalSimulation> gs_;
-    
+
     /// job id (SAMPLE command)
     int id_m;
 
     /// mark a solution as invalid
     void invalidBunch();
-    /// remove temporary simulation files (if Boost filesystem library is not
-    /// available, this call do nothing).
-    void cleanUp();
 
     /// check if we already have simulated the current set of design vars
     bool hasResultsAvailable();
-    
+
     /// create symbolic links
     void createSymlink_m(const std::string& path);
 
@@ -121,4 +122,4 @@ private:
     void restoreOut();
 };
 
-#endif
+#endif
\ No newline at end of file