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

Timestamp:

Feb 26, 2013, 2:35:45 PM (11 years ago)

Author:

touze

Message:

nvx element snapshot

File:

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

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

@@ +1 @@
+
 #include "softwareGenerator.h"
 #include "abstractElement.h"
@@ -4 +5 @@
 #include "mathematicalConstants.h"
 #include "PhysicalConstants.h"
-//#include "dataManager.h"
-
 
 softwareGenerator::softwareGenerator() : abstractSoftware()
-{
-  ;
-}
-
-
-
+{;}
 
 softwareGenerator::softwareGenerator(string inputFileName, globalParameters* globals, dataManager* dt) : abstractSoftware(inputFileName, globals, dt)
-{
-  ;
-}
-
+{;}
 
 bool softwareGenerator::createInputFile(particleBeam* beamBefore, unsigned int numeroDeb, unsigned int numeroFin, string workingDir)
@@ -33 +24 @@
     return false;
   }
+
   ofstream outfile;
   string name = workingDir + inputFileName_;
@@ -53 +45 @@
 }
 
-
-bool  softwareGenerator::execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir) {
+bool softwareGenerator::execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir) {
+  
+  bool ExecuteStatus = true;
+  
   ostringstream sortie;
-  bool ExecuteStatus = true;
-  //  resul.clear();
   sortie << " EXECUTION DE GENERATOR DE l'ELEMENT " << numeroDeb << " A L'ELEMENT " << numeroFin << endl;
 
-  char buf[132];
   string generatorJob = workingDir + "generator";
   generatorJob += string("   ");
   generatorJob += workingDir + inputFileName_;
 
-
-  ofstream outfile;
-  string nameOut = workingDir + "generator.output";
   string resultOfRun;
-  bool success = launchJob(generatorJob, resultOfRun);
+  bool success = launchJob(generatorJob,resultOfRun);
   sortie << resultOfRun << endl;
-  if ( !success) {
+  if ( !success ) {
     sortie << " launching of generator failed " << endl;
     ExecuteStatus = false;
-  }
-  else {
+  } else {
     cout << " execution generator MARCHE " << endl;
     sortie << resultOfRun;
+    string nameOut = workingDir + "generator.output";
+    ofstream outfile;
     outfile.open(nameOut.c_str(), ios::out);
-    if (!outfile) 
-      {
-        sortie << " error first opening transport output stream " << nameOut << endl;
-        ExecuteStatus = false;
-      }
-    else {
+    if (!outfile) {
+      sortie << " error first opening transport output stream " << nameOut << endl;
+      ExecuteStatus = false;
+    } else {
       // on copie la sortie dans un fichier 'generator.out'
       outfile << resultOfRun << endl;
@@ -90 +77 @@
     }
   }
-  //  resul =  sortie.str();
-    dataManager_->consoleMessage(sortie.str());
+  
+  dataManager_->consoleMessage(sortie.str());
   return ExecuteStatus;
 }