Changeset 236 in PSPA for Interface_Web/trunk/pspaWT/include

Timestamp:

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

Author:

lemeur

Message:

epuration particleBeam

Location:

Interface_Web/trunk/pspaWT/include

Files:

• beam2Moments.h (added)
• dataManager.h (modified) (3 diffs)
• particleBeam.h (modified) (5 diffs)
• transportMoments.h (deleted)

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;