Changeset 281 in svn for trunk/Utilities/Hector/src/H_EllipticAperture.cc

Timestamp:

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

Author:

Xavier Rouby

Message:

new Hector version

File:

• trunk/Utilities/Hector/src/H_EllipticAperture.cc (modified) (3 diffs)

trunk/Utilities/Hector/src/H_EllipticAperture.cc

@@ -1 @@
-/*
----- 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_EllipticAperture.cc
@@ -25 +32 @@
 using namespace std;
 
-H_EllipticAperture::H_EllipticAperture(const float l, const float h, const float posx, const float posy) :H_Aperture(ELLIPTIC,l,h,0,0,posx,posy) {
+H_EllipticAperture::H_EllipticAperture(const int type, const float l, const float h, const float posx, const float posy) :
+        H_Aperture(type,l,h,0,0,posx,posy) {
+        /// @param type is the aperture type (ELLIPTIC or CIRCULAR)
+        /// @param l, h are the length and height of the elliptic shape
+        /// @param posx, posy are the (x,y) coordinates of the center of the ellipse
+
+        if (type!= ELLIPTIC && type != CIRCULAR) { 
+                cout << "Warning: trying to define an EllipticalAperture which is neither elliptical nor circular." << endl;
+                cout << "'Elliptical' type forced\n"; 
+                type_ = ELLIPTIC; 
+                aptypestring = getApertureString(); 
+        }
+}
+
+H_EllipticAperture::H_EllipticAperture(const float l, const float h, const float posx, const float posy) :
+        H_Aperture(ELLIPTIC,l,h,0,0,posx,posy) {
         /// @param l, h are the length and height of the elliptic shape
         /// @param posx, posy are the (x,y) coordinates of the center of the ellipse
@@ -48 +70 @@
 }
 
-void H_EllipticAperture::printProperties() const {
-        cout<< "Aperture shape:" << getTypeString() << ", ellipse axes : "<<x1<<", "<<x2<<endl;
-        cout << " \t Center : " << fx << "," << fy << endl;
-        return;
+std::ostream& operator<< (std::ostream& os, const H_EllipticAperture& ap) {
+        os<< "Aperture shape:" << ap.aptypestring << ", ellipse axes : "<< ap.x1 <<", " << ap.x2 << endl;
+        os << " \t Center : "  << ap.fx << "," << ap.fy << endl;
+        return os;
 }