Changeset 1365 in svn for trunk/external/Hector/H_Aperture.h

Timestamp:

Apr 16, 2014, 3:56:14 PM (10 years ago)

Author:

Pavel Demin

Message:

switch to a more stable Hector version

File:

• trunk/external/Hector/H_Aperture.h (modified) (5 diffs)

trunk/external/Hector/H_Aperture.h

@@ -2 +2 @@
 #define _H_Aperture_
 
-  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *                                                         *
-*                   --<--<--  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                 *
- *                                                         *
-   * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/*
+---- 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)
+*/
 
 /// \file H_Aperture.h
@@ -25 +18 @@
 // C++ #defines
 #include <string>
-#include <iostream>
 using namespace std;
 
 // local #defines
-enum {NONE=0, RECTANGULAR, ELLIPTIC, CIRCULAR, RECTELLIPSE};
+#define NONE        0
+#define RECTANGULAR 1
+#define ELLIPTIC    2
+#define CIRCULAR    3
+#define RECTELLIPSE 4
 #define NONENAME        "None       "
 #define RECTANGULARNAME "Rectangle  "
@@ -46 +42 @@
                 H_Aperture(const H_Aperture&);
                 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() {return;};
                 //@}
 
                 /// Prints the aperture features
-                //virtual void printProperties() const;
-                void printProperties() const;
+                virtual void printProperties() const;
                 /// Draws the aperture shape
-                virtual void draw(const float) const {return;};
+                virtual void draw() const {return;};
                 /// Sets the (x,y) position in [m]
                 void setPosition(const float,const float);
@@ -60 +54 @@
                 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; }
@@ -67 +61 @@
         protected:
                 /// Aperture shape (either RECTANGULAR or ELLIPTIC or ...)
-                int type_;
+                int type;
+                /// Aperture shape string
+                string aptypestring;
+
                 /// 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;
                 //@}
-                /// 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);
+                /// Sets the name of the aperture from its type.
+                void setApertureString();
 };
 
-
 #endif