Merge branch 'NPTool.2.dev' of https://gitlab.in2p3.fr/np/nptool into NPTool.2.dev

Inputs/EventGenerator/isotropic.source

@@ -4,13 +4,13 @@
 %      Energy are given in MeV , Position in mm      % 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Isotropic
- EnergyLow=  100
- EnergyHigh= 100
- HalfOpenAngleMin= 40
- HalfOpenAngleMax= 40
+ EnergyLow=  0
+ EnergyHigh= 200
+ HalfOpenAngleMin= 30
+ HalfOpenAngleMax= 60
  x0= 0 
  y0= 0 
  z0= 0 
- particle= 14C
+ particle= 11Be
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Supported particle type: proton, neutron, deuton, triton, He3 , alpha 

NPSimulation/Detectors/PISTA/PISTA.cc

@@ -60,8 +60,8 @@ namespace PISTA_NS{
   // Energy and time Resolution
   const double EnergyThreshold = 0.1*MeV;
   const double ResoTime = 0.2*ns ;
-  const double ResoEnergy = 0.015*MeV ;
-  const double DE_ResoEnergy = 0.015*MeV ;
+  const double DE_ResoEnergy = 0.040*MeV ;
+  const double E_ResoEnergy  = 0.018*MeV ;
 
   // Trapezoid dimension
   const double TrapezoidBaseLarge = 74.1*mm;
@@ -282,7 +282,7 @@ void PISTA::ReadSensitive(const G4Event* ){
     if(Energy>EnergyThreshold){
       double Time = RandGauss::shoot(FirstStageScorer->GetTimeLength(i), ResoTime);
       int DetNbr  = FirstStageScorer->GetDetectorLength(i);
-      int StripFront = FirstStageScorer->GetStripLength(i);
+      int StripFront = FirstStageScorer->GetStripWidth(i);
       m_Event->SetPISTA_DE(DetNbr, StripFront, Energy, Energy, Time, Time);
     }
   }
@@ -294,7 +294,7 @@ void PISTA::ReadSensitive(const G4Event* ){
 
   unsigned int sizeE = SecondStageScorer->GetLengthMult(); 
   for(unsigned int i = 0 ; i < sizeE ; i++){
-    double Energy = RandGauss::shoot(SecondStageScorer->GetEnergyLength(i), ResoEnergy);   
+    double Energy = RandGauss::shoot(SecondStageScorer->GetEnergyLength(i), E_ResoEnergy);   
     if(Energy>EnergyThreshold){
       double Time = RandGauss::shoot(SecondStageScorer->GetTimeLength(i), ResoTime);
       int DetNbr  = SecondStageScorer->GetDetectorLength(i);