Changeset 281 in svn for trunk/Utilities/Hector/src/H_Drift.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_Drift.cc (modified) (2 diffs)

trunk/Utilities/Hector/src/H_Drift.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_Drift.cc
@@ -26 +33 @@
 }
 
-void H_Drift::printProperties() const {
-        cout << typestring << name;
-        cout << "\t\t at s = " << fs;
-        cout << "\t length = " << element_length;
-        cout<<endl;
-        if(element_aperture->getType()!=NONE) {
-                cout <<"\t aperture type = " << element_aperture->getTypeString();
-                element_aperture->printProperties();
+std::ostream& operator<< (std::ostream& os, const H_Drift& el) {
+        os << el.typestring << el.name << "\t\t at s = " << el.fs << "\t length = " << el.element_length <<endl;
+        if(el.element_aperture->getType()!=NONE) {
+                os << *(el.element_aperture) << endl;
         }
-        if(element_length<0)  { if(VERBOSE) cout<<"<H_Drift> ERROR : Interpenetration of elements !"<<endl; }
-        if(element_length==0) { if(VERBOSE) cout<<"<H_Drift> WARNING : 0-length "<< name << " !" << endl; }
+        if(el.element_length<0 && VERBOSE) os <<"<H_Drift> ERROR : Interpenetration of elements !"<<endl;
+        else if(el.element_length==0 && VERBOSE) os <<"<H_Drift> WARNING : 0-length "<< el.name << " !" << endl;
+   return os;
 }