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

Timestamp:

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

Author:

Xavier Rouby

Message:

new Hector version

File:

• trunk/Utilities/Hector/include/H_OpticalElement.h (modified) (6 diffs)

trunk/Utilities/Hector/include/H_OpticalElement.h

@@ -2 +2 @@
 #define _H_OpticalElement_
 
-/*
----- 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_OpticalElement.h
@@ -36 +43 @@
 
         // type #defines
-#define DRIFT        1
-#define RDIPOLE      2
-#define SDIPOLE      3
-#define VQUADRUPOLE  4
-#define HQUADRUPOLE  5
-#define VKICKER      6
-#define HKICKER      7
-#define RCOLLIMATOR  8
-#define ECOLLIMATOR  9
-#define CCOLLIMATOR 10
-#define RP          11
-#define IP          12
-#define MARKER      13
+enum {DRIFT=1, RDIPOLE, SDIPOLE, VQUADRUPOLE, HQUADRUPOLE, VKICKER, HKICKER, RCOLLIMATOR, ECOLLIMATOR, CCOLLIMATOR, RP, IP, MARKER};
 
         // typestring[30] #defines
@@ -82 +77 @@
                 //@}
                 ///     Prints the element features
-                virtual void printProperties() const ;
+                virtual void printProperties() const { cout << *this; return;};
                 ///     Shows the element transport matrix
                 void showMatrix() const ;
@@ -90 +85 @@
                 void setAperture(const H_Aperture*);
                 ///     Ordering operator acting on the s coordinate
-                inline bool operator>(const H_OpticalElement tocomp) const {if(fs>tocomp.getS()) { return true; } else { return false; }};
+                inline bool operator>(const H_OpticalElement& tocomp) const {return ( fs>tocomp.getS() ); };
                 ///     Ordering operator acting on the s coordinate
-                inline bool operator<(const H_OpticalElement tocomp) const {if(fs<tocomp.getS()) { return true; } else { return false; }};
+                inline bool operator<(const H_OpticalElement& tocomp) const {return ( fs<tocomp.getS() ); };
                 ///     Copy operator
                 H_OpticalElement& operator=(const H_OpticalElement&); 
@@ -178 +173 @@
                 //@}
                 virtual H_OpticalElement* clone() const { return new H_OpticalElement();};
-                TVectorD getHitPosition(TVectorD, double, double, double);
+                TVectorD getHitPosition(const TVectorD& , const double, const double, const double);
 
 
@@ -210 +205 @@
                 virtual void setTypeString() {return;};
                 /// Optical element transport matrix.
-            virtual void setMatrix(const float, const float, const float) { cout<<"dummy setmatrix"<<endl; return;};
+                virtual void setMatrix(const float, const float, const float) { cout<<"dummy setmatrix"<<endl; return;};
                 /// Optical element transport matrix.
                 TMatrix element_mat;
                 /// Optical element aperture. 
                 H_Aperture* element_aperture;
+
+        friend std::ostream& operator<< (std::ostream& os, const H_OpticalElement& el);
 };