Changeset 1365 in svn for trunk/external/Hector/H_CircularAperture.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_CircularAperture.h (modified) (2 diffs)

trunk/external/Hector/H_CircularAperture.h

@@ -2 +2 @@
 #define _H_CircularAperture_
 
-  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *                                                         *
-*                   --<--<--  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_CircularAperture.h
@@ -33 +26 @@
                 /// Constructors and destructor
                 //@{
-                H_CircularAperture():H_EllipticAperture(CIRCULAR,0,0,0,0) {};
-                H_CircularAperture(const float r, const float posx, const float posy) : H_EllipticAperture(CIRCULAR,r,r,posx,posy) {};
-                /// @param r is the radius of the circular shape
-                /// @param posx, posy are the (x,y) coordinates of the center of the circle
-                ~H_CircularAperture() {};
-                H_CircularAperture* clone() const;
+                H_CircularAperture():H_EllipticAperture(0,0,0,0) {type = CIRCULAR; setApertureString();}
+                H_CircularAperture(const float, const float, const float);
+                ~H_CircularAperture() {return;};
                 //@}
-        friend std::ostream& operator<< (std::ostream& os, const H_CircularAperture& ap);
+                virtual void printProperties() const;
 };