Changeset 484 in PSPA

Timestamp:

Jan 22, 2014, 3:43:41 PM (10 years ago)

Author:

touze

Message:

softawareMadx:: faisceau donné par l'élément beam

Location:

Interface_Web/trunk/pspaWT/sources/controler

Files:

• include/softwareMadx.h (modified) (1 diff)
• src/softwareMadx.cc (modified) (8 diffs)

Interface_Web/trunk/pspaWT/sources/controler/include/softwareMadx.h

@@ -8 +8 @@
 class softwareMadx : public abstractSoftware
 {
-  string BEAMcommand(particleBeam*) const;
-  string RFGunData(const vector<statements>&) const; 
+  string emittances(const beam2Moments&) const; 
+  string beamData(particleBeam*) const;
+  string beamData(const vector<statements>&) const;
+  string RFgunData(const vector<statements>&) const; 
   string inputFormat(const vector<statements>&) const;
 

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

@@ -5 +5 @@
 #include "mathematicalConstants.h"
 #include "PhysicalConstants.h"
+
+#include <boost/filesystem.hpp>
 
 softwareMadx::softwareMadx() : abstractSoftware()
@@ -43 +45 @@
   abstractElement* elPtr;
   elPtr = getSectionToExecute()->getElements().front();
-
-  // le 1er elt n'est pas RFGun
-  if(elPtr->getNomdElement().getElementType() != nomdElements::RFgun) {
-    
+  nomdElements::typedElement eType = elPtr->getNomdElement().getElementType();
+
+  if(eType == nomdElements::RFgun) {
+    // le 1er elt est RFgun
+    firstIndex = 1;
+    dataManager_->consoleMessage(" softwareMadx::createInputFile : set from RF cavity the quantities to be supplied to the madx BEAM command");
+    sbeam = RFgunData(elPtr->parametersToSoftware());
+  } else if(eType == nomdElements::beam) {
+    // le 1er elt est beam
+    firstIndex = 1;
+    dataManager_->consoleMessage(" softwareMadx::createInputFile : set from beam the quantities to be supplied to the madx BEAM command");
+    sbeam = beamData(elPtr->parametersToSoftware());
+  } else {
+    // on suppose qu'il y a déjà un faisceau
     if(beamBefore == NULL) { 
       // il n'y a pas de faisceau : erreur
@@ -67 +79 @@
         return false;
       }
-
-      sbeam = BEAMcommand(beamBefore);
+      sbeam = beamData(beamBefore);
     }
-    
-    // le 1er elt est RFGun
-  } else {
-     firstIndex = 1;
-    dataManager_->consoleMessage(" softwareMadx::createInputFile : set from RF cavity the quantities to be supplied to the madx BEAM command");
-    sbeam = RFGunData(elPtr->parametersToSoftware());
   }
   ///////////////////////////////////////////
@@ -121 +126 @@
 }
 
-string softwareMadx::BEAMcommand(particleBeam* beam) const 
-{
-  // le 20 décembre : les commandes BEAM de madx sont :
+string softwareMadx::beamData(const vector<statements>& v) const 
+{
+  // x  (cm)   = v.at(1).second.at(0)
+  // xp (mrad) = v.at(1).second.at(1)
+  // y  (cm)   = v.at(1).second.at(2)
+  // yp (mrad) = v.at(1).second.at(3)
+  // dl  (cm)   = v.at(2).second.at(0)
+  // del (mrad) = v.at(2).second.at(1)
+  // p0 (GeV/c) = v.at(3).second.at(0)
+  
+  ostringstream os;
+  os << "beam, PARTICLE = ELECTRON";
+
+  double PC = atof(v.at(3).second.at(0).c_str());
+  os << ", ENERGY = " << PC; // momentum of the central trajectory [GeV/c]
+
+  double x  = atof(v.at(1).second.at(0).c_str());
+  double xp = atof(v.at(1).second.at(1).c_str());
+  double y  = atof(v.at(1).second.at(2).c_str());
+  double yp = atof(v.at(1).second.at(3).c_str());
+  double dl = atof(v.at(2).second.at(0).c_str());
+  double del= atof(v.at(2).second.at(1).c_str());
+  beam2Moments mts(x,xp,y,yp,dl,del);
+  os << emittances(mts) << ";";
+  return os.str();  
+}
+
+string softwareMadx::beamData(particleBeam* beam) const 
+{
+  // les commandes BEAM de madx sont :
   // PARTICLE (defaut POSITRON)
   // ENERGY (defaut 1 GeV) ou bien PC GeV/c
@@ -132 +164 @@
   os << "beam, PARTICLE = ELECTRON";
 
-  double pc = beam->getP0Transport();
-  os << ", ENERGY = " << pc; // en GeV
+  double PC = beam->getP0Transport();
+  os << ", ENERGY = " << PC; // en GeV/c
 
   const beam2Moments& mts = beam->getTransportMoments();
+  os << emittances(mts) << ";";
+  return os.str();
+}
+
+string softwareMadx::emittances(const beam2Moments& mts) const 
+{
   const vector< vector<double> > rij= mts.getMoments();
+  ostringstream os;
 
   // emittance (x,x')
@@ -153 +192 @@
   os << ", EY = " << EY*1.E-05;
 
-  os << ";";
   return os.str();
 }
 
-string softwareMadx::RFGunData(const vector<statements>& v) const 
+string softwareMadx::RFgunData(const vector<statements>& v) const 
 {
   //NPART = v.at(1).second.at(0);
@@ -228 +266 @@
 
   dataManager_->consoleMessage(" softwareMadx::execute");
+  ostringstream sortie;
   bool status= true;
-
-  ostringstream sortie;
-  sortie << " run madx " << endl;
-
   string mjob = workingDir + "madx64";
-  mjob += string(" <  ");
-  mjob += workingDir + inputFileName_;
-  cout << " job madx = " << mjob << endl;
-  
-  string resultOfRun;
-  bool success = launchJob(mjob,resultOfRun);
-  // xx sortie << resultOfRun << endl;
-  if ( !success ) {
-    //sortie << " launching of madx failed " << endl;
+  
+  if(!boost::filesystem::exists(mjob.c_str())) {  
+    sortie << "Error:: " << mjob << " does not exist\n";
     status = false;
   } else {
-    sortie << " madx finished normally" << endl;
-    string nameOut = workingDir + "madx.output";
-    ofstream outfile;
-    outfile.open(nameOut.c_str(),ios::out);
-    if (!outfile) {
-      sortie << " error in opening madx output stream " << nameOut << endl;
+    mjob += string(" <  ");
+    mjob += workingDir + inputFileName_;
+    sortie << " run " << mjob << endl;
+    string resultOfRun;
+    bool success = launchJob(mjob,resultOfRun);
+    // xx sortie << resultOfRun << endl;
+    if ( !success ) {
+      //sortie << " launching of madx failed " << endl;
       status = false;
     } else {
-      // on copie la sortie dans un fichier 'madx.out'
-      outfile << resultOfRun << endl;
-      outfile.close();
+      sortie << " madx finished normally" << endl;
+      string nameOut = workingDir + "madx.output";
+      ofstream outfile;
+      outfile.open(nameOut.c_str(),ios::out);
+      if (!outfile) {
+        sortie << " error in opening madx output stream " << nameOut << endl;
+        status = false;
+      } else {
+        // on copie la sortie dans un fichier 'madx.out'
+        outfile << resultOfRun << endl;
+        outfile.close();
+      }
     }
   }
@@ -263 +303 @@
 }
 
-// bool softwareMadx::execute(string workingDir)
-// {
-//   cout << "***********************************" << endl;
-//   cout << " softwareMadx::execute(...) " << endl << endl;
-
-//   dataManager_->consoleMessage(" softwareMadx::execute");
-//   return false;
-// }
-
 bool softwareMadx::buildBeamAfterElements(string workingDir)
 {