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

Timestamp:

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

Author:

Xavier Rouby

Message:

new Hector version

File:

• trunk/Utilities/Hector/src/H_CircularAperture.cc (modified) (2 diffs)

trunk/Utilities/Hector/src/H_CircularAperture.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_CircularAperture.cc
@@ -23 +30 @@
 using namespace std;
 
-/// Circular apertures
-H_CircularAperture::H_CircularAperture(const float r, const float posx, const float posy) :H_EllipticAperture(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
-        type= CIRCULAR; 
-}
-
 H_CircularAperture* H_CircularAperture::clone() const {
         return new H_CircularAperture(x1,fx,fy);
 }
 
-void H_CircularAperture::printProperties() const {
-        cout << "Aperture shape:" << getTypeString() << ", aperture radius : " << x1 << endl;
-        cout << " \t Center : " << fx << "," << fy << endl;
-        return;
+std::ostream& operator<< (std::ostream& os, const H_CircularAperture& ap) {
+        os     << "Aperture shape:" << ap.aptypestring << ", aperture radius : " << ap.x1 << endl;
+        os     << " \t Center : " << ap.fx << "," << ap.fy << endl;
+        return os;
 }