Changeset 216 in svn for trunk/Utilities/Hector/src

Timestamp:

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

Author:

Xavier Rouby

Message:

passing all objects as references

Location:

trunk/Utilities/Hector/src

Files:

• H_AbstractBeamLine.cc (modified) (6 diffs)
• H_BeamLine.cc (modified) (3 diffs)
• H_BeamLineParser.cc (modified) (1 diff)
• H_BeamParticle.cc (modified) (1 diff)
• H_OpticalElement.cc (modified) (2 diffs)
• H_RectangularCollimator.cc (modified) (1 diff)
• H_RomanPot.cc (modified) (1 diff)

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();