Changeset 236 in PSPA

Timestamp:

Jan 17, 2013, 11:18:56 AM (12 years ago)

Author:

lemeur

Message:

epuration particleBeam

Location:

Interface_Web/trunk/pspaWT

Files:

• cmt/requirements (modified) (1 diff)
• include/beam2Moments.h (added)
• include/dataManager.h (modified) (3 diffs)
• include/particleBeam.h (modified) (5 diffs)
• include/transportMoments.h (deleted)
• src/beam2Moments.cc (added)
• src/dataManager.cc (modified) (5 diffs)
• src/elementBeam.cc (modified) (2 diffs)
• src/particleBeam.cc (modified) (4 diffs)
• src/transportMoments.cc (deleted)

Interface_Web/trunk/pspaWT/cmt/requirements

@@ -27 +27 @@
 
 #macro PSPSLib_linkopts     " -L${PSPAWTROOT}/$(Platform_bin) -lPSPSLib "
-application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_rfgun.cc GWt_soleno.cc GWt_bend.cc GWt_beam.cc GWt_globalParameters.cc GWt_drift.cc GWt_fit.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementRfgun.cc elementSoleno.cc elementBend.cc elementBeam.cc elementFit.cc globalParameters.cc abstractElement.cc GWt_tools.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc GWt_dropZoneLigneFaiseau.cc GWt_draggableImage.cc GWt_dialog.cc nomdElements.cc nomDeLogiciel.cc transportMoments.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags}"'
+application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_rfgun.cc GWt_soleno.cc GWt_bend.cc GWt_beam.cc GWt_globalParameters.cc GWt_drift.cc GWt_fit.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementRfgun.cc elementSoleno.cc elementBend.cc elementBeam.cc elementFit.cc globalParameters.cc abstractElement.cc GWt_tools.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc GWt_dropZoneLigneFaiseau.cc GWt_draggableImage.cc GWt_dialog.cc nomdElements.cc nomDeLogiciel.cc beam2Moments.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags}"'
 
 macro DrawWt_linkopts " ${PSPSLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"

Interface_Web/trunk/pspaWT/include/dataManager.h

@@ -10 +10 @@
 #include "nomDeLogiciel.h"
 #include "trivaluedBool.h"
+#include "beam2Moments.h"
+
+
+
+
 class dataManager
 {
@@ -25 +30 @@
   void removeFile(string nameOfFile); 
   void clearSectionToExecute();
+  bool  moments2FromTransport(string workingDir, string elLab, const nomdElements elem, beam2Moments& moments) const;
 
  public:
@@ -56 +62 @@
   bool restoreElements(string workingDir, string inputFileName);
   void donneesRmsEnveloppe( string type, unsigned int numeroDeb, unsigned int numeroFin, vector<double>& xcor, vector<double>& ycor);
+
+
 };
 #endif

Interface_Web/trunk/pspaWT/include/particleBeam.h

@@ -12 +12 @@
 #include "mathematicalTools.h"
 #include "nomdElements.h"
-#include "transportMoments.h"
+#include "beam2Moments.h"
 
 using namespace std;
@@ -44 +44 @@
   vector<bareParticle> goodPartic_;
 
-  transportMoments rij_;
+  beam2Moments rij_;
 
-  //  vector< vector<double> > rij_transportMoments_;
+
   vector<double> centroid_;
   double P0Transport_;
 
 
-  //  void readTransportMoments(ifstream& inp);
-  void readTransportMoments(stringstream& inp);
+
 
   void impressionDesMoments() const;
@@ -67 +66 @@
   void buildMomentRepresentation();
 
-  bool  setFromTransport(string workingDir, string elementLabel, const nomdElements elem);
-
-  //  void setFromBeamParameters(double x, double xp, double y, double yp, double dl, double del, double P0);
-
-
 
   void clear();
@@ -77 +71 @@
   int getNbParticles() const;
 
-  const transportMoments&  getTransportMoments() const;
+  const beam2Moments&  getTransportMoments() const;
   double getSigmaTransportij(unsigned i, unsigned j);
   double getUnnormalizedEmittanceX();
@@ -97 +91 @@
   void getVariance(double& varx, double& vary, double& varz) const;
  
+  void set2Moments(beam2Moments& moments);
 
   void printAllXYZ() const;

Interface_Web/trunk/pspaWT/src/dataManager.cc

@@ -1 +1 @@
 #include "dataManager.h"
-//#include "environmentVariables.h"
-#include "transportMoments.h"
 
 #include <stdio.h>
@@ -157 +155 @@
             string elemLabel = getLabelFromElementNumero (k);
             abstractElement* ptr = elementsGallery_.getElementPointerFromNumero(k);
-            if (!diagnosticBeam_.back().setFromTransport(workingDir, elemLabel, ptr->getNomdElement() )  )
+
+
+            beam2Moments transpMoments;
+
+            if (!moments2FromTransport(workingDir, elemLabel, ptr->getNomdElement(),transpMoments )  )
+              //            if (!diagnosticBeam_.back().setFromTransport(workingDir, elemLabel, ptr->getNomdElement() )  )
               {
                 sortie << " reading transport output  failed " << endl;
@@ -163 +166 @@
                 break;
               }
+            diagnosticBeam_.back().set2Moments(transpMoments);
           }
         if ( ExecuteStatus ) currentBeam_ = &diagnosticBeam_.back();
@@ -300 +304 @@
       // ici, en principe, on a un faisceau correct
       // on ecrit sur le fichier input
-      const transportMoments& moments = currentBeam_->getTransportMoments();
+      const beam2Moments& moments = currentBeam_->getTransportMoments();
       double P0 = currentBeam_->getP0Transport();
       outfile << moments.writeToTransportInput(P0);
@@ -544 +548 @@
     }
 }
+
+bool  dataManager::moments2FromTransport(string workingDir, string elLab, const nomdElements elem, beam2Moments& moments) const {
+
+  string elementLabel = elLab;
+  // transformer le label en majuscules ; je ne suis pas sur que ca 
+  // marchera a tous les coups (glm)
+  std::transform(elementLabel.begin(), elementLabel.end(), elementLabel.begin(), (int (*)(int))std::toupper);
+
+  cout << " dataManager::moments2FromTransport on cherche element " << elementLabel << endl;
+  ifstream infile;
+  string nameIn = workingDir + "transport.output";
+  infile.open(nameIn.c_str(), ios::in);
+  if (!infile) {
+    cerr << " dataManager::moments2FromTransport : error re-opening transport output stream " << nameIn << endl;
+    return false;
+  }
+  //  else cout << " particleBeam::setFromTransport() : ouverture du fichier " << nameIn << endl; 
+
+  string::size_type nn = string::npos;
+  string  fichier;
+  string buf;
+  unsigned compteur = 0;
+  while ( getline(infile, buf) ) {
+      fichier += buf+"\n";
+    nn = buf.find(elementLabel);
+    if ( nn != string::npos ) {
+      compteur++;
+      //      break;
+    }
+  }
+  infile.close();
+  cout << " compteur= " << compteur << endl;
+  if ( compteur == 0 ) {
+    cerr << " dataManager::moments2FromTransport : element " << elementLabel << " non trouve dans le fichier  " << nameIn << endl;
+    return false;
+  }
+
+
+  stringstream fichierStream(fichier);
+  buf.clear();
+  unsigned relu = 0;
+  while ( std::getline(fichierStream, buf) ) {
+    //    cout << " relecture buffer : " << buf << endl;
+    nn = buf.find(elementLabel);
+    if ( nn != string::npos ) {
+      relu++;
+      if ( relu == compteur ) {
+        cout << " TROUVE !" << endl;
+        break;
+      }
+    }
+  }
+  moments.readFromTransportOutput(fichierStream);
+  //  impressionDesMoments();
+  return true;
+
+}

Interface_Web/trunk/pspaWT/src/elementBeam.cc

@@ -1 +1 @@
 #include "elementBeam.h"
-#include "transportMoments.h"
+#include "beam2Moments.h"
 #include "mixedTools.h"
 
@@ -87 +87 @@
 string elementBeam::transportOutputFlow() const {
   ostringstream sortie;
-  transportMoments moments(x_, xp_, y_, yp_, dl_, del_);
+  beam2Moments moments(x_, xp_, y_, yp_, dl_, del_);
   cout << " elementBeam::transportOutputFlow(), p0 = " << p0_ << endl;
   sortie << label_ << ":" << moments.writeToTransportInput(p0_);

Interface_Web/trunk/pspaWT/src/particleBeam.cc

@@ -35 +35 @@
 }
 
-const transportMoments&   particleBeam::getTransportMoments() const  { 
+const beam2Moments&   particleBeam::getTransportMoments() const  { 
     return rij_;
 }
@@ -73 +73 @@
   return P0Transport_;
 }
+
+void particleBeam::set2Moments(beam2Moments& moments) {
+  rij_ = moments;
+  momentRepresentationOk_ = true;
+}
+
+
+
 bool particleBeam::particleRepresentationOk() const {
   return particleRepresentationOk_;
@@ -140 +148 @@
 // }
 
-bool  particleBeam::setFromTransport(string workingDir, string elLab, const nomdElements elem)
-{
-  string elementLabel = elLab;
-  // transformer le label en majuscules ; je ne suis pas sur que ca 
-  // marchera a tous les coups (glm)
-  std::transform(elementLabel.begin(), elementLabel.end(), elementLabel.begin(), (int (*)(int))std::toupper);
-
-  cout << " particleBeam::setFromTransport on cherche element " << elementLabel << endl;
-  ifstream infile;
-  //  string nameIn = WORKINGAREA + "transport.output";
-  string nameIn = workingDir + "transport.output";
-  infile.open(nameIn.c_str(), ios::in);
-  if (!infile) {
-    cerr << " particleBeam::setFromTransport : error re-opening transport output stream " << nameIn << endl;
-    return false;
-  }
-  //  else cout << " particleBeam::setFromTransport() : ouverture du fichier " << nameIn << endl; 
-
-  string::size_type nn = string::npos;
-  string  fichier;
-  string buf;
-  unsigned compteur = 0;
-  while ( getline(infile, buf) ) {
-      fichier += buf+"\n";
-    nn = buf.find(elementLabel);
-    if ( nn != string::npos ) {
-      compteur++;
-      //      break;
-    }
-  }
-  infile.close();
-  cout << " compteur= " << compteur << endl;
-  if ( compteur == 0 ) {
-    cerr << " particleBeam::setFromTransport : element " << elementLabel << " non trouve dans le fichier  " << nameIn << endl;
-    return false;
-  }
-
-
-  stringstream fichierStream(fichier);
-  buf.clear();
-  unsigned relu = 0;
-  while ( std::getline(fichierStream, buf) ) {
-    //    cout << " relecture buffer : " << buf << endl;
-    nn = buf.find(elementLabel);
-    if ( nn != string::npos ) {
-      relu++;
-      if ( relu == compteur ) {
-        cout << " TROUVE !" << endl;
-        break;
-      }
-    }
-  }
-
-  readTransportMoments(fichierStream);
-  //  impressionDesMoments();
-  momentRepresentationOk_ = true;
-  return true;
-}
+// bool  particleBeam::setFromTransport(string workingDir, string elLab, const nomdElements elem)
+// {
+//   string elementLabel = elLab;
+//   // transformer le label en majuscules ; je ne suis pas sur que ca 
+//   // marchera a tous les coups (glm)
+//   std::transform(elementLabel.begin(), elementLabel.end(), elementLabel.begin(), (int (*)(int))std::toupper);
+
+//   cout << " particleBeam::setFromTransport on cherche element " << elementLabel << endl;
+//   ifstream infile;
+//   //  string nameIn = WORKINGAREA + "transport.output";
+//   string nameIn = workingDir + "transport.output";
+//   infile.open(nameIn.c_str(), ios::in);
+//   if (!infile) {
+//     cerr << " particleBeam::setFromTransport : error re-opening transport output stream " << nameIn << endl;
+//     return false;
+//   }
+//   //  else cout << " particleBeam::setFromTransport() : ouverture du fichier " << nameIn << endl; 
+
+//   string::size_type nn = string::npos;
+//   string  fichier;
+//   string buf;
+//   unsigned compteur = 0;
+//   while ( getline(infile, buf) ) {
+//       fichier += buf+"\n";
+//     nn = buf.find(elementLabel);
+//     if ( nn != string::npos ) {
+//       compteur++;
+//       //      break;
+//     }
+//   }
+//   infile.close();
+//   cout << " compteur= " << compteur << endl;
+//   if ( compteur == 0 ) {
+//     cerr << " particleBeam::setFromTransport : element " << elementLabel << " non trouve dans le fichier  " << nameIn << endl;
+//     return false;
+//   }
+
+
+//   stringstream fichierStream(fichier);
+//   buf.clear();
+//   unsigned relu = 0;
+//   while ( std::getline(fichierStream, buf) ) {
+//     //    cout << " relecture buffer : " << buf << endl;
+//     nn = buf.find(elementLabel);
+//     if ( nn != string::npos ) {
+//       relu++;
+//       if ( relu == compteur ) {
+//      cout << " TROUVE !" << endl;
+//      break;
+//       }
+//     }
+//   }
+//
+//   readTransportMoments(fichierStream);
+//   //  impressionDesMoments();
+//   momentRepresentationOk_ = true;
+//   return true;
+// }
 
 
@@ -501 +509 @@
 // }
 
-void particleBeam::readTransportMoments(stringstream& inp) {
-rij_.readFromTransportOutput(inp);
-}
+// void particleBeam::readTransportMoments(stringstream& inp) {
+// rij_.readFromTransportOutput(inp);
+// }
 
 double particleBeam::getXmaxRms() {