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

Timestamp:

Dec 10, 2012, 7:06:24 PM (12 years ago)

Author:

lemeur

Message:

reecriture de particleBeam

Location:

Interface_Web/trunk/pspaWT/include

Files:

• bareParticle.h (modified) (2 diffs)
• mathematicalTools.h (modified) (1 diff)
• particleBeam.h (modified) (3 diffs)

Interface_Web/trunk/pspaWT/include/bareParticle.h

@@ -34 +34 @@
 ~bareParticle() {;}
 
- inline bareParticle& operator = (const bareParticle& bp)
-   {
-     position_ = bp.position_;
-     betagamma_ = bp.betagamma_;
-     gamma_ = bp.gamma_;
-     return *this;
-   }
 
- bareParticle(const TRIDVECTOR&  pos , const TRIDVECTOR& bg)
-   {
-     position_ = pos;
-     betagamma_ = bg;
-     gamma_ = sqrt( 1.0 + betagamma_.norm2() );
-   }
+ bareParticle(const TRIDVECTOR&  pos , const TRIDVECTOR& bg);
 
- inline void resetDynamics(const bareParticle& bp)
-  {
-    position_ = bp.position_;
-    betagamma_ = bp.betagamma_;
-    gamma_ = bp.gamma_;
+ bareParticle(bareParticle& bp);
 
-  }
+ bareParticle(const bareParticle& bp);
+ 
+ void resetDynamics(const bareParticle& bp);
+
+ bareParticle& operator = (const bareParticle& bp);
 
 
+ const TRIDVECTOR& getReferenceToPosition() const;
 
-inline  const TRIDVECTOR& getReferenceToPosition() const
-  {
-    return position_;
-  }
+ TRIDVECTOR getPosition() const;
 
-inline  TRIDVECTOR getPosition() const
-  {
-    return position_;
-  }
+ TRIDVECTOR& getReferenceToPosition(); 
 
- inline  TRIDVECTOR& getReferenceToPosition() 
-  {
-    return position_;
-  }
-
-inline  double getZ() const
-  {
-    return position_.getComponent(2);
-  }
+ double getZ() const;
 
 
-inline void setZ(double z) 
-  {
-    position_.setComponent(2, z);
-  }
+ void setZ(double z);
 
- inline  void incrementZ( double dz) 
-  {
-    position_.incrementComponent(2, dz);
-  }
+ void incrementZ( double dz);
 
-inline   void setX(double x) 
-  {
-    position_.setComponent(0, x);
-  }
+ void setX(double x); 
 
 
-inline   double getRadius() const
-  {
-    double auxx = position_.getComponent(0);
-    double auxy = position_.getComponent(1);
-
-    return sqrt(auxx * auxx + auxy * auxy);
-  }
+ double getRadius() const;
 
 
-inline  TRIDVECTOR getBetaGamma() const
-  {
-    return betagamma_;
-  }
+ TRIDVECTOR getBetaGamma() const;
 
 
-inline TRIDVECTOR& getReferenceToBetaGamma() 
-  {
-    return betagamma_;
-  }
+ TRIDVECTOR& getReferenceToBetaGamma(); 
  
-inline void setBetaGamma(const TRIDVECTOR& btg) 
-  {
-    betagamma_ = btg;
-     gamma_ = sqrt( 1.0 + betagamma_.norm2() );
-  }
+ void setBetaGamma(const TRIDVECTOR& btg); 
 
-inline double getBetaz() const
-  {
-    return betagamma_.getComponent(2)/gamma_;
-  }
+ double getBetaz() const;
 
 
-inline  double getGamma() const 
-  {
-    return gamma_;
-  }
+ double getGamma() const; 
 
 
@@ -137 +81 @@
 
 
- inline string FileOutputFlow() const
-  {
-    ostringstream sortie;
-    sortie << position_.output_flow()  << betagamma_.output_flow() << " " <<  gamma_;
-    return sortie.str();
-  }
+ string FileOutputFlow() const;
 
-virtual inline bool FileInput( ifstream& ifs)
- {
-    bool test = false;
-    if ( position_.input_flow(ifs) && betagamma_.input_flow(ifs) )
-      { 
-        if (  ifs >> gamma_ ) 
-          {
-            test = true;
-          }
-      } 
-    return test;
- }
+ virtual bool FileInput( ifstream& ifs);
 
 

Interface_Web/trunk/pspaWT/include/mathematicalTools.h

@@ -91 +91 @@
  inline const double& operator() (int index) const { return vec_[index]; }
 
-inline void operator = (const TRIDVECTOR& triv) 
-{
-  setComponents( triv.vec_[0],triv.vec_[1], triv.vec_[2]); 
+inline TRIDVECTOR& operator= (const TRIDVECTOR& triv) 
+{
+  setComponents( triv.vec_[0],triv.vec_[1], triv.vec_[2]);
+  return *this;
 }
 

Interface_Web/trunk/pspaWT/include/particleBeam.h

@@ -11 +11 @@
 #include "bareParticle.h"
 #include "mathematicalTools.h"
-#include "mathematicalConstants.h"
-#include "PhysicalConstants.h"
 #include "nomdElements.h"
 
 using namespace std;
 
-struct particle
+typedef struct 
 {
   float xx, xxp, begamx,yy,yyp,begamy,z, begamz,phi,wz;
@@ -31 +29 @@
     printf( " %e %e %e %e %e %e %e %e %e %e %d %d %d, %d %e %e %e %e \n", xx, xxp, begamx,yy,yyp,begamy,z, begamz,phi,wz,ne,np,ngood,npart,phi0, ksi1,ksi2,ksi3);
   }
-};
+} parmelaParticle;
 
 
@@ -45 +43 @@
   vector<bareParticle> goodPartic_;
 
-      vector< vector<double> > rij_transportMoments_;
-      vector<double> centroid_;
-      double P0Transport_;
+  vector< vector<double> > rij_transportMoments_;
+  vector<double> centroid_;
+  double P0Transport_;
 
 
-      void readTransportMoments(ifstream& inp);
+  void readTransportMoments(ifstream& inp);
 
-      void impressionDesMoments() const;
+  void impressionDesMoments() const;
+  void razDesMoments();
 
 
  public:
 
- particleBeam()  
-   {
-     rij_transportMoments_.resize(6);
-     unsigned dim=0;
-     unsigned k;
-     for ( k=0; k < 6; k++)
-       {
-         rij_transportMoments_.at(k).resize(++dim); 
-       }
-     P0Transport_ = 0.0;
-     particleRepresentationOk_ = false;
-     momentRepresentationOk_ = false;
-
-   }
+  particleBeam(); 
 
   ~particleBeam() {;}
 
   bool setFromParmela(unsigned numeroElement,double referencefrequency);
-      void buildMomentRepresentation();
+  void buildMomentRepresentation();
 
-      //       bool setFromTransport(ifstream& inp, unsigned nblignes);
-          bool  setFromTransport(string elementLabel, const nomdElements elem);
+  bool  setFromTransport(string elementLabel, const nomdElements elem);
 
-  inline void clear() 
-  {
-    goodPartic_.clear();
-     P0Transport_ = 0.0;
-     particleRepresentationOk_ = false;
-     momentRepresentationOk_ = false;
-  }
+  void clear();
 
-inline  int getNbParticles() const
-  {
-    return goodPartic_.size();
-  }
+  int getNbParticles() const;
 
- inline const vector< vector<double> >&  getTransportMoments() const  { return rij_transportMoments_;}
- inline double getP0Transport() const { return P0Transport_;}
-  inline bool particleRepresentationOk() const {return particleRepresentationOk_;}
- inline bool momentRepresentationOk() const {return momentRepresentationOk_;}
+  const vector< vector<double> >&  getTransportMoments() const;
+  double getP0Transport() const;
+  bool particleRepresentationOk() const;
+  bool momentRepresentationOk() const;
 
 
-inline void  addParticle( bareParticle p)
-    {
-      goodPartic_.push_back(p);
-    }
+  void  addParticle( bareParticle p);
 
 
 
-inline const vector<bareParticle>& getParticleVector() const
- {
-   return goodPartic_;
- }
+  const vector<bareParticle>& getParticleVector() const;
 
-inline vector<bareParticle>& getParticleVector() 
- {
-   return goodPartic_;
- }
+  vector<bareParticle>& getParticleVector(); 
 
- double getXmaxRms();
+  double getXmaxRms();
 
- void getVariance(double& varx, double& vary, double& varz) const;
+  void getVariance(double& varx, double& vary, double& varz) const;
  
 
- void printAllXYZ() const;
+  void printAllXYZ() const;
 
 
- void Zrange(double& zmin, double& zmax) const;
+  void Zrange(double& zmin, double& zmax) const;
 
- void donneesDessinEllipseXxp(vector<double>& xcor, vector<double>& ycor);
+  void donneesDessinEllipseXxp(vector<double>& xcor, vector<double>& ycor);
 
 
- virtual string FileOutputFlow() const;
+  virtual string FileOutputFlow() const;
 
 
- virtual bool FileInput(ifstream& ifs);
+  virtual bool FileInput(ifstream& ifs);