Changeset 455 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareGenerator.cc

Timestamp:

Dec 16, 2013, 5:16:54 PM (11 years ago)

Author:

garnier

Message:

grosse modification pour intégrer les sections

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/softwareGenerator.cc (modified) (5 diffs)

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

@@ -12 +12 @@
 }
 
-softwareGenerator::softwareGenerator(string inputFileName, globalParameters* globals, dataManager* dt) : abstractSoftware(inputFileName, globals, dt)
+softwareGenerator::softwareGenerator(string inputFileName, sectionToExecute* sect) : abstractSoftware(inputFileName, sect)
 {
   cout << " softwareUsersprogram::softwareGenerator ENREGISTREMENT " << endl;
@@ -19 +19 @@
 }
 
-bool softwareGenerator::createInputFile(particleBeam* beamBefore, unsigned int numeroDeb, unsigned int numeroFin, string workingDir)
+bool softwareGenerator::createInputFile(particleBeam* beamBefore, string workingDir)
 {
-  if ( !initComputationLimits(numeroDeb,numeroFin) ) return false;
-
-  if ( numeroDeb_ != numeroFin_ ) return false;
-
-  abstractElement* elPtr;
-  elPtr = dataManager_->getElementPointerFromNumero(numeroDeb_);
-
-  if ( elPtr->getNomdElement().getElementType() != nomdElements::RFgun ) {
+  abstractElement* firstElement = getSectionToExecute()->getElements().front();
+  
+  if ( firstElement->getNomdElement().getElementType() != nomdElements::RFgun ) {
     dataManager_->consoleMessage(" softwareGenerator::createInputFile : the element must be rfgun " );
     cerr << " softwareGenerator::createInputFile : the element must be rfgun" << endl;
@@ -47 +42 @@
   outfile << " Add=FALSE, N_add=0" << endl;
   outfile << " Species='electrons'" << endl;
-  //  outfile << elPtr->generatorOutputFlow() << endl;
-
-  outfile << elementsData(elPtr->parametersToSoftware()) << endl;
+  //  outfile << firstElement->generatorOutputFlow() << endl;
+
+  outfile << elementsData(firstElement->parametersToSoftware()) << endl;
 
   outfile << "/" << endl;
@@ -62 +57 @@
   
   ostringstream sortie;
-  sortie << " EXECUTION DE GENERATOR DE l'ELEMENT " << numeroDeb_ << " A L'ELEMENT " << numeroFin_ << endl;
+  sortie << " EXECUTION DE GENERATOR DE l'ELEMENT " << numeroDeb_deprecated_ << " A L'ELEMENT " << numeroFin_deprecated_ << endl;
 
   string generatorJob = workingDir + "generator";
@@ -97 +92 @@
 
   bool result = true;
-  if ( !ComputationLimitsOk() ) return false;
-
-  if ( numeroDeb_ != numeroFin_ ) {
+  if ( !ComputationLimitsOk_deprecated() ) return false;
+
+  if ( numeroDeb_deprecated_ != numeroFin_deprecated_ ) {
     dataManager_->consoleMessage(" softwareGenerator::buildBeamAfterElements : only one element (rfgun) must be calculated " );
     return false;