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

NPLib/Physics/NPQFS.cxx

@@ -156,6 +156,12 @@ void QFS::ReadConfigurationFile(NPL::InputParser parser){
           fshoot1 = blocks[i]->GetInt("ShootLight");
           fshoot2 = blocks[i]->GetInt("ShootLight");
       }
+      if(blocks[i]->HasToken("ShootLight1")){
+          fshoot1 = blocks[i]->GetInt("ShootLight1");
+      }
+      if(blocks[i]->HasToken("ShootLight2")){
+          fshoot2 = blocks[i]->GetInt("ShootLight2");
+      }
       if(blocks[i]->HasToken("PerpMomentumPath")){
           vector<string> file_perp = blocks[i]->GetVectorString("PerpMomentumPath");
           TH1F* Perptemp = Read1DProfile(file_perp[0], file_perp[1]);

NPLib/Physics/NPQFS.h

@@ -182,6 +182,7 @@ namespace NPL{
     bool     GetShoot2()         const        {return fshoot2;}
     bool     GetShootB()         const        {return fshootB;}
     double   GetThetaCM()        const        {return fThetaCM;}
+    double   GetPhiCM()          const        {return fPhiCM;}
     double   GetMomentumSigma()  const        {return fMomentumSigma;}
     TVector3 GetInternalMomentum() const   {return fInternalMomentum;}
  

NPSimulation/Process/BeamReaction.cc

@@ -442,7 +442,8 @@ void NPS::BeamReaction::DoIt(const G4FastTrack& fastTrack,
     /////////////////////////////////////////////////////////////////
 
     // Shoot and Set a Random ThetaCM
-    double theta = G4RandFlat::shoot() *  pi;
+    double costheta = G4RandFlat::shoot() * 2 - 1;
+    double theta = acos(costheta);
     double phi = G4RandFlat::shoot() * 2. * pi - pi; //rand in [-pi,pi]
     m_QFS.SetThetaCM(theta);
     m_QFS.SetPhiCM(phi);

Projects/Strasse/geometry/strasse_optimized.detector

@@ -12,7 +12,7 @@ Target
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
 Strasse Info
   Inner_Wafer_Length= 127 mm
-  Inner_Wafer_Width= 33 mm
+  Inner_Wafer_Width= 30.6 mm
   Inner_Wafer_Thickness= 200 micrometer
   Inner_Wafer_AlThickness= 0.4 micrometer
   Inner_Wafer_PADExternal= 0 mm
@@ -28,7 +28,7 @@ Strasse Info
   Inner_PCB_MidWidth= 1 mm
   Inner_PCB_Thickness= 1.6 mm
   Outer_Wafer_Length= 124 mm
-  Outer_Wafer_Width= 68 mm
+  Outer_Wafer_Width= 65.6 mm
   Outer_Wafer_Thickness= 300 micrometer
   Outer_Wafer_AlThickness= 0.4 micrometer
   Outer_Wafer_PADExternal= 0 mm
@@ -84,9 +84,9 @@ Strasse Chamber
   Z= -30 mm
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Catana CSV
- Path= geometry/Catana.csv 
- Pos= 0 0 100 mm
- Rshift= 100 micrometer
+%Catana CSV
+% Path= geometry/Catana.csv 
+% Pos= 0 0 100 mm
+% Rshift= 100 micrometer