Changeset 1347 for trunk/source/event/include

Timestamp:

Dec 22, 2010, 3:52:27 PM (15 years ago)

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/event/include

Files:

• G4GeneralParticleSourceMessenger.hh (modified) (2 diffs)
• G4SPSEneDistribution.hh (modified) (1 diff)
• G4SPSRandomGenerator.hh (modified) (1 diff)
• G4SingleParticleSource.hh (modified) (1 diff)

trunk/source/event/include/G4GeneralParticleSourceMessenger.hh

@@ -212 +212 @@
   G4UIcmdWithADouble         *gradientCmd1;
   G4UIcmdWithADouble         *interceptCmd1;
+  G4UIcmdWithADouble         *arbeintCmd1;
   G4UIcmdWithoutParameter    *calculateCmd1;
   G4UIcmdWithABool           *energyspecCmd1;
@@ -237 +238 @@
   // old ones, will be removed soon
   G4UIcmdWith3Vector         *histpointCmd1;
+  G4UIcmdWithAString         *histfileCmd1;
   G4UIcmdWithAString         *histnameCmd1;
   G4UIcmdWithAString         *arbintCmd1;

trunk/source/event/include/G4SPSEneDistribution.hh

@@ -144 +144 @@
 #include "G4SPSRandomGenerator.hh"
 
-class G4SPSEneDistribution
-{
+class G4SPSEneDistribution {
 public:
-  G4SPSEneDistribution (); 
-  ~G4SPSEneDistribution ();
-
-  void SetEnergyDisType(G4String);
-  inline G4String GetEnergyDisType() {return EnergyDisType;};
-  void SetEmin(G4double);
-  inline G4double GetEmin() {return Emin;} ;
-  inline G4double GetArbEmin() {return ArbEmin;} ;
-  void SetEmax(G4double);
-  inline G4double GetEmax() {return Emax;} ;
-  inline G4double GetArbEmax() {return ArbEmax;};
-  void SetMonoEnergy(G4double);
-  void SetAlpha(G4double);
-  void SetTemp(G4double);
-  void SetBeamSigmaInE(G4double);
-  void SetEzero(G4double);
-  void SetGradient(G4double);
-  void SetInterCept(G4double);
-  void UserEnergyHisto(G4ThreeVector);
-  void ArbEnergyHisto(G4ThreeVector);
-  void EpnEnergyHisto(G4ThreeVector);
-
-  void InputEnergySpectra(G4bool);
-  void InputDifferentialSpectra(G4bool);
-  void ArbInterpolate(G4String);
-  inline G4String GetIntType() {return IntType;};
-  void Calculate();
-  //
-  void SetBiasRndm(G4SPSRandomGenerator* a) {eneRndm = a; };
-  // method to re-set the histograms
-  void ReSetHist(G4String);
-  // Set the verbosity level.
-  void SetVerbosity(G4int a) {verbosityLevel = a; } ;
-  //x
-
-  G4double GetMonoEnergy () {return MonoEnergy; }; //Mono-energteic energy
-  G4double GetSE() {return SE;}; // Standard deviation for Gaussion distrbution in energy
-  G4double Getalpha () {return alpha;}; // alpha (pow)
-  G4double GetEzero() {return Ezero;}; // E0 (exp)
-  G4double GetTemp() {return Temp;}; // Temp (bbody,brem)
-  G4double Getgrad() {return grad;}; // gradient and intercept for linear spectra
-  G4double Getcept() {return cept;};
-
-  inline G4PhysicsOrderedFreeVector  GetUserDefinedEnergyHisto(){return UDefEnergyH;};
-  inline G4PhysicsOrderedFreeVector  GetArbEnergyHisto(){return ArbEnergyH;};
-
-  G4double GenerateOne(G4ParticleDefinition*);
-  
+        G4SPSEneDistribution();
+        ~G4SPSEneDistribution();
+
+        void SetEnergyDisType(G4String);
+        inline G4String GetEnergyDisType() {
+                return EnergyDisType;
+        }
+        ;
+        void SetEmin(G4double);
+        inline G4double GetEmin() {
+                return Emin;
+        }
+        ;
+        inline G4double GetArbEmin() {
+                return ArbEmin;
+        }
+        ;
+        void SetEmax(G4double);
+        inline G4double GetEmax() {
+                return Emax;
+        }
+        ;
+        inline G4double GetArbEmax() {
+                return ArbEmax;
+        }
+        ;
+        void SetMonoEnergy(G4double);
+        void SetAlpha(G4double);
+        void SetBiasAlpha(G4double);
+        void SetTemp(G4double);
+        void SetBeamSigmaInE(G4double);
+        void SetEzero(G4double);
+        void SetGradient(G4double);
+        void SetInterCept(G4double);
+        void UserEnergyHisto(G4ThreeVector);
+        void ArbEnergyHisto(G4ThreeVector);
+        void ArbEnergyHistoFile(G4String);
+        void EpnEnergyHisto(G4ThreeVector);
+
+        void InputEnergySpectra(G4bool);
+        void InputDifferentialSpectra(G4bool);
+        void ArbInterpolate(G4String);
+        inline G4String GetIntType() {
+                return IntType;
+        }
+        ;
+        void Calculate();
+        //
+        void SetBiasRndm(G4SPSRandomGenerator* a) {
+                eneRndm = a;
+        }
+        ;
+        // method to re-set the histograms
+        void ReSetHist(G4String);
+        // Set the verbosity level.
+        void SetVerbosity(G4int a) {
+                verbosityLevel = a;
+        }
+        ;
+        //x
+        G4double GetWeight() {
+                return weight;
+        }
+
+        G4double GetMonoEnergy() {
+                return MonoEnergy;
+        }
+        ; //Mono-energteic energy
+        G4double GetSE() {
+                return SE;
+        }
+        ; // Standard deviation for Gaussion distrbution in energy
+        G4double Getalpha() {
+                return alpha;
+        }
+        ; // alpha (pow)
+        G4double GetEzero() {
+                return Ezero;
+        }
+        ; // E0 (exp)
+        G4double GetTemp() {
+                return Temp;
+        }
+        ; // Temp (bbody,brem)
+        G4double Getgrad() {
+                return grad;
+        }
+        ; // gradient and intercept for linear spectra
+        G4double Getcept() {
+                return cept;
+        }
+        ;
+
+        inline G4PhysicsOrderedFreeVector GetUserDefinedEnergyHisto() {
+                return UDefEnergyH;
+        }
+        ;
+        inline G4PhysicsOrderedFreeVector GetArbEnergyHisto() {
+                return ArbEnergyH;
+        }
+        ;
+
+        G4double GenerateOne(G4ParticleDefinition*);
+        G4double GetProbability (G4double);
+
+
 private:
-  void LinearInterpolation();
-  void LogInterpolation();
-  void ExpInterpolation();
-  void SplineInterpolation();
-  void CalculateCdgSpectrum(); 
-  void CalculateBbodySpectrum();
-
-  // The following methods generate energies according to the spectral
-  // parameters defined above.
-  void GenerateMonoEnergetic();
-  void GenerateLinearEnergies(G4bool);
-  void GeneratePowEnergies(G4bool);
-  void GenerateExpEnergies(G4bool );
-  void GenerateGaussEnergies();
-  void GenerateBremEnergies();
-  void GenerateBbodyEnergies();
-  void GenerateCdgEnergies();
-  void GenUserHistEnergies();
-  void GenEpnHistEnergies();
-  void GenArbPointEnergies();
-  // converts energy per nucleon to energy.
-  void ConvertEPNToEnergy();
+        void LinearInterpolation();
+        void LogInterpolation();
+        void ExpInterpolation();
+        void SplineInterpolation();
+        void CalculateCdgSpectrum();
+        void CalculateBbodySpectrum();
+
+        // The following methods generate energies according to the spectral
+        // parameters defined above.
+        void GenerateMonoEnergetic();
+        void GenerateLinearEnergies(G4bool);
+        void GeneratePowEnergies(G4bool);
+        void GenerateBiasPowEnergies();
+        void GenerateExpEnergies(G4bool);
+        void GenerateGaussEnergies();
+        void GenerateBremEnergies();
+        void GenerateBbodyEnergies();
+        void GenerateCdgEnergies();
+        void GenUserHistEnergies();
+        void GenEpnHistEnergies();
+        void GenArbPointEnergies();
+        // converts energy per nucleon to energy.
+        void ConvertEPNToEnergy();
+
 
 private:
 
-  G4String EnergyDisType; // energy dis type Variable  - Mono,Lin,Exp,etc
-  G4double MonoEnergy; //Mono-energteic energy
-  G4double SE ; // Standard deviation for Gaussion distrbution in energy
-  G4double Emin, Emax; // emin and emax
-  G4double alpha, Ezero, Temp; // alpha (pow), E0 (exp) and Temp (bbody,brem)
-  G4double grad, cept; // gradient and intercept for linear spectra
-  G4bool EnergySpec; // true - energy spectra, false - momentum spectra
-  G4bool DiffSpec;  // true - differential spec, false integral spec
-  G4bool ApplyRig; // false no rigidity cutoff, true then apply one
-  G4double ERig; // energy of rigidity cutoff
-  G4PhysicsOrderedFreeVector UDefEnergyH; // energy hist data
-  G4PhysicsOrderedFreeVector IPDFEnergyH;  
-  G4bool IPDFEnergyExist, IPDFArbExist, Epnflag;
-  G4PhysicsOrderedFreeVector ArbEnergyH; // Arb x,y histogram
-  G4PhysicsOrderedFreeVector IPDFArbEnergyH; // IPDF for Arb
-  G4PhysicsOrderedFreeVector EpnEnergyH; 
-  G4double CDGhist[3]; // cumulative histo for cdg
-  G4double BBHist[10001], Bbody_x[10001];
-  G4String IntType; // Interpolation type
-  G4double Arb_grad[1024], Arb_cept[1024]; // grad and cept for 1024 segments
-  G4double Arb_alpha[1024], Arb_Const[1024]; // alpha and constants
-  G4double Arb_ezero[1024]; // ezero
-  G4double ArbEmin, ArbEmax; // Emin and Emax for the whole arb distribution used primarily for debug.
-
-  G4double               particle_energy;
-  G4ParticleDefinition*  particle_definition;
-
-  G4SPSRandomGenerator* eneRndm;
-
-  // Verbosity
-  G4int verbosityLevel;
-
-  G4PhysicsOrderedFreeVector ZeroPhysVector ; // for re-set only 
-
-  G4DataInterpolation *SplineInt; // holds Spline stuff
+        G4String EnergyDisType; // energy dis type Variable  - Mono,Lin,Exp,etc
+        G4double weight; // particle weight
+        G4double MonoEnergy; //Mono-energteic energy
+        G4double SE; // Standard deviation for Gaussion distrbution in energy
+        G4double Emin, Emax; // emin and emax
+        G4double alpha, Ezero, Temp; // alpha (pow), E0 (exp) and Temp (bbody,brem)
+        G4double biasalpha; // biased power index
+        G4double grad, cept; // gradient and intercept for linear spectra
+        G4double prob_norm; // normalisation factor use in calculate the probability 
+        G4bool Biased; // true - biased to power-law
+        G4bool EnergySpec; // true - energy spectra, false - momentum spectra
+        G4bool DiffSpec; // true - differential spec, false integral spec
+        G4bool ApplyRig; // false no rigidity cutoff, true then apply one
+        G4double ERig; // energy of rigidity cutoff
+        G4PhysicsOrderedFreeVector UDefEnergyH; // energy hist data
+        G4PhysicsOrderedFreeVector IPDFEnergyH;
+        G4bool IPDFEnergyExist, IPDFArbExist, Epnflag;
+        G4PhysicsOrderedFreeVector ArbEnergyH; // Arb x,y histogram
+        G4PhysicsOrderedFreeVector IPDFArbEnergyH; // IPDF for Arb
+        G4PhysicsOrderedFreeVector EpnEnergyH;
+        G4double CDGhist[3]; // cumulative histo for cdg
+        G4double BBHist[10001], Bbody_x[10001];
+        G4String IntType; // Interpolation type
+        G4double Arb_grad[1024], Arb_cept[1024]; // grad and cept for 1024 segments
+        G4double Arb_alpha[1024], Arb_Const[1024]; // alpha and constants
+        G4double Arb_ezero[1024]; // ezero
+        G4double ArbEmin, ArbEmax; // Emin and Emax for the whole arb distribution used primarily for debug.
+
+        G4double particle_energy;
+        G4ParticleDefinition* particle_definition;
+
+        G4SPSRandomGenerator* eneRndm;
+
+        // Verbosity
+        G4int verbosityLevel;
+
+        G4PhysicsOrderedFreeVector ZeroPhysVector; // for re-set only
+
+        G4DataInterpolation *SplineInt[1024]; // holds Spline stuff required for sampling
+        G4DataInterpolation *Splinetemp; // holds a temp Spline used for calculating area
 
 };
 
-
 #endif
 
-
-
-

trunk/source/event/include/G4SPSRandomGenerator.hh

@@ -136 +136 @@
 #include "G4DataInterpolation.hh"
 
-class G4SPSRandomGenerator
-{
+class G4SPSRandomGenerator {
 public:
-  G4SPSRandomGenerator (); 
-  ~G4SPSRandomGenerator ();
-
-  //  static G4SPSRandomGenerator* getInstance ();
-
-  // Biasing Methods 
-  void SetXBias(G4ThreeVector);
-  void SetYBias(G4ThreeVector);
-  void SetZBias(G4ThreeVector);
-  void SetThetaBias(G4ThreeVector);
-  void SetPhiBias(G4ThreeVector);
-  void SetEnergyBias(G4ThreeVector);
-  void SetPosThetaBias(G4ThreeVector);
-  void SetPosPhiBias(G4ThreeVector);
-  G4double GenRandX();
-  G4double GenRandY();
-  G4double GenRandZ();
-  G4double GenRandTheta();
-  G4double GenRandPhi();
-  G4double GenRandEnergy();
-  G4double GenRandPosTheta();
-  G4double GenRandPosPhi();
-
-  inline void SetIntensityWeight(G4double weight) {bweights[8]=weight;};
-
-  inline G4double GetBiasWeight() 
-  { return bweights[0]*bweights[1]*bweights[2]*bweights[3]*bweights[4]*bweights[5]*bweights[6]*bweights[7]*bweights[8];};
- 
- // method to re-set the histograms
-  void ReSetHist(G4String);
-
-  // Set the verbosity level.
-   void SetVerbosity(G4int a) {verbosityLevel = a; } ;
+        G4SPSRandomGenerator();
+        ~G4SPSRandomGenerator();
+
+        //  static G4SPSRandomGenerator* getInstance ();
+
+        // Biasing Methods
+        void SetXBias(G4ThreeVector);
+        void SetYBias(G4ThreeVector);
+        void SetZBias(G4ThreeVector);
+        void SetThetaBias(G4ThreeVector);
+        void SetPhiBias(G4ThreeVector);
+        void SetEnergyBias(G4ThreeVector);
+        void SetPosThetaBias(G4ThreeVector);
+        void SetPosPhiBias(G4ThreeVector);
+        G4double GenRandX();
+        G4double GenRandY();
+        G4double GenRandZ();
+        G4double GenRandTheta();
+        G4double GenRandPhi();
+        G4double GenRandEnergy();
+        G4double GenRandPosTheta();
+        G4double GenRandPosPhi();
+
+        inline void SetIntensityWeight(G4double weight) {
+                bweights[8] = weight;
+        }
+        ;
+
+        inline G4double GetBiasWeight() {
+                return bweights[0] * bweights[1] * bweights[2] * bweights[3]
+                                * bweights[4] * bweights[5] * bweights[6] * bweights[7]
+                                * bweights[8];
+        }
+        ;
+
+        // method to re-set the histograms
+        void ReSetHist(G4String);
+
+        // Set the verbosity level.
+        void SetVerbosity(G4int a) {
+                verbosityLevel = a;
+        }
+        ;
 
 private:
 
-  //  static G4SPSRandomGenerator  *instance;
-
-  G4bool XBias, IPDFXBias;
-  G4PhysicsOrderedFreeVector XBiasH;
-  G4PhysicsOrderedFreeVector IPDFXBiasH;
-  G4bool YBias, IPDFYBias;
-  G4PhysicsOrderedFreeVector YBiasH;
-  G4PhysicsOrderedFreeVector IPDFYBiasH;
-  G4bool ZBias, IPDFZBias;
-  G4PhysicsOrderedFreeVector ZBiasH;
-  G4PhysicsOrderedFreeVector IPDFZBiasH;
-  G4bool ThetaBias, IPDFThetaBias;
-  G4PhysicsOrderedFreeVector ThetaBiasH;
-  G4PhysicsOrderedFreeVector IPDFThetaBiasH;
-  G4bool PhiBias, IPDFPhiBias;
-  G4PhysicsOrderedFreeVector PhiBiasH;
-  G4PhysicsOrderedFreeVector IPDFPhiBiasH;
-  G4bool EnergyBias, IPDFEnergyBias;
-  G4PhysicsOrderedFreeVector EnergyBiasH;
-  G4PhysicsOrderedFreeVector IPDFEnergyBiasH;
-  G4bool PosThetaBias, IPDFPosThetaBias;
-  G4PhysicsOrderedFreeVector PosThetaBiasH;
-  G4PhysicsOrderedFreeVector IPDFPosThetaBiasH;
-  G4bool PosPhiBias, IPDFPosPhiBias;
-  G4PhysicsOrderedFreeVector PosPhiBiasH;
-  G4PhysicsOrderedFreeVector IPDFPosPhiBiasH;
-
-  G4double bweights[9]; //record x,y,z,theta,phi,energy,posThet,posPhi,intensity weights
-
-  // Verbosity
-  G4int verbosityLevel;
-
-  G4PhysicsOrderedFreeVector ZeroPhysVector ; // for re-set only 
-  
+        //  static G4SPSRandomGenerator  *instance;
+
+        G4bool XBias, IPDFXBias;
+        G4PhysicsOrderedFreeVector XBiasH;
+        G4PhysicsOrderedFreeVector IPDFXBiasH;
+        G4bool YBias, IPDFYBias;
+        G4PhysicsOrderedFreeVector YBiasH;
+        G4PhysicsOrderedFreeVector IPDFYBiasH;
+        G4bool ZBias, IPDFZBias;
+        G4PhysicsOrderedFreeVector ZBiasH;
+        G4PhysicsOrderedFreeVector IPDFZBiasH;
+        G4bool ThetaBias, IPDFThetaBias;
+        G4PhysicsOrderedFreeVector ThetaBiasH;
+        G4PhysicsOrderedFreeVector IPDFThetaBiasH;
+        G4bool PhiBias, IPDFPhiBias;
+        G4PhysicsOrderedFreeVector PhiBiasH;
+        G4PhysicsOrderedFreeVector IPDFPhiBiasH;
+        G4bool EnergyBias, IPDFEnergyBias;
+        G4PhysicsOrderedFreeVector EnergyBiasH;
+        G4PhysicsOrderedFreeVector IPDFEnergyBiasH;
+        G4bool PosThetaBias, IPDFPosThetaBias;
+        G4PhysicsOrderedFreeVector PosThetaBiasH;
+        G4PhysicsOrderedFreeVector IPDFPosThetaBiasH;
+        G4bool PosPhiBias, IPDFPosPhiBias;
+        G4PhysicsOrderedFreeVector PosPhiBiasH;
+        G4PhysicsOrderedFreeVector IPDFPosPhiBiasH;
+
+        G4double alpha;   // for biasing energy
+
+        G4double bweights[9]; //record x,y,z,theta,phi,energy,posThet,posPhi,intensity weights
+
+        // Verbosity
+        G4int verbosityLevel;
+
+        G4PhysicsOrderedFreeVector ZeroPhysVector; // for re-set only
+
 };
 
-
 #endif
 
-
-
-

trunk/source/event/include/G4SingleParticleSource.hh

@@ -121 +121 @@
 #include "G4SPSRandomGenerator.hh"
 
-class G4SingleParticleSource : public G4VPrimaryGenerator
-{
+class G4SingleParticleSource: public G4VPrimaryGenerator {
 public:
-  G4SingleParticleSource (); 
-  ~G4SingleParticleSource ();
-  void GeneratePrimaryVertex(G4Event *evt);
-  //
-  G4SPSPosDistribution* GetPosDist() {return posGenerator;};
-  G4SPSAngDistribution* GetAngDist() {return angGenerator;};
-  G4SPSEneDistribution* GetEneDist() {return eneGenerator;};
-  G4SPSRandomGenerator* GetBiasRndm() {return biasRndm;};
-
-  // Set the verbosity level.
-  void SetVerbosity(G4int);
-
-  // Set the particle species
-  void SetParticleDefinition (G4ParticleDefinition * aParticleDefinition);
-  inline G4ParticleDefinition * GetParticleDefinition () { return particle_definition;} ;
-
-  inline void SetParticleCharge(G4double aCharge) { particle_charge = aCharge; } ;
-
-  // Set polarization
-  inline void SetParticlePolarization (G4ThreeVector aVal) {particle_polarization = aVal;};
-  inline G4ThreeVector GetParticlePolarization ()  {return particle_polarization;};
-
-  // Set Time.
-  inline void SetParticleTime(G4double aTime)  { particle_time = aTime; };
-  inline G4double GetParticleTime()  { return particle_time; };
-
-  inline void SetNumberOfParticles(G4int i)  { NumberOfParticlesToBeGenerated = i; };
-  //
-  inline G4int GetNumberOfParticles() { return NumberOfParticlesToBeGenerated; };
-  inline G4ThreeVector GetParticlePosition()  { return particle_position;};
-  inline G4ThreeVector GetParticleMomentumDirection()  { return particle_momentum_direction;};
-  inline G4double GetParticleEnergy()  {return particle_energy;};
+        G4SingleParticleSource();
+        ~G4SingleParticleSource();
+        void GeneratePrimaryVertex(G4Event *evt);
+        //
+        G4SPSPosDistribution* GetPosDist() {
+                return posGenerator;
+        }
+        ;
+        G4SPSAngDistribution* GetAngDist() {
+                return angGenerator;
+        }
+        ;
+        G4SPSEneDistribution* GetEneDist() {
+                return eneGenerator;
+        }
+        ;
+        G4SPSRandomGenerator* GetBiasRndm() {
+                return biasRndm;
+        }
+        ;
+
+        // Set the verbosity level.
+        void SetVerbosity(G4int);
+
+        // Set the particle species
+        void SetParticleDefinition(G4ParticleDefinition * aParticleDefinition);
+        inline G4ParticleDefinition * GetParticleDefinition() {
+                return particle_definition;
+        }
+        ;
+
+        inline void SetParticleCharge(G4double aCharge) {
+                particle_charge = aCharge;
+        }
+        ;
+
+        // Set polarization
+        inline void SetParticlePolarization(G4ThreeVector aVal) {
+                particle_polarization = aVal;
+        }
+        ;
+        inline G4ThreeVector GetParticlePolarization() {
+                return particle_polarization;
+        }
+        ;
+
+        // Set Time.
+        inline void SetParticleTime(G4double aTime) {
+                particle_time = aTime;
+        }
+        ;
+        inline G4double GetParticleTime() {
+                return particle_time;
+        }
+        ;
+
+        inline void SetNumberOfParticles(G4int i) {
+                NumberOfParticlesToBeGenerated = i;
+        }
+        ;
+        //
+        inline G4int GetNumberOfParticles() {
+                return NumberOfParticlesToBeGenerated;
+        }
+        ;
+        inline G4ThreeVector GetParticlePosition() {
+                return particle_position;
+        }
+        ;
+        inline G4ThreeVector GetParticleMomentumDirection() {
+                return particle_momentum_direction;
+        }
+        ;
+        inline G4double GetParticleEnergy() {
+                return particle_energy;
+        }
+        ;
 
 private:
 
-  G4SPSPosDistribution* posGenerator;
-  G4SPSAngDistribution* angGenerator;
-  G4SPSEneDistribution* eneGenerator;
-  G4SPSRandomGenerator* biasRndm;
-  //
-  // Other particle properties
-  G4int                  NumberOfParticlesToBeGenerated;
-  G4ParticleDefinition * particle_definition;
-  G4ParticleMomentum     particle_momentum_direction;
-  G4double               particle_energy;
-  G4double               particle_charge;
-  G4ThreeVector          particle_position;
-  G4double               particle_time;
-  G4ThreeVector          particle_polarization;
-  G4double               particle_weight;
-
-  // Verbosity
-  G4int verbosityLevel;
+        G4SPSPosDistribution* posGenerator;
+        G4SPSAngDistribution* angGenerator;
+        G4SPSEneDistribution* eneGenerator;
+        G4SPSRandomGenerator* biasRndm;
+        //
+        // Other particle properties
+        G4int NumberOfParticlesToBeGenerated;
+        G4ParticleDefinition * particle_definition;
+        G4ParticleMomentum particle_momentum_direction;
+        G4double particle_energy;
+        G4double particle_charge;
+        G4ThreeVector particle_position;
+        G4double particle_time;
+        G4ThreeVector particle_polarization;
+        G4double particle_weight;
+
+        // Verbosity
+        G4int verbosityLevel;
 
 };
 
-
 #endif
 
-
-
-