Changeset 472 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

Timestamp:

Dec 19, 2013, 6:22:39 PM (11 years ago)

Author:

garnier

Message:

Modification pour remettre en marche le Run. Desormais Transport passe, mais aucun test ne permet de dire si c est bon

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc (modified) (6 diffs)

Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

@@ -18 +18 @@
 
 dataManager::dataManager(PspaApplication* pspa) :
-currentBeam_(NULL),
 pspa_ (pspa)
 {}
@@ -28 +27 @@
     if ( jobList_[k] != NULL ) delete jobList_[k];
   }
-  if ( currentBeam_ == NULL ) delete currentBeam_;
 }
 
@@ -82 +80 @@
   diagnosticBeam_.clear();
   indexElementToIndexDiag_.clear();
-  currentBeam_ = NULL;
   for (unsigned int a=0; a< jobList_.size(); a++) {
       jobList_[a]->clearSectionToExecute();
@@ -130 +127 @@
     }
     
-    success = softw->createInputFile(currentBeam_,workingDir);
+    success = softw->createInputFile(sector->getParticleBeam(),workingDir);
     if ( success ) {
       success = softw->execute(workingDir);
@@ -139 +136 @@
     
     if ( success ) {
-      currentBeam_ = &diagnosticBeam_.at(indexElementToIndexDiag_.back());
+      sector->setParticleBeam(&diagnosticBeam_.at(indexElementToIndexDiag_.back()));
       cout << " execute termine avec succes " << endl;
     } else {
-      currentBeam_ = NULL;
+      sector->setParticleBeam(NULL);
       cout << " execute termine en ECHEC " << endl;
     }
@@ -157 +154 @@
     } //l
   } //k
-  // if ( currentBeam_ ) {
+  // if ( currentBeam_deprecated_ ) {
   // string aml_file = workingDir + "/" + "faisceau_final" + ".aml";
-  //   currentBeam_->writeToAMLFile(aml_file);
+  //   currentBeam_deprecated_->writeToAMLFile(aml_file);
   //   // TESTS
-  //   currentBeam_->readFromAMLFile(aml_file);
+  //   currentBeam_deprecated_->readFromAMLFile(aml_file);
   // }
   cout << " dataManager::executeAll() " << endl;