Changeset 3c40083 in git for external/Hector/H_VerticalKicker.cc

Timestamp:

Apr 16, 2014, 3:56:14 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

64a4950

Parents:

f6b9fec

Message:

switch to a more stable Hector version

File:

• external/Hector/H_VerticalKicker.cc (modified) (2 diffs)

external/Hector/H_VerticalKicker.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_VerticalKicker.cc
@@ -26 +19 @@
 #include "H_TransportMatrices.h"
 
-void H_VerticalKicker::setMatrix(const float eloss, const float p_mass, const float p_charge) {
+void H_VerticalKicker::setMatrix(const float eloss, const float p_mass, const float p_charge) const {
         extern int kickers_on;
         if(kickers_on) {
-                element_mat = vkickmat(element_length,fk,eloss,p_mass,p_charge);
+                *element_mat = vkickmat(element_length,fk,eloss,p_mass,p_charge);
         } else{
-                element_mat = driftmat(element_length);
+                *element_mat = driftmat(element_length);
         }
         return ;
 }
-
-H_VerticalKicker* H_VerticalKicker::clone() const {
-        H_VerticalKicker* temp_kick = new H_VerticalKicker(name,fs,fk,element_length);
-        temp_kick->setAperture(element_aperture);
-        temp_kick->setX(xpos);
-        temp_kick->setY(ypos);
-        temp_kick->setTX(txpos);
-        temp_kick->setTY(typos);
-        temp_kick->setBetaX(betax);
-        temp_kick->setBetaY(betay);
-        return temp_kick;
-}
-
-