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

Timestamp:

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

Author:

Xavier Rouby

Message:

new Hector version

File:

• trunk/Utilities/Hector/src/H_AbstractBeamLine.cc (modified) (7 diffs)

trunk/Utilities/Hector/src/H_AbstractBeamLine.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_AbstractBeamLine.cc
@@ -45 +51 @@
 }
 
-H_AbstractBeamLine::H_AbstractBeamLine(const H_AbstractBeamLine& beamline) {
-        elements = beamline.elements;
-        matrices = beamline.matrices;
+H_AbstractBeamLine::H_AbstractBeamLine(const H_AbstractBeamLine& beamline) : 
+        matrices(beamline.matrices)   {
+        //elements = beamline.elements; //<-- bad ! the new vector contains the same pointers as the previous one
+        cloneElements(beamline);
         beam_mat.ResizeTo(MDIM,MDIM);
         beam_mat = beamline.beam_mat;
@@ -55 +62 @@
 H_AbstractBeamLine& H_AbstractBeamLine::operator=(const H_AbstractBeamLine& beamline) {
         if(this== &beamline) return *this;
-        elements = beamline.elements;
+        //elements = beamline.elements; //<-- bad ! the new vector contains the same pointers as the previous one
+        cloneElements(beamline);
         matrices = beamline.matrices;
         beam_mat = beamline.beam_mat;
@@ -83 +91 @@
         elements.clear(); 
         matrices.clear(); 
+}
+
+void H_AbstractBeamLine::cloneElements(const H_AbstractBeamLine& beam) {
+        vector<H_OpticalElement*>::const_iterator element_i;
+        for (element_i = beam.elements.begin(); element_i< beam.elements.end(); element_i++) {
+                H_OpticalElement* temp_el = (*element_i)->clone();
+                elements.push_back(temp_el);
+        }
 }
 
@@ -101 +117 @@
 }
 
-void H_AbstractBeamLine::add(H_OpticalElement & newElement) {
-        /// @param newElement is added to the beamline
-//      H_OpticalElement * el = new H_OpticalElement(newElement);
-//      elements.push_back(el);
-        elements.push_back(&newElement);
-        float a = newElement.getS()+newElement.getLength();
-        if (a > beam_length)    {
-                beam_length = a;
-                if(VERBOSE) cout<<"<H_AbstractBeamLine> WARNING : element ("<< newElement.getName()<<") too far away. The beam length has been extended to "<< beam_length << ". "<<endl;
-        }
-        calcSequence();
-        calcMatrix();
-}
-
 const TMatrix H_AbstractBeamLine::getBeamMatrix() const {
         return beam_mat;
@@ -205 +207 @@
 }
 
-void H_AbstractBeamLine::printProperties() const {
-        vector<H_OpticalElement*>::const_iterator element_i;
-        cout << "Pointeurs des elements du faisceau" << endl;
-        for (element_i = elements.begin(); element_i < elements.end(); element_i++) {
-                cout << (int)(element_i-elements.begin()) << "\t" << (*element_i)->getName() << "\t" << (*element_i)->getS() << endl;   
-        }
-        return;
-}
+std::ostream& operator<< (std::ostream& os, const H_AbstractBeamLine& be) {
+        vector<H_OpticalElement*>::const_iterator element_i;
+        os << "Beamline content" << endl;
+        for (element_i = be.elements.begin(); element_i < be.elements.end(); element_i++) {
+                os << (int)(element_i - be.elements.begin()) << "\t" << (*element_i)->getName() << "\t" << (*element_i)->getS() << endl;
+        }
+  return os;
+}
+
+void H_AbstractBeamLine::printProperties() const { cout << *this; return; }
 
 void H_AbstractBeamLine::showElements() const{
@@ -485 +489 @@
         /// @param offset In meters
 
-        extern bool relative_energy;
+        extern int relative_energy;
         if(!relative_energy) {
                 vector<H_OpticalElement*>::iterator element_i;