Changeset 281 in svn for trunk/Utilities/Hector/src/H_BeamParticle.cc

Timestamp:

Mar 1, 2009, 3:56:11 PM (16 years ago)

Author:

Xavier Rouby

Message:

new Hector version

File:

• trunk/Utilities/Hector/src/H_BeamParticle.cc (modified) (10 diffs)

trunk/Utilities/Hector/src/H_BeamParticle.cc

@@ -1 @@
-/*
----- Hector the simulator ----
-   A fast simulator of particles through generic beamlines.
-   J. de Favereau, X. Rouby ~~~ hector_devel@cp3.phys.ucl.ac.be
-
-        http://www.fynu.ucl.ac.be/hector.html
-
-   Centre de Physique des Particules et de Phénoménologie (CP3)
-   Université Catholique de Louvain (UCL)
-*/
+  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *                                                         *
+*                   --<--<--  A fast simulator --<--<--     *
+*                 / --<--<--     of particle   --<--<--     *
+*  ----HECTOR----<                                          *
+*                 \ -->-->-- transport through -->-->--     *
+*                   -->-->-- generic beamlines -->-->--     *
+*                                                           *
+* JINST 2:P09005 (2007)                                     *
+*      X Rouby, J de Favereau, K Piotrzkowski (CP3)         *
+*       http://www.fynu.ucl.ac.be/hector.html               *
+*                                                           *
+* Center for Cosmology, Particle Physics and Phenomenology  *
+*              Universite catholique de Louvain             *
+*                 Louvain-la-Neuve, Belgium                 *
+ *                                                         *
+   * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /// \file H_BeamParticle.cc
@@ -39 +46 @@
 using namespace std;
 
-void H_BeamParticle::init() {
+void H_BeamParticle::init() { // for more efficiency, put the objects away from init!
         mp = MP;
         qp = QP;
@@ -57 +64 @@
 }
 
-H_BeamParticle::H_BeamParticle() {
+H_BeamParticle::H_BeamParticle() { 
         init();
 }
 
-H_BeamParticle::H_BeamParticle(const H_BeamParticle& p) {
-        mp = p.mp;
-        qp = p.qp;
-        fx = p.fx;
-        fy = p.fy;
-        thx = p.thx;
-        thy = p.thy;
-        fs = p.fs;
-        energy = p.energy;
-        hasstopped = p.hasstopped;
-        hasemitted = p.hasemitted;
-        isphysical = p.isphysical;
-        stop_position = new TVectorD(*(p.stop_position));
+H_BeamParticle::H_BeamParticle(const H_BeamParticle& p): 
+        mp(p.mp), qp(p.qp), fs(p.fs), fx(p.fx), fy(p.fy), thx(p.thx), thy(p.thy), 
+        energy(p.energy), hasstopped(p.hasstopped), hasemitted(p.hasemitted),
+        isphysical(p.isphysical), stop_position(new TVectorD(*(p.stop_position))),
+        stop_element(0), positions(p.positions) {
         if(p.hasstopped) stop_element = new H_OpticalElement(*(p.stop_element)); 
-        positions = p.positions;
 }
 
@@ -100 +98 @@
         stop_position = new TVectorD(*(p.stop_position));
         if(p.hasstopped) stop_element = new H_OpticalElement(*(p.stop_element));
+        else stop_element = 0;
         positions = p.positions;
         return *this;
 }
 
-bool H_BeamParticle::stopped(const H_AbstractBeamLine * beamline) {
+const bool H_BeamParticle::stopped(const H_AbstractBeamLine * beamline) {
         vector<TVectorD>::const_iterator position_i;
         for(position_i = positions.begin(); position_i < positions.end()-1; position_i++) {
@@ -159 +158 @@
 }
 
-void H_BeamParticle::smearPos(const double dx,const double dy) {
+
+
+void H_BeamParticle::smearPos(const double dx,const double dy, TRandom* r) {
   // the beam is centered on (fx,fy) at IP
-        fx = gRandom->Gaus(fx,dx);
-        fy = gRandom->Gaus(fy,dy);
+        fx = r->Gaus(fx,dx);
+        fy = r->Gaus(fy,dy);
+        positions.clear();
+        addPosition(fx,thx,fy,thy,fs);
+        return;
+}
+
+void H_BeamParticle::smearAng(const double tx, const double ty, TRandom* r) {
+  // the beam transverse direction is centered on (thx,thy) at IP
+        thx = r->Gaus(thx,tx);
+        thy = r->Gaus(thy,ty);
         positions.clear();
         addPosition(fx,thx,fy,thy,fs);
@@ -168 +178 @@
 }
 
-void H_BeamParticle::smearPos() {
-  // the beam is centered on (fx,fy) at IP
-        fx = gRandom->Gaus(fx,SX);
-        fy = gRandom->Gaus(fy,SY);
-        positions.clear();
-        addPosition(fx,thx,fy,thy,fs);
-        return;
-}
-
-void H_BeamParticle::smearAng(const double tx, const double ty) {
-  // the beam transverse direction is centered on (thx,thy) at IP
-        thx = gRandom->Gaus(thx,tx);
-        thy = gRandom->Gaus(thy,ty);
-        positions.clear();
-        addPosition(fx,thx,fy,thy,fs);
-        return;
-}
-
-void H_BeamParticle::smearAng() {
-   // the beam transverse direction is centered on (thx,thy) at IP
-        thx = gRandom->Gaus(thx,STX);
-        thy = gRandom->Gaus(thy,STY);
-        positions.clear();
-        addPosition(fx,thx,fy,thy,fs);
-        return;
-}
-
-void H_BeamParticle::smearE(const double erre) {
-        energy = gRandom->Gaus(energy,erre);
-        return;
-}
-
-void H_BeamParticle::smearE() {
-        energy = gRandom->Gaus(energy,SBE);
-        return;
-}
-
-void H_BeamParticle::smearS(const double errs) {
-        fs= gRandom->Gaus(fs,errs);
+void H_BeamParticle::smearE(const double erre, TRandom* r) {
+        energy = r->Gaus(energy,erre);
+        return;
+}
+
+void H_BeamParticle::smearS(const double errs, TRandom* r) {
+        fs= r->Gaus(fs,errs);
         positions.clear();
         addPosition(fx,thx,fy,thy,fs);
@@ -212 +190 @@
 }
 
-void H_BeamParticle::smearS() {
-        fs = gRandom->Gaus(fs,SS);
-        positions.clear();
-        addPosition(fx,thx,fy,thy,fs);
-        return;
-}
 
 void H_BeamParticle::set4Momentum(const double px, const double py, const double pz, const double ene) {
@@ -267 +239 @@
         if(hasstopped) return stop_element;
         else { H_OpticalElement * dummy_el = new H_Drift("",0,0); return dummy_el;}
-}
-
-void H_BeamParticle::emitGamma(const double gee, const double gq2) {
-        emitGamma(gee,gq2,0,2*pi);
-        return;
 }
 
@@ -362 +329 @@
 }
 
-void H_BeamParticle::printProperties() const {
-        cout << " M   = " << getM()  << "GeV ";
-        cout << " Q   = " << getQ()  << "e";
-        cout << " fx  = " << getX()  << "m   ";
-        cout << " fy  = " << getY()  << "m   ";
-        cout << " thx = " << getTX() << "rad ";
-        cout << " thy = " << getTY() << "rad ";
-        cout << endl;
-        return;
+std::ostream& operator<< (std::ostream& os, const H_BeamParticle& p) {
+        os << " M   = " << p.getM()  << "GeV ";
+        os << " Q   = " << p.getQ()  << "e";
+        os << " fx  = " << p.getX()  << "m   ";
+        os << " fy  = " << p.getY()  << "m   ";
+        os << " thx = " << p.getTX() << "rad ";
+        os << " thy = " << p.getTY() << "rad ";
+        os << endl;
+   return os;
 }
 
@@ -491 +458 @@
         delete [] graph;
         return ppath;
-}
-
-void H_BeamParticle::computePath(const H_AbstractBeamLine * beam) {
-        computePath(beam,true);
 }