Changeset 1365 in svn for trunk/external/Hector/H_Drift.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_Drift.cc (modified) (3 diffs)

trunk/external/Hector/H_Drift.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_Drift.cc
@@ -24 +17 @@
 #include "H_TransportMatrices.h"
 
-
 void H_Drift::init() {
         // must be in public section
-        element_mat.ResizeTo(MDIM,MDIM);
         setTypeString();
         setMatrix(0,MP,QP);
@@ -33 +24 @@
 }
 
-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;
+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();
         }
-        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;
+        if(element_length<0)  { if(VERBOSE) cout<<"\t ERROR : Interpenetration of elements !"<<endl; }
+        if(element_length==0) { if(VERBOSE) cout<<"\t WARNING : 0-length "<< name << " !" << endl; }
 }
 
-//void H_Drift::setMatrix(const float eloss, const float p_mass, const float p_charge) {
-void H_Drift::setMatrix(const float , const float , const float ) {
-        element_mat = driftmat(element_length);
+void H_Drift::setMatrix(const float eloss, const float p_mass, const float p_charge) const {
+                *element_mat = driftmat(element_length);
         return ;
 }
-
-H_Drift* H_Drift::clone() const {
-        H_Drift* temp_drift = new H_Drift(name,fs,element_length);
-        temp_drift->setX(xpos);
-        temp_drift->setY(ypos);
-        temp_drift->setTX(txpos);
-        temp_drift->setTY(typos);
-        temp_drift->setBetaX(betax);
-        temp_drift->setBetaY(betay); 
-        return temp_drift;
-}
-