Changeset 281 in svn for trunk/Utilities/Hector/include/H_BeamLine.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_BeamLine.h (modified) (3 diffs)

trunk/Utilities/Hector/include/H_BeamLine.h

@@ -2 +2 @@
 #define _H_BeamLine_
 
-/*
----- 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_BeamLine.h
@@ -32 +39 @@
         ///     Constructors and destructor
         //@{
-                H_BeamLine():H_AbstractBeamLine() {direction=1; ips=0; };
+                H_BeamLine();
                 H_BeamLine(const H_BeamLine& );
                 H_BeamLine(const int, const float);
@@ -39 +46 @@
         //@
                 ///     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& filename, const string& ipname="IP5");
                 ///     Reader for the external MAD table
-                //@{
-                void fill(const string&);
-                void fill(const string&, const int, const string& );
-                //@}
+                void fill(const string& filename, const int dir=1, const string& ipname="IP5");
                 ///     Returns the IP position (s)
-                double getIP() {return ips;};
+                double getIP() const {return ips;};
                 ///             Returns positions and angles of beam at IP
                 double* getIPProperties();