Changeset 3c40083 in git for external/Hector/H_Kicker.h

Timestamp:

Apr 16, 2014, 3:56:14 PM (10 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_Kicker.h (modified) (2 diffs)

external/Hector/H_Kicker.h

@@ -1 @@
-#ifndef _H_Kicker_
-#define _H_Kicker_
-
-  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *                                                         *
-*                   --<--<--  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                 *
- *                                                         *
-   * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
 /// \file H_Kicker.h
 /// \brief Classes aiming at simulating kickers in LHC beamline.
 /// fk [rad] for kickers !!!!
+
+/*
+---- 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)
+*/
+
+#ifndef _H_Kicker_
+#define _H_Kicker_
 
 // local #includes
@@ -35 +28 @@
                 H_Kicker():H_OpticalElement() {}
                 H_Kicker(const int dtype, const double s, const double k, const double l):H_OpticalElement(dtype,s,k,l){}
-                H_Kicker(const string& nameE, const int dtype, const double s, const double k, const double l):H_OpticalElement(nameE,dtype,s,k,l){}
-                virtual ~H_Kicker() {};
+                H_Kicker(const string nameE, const int dtype, const double s, const double k, const double l):H_OpticalElement(nameE,dtype,s,k,l){}
+                virtual ~H_Kicker() {return;};
         //@}
-                virtual H_Kicker* clone() const = 0;
-                virtual void printProperties() const { cout << *this; return;};
+        /// prints the kicker properties
+                virtual void printProperties() const;
                 void init();
 
         protected:
-                virtual void setTypeString() = 0;
-                virtual void setMatrix(const float, const float, const float) = 0;
-        friend std::ostream& operator<< (std::ostream& os, const H_Kicker& el);
+                virtual void setTypeString() =0;
+                virtual void setMatrix(const float, const float, const float) const =0;
 };