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

trunk/Utilities/Hector/include/H_Aperture.h

@@ -2 +2 @@
 #define _H_Aperture_
 
-/*
----- 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_Aperture.h
@@ -18 +25 @@
 // C++ #defines
 #include <string>
+#include <iostream>
 using namespace std;
 
 // local #defines
-#define NONE        0
-#define RECTANGULAR 1
-#define ELLIPTIC    2
-#define CIRCULAR    3
-#define RECTELLIPSE 4
+enum {NONE=0, RECTANGULAR, ELLIPTIC, CIRCULAR, RECTELLIPSE};
 #define NONENAME        "None       "
 #define RECTANGULARNAME "Rectangle  "
@@ -43 +47 @@
                 H_Aperture& operator=(const H_Aperture&);
                 virtual ~H_Aperture() { };
-                virtual H_Aperture* clone() const { return new H_Aperture(type,x1,x2,x3,x4,fx,fy); };
+                virtual H_Aperture* clone() const { return new H_Aperture(type_,x1,x2,x3,x4,fx,fy); };
                 //@}
 
                 /// Prints the aperture features
-                virtual void printProperties() const;
+                //virtual void printProperties() const;
+                void printProperties() const;
                 /// Draws the aperture shape
                 virtual void draw(const float scale=1) const {return;};
@@ -55 +60 @@
                 virtual bool isInside(const float, const float) const; 
                 /// Returns the (int) type of aperture
-                inline int getType() const {return type;};
+                inline int getType() const {return type_;};
                 /// Returns the (string) type of the aperture
                 inline const string getTypeString() const { return aptypestring; }
@@ -62 +67 @@
         protected:
                 /// Aperture shape (either RECTANGULAR or ELLIPTIC or ...)
-                int type;
-                /// Aperture shape string
-                string aptypestring;
-
+                int type_;
                 /// Aperture geometrical sizes (length/width or great/small radii) [m]
                 //@{
                 float x1, x2, x3, x4; 
                 //@}
-
                 /// Horizontal coordinate of the aperture center [m] (from the nominal beam position).
                 //@{
                 float fx, fy;
                 //@}
-                /// Sets the name of the aperture from its type.
-                void setApertureString();
+                /// Aperture shape string
+                string aptypestring;
+                // Sets the name of the aperture from its type.
+                //void setApertureString();
+                /// Gets the name of the aperture from its type.
+                const string getApertureString() const;
+
+        friend std::ostream& operator<< (std::ostream& os, const H_Aperture& ap);
 };
 
+
 #endif