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

Timestamp:

Nov 26, 2013, 5:36:11 PM (11 years ago)

Author:

touze

Message:

ajout de secteurs

File:

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

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

@@ -32 +32 @@
     return false;
   }
-  
-  outfile << endl; // saut de ligne
-  ostringstream os;
-  os << "L: " << "line=(";
+
+  cout << " softwareMadx::createInputFile(...) lecture des elts de " << numeroDeb_ << " Ã  " << numeroFin_ << endl;
+  
+  // element label //////////////////////////
+
+  outfile << endl; // saut de ligne
 
   abstractElement* elPtr;
@@ -41 +43 @@
     {
       elPtr = dataManager_->getElementPointerFromNumero(k);
-      cout << "debug:: element [" << k << "] " << elPtr->getNomdElement().getExpandedName() << endl;
+      //cout << " debug:: element [" << k << "] " << elPtr->getNomdElement().getExpandedName() << endl;
       vector<statements> v= elPtr->parametersToSoftware();
-      string label= v.at(0).second.at(1);
-      outfile << inputFormat(v); //<< endl;
-      os << label <<",";
-    }//k;
-
-  os << ");" << endl;
-  int nCells= sectParamPtr_->getNumberOfCells();
-  os << "all: line=(" << nCells << "*L);" << endl;
-  outfile << endl; // saut de ligne
-  outfile << os.str() << endl; // beam line definition p34
+      outfile << inputFormat(v);
+    }
+
+  // sublines ///////////////////////////////
+
+  outfile << endl; // saut de ligne
+
+  vector<statements> u = sectParamPtr_->getSectors();
+  for(unsigned int i = 0; i < u.size(); i++) {
+    ostringstream os;
+    os << u.at(i).first << ": line=(";
+    unsigned ai = dataManager_->getNumeroFromElementLabel(u.at(i).second.at(0));
+    unsigned bi = dataManager_->getNumeroFromElementLabel(u.at(i).second.at(1));
+
+    for(unsigned k = numeroDeb_; k <= numeroFin_; k++) {
+      elPtr = dataManager_->getElementPointerFromNumero(k);
+      
+      if(k >= ai && k <= bi) { 
+        if(k == bi) 
+          os << elPtr->getLabel() <<");";
+        else
+          os << elPtr->getLabel() <<",";
+      }
+    }// k
+
+    outfile << os.str() << endl; 
+  }// i
+
+  // relection and repetition ///////////////
+
+  outfile << endl; // saut de ligne
+
+  string *str= NULL;
+  if(u.size() > 0) {
+    str = new string[u.size()];
+    for(unsigned int i = 0; i < u.size(); i++) str[i]= "false";
+  }
+
+  ostringstream os;
+  os << "all: " << "line=(";
+  for(unsigned k = numeroDeb_; k <= numeroFin_; k++) {
+    elPtr = dataManager_->getElementPointerFromNumero(k);
+    bool isMember = false;
+
+    for(unsigned int i = 0; i < u.size(); i++) {
+      unsigned ai = dataManager_->getNumeroFromElementLabel(u.at(i).second.at(0));
+      unsigned bi = dataManager_->getNumeroFromElementLabel(u.at(i).second.at(1));
+      if(k >= ai && k <= bi) {
+        isMember = true;
+
+        if(str[i] == "false") {
+          //int reflection = atoi(u.at(i).second.at(2).c_str());
+          int reflection = ( (u.at(i).second.at(2) == "Unchecked") ? 0:1 );
+          int repeat = atoi(u.at(i).second.at(3).c_str());
+          if(reflection > 0)
+            os << "-" << repeat << "*" << u.at(i).first;
+          else
+            os << repeat << "*" << u.at(i).first;
+
+          if(i < u.size()-1) os << ", ";
+        }
+
+        str[i] = "true";
+        break;
+      }
+    }// i
+    
+    if(isMember && k == numeroFin_) os << ");";
+   
+    if(!isMember) {
+      if(k == numeroFin_) os << elPtr->getLabel() << ");";
+      else os << elPtr->getLabel() << ",";
+    }
+  }// k
+
+  outfile << os.str() << endl;
+  ///////////////////////////////////////////
+      
+  outfile << endl; // saut de ligne
 
   outfile << "beam;" << endl; // beam data p46
@@ -58 +129 @@
   
   outfile << "select,flag = twiss,column = name,s,betx,bety;" << endl; //p48
-  outfile << "twiss,save,centre,file = twiss.out;" << endl; //p51
+  outfile << "twiss,save,centre,file = "+workingDir+"twiss.out;" << endl; //p51
   outfile << "stop;" << endl;