Changeset 1365 in svn for trunk/external/Hector/H_RomanPot.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_RomanPot.h (modified) (1 diff)

trunk/external/Hector/H_RomanPot.h

@@ -1 +1 @@
 #ifndef _H_RomanPot_
 #define _H_RomanPot_
-
-  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *                                                         *
-*                   --<--<--  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_RomanPot.h
 /// \brief Roman pot class
 
+/*
+---- 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)
+*/
+
 // local #includes
-#include "H_Drift.h"
+#include "H_OpticalElement.h"
 
 #define RP_LENGTH 0.0001
 #define RP_HEIGHT 10000
 /// Roman pot as an optics element.
-class H_RomanPot : public H_Drift {
+class H_RomanPot : public H_OpticalElement {
 
         public:
         ///     Constructors and destructor
         //@{
-                H_RomanPot():H_Drift() {type = RP; init();}
-                H_RomanPot(const string&, const double, const double);
+                H_RomanPot():H_OpticalElement(RP,0.,0.,RP_LENGTH) {init();}
+                H_RomanPot(const string, const double, const double);
                 H_RomanPot(const double, const double);
-                ~H_RomanPot() {};
+                ~H_RomanPot() { return; };
         //@}
-                H_RomanPot* clone() const ;
+                virtual void printProperties() const;
                 void init();
+
         private:
                 virtual void setTypeString() {typestring=RPNAME;};
-                virtual void setMatrix(const float, const float, const float) ;
-        friend std::ostream& operator<< (std::ostream& os, const H_RomanPot& el);
+                virtual void setMatrix(const float, const float, const float) const;
+
 };