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

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

@@ -8 +8 @@
 }
 
-softwareMadx::softwareMadx(string inputFileName,sectorParameters* lattice,dataManager* dt) : abstractSoftware(inputFileName,lattice,dt)
+softwareMadx::softwareMadx(string inputFileName,sectionToExecute* sect) : abstractSoftware(inputFileName,sect)
 {
   nameOfSoftware_ = nomDeLogiciel("madx");
@@ -16 +16 @@
 }
 
-bool softwareMadx::createInputFile(particleBeam* beamBefore,unsigned int numeroDeb,unsigned int numeroFin,string workingDir)
+bool softwareMadx::createInputFile(particleBeam* beamBefore, string workingDir)
 {
   cout << "***********************************" << endl;
@@ -22 +22 @@
 
   dataManager_->consoleMessage(" softwareMadx::createInputFile");
-  if (!initComputationLimits(numeroDeb,numeroFin)) return false;
 
   string name = workingDir + inputFileName_;
@@ -33 +32 @@
   }
 
-  cout << " softwareMadx::createInputFile(...) lecture des elts de " << numeroDeb_ << " Ã  " << numeroFin_ << endl;
+  cout << " softwareMadx::createInputFile(...) lecture des elts " << endl;
   
   // element label //////////////////////////
@@ -40 +39 @@
 
   abstractElement* elPtr;
-  for(unsigned k = numeroDeb_; k <= numeroFin_; k++)
+  std::vector <abstractElement*> elements = getSectionToExecute()->getElements();
+  for(unsigned k = 0; k < elements.size(); k++)
     {
-      elPtr = dataManager_->getElementPointerFromNumero(k);
+      elPtr = elements[k];
       //cout << " debug:: element [" << k << "] " << elPtr->getNomdElement().getExpandedName() << endl;
       vector<statements> v= elPtr->parametersToSoftware();
@@ -52 +52 @@
   outfile << endl; // saut de ligne
 
+  //_______________________________________________________
+  // FIXME Francois !!!!!
+  //_______________________________________________________
+ /*
   vector<statements> u = sectParamPtr_->getSectors();
   for(unsigned int i = 0; i < u.size(); i++) {
@@ -59 +63 @@
     unsigned bi = dataManager_->getNumeroFromElementLabel(u.at(i).second.at(1));
 
-    for(unsigned k = numeroDeb_; k <= numeroFin_; k++) {
-      elPtr = dataManager_->getElementPointerFromNumero(k);
+    std::vector <abstractElement*> elements = getSectionToExecute()->getElements();
+    for(unsigned k = 0; k < elements.size(); k++) {
+      elPtr = elements[k];
       
       if(k >= ai && k <= bi) { 
@@ -85 +90 @@
   ostringstream os;
   os << "all: " << "line=(";
-  for(unsigned k = numeroDeb_; k <= numeroFin_; k++) {
-    elPtr = dataManager_->getElementPointerFromNumero(k);
+  for(unsigned k = 0; k < elements.size(); k++) {
+    elPtr = elements[k];
     bool isMember = false;
 
@@ -112 +117 @@
     }// i
     
-    if(isMember && k == numeroFin_) os << ");";
-   
+    if(isMember && k == (elements.size()-1)) os << ");";
+    
     if(!isMember) {
-      if(k == numeroFin_) os << elPtr->getLabel() << ");";
+      if(k == (elements.size()-1)) os << elPtr->getLabel() << ");";
       else os << elPtr->getLabel() << ",";
     }
@@ -131 +136 @@
   outfile << "twiss,save,centre,file = "+workingDir+"twiss.out;" << endl; //p51
   outfile << "stop;" << endl;
+
+  */
+  //_______________________________________________________
+  // FIXME Francois !!!!!
+  //_______________________________________________________
 
   outfile.close();
@@ -174 +184 @@
 
   ostringstream sortie;
-  sortie << " run madx from " << numeroDeb_ << " to " << numeroFin_ << endl;
+  sortie << " run madx " << endl;
 
   string mjob = workingDir + "madx64";