Changeset 472 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareGenerator.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/softwareGenerator.cc (modified) (3 diffs)

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

@@ -12 +12 @@
 }
 
-softwareGenerator::softwareGenerator(string inputFileName, sectionToExecute* sect) : abstractSoftware(inputFileName, sect)
+softwareGenerator::softwareGenerator(string inputFileName, sectionToExecute* sect,dataManager* data) : abstractSoftware(inputFileName, sect,data)
 {
   cout << " softwareUsersprogram::softwareGenerator ENREGISTREMENT " << endl;
@@ -57 +57 @@
   
   ostringstream sortie;
-  sortie << " EXECUTION DE GENERATOR DE l'ELEMENT " << numeroDeb_deprecated_ << " A L'ELEMENT " << numeroFin_deprecated_ << endl;
+  sortie << " EXECUTION DE GENERATOR  " << endl;
 
   string generatorJob = workingDir + "generator";
@@ -94 +94 @@
   if ( !ComputationLimitsOk_deprecated() ) return false;
 
-  if ( numeroDeb_deprecated_ != numeroFin_deprecated_ ) {
+  if ( getSectionToExecute()->getElements().size() != 1 ) {
     dataManager_->consoleMessage(" softwareGenerator::buildBeamAfterElements : only one element (rfgun) must be calculated " );
     return false;