From d17c82b1758d6badbb314528bae654417bf1a8c7 Mon Sep 17 00:00:00 2001 From: Vratislav Chudoba Date: Mon, 17 Jul 2017 17:33:57 +0300 Subject: [PATCH] Compilation errors and some warnings solved. --- Be/BeEvent.cpp | 6 ++++-- Be/BeReaction.cpp | 18 ++++++++++++------ Be/BinaryReaction.cpp | 6 ++++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Be/BeEvent.cpp b/Be/BeEvent.cpp index c547c08..54aacf5 100644 --- a/Be/BeEvent.cpp +++ b/Be/BeEvent.cpp @@ -757,7 +757,8 @@ Double_t BeEvent::CsIcorrectedEnergy(Int_t _address, Int_t _subaddress, // // c1 = (a*x0+b)/( (x0-p)^c2 ) - Double_t energy; +// Double_t energy; + Double_t energy = 0.; Double_t cp1; Double_t cp2; @@ -2728,7 +2729,8 @@ void BeEvent::HitIdentification(const Int_t tel, const Int_t hit, /// //////////////////////////////////////////////////////////////////////////// - Double_t x; +// Double_t x; + Double_t x = 0.; Double_t econ; //case when there is no signal in CsI diff --git a/Be/BeReaction.cpp b/Be/BeReaction.cpp index ed3fea3..8fcd80f 100644 --- a/Be/BeReaction.cpp +++ b/Be/BeReaction.cpp @@ -158,12 +158,18 @@ void BeReaction::FillProcess(Double_t _LiT, Double_t _LiThetaIn, //physical generator based on theoretical calculations //set masses for 6Li + p --> 6Be + n: mass of 6Be taken from generator - TLorentzVector pa(_p_alpha[0], _p_alpha[1], _p_alpha[2]); //alpha in the a-p-p CM - pa.SetE( E( Power(pa.P(), 2), BeDecayM[3] ) ); - TLorentzVector pp1(_p_p1[0], _p_p1[1], _p_p1[2]); //proton in the a-p-p CM - pp1.SetE( E( Power(pp1.P(), 2), LipM[1] ) ); - TLorentzVector pp2(_p_p2[0], _p_p2[1], _p_p2[2]); //proton in the a-p-p CM - pp2.SetE( E( Power(pp2.P(), 2), LipM[1] ) ); +// TLorentzVector pa(_p_alpha[0], _p_alpha[1], _p_alpha[2]); //alpha in the a-p-p CM +// pa.SetE( E( Power(pa.P(), 2), BeDecayM[3] ) ); + TLorentzVector pa(_p_alpha[0], _p_alpha[1], _p_alpha[2], E( Power(pa.P(), 2), BeDecayM[3] )); //alpha in the a-p-p CM + +// TLorentzVector pp1(_p_p1[0], _p_p1[1], _p_p1[2]); //proton in the a-p-p CM +// pp1.SetE( E( Power(pp1.P(), 2), LipM[1] ) ); + TLorentzVector pp1(_p_p1[0], _p_p1[1], _p_p1[2], E( Power(pp1.P(), 2), LipM[1] )); //proton in the a-p-p CM + +// TLorentzVector pp2(_p_p2[0], _p_p2[1], _p_p2[2]); //proton in the a-p-p CM +// pp2.SetE( E( Power(pp2.P(), 2), LipM[1] ) ); + TLorentzVector pp2(_p_p2[0], _p_p2[1], _p_p2[2], E( Power(pp2.P(), 2), LipM[1] )); //proton in the a-p-p CM + TLorentzVector pbe; //6Be in the a-p-p CM pbe = pa + pp1 + pp2; diff --git a/Be/BinaryReaction.cpp b/Be/BinaryReaction.cpp index 1b8e922..6c012fe 100644 --- a/Be/BinaryReaction.cpp +++ b/Be/BinaryReaction.cpp @@ -192,12 +192,14 @@ void BinaryReaction::SetOrientationV() rdirection.SetPhi(fPhiIn); //rdirection.SetMag(1.); - TVector3 a(1); +// TVector3 a(1); + TVector3 a(1., 1., 1.); a.SetTheta(fThetaA); a.SetPhi(fPhiA); //a.SetMag(1.); - TVector3 b(1); +// TVector3 b(1); + TVector3 b(1., 1., 1.); b.SetTheta(fThetaB); b.SetPhi(fPhiB); //b.SetMag(1.); -- 2.18.1