Changeset 493 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareMadx.cc

Timestamp:

Mar 11, 2014, 11:21:43 AM (10 years ago)

Author:

lemeur

Message:

refection generale des secteurs et applications de softwares (suite)

File:

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

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

@@ -13 +13 @@
 }
 
-softwareMadx::softwareMadx(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName,sect,data)
+// softwareMadx::softwareMadx(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName,sect,data)
+// {
+//   nameOfSoftware_ = new nomDeLogiciel("madx");
+// }
+
+softwareMadx::softwareMadx(string inputFileName,computingBlock* cmpb, dataManager* data) : abstractSoftware(inputFileName,cmpb,data)
 {
   nameOfSoftware_ = new nomDeLogiciel("madx");
@@ -33 +38 @@
   }
 
-  sector* sector= getSectionToExecute()->getSector();
-  cout << " softwareMadx::createInputFile sector " << sector->getName() << endl;
+  //  sector* sector= getSectionToExecute()->getSector();
+  //  cout << " softwareMadx::createInputFile sector " << sector->getName() << endl;
   ///////////////////////////////////////////
   
@@ -40 +45 @@
   string sbeam;
   abstractElement* elPtr;
-  elPtr = getSectionToExecute()->getElements().front();
+  //  elPtr = getSectionToExecute()->getElements().front();
+  elPtr = getComputingBlock()->getFirstElement();
   nomdElements::typedElement eType = elPtr->getNomdElement().getElementType();
 
@@ -85 +91 @@
   ostringstream os;
   os << "L: line=(";
-  unsigned nElts= getSectionToExecute()->getElements().size();
+  //  unsigned nElts= getSectionToExecute()->getElements().size();
+  unsigned nElts= getComputingBlock()->getNumberOfElements();
   for(unsigned k = firstIndex; k < nElts; k++)
     {
-      elPtr = getSectionToExecute()->getElements()[k];
+      //      elPtr = getSectionToExecute()->getElements()[k];
+      elPtr = getComputingBlock()->getElement(k);
       cout << " debug:: element [" << k << "] " << elPtr->getNomdElement().getExpandedName() << endl;
       vector<statements> v= elPtr->parametersToSoftware();
@@ -103 +111 @@
   
   // relection and repetition ///////////////
-  os << "all: " << "line=(" << sector->getRepetitionNumber() << "*L);";
+  //  os << "all: " << "line=(" << sector->getRepetitionNumber() << "*L);";
+  int bid = 1;
+os << "all: " << "line=(" << bid << "*L);";
   ///////////////////////////////////////////