Changeset 216 in svn for trunk/Utilities

Timestamp:

Feb 2, 2009, 12:26:00 PM (16 years ago)

Author:

Xavier Rouby

Message:

passing all objects as references

Location:

trunk/Utilities/Hector

Files:

• include/H_AbstractBeamLine.h (modified) (3 diffs)
• include/H_Aperture.h (modified) (1 diff)
• include/H_BeamLine.h (modified) (1 diff)
• include/H_BeamLineParser.h (modified) (2 diffs)
• include/H_BeamParticle.h (modified) (2 diffs)
• include/H_CircularAperture.h (modified) (1 diff)
• include/H_Dipole.h (modified) (1 diff)
• include/H_Drift.h (modified) (1 diff)
• include/H_EllipticAperture.h (modified) (1 diff)
• include/H_HorizontalKicker.h (modified) (1 diff)
• include/H_HorizontalQuadrupole.h (modified) (1 diff)
• include/H_Kicker.h (modified) (1 diff)
• include/H_Marker.h (modified) (1 diff)
• include/H_OpticalElement.h (modified) (1 diff)
• include/H_Quadrupole.h (modified) (1 diff)
• include/H_RectEllipticAperture.h (modified) (1 diff)
• include/H_RectangularAperture.h (modified) (1 diff)
• include/H_RectangularCollimator.h (modified) (1 diff)
• include/H_RectangularDipole.h (modified) (1 diff)
• include/H_RomanPot.h (modified) (1 diff)
• include/H_SectorDipole.h (modified) (1 diff)
• include/H_VerticalKicker.h (modified) (1 diff)
• include/H_VerticalQuadrupole.h (modified) (1 diff)
• src/H_AbstractBeamLine.cc (modified) (6 diffs)
• src/H_BeamLine.cc (modified) (3 diffs)
• src/H_BeamLineParser.cc (modified) (1 diff)
• src/H_BeamParticle.cc (modified) (1 diff)
• src/H_OpticalElement.cc (modified) (2 diffs)
• src/H_RectangularCollimator.cc (modified) (1 diff)
• src/H_RomanPot.cc (modified) (1 diff)

trunk/Utilities/Hector/include/H_AbstractBeamLine.h

@@ -67 +67 @@
                 const TMatrix getPartialMatrix(const unsigned int ) const;
                 ///     Returns the transport matrix for a part of the beam from the IP to a given element, given energy loss/mass/charge
-                const TMatrix getPartialMatrix(const string, const float, const float, const float);
+                const TMatrix getPartialMatrix(const string&, const float, const float, const float);
                 ///     Returns the ith element of the beamline
                 //@{
@@ -75 +75 @@
                 ///     Returns a given element of the beamline, choosen by name 
                 //@{
-                H_OpticalElement * getElement(const string );
-                H_OpticalElement * getElement(const string ) const;
+                H_OpticalElement * getElement(const string& );
+                H_OpticalElement * getElement(const string& ) const;
                 //@}
                 ///     Print some info
@@ -99 +99 @@
                 void drawY(const float, const float) const;
                 ///     Moves an element in the list, reorders the lists and recomputes the transport matrix
-                void moveElement(const string, const float ); 
+                void moveElement(const string&, const float ); 
                 /// Moves the given element tranversely by given amounts.
-                void alignElement(const string, const float, const float);
+                void alignElement(const string&, const float, const float);
                 /// Tilts the given element tranversely by given angles.
-                void tiltElement(const string, const float, const float);
+                void tiltElement(const string&, const float, const float);
                 ///     Offsets all element in X pos from the start position
                 void offsetElements(const float start, const float offset);

trunk/Utilities/Hector/include/H_Aperture.h

@@ -42 +42 @@
                 H_Aperture(const H_Aperture&);
                 H_Aperture& operator=(const H_Aperture&);
-                virtual ~H_Aperture() { return; };
+                virtual ~H_Aperture() { };
                 virtual H_Aperture* clone() const { return new H_Aperture(type,x1,x2,x3,x4,fx,fy); };
                 //@}

trunk/Utilities/Hector/include/H_BeamLine.h

@@ -36 +36 @@
                 H_BeamLine(const int, const float);
                 H_BeamLine& operator=(const H_BeamLine& );
-                ~H_BeamLine() {return;};
+                ~H_BeamLine() {};
         //@
                 ///     Finds the IP position (s) from the MAD table. Should be "IP5" or "IP1".
                 //@{
-                void findIP(const string);
-                void findIP(const string, const string);
+                void findIP(const string&);
+                void findIP(const string&, const string&);
                 //@}
                 ///     Reader for the external MAD table
                 //@{
-                void fill(const string);
-                void fill(const string, const int, const string );
+                void fill(const string&);
+                void fill(const string&, const int, const string& );
                 //@}
                 ///     Returns the IP position (s)

trunk/Utilities/Hector/include/H_BeamLineParser.h

@@ -71 +71 @@
 */
 
-extern int column_identification(const string );
+extern int column_identification(const string& );
 
 /// \brief Reader for madx tables to use in H_BeamLine
@@ -82 +82 @@
         //@{
                 H_BeamLineParser() {init();}
-                ~H_BeamLineParser() {return;}
+                ~H_BeamLineParser() {}
         //@}
                 void init();

trunk/Utilities/Hector/include/H_BeamParticle.h

@@ -46 +46 @@
                 H_BeamParticle(const double, const double);
                 H_BeamParticle& operator=(const H_BeamParticle&);
-                ~H_BeamParticle() {if(stop_position) delete stop_position; if(!stop_element) delete stop_element; positions.clear(); return; }
+                ~H_BeamParticle() {if(stop_position) delete stop_position; if(!stop_element) delete stop_element; positions.clear();}
                 //@}
                 /// Smears the (x,y) coordinates of the particle [\f$ \mu m \f$]
@@ -112 +112 @@
                 void propagate(const H_AbstractBeamLine *, const H_OpticalElement *);
                 /// Propagates the particle accross the beamline until a given element
-                void propagate(const H_AbstractBeamLine *, const string);
+                void propagate(const H_AbstractBeamLine *, const string&);
                 /// Propagates the particle until the end of the beamline
                 void propagate(const H_AbstractBeamLine *);

trunk/Utilities/Hector/include/H_CircularAperture.h

@@ -28 +28 @@
                 H_CircularAperture():H_EllipticAperture(0,0,0,0) {type = CIRCULAR; setApertureString();}
                 H_CircularAperture(const float, const float, const float);
-                ~H_CircularAperture() {return;};
+                ~H_CircularAperture() {};
                 H_CircularAperture* clone() const;
                 //@}

trunk/Utilities/Hector/include/H_Dipole.h

@@ -26 +26 @@
                 H_Dipole():H_OpticalElement() {}
                 H_Dipole(const int dtype, const double s, const double k, const double l):H_OpticalElement(dtype,s,k,l){}
-                H_Dipole(const string nameE, const int dtype, const double s, const double k, const double l):H_OpticalElement(nameE,dtype,s,k,l){}
-                virtual ~H_Dipole() {return;};
+                H_Dipole(const string& nameE, const int dtype, const double s, const double k, const double l):H_OpticalElement(nameE,dtype,s,k,l){}
+                virtual ~H_Dipole() {};
                 //@}
                 /// Prints the properties of the element

trunk/Utilities/Hector/include/H_Drift.h

@@ -25 +25 @@
         /// Constructors and destructor
         //@{
-                        H_Drift():H_OpticalElement(DRIFT,0.,0.,0.) {init();}
+                H_Drift():H_OpticalElement(DRIFT,0.,0.,0.) {init();}
                 H_Drift(const double s, const double l):H_OpticalElement(DRIFT,s,0.,l){init();}
-                H_Drift(const string nameE, const double s, const double l):H_OpticalElement(nameE,DRIFT,s,0.,l){init();}
-                ~H_Drift() { return; };
+                H_Drift(const string& nameE, const double s, const double l):H_OpticalElement(nameE,DRIFT,s,0.,l){init();}
+                ~H_Drift() { };
         //@}
                 virtual void printProperties() const;
                 void init();
-                        H_Drift* clone() const;
+                H_Drift* clone() const;
 
         protected:

trunk/Utilities/Hector/include/H_EllipticAperture.h

@@ -27 +27 @@
                 H_EllipticAperture():H_Aperture(ELLIPTIC,0,0,0,0,0,0) {}
                 H_EllipticAperture(const float, const float, const float, const float);
-                ~H_EllipticAperture() {return;};
+                ~H_EllipticAperture() {};
                 virtual H_EllipticAperture* clone() const;
                 //@}

trunk/Utilities/Hector/include/H_HorizontalKicker.h

@@ -29 +29 @@
                 H_HorizontalKicker():H_Kicker(HKICKER,0.,0.,0.) {init();}
                 H_HorizontalKicker(const double s, const double k, const double l) :H_Kicker(HKICKER,s,k,l){init();}
-                H_HorizontalKicker(const string nameE, const double s, const double k, const double l) :H_Kicker(nameE,HKICKER,s,k,l){init();}
-                ~H_HorizontalKicker() {return;};
+                H_HorizontalKicker(const string &nameE, const double s, const double k, const double l) :H_Kicker(nameE,HKICKER,s,k,l){init();}
+                ~H_HorizontalKicker() {};
         //@}
                 H_HorizontalKicker* clone() const;

trunk/Utilities/Hector/include/H_HorizontalQuadrupole.h

@@ -27 +27 @@
                 H_HorizontalQuadrupole():H_Quadrupole(HQUADRUPOLE,0.,0.,0.) {init();}
                 H_HorizontalQuadrupole(const double s, const double k, const double l) : H_Quadrupole(HQUADRUPOLE,s,k,l){init();}
-                H_HorizontalQuadrupole(const string nameE, const double s, const double k, const double l) : H_Quadrupole(nameE,HQUADRUPOLE,s,k,l){init();}
-                ~H_HorizontalQuadrupole() {return;};
+                H_HorizontalQuadrupole(const string& nameE, const double s, const double k, const double l) : H_Quadrupole(nameE,HQUADRUPOLE,s,k,l){init();}
+                ~H_HorizontalQuadrupole() {};
         //@}
                 H_HorizontalQuadrupole* clone() const ;

trunk/Utilities/Hector/include/H_Kicker.h

@@ -28 +28 @@
                 H_Kicker():H_OpticalElement() {}
                 H_Kicker(const int dtype, const double s, const double k, const double l):H_OpticalElement(dtype,s,k,l){}
-                H_Kicker(const string nameE, const int dtype, const double s, const double k, const double l):H_OpticalElement(nameE,dtype,s,k,l){}
-                virtual ~H_Kicker() {return;};
+                H_Kicker(const string& nameE, const int dtype, const double s, const double k, const double l):H_OpticalElement(nameE,dtype,s,k,l){}
+                virtual ~H_Kicker() {};
         //@}
         /// prints the kicker properties

trunk/Utilities/Hector/include/H_Marker.h

@@ -27 +27 @@
                 H_Marker():H_Drift() { type = MARKER; init();}
                 H_Marker(const double s):H_Drift(s,0.) { type =MARKER; init();}
-                H_Marker(const string nameE, const double s):H_Drift(nameE,s,0.) { type=MARKER; init();}
-                ~H_Marker() { return; };
+                H_Marker(const string& nameE, const double s):H_Drift(nameE,s,0.) { type=MARKER; init();}
+                ~H_Marker() { };
         //@}
                 virtual void printProperties() const;

trunk/Utilities/Hector/include/H_OpticalElement.h

@@ -70 +70 @@
         public:
         ///     init method for constructors
-                void init(const string, const int , const double , const double , const double);
+                void init(const string&, const int , const double , const double , const double);
                 /// Constructors and destructor
                 //@{
-                H_OpticalElement(const string, const int, const double, const double, const double, H_Aperture*);
+                H_OpticalElement(const string&, const int, const double, const double, const double, H_Aperture*);
                 H_OpticalElement(const int, const double, const double, const double, H_Aperture*);
-                H_OpticalElement(const string, const int, const double, const double, const double);
+                H_OpticalElement(const string&, const int, const double, const double, const double);
                 H_OpticalElement(const int, const double, const double, const double);
                 H_OpticalElement();

trunk/Utilities/Hector/include/H_Quadrupole.h

@@ -27 +27 @@
                 H_Quadrupole():H_OpticalElement() {}
                 H_Quadrupole(const int dtype, const double s, const double k, const double l) : H_OpticalElement(dtype,s,k,l) {}
-                H_Quadrupole(const string nameE, const int dtype, const double s, const double k, const double l) : H_OpticalElement(nameE,dtype,s,k,l) {}
-                virtual ~H_Quadrupole() {return;};
+                H_Quadrupole(const string& nameE, const int dtype, const double s, const double k, const double l) : H_OpticalElement(nameE,dtype,s,k,l) {}
+                virtual ~H_Quadrupole() {};
         //@}    
                 virtual void printProperties() const;

trunk/Utilities/Hector/include/H_RectEllipticAperture.h

@@ -27 +27 @@
                 H_RectEllipticAperture():H_Aperture(RECTELLIPSE,0,0,0,0,0,0) {}
                 H_RectEllipticAperture(const float,const float,const float,const float, const float, const float);
-                ~H_RectEllipticAperture() {return;};
+                ~H_RectEllipticAperture() {};
                 H_RectEllipticAperture* clone() const;
                 //@}

trunk/Utilities/Hector/include/H_RectangularAperture.h

@@ -27 +27 @@
                 H_RectangularAperture():H_Aperture(RECTANGULAR,0,0,0,0,0,0) {}
                 H_RectangularAperture(const float,const float,const float,const float);
-                ~H_RectangularAperture() {return;};
+                ~H_RectangularAperture() {};
                 H_RectangularAperture* clone() const;
                 //@}

trunk/Utilities/Hector/include/H_RectangularCollimator.h

@@ -27 +27 @@
                 H_RectangularCollimator():H_Drift() {type = RCOLLIMATOR; init();}
                 H_RectangularCollimator(const double, const double );
-                H_RectangularCollimator(const string, const double, const double );
-                ~H_RectangularCollimator() { return; };
+                H_RectangularCollimator(const string&, const double, const double );
+                ~H_RectangularCollimator() {};
         //@}
                 virtual void printProperties() const;

trunk/Utilities/Hector/include/H_RectangularDipole.h

@@ -26 +26 @@
                 H_RectangularDipole():H_Dipole(RDIPOLE,0.,0.,0.) {init();}
                 H_RectangularDipole(const double s, const double k, const double l) :H_Dipole(RDIPOLE,s,k,l){init();}
-                H_RectangularDipole(const string nameE, const double s, const double k, const double l) :H_Dipole(nameE,RDIPOLE,s,k,l){init();}
-                ~H_RectangularDipole() { return; };
+                H_RectangularDipole(const string& nameE, const double s, const double k, const double l) :H_Dipole(nameE,RDIPOLE,s,k,l){init();}
+                ~H_RectangularDipole() {};
                 //@}
                 H_RectangularDipole* clone() const ;

trunk/Utilities/Hector/include/H_RomanPot.h

@@ -28 +28 @@
         //@{
                 H_RomanPot():H_Drift() {type = RP; init();}
-                H_RomanPot(const string, const double, const double);
+                H_RomanPot(const string&, const double, const double);
                 H_RomanPot(const double, const double);
-                ~H_RomanPot() { return; };
+                ~H_RomanPot() {};
         //@}
                 virtual void printProperties() const;

trunk/Utilities/Hector/include/H_SectorDipole.h

@@ -27 +27 @@
                 H_SectorDipole(const double s, const double k, const double l) :H_Dipole(SDIPOLE,s,k,l){init();}
                 H_SectorDipole(const string nameE, const double s, const double k, const double l) :H_Dipole(nameE,SDIPOLE,s,k,l){init();}
-                ~H_SectorDipole() {return;};
+                ~H_SectorDipole() {};
                 //@}
                 H_SectorDipole* clone() const ;

trunk/Utilities/Hector/include/H_VerticalKicker.h

@@ -31 +31 @@
                 H_VerticalKicker(const double s, const double k, const double l) :H_Kicker(VKICKER,s,k,l){init();}
                 H_VerticalKicker(const string nameE, const double s, const double k, const double l) :H_Kicker(nameE,VKICKER,s,k,l){init();}
-                ~H_VerticalKicker() {return;};
+                ~H_VerticalKicker() {};
         //@}
                 H_VerticalKicker* clone() const ;

trunk/Utilities/Hector/include/H_VerticalQuadrupole.h

@@ -28 +28 @@
                 H_VerticalQuadrupole(const double s, const double k, const double l):H_Quadrupole(VQUADRUPOLE,s,k,l) {init();}
                 H_VerticalQuadrupole(string nameE, const double s, const double k, const double l):H_Quadrupole(nameE,VQUADRUPOLE,s,k,l) {init();}
-                ~H_VerticalQuadrupole() {return;};
+                ~H_VerticalQuadrupole() {};
         //@}
                 H_VerticalQuadrupole* clone() const ;

trunk/Utilities/Hector/src/H_AbstractBeamLine.cc

@@ -134 +134 @@
 }
 
-const TMatrix H_AbstractBeamLine::getPartialMatrix(const string elname, const float eloss, const float p_mass, const float p_charge) {
+const TMatrix H_AbstractBeamLine::getPartialMatrix(const string& elname, const float eloss, const float p_mass, const float p_charge) {
 
         vector<H_OpticalElement*>::iterator element_i;
@@ -186 +186 @@
 
 
-H_OpticalElement * H_AbstractBeamLine::getElement(const string el_name) {
+H_OpticalElement * H_AbstractBeamLine::getElement(const string& el_name) {
         for(unsigned int i=0; i < elements.size(); i++) {
                 if( (*(elements.begin()+i))->getName() == el_name ) 
@@ -195 +195 @@
 }
 
-H_OpticalElement * H_AbstractBeamLine::getElement(const string el_name) const {
+H_OpticalElement * H_AbstractBeamLine::getElement(const string& el_name) const {
         for(unsigned int i=0; i < elements.size(); i++) {
                 if( (*(elements.begin()+i))->getName() == el_name)
@@ -435 +435 @@
 }
 
-void H_AbstractBeamLine::moveElement(const string name, const float new_s) {
+void H_AbstractBeamLine::moveElement(const string& name, const float new_s) {
         /// @param name identifies the element to move
         /// @param new_s is where to put it
@@ -448 +448 @@
 }
 
-void H_AbstractBeamLine::alignElement(const string name, const float disp_x, const float disp_y) {
+void H_AbstractBeamLine::alignElement(const string& name, const float disp_x, const float disp_y) {
         /// @param name identifies the element to move
         /// @param disp_x identifies the displacement to add in x [\f$ \mu m \f$]
@@ -464 +464 @@
 }
 
-void H_AbstractBeamLine::tiltElement(const string name, const float ang_x, const float ang_y) {
+void H_AbstractBeamLine::tiltElement(const string& name, const float ang_x, const float ang_y) {
         /// @param name identifies the element to move
         /// @param ang_x identifies the angle to add in x

trunk/Utilities/Hector/src/H_BeamLine.cc

@@ -68 +68 @@
 }
 
-void H_BeamLine::findIP(const string filename) {
+void H_BeamLine::findIP(const string& filename) {
         findIP(filename,"IP5");
         return;
 }
 
-void H_BeamLine::findIP(const string filename, const string ipname) {
+void H_BeamLine::findIP(const string& filename, const string& ipname) {
         // searches for the IP position in the extended table.
         ifstream tabfile(filename.c_str());
@@ -127 +127 @@
 }
 
-void H_BeamLine::fill(const string filename) {
+void H_BeamLine::fill(const string& filename) {
         fill(filename,1,"IP5");
         return;
@@ -133 +133 @@
 
 
-void H_BeamLine::fill(const string filename, const int dir, const string ipname) {
+void H_BeamLine::fill(const string& filename, const int dir, const string& ipname) {
         string headers[40];  // table of all column headers
         int header_type[40]; // table of all column types

trunk/Utilities/Hector/src/H_BeamLineParser.cc

@@ -31 +31 @@
 
 /// Identifies the column content from its header
-int column_identification(const string header) {
+int column_identification(const string& header) {
         // identifies the column type from its name
 

trunk/Utilities/Hector/src/H_BeamParticle.cc

@@ -444 +444 @@
 }
 
-void H_BeamParticle::propagate(const H_AbstractBeamLine * beam, const string el_name) {
+void H_BeamParticle::propagate(const H_AbstractBeamLine * beam, const string& el_name) {
         propagate(beam->getElement(el_name)->getS()+beam->getElement(el_name)->getLength());
         return;

trunk/Utilities/Hector/src/H_OpticalElement.cc

@@ -28 +28 @@
 
 /// called by the constructors
-void H_OpticalElement::init(const string nameE, const int typeE, const double s, const double k, const double l) {
+void H_OpticalElement::init(const string& nameE, const int typeE, const double s, const double k, const double l) {
         // this is called by the constructors
         // must be in public section !
@@ -56 +56 @@
 }
 
-H_OpticalElement::H_OpticalElement(const string nameE, const int typeE, const double s, const double k, const double l) : element_aperture(new H_Aperture()) {
+H_OpticalElement::H_OpticalElement(const string& nameE, const int typeE, const double s, const double k, const double l) : element_aperture(new H_Aperture()) {
         init(nameE,typeE,s,k,l);
 }
 
-H_OpticalElement::H_OpticalElement(const string nameE, const int typeE, const double s, const double k, const double l, H_Aperture* the_app) : element_aperture(the_app->clone()) {
+H_OpticalElement::H_OpticalElement(const string& nameE, const int typeE, const double s, const double k, const double l, H_Aperture* the_app) : element_aperture(the_app->clone()) {
         init(nameE,typeE,s,k,l);
 }

trunk/Utilities/Hector/src/H_RectangularCollimator.cc

@@ -30 +30 @@
 }
 
-H_RectangularCollimator::H_RectangularCollimator(const string nameE, const double s, const double l) :H_Drift(nameE,s,l){
+H_RectangularCollimator::H_RectangularCollimator(const string& nameE, const double s, const double l) :H_Drift(nameE,s,l){
         type = RCOLLIMATOR;
         init();

trunk/Utilities/Hector/src/H_RomanPot.cc

@@ -32 +32 @@
 }
 
-H_RomanPot::H_RomanPot(const string nameE, const double s, const double app) :H_Drift(nameE,s,RP_LENGTH){
+H_RomanPot::H_RomanPot(const string& nameE, const double s, const double app) :H_Drift(nameE,s,RP_LENGTH){
                 type = RP;
                 init();