From 29f1563d39cf31f27c134fc233c3445b2818c280 Mon Sep 17 00:00:00 2001 From: adrien matta <matta@lpccaen.in2p3.fr> Date: Wed, 9 Jan 2019 10:07:04 +0100 Subject: [PATCH] * removing argument by reference in TReaction Condition to make the fonction callable from root cint --- NPLib/Physics/TReactionConditions.cxx | 2 +- NPLib/Physics/TReactionConditions.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NPLib/Physics/TReactionConditions.cxx b/NPLib/Physics/TReactionConditions.cxx index bd7476763..d5969c63a 100644 --- a/NPLib/Physics/TReactionConditions.cxx +++ b/NPLib/Physics/TReactionConditions.cxx @@ -103,7 +103,7 @@ TVector3 TReactionConditions::GetBeamDirection() const{ cos(fRC_Beam_Emittance_Theta*deg)); } //////////////////////////////////////////////////////////////////////////////// -TVector3 TReactionConditions::GetParticleDirection (const int &i) const { +TVector3 TReactionConditions::GetParticleDirection (const int i) const { 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 d0632b05c..0fd75266d 100644 --- a/NPLib/Physics/TReactionConditions.h +++ b/NPLib/Physics/TReactionConditions.h @@ -123,24 +123,24 @@ public: int GetParticleMultiplicity() const {return fRC_Kinetic_Energy.size();}//! string GetParticleName (const int &i) const {return fRC_Particle_Name[i];}//! double GetTheta (const int &i) const {return fRC_Theta[i];}//! - double GetPhi (const int &i) const {return fRC_Phi[i];}//! + double GetPhi (const int &i) const {return fRC_Phi[i];}//! double GetKineticEnergy (const int &i) const {return fRC_Kinetic_Energy[i];}//! double GetMomentumDirectionX (const int &i) const {return fRC_Momentum_Direction_X[i];}//! double GetMomentumDirectionY (const int &i) const {return fRC_Momentum_Direction_Y[i];}//! double GetMomentumDirectionZ (const int &i) const {return fRC_Momentum_Direction_Z[i];}//! - TVector3 GetBeamDirection () const ;//! - TVector3 GetParticleDirection (const int &i) const ;//! - - double GetThetaLab_WorldFrame (const int &i) const { + 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_BeamFrame (const int &i) const{ + double GetThetaLab_BeamFrame (const int i) const{ return (GetParticleDirection(i).Angle(GetBeamDirection()))/deg; - } //! + } - unsigned int GetEmittedMult() const {return fRC_Particle_Name.size();} //! + unsigned int GetEmittedMult() const {return fRC_Particle_Name.size();} ClassDef(TReactionConditions, 1) // TReactionConditions structure }; -- GitLab