Changeset 1365 in svn for trunk/external/Hector/H_HorizontalQuadrupole.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_HorizontalQuadrupole.cc (modified) (1 diff)

trunk/external/Hector/H_HorizontalQuadrupole.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_HorizontalQuadrupole.cc
-/// \brief Classes aiming at simulating horizontal quadrupoles in beamline
+/// \brief Classes aiming at simulating horizontal kickers in beamline
 
 // local #includes
 #include "H_HorizontalQuadrupole.h"
 
-void H_HorizontalQuadrupole::setMatrix(const float eloss, const float p_mass, const float p_charge) {
-        if (fk>0)  { if(VERBOSE) cout<<"<H_HorizontalQuadrupole> ERROR : k1 should be < 0 (" << name << ")!"<<endl; }
-                if (fk !=0 ) element_mat = hquadmat(element_length,fk,eloss, p_mass, p_charge);
+void H_HorizontalQuadrupole::setMatrix(const float eloss, const float p_mass, const float p_charge) const {
+        if (fk>0)  { if(VERBOSE) cout<<"\t ERROR : k1 should be < 0 for H_HorizontalQuadrupole (" << name << ")!"<<endl; }
+                if (fk !=0 ) *element_mat = hquadmat(element_length,fk,eloss, p_mass, p_charge);
                 else  {
-                        element_mat = driftmat(element_length);
-                        if(VERBOSE) cout<<"<H_HorizontalQuadrupole> WARNING : k1= 0 ; drift-like quadrupole (" << name << ") !" << endl;
+                        *element_mat = driftmat(element_length);
+                        if(VERBOSE) cout<<"\t WARNING : k1= 0 ; drift-like quadrupole (" << name << ") !" << endl;
                 }
         return ;
 }
-
-H_HorizontalQuadrupole* H_HorizontalQuadrupole::clone() const {
-        H_HorizontalQuadrupole* temp_quad = new H_HorizontalQuadrupole(name,fs,fk,element_length);
-        temp_quad->setAperture(element_aperture);
-        temp_quad->setX(xpos);
-        temp_quad->setY(ypos);
-        temp_quad->setTX(txpos);
-        temp_quad->setTY(typos);
-        temp_quad->setBetaX(betax);
-        temp_quad->setBetaY(betay);
-        return temp_quad;
-}