Changeset 1365 in svn for trunk/external/Hector/H_Quadrupole.cc

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_Quadrupole.cc (modified) (3 diffs)

trunk/external/Hector/H_Quadrupole.cc

@@ -1 @@
-  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *                                                         *
-*                   --<--<--  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_Quadrupole.cc
@@ -25 +18 @@
         // needed for call from H- and V-Quadrupoles constructor
         // must be in public section
-                element_mat.ResizeTo(MDIM,MDIM);
                 setTypeString();
                 setMatrix(0,MP,QP);
@@ -31 +23 @@
 }
 
-std::ostream& operator<< (std::ostream& os, const H_Quadrupole& el) {
-        os << el.typestring  << el.name  << "\t at s = " << el.fs << "\t length = " << el.element_length << "\t k1 = " << el.fk <<endl;
-        if(el.element_aperture->getType()!=NONE) {
-                os << *(el.element_aperture) << endl;
+void H_Quadrupole::printProperties() const{
+        cout << typestring;
+        cout << name;
+        cout << "\t at s = " << fs;
+        cout << "\t length = " << element_length;
+        cout << "\t k1 = " << fk;
+        cout<<endl;
+        if(element_aperture->getType()!=NONE) {
+                cout <<"\t aperture type = " << element_aperture->getTypeString();
+                element_aperture->printProperties();
         }
 
-        if(el.element_length<0 && VERBOSE) os<<"<H_Quadrupole> ERROR : Interpenetration of elements !"<<endl; 
-        else if(el.element_length==0 && VERBOSE) os<<"<H_Quadrupole> WARNING : 0-length "<< el.typestring << " !" << endl; 
-   return os;
+        if(element_length<0)  { if(VERBOSE) cout<<"\t ERROR : Interpenetration of elements !"<<endl; }
+        if(element_length==0) { if(VERBOSE) cout<<"\t WARNING : 0-length "<< typestring << " !" << endl; }
 }