Merge branch 'NPTool.2.dev' of github.com:adrien-matta/nptool into NPTool.2.dev

NPLib/Physics/TReactionConditions.cxx

@@ -54,8 +54,6 @@ void TReactionConditions::Clear(){
     fRC_Particle_Name.clear();
     fRC_Theta.clear();
     fRC_Phi.clear();
-    fRC_LAB_Theta.clear();
-    fRC_LAB_Phi.clear();
     fRC_Kinetic_Energy.clear();
     fRC_Momentum_Direction_X.clear();
     fRC_Momentum_Direction_Y.clear();
@@ -106,7 +104,7 @@ TVector3 TReactionConditions::GetBeamDirection() const{
 }
 ////////////////////////////////////////////////////////////////////////////////
 TVector3 TReactionConditions::GetParticleDirection (const int i) const {
-    return TVector3(  fRC_Momentum_Direction_X[i],
+    return TVector3(fRC_Momentum_Direction_X[i],
                     fRC_Momentum_Direction_Y[i],
                     fRC_Momentum_Direction_Z[i]);
 }

NPLib/Physics/TReactionConditions.h

@@ -63,8 +63,6 @@ private:
     vector<string> fRC_Particle_Name;
     vector<double> fRC_Theta;
     vector<double> fRC_Phi;
-    vector<double> fRC_LAB_Theta;
-    vector<double> fRC_LAB_Phi; 
     vector<double> fRC_Kinetic_Energy;
     vector<double> fRC_Momentum_Direction_X;
     vector<double> fRC_Momentum_Direction_Y;
@@ -99,8 +97,6 @@ public:
     void SetParticleName       (const string & Particle_Name)         {fRC_Particle_Name.push_back(Particle_Name);}//!
     void SetTheta              (const double & Angle)                 {fRC_Theta.push_back(Angle);}//!
     void SetPhi              (const double & AnglePhi)                 {fRC_Phi.push_back(AnglePhi);}//!
-    void SetLABTheta              (const double & LABAngle)                 {fRC_LAB_Theta.push_back(LABAngle);}//!
-    void SetLABPhi              (const double & LABAnglePhi)                 {fRC_LAB_Phi.push_back(LABAnglePhi);}//!
     void SetKineticEnergy      (const double & Kinetic_Energy)        {fRC_Kinetic_Energy.push_back(Kinetic_Energy);}//!
     void SetMomentumDirectionX (const double & Momentum_Direction_X)  {fRC_Momentum_Direction_X.push_back(Momentum_Direction_X);}//!
     void SetMomentumDirectionY (const double & Momentum_Direction_Y)  {fRC_Momentum_Direction_Y.push_back(Momentum_Direction_Y);}//!
@@ -135,13 +131,18 @@ public:
 
     TVector3 GetBeamDirection         () const ;
     TVector3 GetParticleDirection     (const int i) const ; 
- 
-    double GetThetaLab_WorldFrame (const int i) const {
-        return (GetParticleDirection(i).Angle(TVector3(0,0,1)))/deg;
-    } 
+
+
+    double GetThetaLab_WorldFrame(const int i) const{
+      return (GetParticleDirection(i).Theta())/deg;
+    }
+    
+    double GetPhiLab_WorldFrame (const int i) const {
+      return (GetParticleDirection(i).Phi())/deg;
+    }
     
     double GetThetaLab_BeamFrame (const int i) const{
-        return (GetParticleDirection(i).Angle(GetBeamDirection()))/deg;
+      return (GetParticleDirection(i).Angle(GetBeamDirection()))/deg;
     } 
     
     unsigned int GetEmittedMult() const {return fRC_Particle_Name.size();} 

NPSimulation/Process/BeamReaction.cc

@@ -322,13 +322,6 @@ void NPS::BeamReaction::DoIt(const G4FastTrack& fastTrack,G4FastStep& fastStep)
     if((phi+pi)/deg > 360 ) m_ReactionConditions->SetPhi((phi-pi)/deg);
     else m_ReactionConditions->SetPhi((phi+pi)/deg);
 
-    // Angle 3 and 4 in LAB ZAXIS FRAME //
-    m_ReactionConditions->SetLABTheta(momentum_kine3_world.theta()/deg);
-    m_ReactionConditions->SetLABTheta(momentum_kine4_world.theta()/deg);
-
-    m_ReactionConditions->SetLABPhi(momentum_kine3_world.phi()/deg);
-    m_ReactionConditions->SetLABPhi(momentum_kine4_world.phi()/deg);
-        
     // Energy 3 and 4 //
     m_ReactionConditions->SetKineticEnergy(Energy3);
     m_ReactionConditions->SetKineticEnergy(Energy4);

Projects/Dali/proton2.reaction

+%%%%%%%%%%%%%%%%%%%%%% FOR DALI PROTON ELASTIC SCATTERING %%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Beam
+ Particle= 1H 
+ ExcitationEnergy= 0
+ Energy= 180
+ SigmaEnergy= 0.448
+ SigmaThetaX= 0.01 
+ SigmaPhiY= 0.01
+ SigmaX= 0.01 
+ %0.5
+ SigmaY= 0.01 
+ %0.5
+ MeanThetaX= 0
+ MeanPhiY= 0
+ MeanX= 0
+ MeanY= 0
+ %EnergyProfilePath=
+ %XThetaXProfilePath=
+ %YPhiYProfilePath=
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+TwoBodyReaction
+ Beam= 1H
+ Target= 1H
+ Light= 1H
+ Heavy= 1H
+ ExcitationEnergyLight= 0.0
+ ExcitationEnergyHeavy= 0.0
+ CrossSectionPath= flat.txt CSR
+ ShootLight= 1
+ ShootHeavy= 1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Projects/Dali/protonSingle.reaction

+%%%%%%%%%%%%%%%%%%%%%% FOR DALI PROTON ELASTIC SCATTERING %%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Beam
+ Particle= 1H 
+ ExcitationEnergy= 0
+ Energy= 180
+ SigmaEnergy= 0.448
+ SigmaThetaX= 0.01 
+ SigmaPhiY= 0.01
+ SigmaX= 0.01 
+ %0.5
+ SigmaY= 0.01 
+ %0.5
+ MeanThetaX= 5
+ MeanPhiY= 0
+ MeanX= 0
+ MeanY= 0
+ %EnergyProfilePath=
+ %XThetaXProfilePath=
+ %YPhiYProfilePath=
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+TwoBodyReaction
+ Beam= 1H
+ Target= 1H
+ Light= 1H
+ Heavy= 1H
+ ExcitationEnergyLight= 0.0
+ ExcitationEnergyHeavy= 0.0
+ CrossSectionPath= flat.txt CSR
+ ShootLight= 1
+ ShootHeavy= 0
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%