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

Timestamp:

Dec 11, 2013, 9:33:35 AM (11 years ago)

Author:

lemeur

Message:

ajout traitement utilisateur

File:

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

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

@@ -12 +12 @@
 #include "softwareTransport.h"
 #include "softwareGenerator.h"
+#include "softwareGenerator.h"
+#include "softwareUsersprogram.h"
 #include "softwareTest.h"
 #include "softwareMadx.h" //xx
@@ -89 +91 @@
     inputFileName = "generator.in";
     prog = new softwareGenerator(inputFileName, &globParam_, this);
-  } else if (logiciel  == nomDeLogiciel::test) {
-    prog = new softwareTest(inputFileName, &globParam_, this);
   } else if (logiciel  == nomDeLogiciel::madx) {
     inputFileName = "madx.input";
     prog = new softwareMadx(inputFileName,&sectorParam_,this);  
+  } else if (logiciel  == nomDeLogiciel::usersprogram) {
+    inputFileName = "dummy";
+    prog = new softwareUsersprogram(inputFileName, &globParam_, this);
+  } else if (logiciel  == nomDeLogiciel::test) {
+    prog = new softwareTest(inputFileName, &globParam_, this);
   } else {
     prog = new softwareUnknown(); // xx
@@ -230 +235 @@
 
   } //k
-  
+  // if ( currentBeam_ ) {
+  // string aml_file = workingDir + "/" + "faisceau_final" + ".aml";
+  //   currentBeam_->writeToAMLFile(aml_file);
+  //   // TESTS
+  //   currentBeam_->readFromAMLFile(aml_file);
+  // }
   cout << " dataManager::executeAll() : premier element = " << firstComputedElemNumero_ << " dernier = " << lastComputedElemNumero_ << endl;