Index: external/Hector/H_Parameters.h
===================================================================
--- external/Hector/H_Parameters.h	(revision 5b822e567e81b047f743b282d78eaae9b7c4fb20)
+++ external/Hector/H_Parameters.h	(revision 3c40083cb5c3b145665840d29f1189d1de1c3a0d)
@@ -2,21 +2,14 @@
 #define _Hector_parameters_
 
-  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *                                                         *
-*                   --<--<--  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_Parameters.h
@@ -25,58 +18,80 @@
 /// Units : angles [\f$ \mu \f$rad], distances [\f$ \mu \f$m], energies [GeV], c=[1].
 
-#include <cmath>
-
 /* from physics and maths */
    /// proton mass [GeV]
 const double MP=0.93827;
    /// proton charge [e]
-const double QP=1.;
+const double QP=1;
+   /// pi
+#define PI 3.14159265359
    /// conversion factor for \f$\mu\f$rad <-> rad
-const double URAD=1000000.;
+#define URAD 1000000.
+   /// in thx = thx* / 3 <==> thx* = THX thx
+#define THX 3.86 
+   /// in dy = 10 thy*   <==> thy* = dy / THY
+#define THY 51.4       
 
 /* beam parameters */
    /// beam nominal energy in GeV
+//#define BE  7000.
 const double BE=7000.;
    /// beam energy divergence, in GeV
-const double SBE=0.79;
+#define SBE 0.79
    /// beam nominal energy in TeV
-const double BETEV=7.;
+#define BETEV 7.
    /// beam S @ IP
-const double PS=0.;
+#define PS 0.
    /// beam X @ IP
-const double PX=-500.;    
+#define PX  -500.      
    /// beam Y @ IP
-const double PY=0.;
+#define PY  0.      
    /// beam longitudinal dispersion
-const double SS=0.;
+#define SS 0.
    /// beam lateral width SX @ IP
-const double SX=16.63;
+#define SX  16.63
+// #define SX  0.      
    /// beam lateral width SY @ IP
-const double SY=16.63;
+#define SY  16.63
+// #define SY 0.
    /// beam transverse direction angle TX @ IP
-const double TX=0.;
+#define TX 0.
    /// beam transverse direction angle TY @ IP
-const double TY=0.;
+#define TY 0.      
    /// beam angular divergence STX @ IP
-const double STX=30.23;
+//#define STX 0.
+#define STX 30.23      
    /// beam angular divergence STY @ IP
-const double STY=30.23;
+//#define STY 0.
+#define STY 30.23      
+   /// beam dispersion
+//#define D   120000.
+const double D=120000.;
 	/// half crossing angle at IP [\f$ \mu \f$RAD]
-const double CRANG=142.5;
+#define CRANG 142.5 
 
-// local defines, used in H_BeamParticle & H_OpticalElements
-enum {INDEX_X=0, INDEX_TX, INDEX_Y, INDEX_TY, INDEX_S, LENGTH_VEC};
-// (x,theta_x,y,theta_y,s)
-
-/// include Pythia libraries ? (not included on some ROOT installations)
-//#define _include_pythia_
-
-const unsigned int TM = 0; // not used anymore. left for backward compatibility
-const unsigned int AM = 1; // not used anymore. left for backward compatibility
-
+/* roman pots parameters */
+   /// granularity in X position
+#define GRANPOSX 5.
+   /// granularity in Y position
+#define GRANPOSY 5.
+   /// granularity in X angle
+#define GRANANGX 10.
+   /// granularity in Y angle
+#define GRANANGY 10.
+   /// Distance between rp's
+#define DISTRP 4000000.
+   /// RP resolution in X, for smearing
+#define RESX 10.
+   /// RP resolution in Y, for smearing
+#define RESY 10.
+   /// Radius of the hole in the RP
+#define RADIUS 1000.
 
 /* display parameters */
    /// Verbose mode ?
-const bool VERBOSE=false; 
+#define VERBOSE 0 
+
+/// include Pythia libraries ? (not included on some ROOT installations) 
+//#define _include_pythia_
 
 #endif
