Index: trunk/external/Hector/H_Beam.h
===================================================================
--- trunk/external/Hector/H_Beam.h	(revision 1360)
+++ trunk/external/Hector/H_Beam.h	(revision 1365)
@@ -2,21 +2,14 @@
 #define _H_Beam_
 
-  /* * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *                                                         *
-*                   --<--<--  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_Beam.h
@@ -31,8 +24,7 @@
 
 // ROOT #includes
-#include "TH2F.h"
-#include "TGraphErrors.h"
-#include "TMultiGraph.h"
-#include "TMath.h"
+////#include "TH2F.h"
+////#include "TGraphErrors.h"
+////#include "TMultiGraph.h"
 
 // local #includes
@@ -63,9 +55,9 @@
 		~H_Beam();
 	//@}
-        /// Fills the beam with particles in given position/angle/energy        intervals (flat distribution)
-                void particleGun(const unsigned int Number_of_particles, const float E_min=BE, const float E_max=BE, const float fs_min=0, const float fs_max=0, const float fx_min=0, const float fx_max=0, const float fy_min=0, const float fy_max=0, const float tx_min=-TMath::Pi()/2., const float tx_max=TMath::Pi()/2., const float ty_min=-TMath::Pi()/2., const float ty_max=TMath::Pi()/2., const float p_mass=MP, const double p_charge=QP, const bool flat = true, TRandom* r=gRandom);
-
 	/// Fills the beam with particles
-		void createBeamParticles(const unsigned int Number_of_particles, const double p_mass=MP, const double p_charge=QP, TRandom* r=gRandom);
+	//@{
+		void createBeamParticles(const unsigned int , const double , const double );
+		void createBeamParticles(const unsigned int);
+	//@}
 	/// Fills the beam with particles with incremental offset and no initial transverse momentum
 	//@{
@@ -86,7 +78,13 @@
 		void add(const H_BeamParticle&);
 	/// Compute the position of each particle in the beamline
-		void computePath(const H_AbstractBeamLine * beamline, const bool NonLinear=false);
+	//@{	
+		void computePath(const H_AbstractBeamLine *, const bool);
+		void computePath(const H_AbstractBeamLine *);
+	//@}
 	// Photon emission by the particle
-                void emitGamma(const double gee, const double gq2, const double phimin=0, const double phimax=2*TMath::Pi());
+	// @{
+                void emitGamma(const double, const double, const double, const double);
+		void emitGamma(const double, const double);
+	//@}
 	// Propagates the beam until a given s
 		void propagate(const float );
@@ -98,6 +96,6 @@
 	/// Draws the \f$ \beta \f$ function of the beam
 	//@{
-		TGraphErrors  * getBetaX(const float, const unsigned int);
-		TGraphErrors  * getBetaY(const float, const unsigned int);
+        ////	TGraphErrors  * getBetaX(const float, const unsigned int);
+	////	TGraphErrors  * getBetaY(const float, const unsigned int);
 	//@}
         /// Returns the position of the beam
@@ -108,6 +106,6 @@
 	/// Returns the emittance \f$ \epsilon \f$ of the beam in x and y
 	//@{
-	inline const float getEmittanceX() const {
-			if(!x_disp*tx_disp) cout<<"Warning : Degenerate Beam : x-emittance = 0"<<endl; 	
+		inline const float getEmittanceX() const {
+		    if(!x_disp*tx_disp) cout<<"Warning : Degenerate Beam : x-emittance = 0"<<endl; 	
 			return x_disp * tan(tx_disp/URAD)/URAD;
 		}
@@ -140,9 +138,9 @@
 		unsigned int getStoppedNumber(const H_AbstractBeamLine *);
 	/// Returns the list of the stopping elements in the beamline
-		vector<TVectorD> getStoppingElements(const H_AbstractBeamLine *, vector<H_OpticalElement>&, vector<int>&);
+		void getStoppingElements(const H_AbstractBeamLine *, vector<H_OpticalElement>&, vector<int>&);
 	/// Prints the initial parameters
 		void printInitialState() const;
 	/// Prints the properties for each particle
-		void printProperties() const {cout << *this; return;}
+		void printProperties() const;
 	/// Prints the list of the stopping elements in the beamline
 		void printStoppingElements(const vector<H_OpticalElement>&, const vector<int>&) const;
@@ -150,10 +148,9 @@
 		const int getNumberOfBeamParticles() const {return Nparticles;}
 	/// Draws the beam profile at a given s
-		TH2F * drawProfile(const float);
-		TH2F * drawAngleProfile(const float);
+	////	TH2F * drawProfile(const float);
 	/// Draws the beam width and height
 	//@{
-		TMultiGraph * drawBeamX(const int) const;
-		TMultiGraph * drawBeamY(const int) const ;
+	////	TMultiGraph * drawBeamX(const int) const;
+	////	TMultiGraph * drawBeamY(const int) const ;
 	//@}
 
@@ -183,6 +180,4 @@
 	/// Number of particles in this beam
 		unsigned int Nparticles;
-
-	friend std::ostream& operator<< (std::ostream& os, const H_Beam& be);
 };
 
