Changeset 1365 in svn for trunk/external/Hector/H_SectorDipole.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_SectorDipole.cc (modified) (2 diffs)

trunk/external/Hector/H_SectorDipole.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_SectorDipole.cc
@@ -23 +16 @@
 #include "H_TransportMatrices.h"
 
-void H_SectorDipole::setMatrix(const float eloss, const float p_mass, const float p_charge) {
-        if (fk !=0 ) element_mat = sdipmat(element_length,fk,eloss,p_mass,p_charge);
+void H_SectorDipole::setMatrix(const float eloss, const float p_mass, const float p_charge) const {
+        if (fk !=0 ) *element_mat = sdipmat(element_length,fk,eloss,p_mass,p_charge);
         else  {
-                element_mat = driftmat(element_length);
-                if(VERBOSE) cout<<"<H_SectorDipole> WARNING : k0= 0, drift-like dipole (" << name << ") !" << endl;
+                *element_mat = driftmat(element_length);
+                if(VERBOSE) cout<<"\t WARNING : k0= 0, drift-like dipole (" << name << ") !" << endl;
                 }
         return ;
 }
-
-H_SectorDipole* H_SectorDipole::clone() const {
-        H_SectorDipole* temp_dip = new H_SectorDipole(name,fs,fk,element_length);
-        temp_dip->setAperture(element_aperture);
-        temp_dip->setX(xpos);
-        temp_dip->setY(ypos);
-        temp_dip->setTX(txpos);
-        temp_dip->setTY(typos);
-        temp_dip->setBetaX(betax);
-        temp_dip->setBetaY(betay);
-        return temp_dip;
-}
-