Changeset 281 in svn for trunk/Utilities/Hector/include/H_AbstractBeamLine.h

Timestamp:

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

Author:

Xavier Rouby

Message:

new Hector version

File:

• trunk/Utilities/Hector/include/H_AbstractBeamLine.h (modified) (4 diffs)

trunk/Utilities/Hector/include/H_AbstractBeamLine.h

@@ -2 +2 @@
 #define _H_AbstractBeamLine_
 
-/*
----- Hector the simulator ----
-   A fast simulator of particles through generic beamlines.
-   J. de Favereau, X. Rouby ~~~ hector_devel@cp3.phys.ucl.ac.be
+  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *                                                         *
+*                   --<--<--  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                 *
+ *                                                         *
+   * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-        http://www.fynu.ucl.ac.be/hector.html
-
-   Centre de Physique des Particules et de Phï¿œnomï¿œnologie (CP3)
-   Universitￜ Catholique de Louvain (UCL)
-*/
 
 /// \file H_AbstractBeamLine.h
 /// \brief Class aiming at simulating the LHC beamline.
 ///
-/// Units : angles [ï¿œrad], distances [ï¿œm], energies [GeV], c=[1].
+/// Units : angles [urad], distances [um], energies [GeV], c=[1].
 
         /// default length of the beam line
@@ -39 +47 @@
 
         public:
-                void init(const float );
                 ///     Constructors, destructor and operator
                 //@{
@@ -50 +57 @@
                 //@}
                 ///     Adds an element to the beamline
-                //@{
                 void add(H_OpticalElement *);
-                void add(H_OpticalElement &);
-                //@}
                 ///     Returns the (float) length of the beamline
-                inline float getLength() const { return beam_length;};
+                const float getLength() const { return beam_length;};
                 ///     Returns the (int) number of optics element of the beamline, including drifts
-                inline int getNumberOfElements() const { return (int)elements.size();}; 
+                const unsigned int getNumberOfElements() const { return elements.size();}; 
                 ///     Returns the transport matrix for the whole beam
                 const TMatrix getBeamMatrix() const;
@@ -124 +128 @@
 
         private:
-                /// list of all optics elements, including drifts
-                vector<H_OpticalElement*> elements; 
                 /// list of matrices, 1 matrix = the transport till the end of each element
                 vector<TMatrix> matrices; 
                 /// transport matrix for the whole beam
-                TMatrix beam_mat;                       
+                TMatrix beam_mat;
+                /// list of all optics elements, including drifts
+                vector<H_OpticalElement*> elements;
                 /// Orderting method for the vector of H_OpticalElement*
-                struct ordering{ bool operator()(H_OpticalElement* el1, H_OpticalElement* el2) const { return (*el1 < *el2);}};
+                struct ordering{ bool operator()(const H_OpticalElement* el1, const H_OpticalElement* el2) const {return (*el1 < *el2);}};
+                // private method for copying the contents of "elements"
+                void cloneElements(const H_AbstractBeamLine&);
 
         protected:
+                void init(const float );
                 /// total length of the beamline
                 float beam_length;
+        friend std::ostream& operator<< (std::ostream& os, const H_AbstractBeamLine& be);
 };