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

Timestamp:

Jan 21, 2014, 1:52:16 PM (10 years ago)

Author:

touze

Message:

maj dans le fichier d'appel de madx

File:

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

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

@@ -78 +78 @@
   string workingDir = pspa_->getWorkingDir();
   
-
   // Main loop !
-  for(unsigned k = 0; k < jobList_.size(); k++) {
-    sector* sector = jobList_[k];
-    
-    // for the moment, we put everything in one line without loops
-    for (unsigned int l=0; l <sector->getSectionsToExecute().size(); l++) {
-      sectionToExecute* section = sector->getSectionsToExecute()[l];
-      abstractSoftware* softw = section->getSoftware();
+  cout << " dataManager::executeAll #jobList_= " << jobList_.size() << endl;
+  for(unsigned k = 0; k < jobList_.size(); k++) 
+    {
+      sector* sector = jobList_[k];
+      cout << " dataManager::executeAll sector name= " << sector->getName() << endl;
+      cout << " dataManager::executeAll #sectionsToExecute= " << sector->getSectionsToExecute().size() << endl;
       
-#if BAVARD > 0
-    cout << " dataManager::executeAll je m'apprete a executer : " << (jobList_[k]->getSoftware()->getName()) << endl;
-#endif
-      
+      // for the moment, we put everything in one line without loops
+      for(unsigned int l = 0; l < sector->getSectionsToExecute().size(); l++) 
+        {
+          sectionToExecute* section = sector->getSectionsToExecute()[l];
+          abstractSoftware* softw = section->getSoftware();
+          
       //cout << "k= " << k << ", de " << jobList_[k]->getFirstElement()->getLabel() << " Ã  " << jobList_[k]->getLastElement()->getLabel() << " avec " << softw->getName() << endl;
       
@@ -99 +99 @@
       break;
     }
-      // END OF FIXME
-      success = softw->createInputFile(sector->getParticleBeam(),workingDir);
+    
+    success = softw->createInputFile(sector->getParticleBeam(),workingDir);
     if ( success ) {
       success = softw->execute(workingDir);
@@ -110 +110 @@
     if ( success  && (diagnosticBeam_.size() > 0)) {
       sector->setParticleBeam(&diagnosticBeam_.at(indexElementToIndexDiag_.back()));
-      cout << " execute termine avec succes " << endl;
+      cout << " dataManager::executeAll termine avec succes " << endl;
     } else {
       sector->setParticleBeam(NULL);
-      cout << " execute termine en ECHEC " << endl;
+      cout << " dataManager::executeAll termine en ECHEC " << endl;
     }
     if ( !success ) break;
     
 #if BAVARD > 0
-      cout << "dataManager::executeAll #diagnosticBeam= " << diagnosticBeam_.size() << endl;
-      cout << "dataManager::executeAll #getBeamLineSize()= " << getBeamLineSize() << endl;
-      std::vector< abstractElement* > elements = section->getElements();
-      for (unsigned j = 0; j < elements.size(); j++) {
-        cout << "[" << j << "] " << elements[j]->getNomdElement().getExpandedName() << endl;
-      }
+          cout << "dataManager::executeAll #diagnosticBeam= " << diagnosticBeam_.size() << endl;
+          cout << "dataManager::executeAll #getBeamLineSize()= " << getBeamLineSize() << endl;
+          std::vector< abstractElement* > elements = section->getElements();
+          for (unsigned j = 0; j < elements.size(); j++) {
+            cout << "[" << j << "] " << elements[j]->getNomdElement().getExpandedName() << endl;
+          }
 #endif
-    } //l
-  } //k
+        } //l
+    } //k
+  
   // if ( currentBeam_deprecated_ ) {
   // string aml_file = workingDir + "/" + "faisceau_final" + ".aml";
@@ -133 +134 @@
   //   currentBeam_deprecated_->readFromAMLFile(aml_file);
   // }
-  cout << " dataManager::executeAll() " << endl;
-
+ 
   return success;
 }