* Fixing nps compilation

        - missing using naespace std in NPIonIon
        - Fixing warning in neutron wall

NPSimulation/Core/NPIonIonInelasticPhysic.cc

@@ -64,6 +64,7 @@
 #include "G4IonInelasticProcess.hh"
 #include "G4GeneralSpaceNNCrossSection.hh"
 
+using namespace std;
 /////////////////////////////////////////////////////////////////////////////
 NPIonIonInelasticPhysic::NPIonIonInelasticPhysic(const G4String& name):
 G4VPhysicsConstructor(name)
@@ -99,7 +100,7 @@ void NPIonIonInelasticPhysic::ConstructProcess()
     G4IonsShenCrossSection* ShenCrossSections = new G4IonsShenCrossSection;
     G4ComponentGGHadronNucleusXsc* GlauberGribovCrossSection = new G4ComponentGGHadronNucleusXsc;
     
-    G4CrossSectionInelastic* GlauberGribovDataSet = new G4CrossSectionInelastic(GlauberGribovCrossSection);
+    //G4CrossSectionInelastic* GlauberGribovDataSet = new G4CrossSectionInelastic(GlauberGribovCrossSection);
     
     // ******************
     // **** Elastic ****

NPSimulation/Detectors/NeutronWall/NeutronWall.cc

@@ -60,9 +60,9 @@ using namespace CLHEP;
 namespace NeutronWall_NS{
     // Energy and time Resolution
     const double EnergyThreshold = 0.1*MeV;
-    const double ResoTime = 0*ns ;
-    const double ResoEnergy = 0*MeV ;
-    const double ResoPosition = 0*cm;
+    //const double ResoTime = 0*ns ;
+    //const double ResoEnergy = 0*MeV ;
+    //const double ResoPosition = 0*cm;
     //The size of NS should depend on the distance between NeutronWall and plastic Bar right now
     double NS_X = 2020.0*mm;
     double NS_Y = 2020.0*mm;

NPSimulation/Detectors/Tiara/Tiara.cc

@@ -283,7 +283,7 @@ void Tiara::ReadSensitive(const G4Event* event){
     double EF = RandGauss::shoot(Info[0],ResoEnergyHyball);
     if(EF>EnergyThreshold){
       int RingNumber=Info[8];
-      RingNumber=abs(RingNumber-17);                                                                                 //
+      RingNumber=abs(RingNumber-17);    
       Info[8]=RingNumber; 
       m_EventHyball->SetRingE(Info[7],Info[8],EF);
       m_EventHyball->SetRingT(Info[7],Info[8],Info[1]); 

NPSimulation/Detectors/Tiara/Tiara.hh

@@ -48,9 +48,9 @@ using namespace CLHEP;
 namespace TIARA{
   // Energy and time Resolution
   const G4double ResoTime    = 0      ;
-  const G4double ResoEnergyInnerBarrel  = 0.058*MeV ;// = 136keV of Resolution   //   Unit is MeV/2.35
-  const G4double ResoEnergyOuterBarrel  = 0.058*MeV ;// = 136keV of Resolution   //   Unit is MeV/2.35
-  const G4double ResoEnergyHyball       = 0.029*MeV ;// =  70keV of Resolution   //   Unit is MeV/2.35
+  const G4double ResoEnergyInnerBarrel  = 0.058*MeV ;// = 136keV FWHM 
+  const G4double ResoEnergyOuterBarrel  = 0.058*MeV ;// = 136keV FWHM
+  const G4double ResoEnergyHyball       = 0.029*MeV ;// =  70keV FWHM
 
   const G4double EnergyThreshold = 200*keV;
 

Projects/T40/22Nadp.reaction

@@ -5,7 +5,7 @@ Beam
   Particle= 22Na
   ExcitationEnergy= 0
   Energy= 220
-  SigmaEnergy= 1
+  SigmaEnergy= 0
   SigmaThetaX= 0.01 
   SigmaPhiY= 0.01
   SigmaX= 0.5

Projects/T40/Analysis.cxx

@@ -119,7 +119,8 @@ void Analysis::TreatEvent(){
     Energy = Si_E_TH;
 
     // Evaluate energy using the thickness 
-    ELab = LightAl.EvaluateInitialEnergy( Energy ,0.4*micrometer , ThetaTHSurface); 
+//    ELab = LightAl.EvaluateInitialEnergy( Energy ,0.4*micrometer , ThetaTHSurface); 
+    ELab = Energy;
     // Target Correction
     ELab = LightTarget.EvaluateInitialEnergy( ELab ,TargetThickness/2., ThetaNormalTarget); 
 

Projects/T40/run.mac

+/run/beamOn 100000