Changeset 1365 in svn for trunk/external/Hector/H_Quadrupole.h

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_Quadrupole.h (modified) (2 diffs)

trunk/external/Hector/H_Quadrupole.h

@@ -2 +2 @@
 #define _H_Quadrupole_
 
-  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *                                                         *
-*                   --<--<--  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_Quadrupole.h
@@ -34 +27 @@
                 H_Quadrupole():H_OpticalElement() {}
                 H_Quadrupole(const int dtype, const double s, const double k, const double l) : H_OpticalElement(dtype,s,k,l) {}
-                H_Quadrupole(const string& nameE, const int dtype, const double s, const double k, const double l) : H_OpticalElement(nameE,dtype,s,k,l) {}
-                virtual ~H_Quadrupole() {};
+                H_Quadrupole(const string nameE, const int dtype, const double s, const double k, const double l) : H_OpticalElement(nameE,dtype,s,k,l) {}
+                virtual ~H_Quadrupole() {return;};
         //@}    
-                virtual H_Quadrupole* clone() const =0 ;
-                virtual void printProperties() const { cout << *this; return;};
+                virtual void printProperties() const;
                 void init();
 
         protected:
                 virtual void setTypeString() =0;
-                virtual void setMatrix(const float, const float, const float) = 0;
+                virtual void setMatrix(const float, const float, const float) const =0;
                 
-        friend std::ostream& operator<< (std::ostream& os, const H_Quadrupole& el);
 };