diff --git a/NPLib/Physics/TReactionConditions.cxx b/NPLib/Physics/TReactionConditions.cxx index a4bd2d87427d2fc0317548cd42cb9fbdfce0ea4b..87fd573964d67e51399b87d6d40f182488578acd 100644 --- a/NPLib/Physics/TReactionConditions.cxx +++ b/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]); } diff --git a/NPLib/Physics/TReactionConditions.h b/NPLib/Physics/TReactionConditions.h index f54017e894f74a41a4cddd376d733a2cde7da3fb..cf8936209fcb6d522ed81b5e819680529c6733b2 100644 --- a/NPLib/Physics/TReactionConditions.h +++ b/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();} diff --git a/NPSimulation/Process/BeamReaction.cc b/NPSimulation/Process/BeamReaction.cc index 1cb6d413a91b25920cfb6c9c86f52936491a2f5f..32df6f88d70233dc2e49460c5017a8ce8f16e125 100644 --- a/NPSimulation/Process/BeamReaction.cc +++ b/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); diff --git a/Projects/Dali/proton2.reaction b/Projects/Dali/proton2.reaction new file mode 100644 index 0000000000000000000000000000000000000000..613adcc7eb51dced32b27292de5e715f5fd1b5dc --- /dev/null +++ b/Projects/Dali/proton2.reaction @@ -0,0 +1,32 @@ +%%%%%%%%%%%%%%%%%%%%%% 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 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Projects/Dali/protonSingle.reaction b/Projects/Dali/protonSingle.reaction new file mode 100644 index 0000000000000000000000000000000000000000..cf1f63939d811b52d92832c94f2104af8d755f2e --- /dev/null +++ b/Projects/Dali/protonSingle.reaction @@ -0,0 +1,32 @@ +%%%%%%%%%%%%%%%%%%%%%% 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 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%