From 58ee85907c10d2b98c42969f27aa9e1b3b986f62 Mon Sep 17 00:00:00 2001 From: skowron Date: Thu, 11 Dec 2003 10:06:41 +0000 Subject: [PATCH] Coding conventions violations corrected. --- HBTAN/AliHBTMonDistributionFctns.cxx | 56 ++++++++++++++--- HBTAN/AliHBTMonDistributionFctns.h | 92 ++++++++++++---------------- HBTAN/AliHBTPair.cxx | 18 ++++++ HBTAN/AliHBTPair.h | 60 +++++++++++------- HBTAN/AliHBTQResolutionFctns.h | 73 ++++++---------------- 5 files changed, 160 insertions(+), 139 deletions(-) diff --git a/HBTAN/AliHBTMonDistributionFctns.cxx b/HBTAN/AliHBTMonDistributionFctns.cxx index 1e5fe5de4dc..37bf0af0785 100644 --- a/HBTAN/AliHBTMonDistributionFctns.cxx +++ b/HBTAN/AliHBTMonDistributionFctns.cxx @@ -1,7 +1,27 @@ #include "AliHBTMonDistributionFctns.h" - -/******************************************************************/ -/******************************************************************/ +//______________________________________________________________ +//////////////////////////////////////////////////////////////// +// +// class AliHBTMonPxDistributionFctn; +// class AliHBTMonPxDistributionVsPtFctn; +// class AliHBTMonPyDistributionFctn; +// class AliHBTMonPyDistributionVsPtFctn; +// class AliHBTMonPzDistributionFctn; +// class AliHBTMonPzDistributionVsPtFctn; +// class AliHBTMonPDistributionFctn; +// class AliHBTMonPDistributionVsPtFctn; +// class AliHBTMonPtDistributionFctn; +// class AliHBTMonVxDistributionFctn; +// class AliHBTMonVyDistributionFctn; +// class AliHBTMonVzDistributionFctn; +// class AliHBTMonRDistributionFctn; +// class AliHBTMonVyDistributionVsVxFctn; +// class AliHBTMonRtDistributionVsVzFctn; +// +// added by Zbigniew.Chajecki@cern.ch +// this classes create distribution functions of particle momentum +// +///////////////////////////////////////////////////////////////// /******************************************************************/ ClassImp(AliHBTMonPxDistributionFctn) @@ -9,6 +29,7 @@ ClassImp(AliHBTMonPxDistributionFctn) AliHBTMonPxDistributionFctn::AliHBTMonPxDistributionFctn(Int_t nbins, Double_t maxXval, Double_t minXval): AliHBTMonOneParticleFctn1D(nbins,maxXval,minXval) { + //constructor Rename("Px","Px"); } @@ -20,6 +41,7 @@ AliHBTMonPyDistributionFctn:: AliHBTMonPyDistributionFctn(Int_t nbins, Double_t maxXval, Double_t minXval): AliHBTMonOneParticleFctn1D(nbins,maxXval,minXval) { + //constructor Rename("Py","Py"); } @@ -30,6 +52,7 @@ ClassImp(AliHBTMonPzDistributionFctn) AliHBTMonPzDistributionFctn::AliHBTMonPzDistributionFctn(Int_t nbins, Double_t maxXval, Double_t minXval): AliHBTMonOneParticleFctn1D(nbins,maxXval,minXval) { + //constructor Rename("Pz","Pz"); } @@ -41,6 +64,7 @@ AliHBTMonPDistributionFctn::AliHBTMonPDistributionFctn (Int_t nbins, Double_t maxXval, Double_t minXval): AliHBTMonOneParticleFctn1D(nbins,maxXval,minXval) { + //constructor Rename("P","P"); } @@ -53,6 +77,7 @@ AliHBTMonPtDistributionFctn::AliHBTMonPtDistributionFctn (Int_t nbins, Double_t maxXval, Double_t minXval): AliHBTMonOneParticleFctn1D(nbins,maxXval,minXval) { + //constructor Rename("Pt","Pt"); } @@ -66,6 +91,7 @@ AliHBTMonPxDistributionVsPtFctn::AliHBTMonPxDistributionVsPtFctn Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTMonOneParticleFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval) { + //constructor Rename("PxDistVsPt","Px vs. Pt"); } /******************************************************************/ @@ -76,7 +102,8 @@ AliHBTMonPyDistributionVsPtFctn::AliHBTMonPyDistributionVsPtFctn Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTMonOneParticleFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval) { - Rename("PyDistVsPt","Py vs. Pt"); + //constructor + Rename("PyDistVsPt","Py vs. Pt"); } /******************************************************************/ ClassImp( AliHBTMonPzDistributionVsPtFctn ) @@ -86,6 +113,7 @@ AliHBTMonPzDistributionVsPtFctn::AliHBTMonPzDistributionVsPtFctn Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTMonOneParticleFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval) { + //constructor Rename("PzDistVsPt","Pz vs. Pt"); } /******************************************************************/ @@ -96,7 +124,8 @@ AliHBTMonPDistributionVsPtFctn::AliHBTMonPDistributionVsPtFctn Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTMonOneParticleFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval) { - Rename("PDistVsPt","P vs. Pt"); + //constructor + Rename("PDistVsPt","P vs. Pt"); } /******************************************************************/ @@ -107,6 +136,7 @@ ClassImp(AliHBTMonPhiDistributionFctn) AliHBTMonPhiDistributionFctn::AliHBTMonPhiDistributionFctn(Int_t nbins, Double_t maxXval, Double_t minXval): AliHBTMonOneParticleFctn1D(nbins,maxXval,minXval) { + //constructor Rename("Phi","Phi"); } /******************************************************************/ @@ -115,6 +145,7 @@ ClassImp(AliHBTMonThetaDistributionFctn) AliHBTMonThetaDistributionFctn::AliHBTMonThetaDistributionFctn(Int_t nbins, Double_t maxXval, Double_t minXval): AliHBTMonOneParticleFctn1D(nbins,maxXval,minXval) { + //constructor Rename("Theta","Theta"); } /******************************************************************/ @@ -125,6 +156,7 @@ AliHBTMonPhiDistributionVsPtFctn::AliHBTMonPhiDistributionVsPtFctn Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTMonOneParticleFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval) { + //constructor Rename("PhiDistVsPt","Phi vs. Pt"); } /******************************************************************/ @@ -135,7 +167,8 @@ AliHBTMonThetaDistributionVsPtFctn::AliHBTMonThetaDistributionVsPtFctn Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTMonOneParticleFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval) { - Rename("ThetaDistVsPt","Theta vs. Pt"); + //constructor + Rename("ThetaDistVsPt","Theta vs. Pt"); } /******************************************************************/ @@ -145,6 +178,7 @@ AliHBTMonVxDistributionFctn:: AliHBTMonVxDistributionFctn(Int_t nbins, Double_t maxXval, Double_t minXval): AliHBTMonOneParticleFctn1D(nbins,maxXval,minXval) { + //constructor Rename("Vx","X of Vertex"); } /******************************************************************/ @@ -165,6 +199,7 @@ AliHBTMonVzDistributionFctn:: AliHBTMonVzDistributionFctn(Int_t nbins, Double_t maxXval, Double_t minXval): AliHBTMonOneParticleFctn1D(nbins,maxXval,minXval) { + //constructor Rename("Vz","Z of Vertex"); } /******************************************************************/ @@ -174,7 +209,8 @@ AliHBTMonRDistributionFctn:: AliHBTMonRDistributionFctn(Int_t nbins, Double_t maxXval, Double_t minXval): AliHBTMonOneParticleFctn1D(nbins,maxXval,minXval) { - Rename("VertexDistanceFromCenter","Distance of Particle Vertex From Center"); + //constructor + Rename("VertexDistanceFromCenter","Distance of Particle Vertex From Center"); } /******************************************************************/ @@ -184,7 +220,8 @@ AliHBTMonVyDistributionVsVxFctn::AliHBTMonVyDistributionVsVxFctn Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTMonOneParticleFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval) { - Rename("VyDistVsVx","Vrtex Y position versus X vertex position"); + //constructor + Rename("VyDistVsVx","Vrtex Y position versus X vertex position"); } /******************************************************************/ @@ -194,7 +231,8 @@ AliHBTMonRtDistributionVsVzFctn::AliHBTMonRtDistributionVsVzFctn Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTMonOneParticleFctn2D(nXbins,maxXval,minXval,nYbins,maxYval,minYval) { - Rename("RDistVsVz","Distance of vertex position from center in trensverse plane versus Z vertex position"); + //constructor + Rename("RDistVsVz","Distance of vertex position from center in trensverse plane versus Z vertex position"); } /******************************************************************/ diff --git a/HBTAN/AliHBTMonDistributionFctns.h b/HBTAN/AliHBTMonDistributionFctns.h index 00bd7da5153..539486614c8 100644 --- a/HBTAN/AliHBTMonDistributionFctns.h +++ b/HBTAN/AliHBTMonDistributionFctns.h @@ -1,8 +1,28 @@ -#ifndef ALIHBTMONPXDISTRIBUTIONVSPTFCTN_H -#define ALIHBTMONPXDISTRIBUTIONVSPTFCTN_H - +#ifndef ALIHBTMONDISTRIBUTIONFCTNS_H +#define ALIHBTMONDISTRIBUTIONFCTNS_H +//______________________________________________________________ +//////////////////////////////////////////////////////////////// +// +// class AliHBTMonPxDistributionFctn; +// class AliHBTMonPxDistributionVsPtFctn; +// class AliHBTMonPyDistributionFctn; +// class AliHBTMonPyDistributionVsPtFctn; +// class AliHBTMonPzDistributionFctn; +// class AliHBTMonPzDistributionVsPtFctn; +// class AliHBTMonPDistributionFctn; +// class AliHBTMonPDistributionVsPtFctn; +// class AliHBTMonPtDistributionFctn; +// class AliHBTMonVxDistributionFctn; +// class AliHBTMonVyDistributionFctn; +// class AliHBTMonVzDistributionFctn; +// class AliHBTMonRDistributionFctn; +// class AliHBTMonVyDistributionVsVxFctn; +// class AliHBTMonRtDistributionVsVzFctn; +// // added by Zbigniew.Chajecki@cern.ch -// this classes create distribution functions of particle momentum +// this classes create distribution functions of particle momentum +// +///////////////////////////////////////////////////////////////// class AliHBTMonPxDistributionFctn; class AliHBTMonPxDistributionVsPtFctn; @@ -35,9 +55,7 @@ class AliHBTMonPxDistributionFctn: public AliHBTMonOneParticleFctn1D TH1* GetResult(){return fResult;} protected: Double_t GetValue(AliHBTParticle * particle) { return particle->Px();} - public: - ClassDef(AliHBTMonPxDistributionFctn,1) - + ClassDef(AliHBTMonPxDistributionFctn,1) }; /*************************************************************************************/ @@ -49,9 +67,7 @@ class AliHBTMonPyDistributionFctn: public AliHBTMonOneParticleFctn1D TH1* GetResult(){return fResult;} protected: Double_t GetValue(AliHBTParticle * particle) { return particle->Py();} - public: - ClassDef(AliHBTMonPyDistributionFctn,1) - + ClassDef(AliHBTMonPyDistributionFctn,1) }; /*************************************************************************************/ @@ -63,8 +79,7 @@ class AliHBTMonPzDistributionFctn: public AliHBTMonOneParticleFctn1D TH1* GetResult(){return fResult;} protected: Double_t GetValue(AliHBTParticle * particle) { return particle->Pz();} - public: - ClassDef(AliHBTMonPzDistributionFctn,1) + ClassDef(AliHBTMonPzDistributionFctn,1) }; /*************************************************************************************/ @@ -77,8 +92,7 @@ class AliHBTMonPDistributionFctn: public AliHBTMonOneParticleFctn1D TH1* GetResult(){return fResult;} protected: Double_t GetValue(AliHBTParticle * particle) { return particle->P();} - public: - ClassDef(AliHBTMonPDistributionFctn,1) + ClassDef(AliHBTMonPDistributionFctn,1) }; /*************************************************************************************/ @@ -91,9 +105,7 @@ class AliHBTMonPtDistributionFctn: public AliHBTMonOneParticleFctn1D TH1* GetResult(){return fResult;} protected: Double_t GetValue(AliHBTParticle * particle) { return particle->Pt();} - public: - ClassDef(AliHBTMonPtDistributionFctn,1) - + ClassDef(AliHBTMonPtDistributionFctn,1) }; /***********************************************************************/ @@ -106,14 +118,11 @@ class AliHBTMonPxDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D void GetValues(AliHBTParticle* partparticle, Double_t& x, Double_t& y) { - x = partparticle->Pt(); - y = partparticle->Px(); + x = partparticle->Pt(); + y = partparticle->Px(); } TH1* GetResult(){return fResult;} - protected: - private: - public: - ClassDef(AliHBTMonPxDistributionVsPtFctn,1) + ClassDef(AliHBTMonPxDistributionVsPtFctn,1) }; /***********************************************************************/ @@ -129,11 +138,8 @@ class AliHBTMonPyDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D x = partparticle->Pt(); y = partparticle->Py(); } - TH1* GetResult(){return fResult;} - protected: - private: - public: - ClassDef(AliHBTMonPyDistributionVsPtFctn,1) + TH1* GetResult(){return fResult;} + ClassDef(AliHBTMonPyDistributionVsPtFctn,1) }; /***********************************************************************/ class AliHBTMonPzDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D @@ -149,10 +155,7 @@ class AliHBTMonPzDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D y = partparticle->Pz(); } TH1* GetResult(){return fResult;} - protected: - private: - public: - ClassDef(AliHBTMonPzDistributionVsPtFctn,1) + ClassDef(AliHBTMonPzDistributionVsPtFctn,1) }; /***********************************************************************/ @@ -169,10 +172,7 @@ class AliHBTMonPDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D y = partparticle->P(); } TH1* GetResult(){return fResult;} - protected: - private: - public: - ClassDef(AliHBTMonPDistributionVsPtFctn,1) + ClassDef(AliHBTMonPDistributionVsPtFctn,1) }; /***********************************************************************/ @@ -188,9 +188,7 @@ class AliHBTMonPhiDistributionFctn: public AliHBTMonOneParticleFctn1D TH1* GetResult(){return fResult;} protected: Double_t GetValue(AliHBTParticle * particle) { return particle->Phi();} - public: - ClassDef(AliHBTMonPhiDistributionFctn,1) - + ClassDef(AliHBTMonPhiDistributionFctn,1) }; /***********************************************************************/ @@ -202,8 +200,7 @@ class AliHBTMonThetaDistributionFctn: public AliHBTMonOneParticleFctn1D TH1* GetResult(){return fResult;} protected: Double_t GetValue(AliHBTParticle * particle) { return particle->Theta();} - public: - ClassDef(AliHBTMonThetaDistributionFctn,1) + ClassDef(AliHBTMonThetaDistributionFctn,1) }; /***********************************************************************/ @@ -220,11 +217,8 @@ class AliHBTMonPhiDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D x = partparticle->Pt(); y = partparticle->Phi(); } - TH1* GetResult(){return fResult;} - protected: - private: - public: - ClassDef(AliHBTMonPhiDistributionVsPtFctn,1) + TH1* GetResult(){return fResult;} + ClassDef(AliHBTMonPhiDistributionVsPtFctn,1) }; /***********************************************************************/ @@ -241,8 +235,6 @@ class AliHBTMonThetaDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D y = partparticle->Theta(); } TH1* GetResult(){return fResult;} - protected: - private: ClassDef(AliHBTMonThetaDistributionVsPtFctn,1) }; @@ -305,8 +297,6 @@ class AliHBTMonVyDistributionVsVxFctn: public AliHBTMonOneParticleFctn2D y = partparticle->Vy(); } TH1* GetResult(){return fResult;} - protected: - private: ClassDef(AliHBTMonVyDistributionVsVxFctn,1) }; @@ -324,8 +314,6 @@ class AliHBTMonRtDistributionVsVzFctn: public AliHBTMonOneParticleFctn2D y = TMath::Hypot(partparticle->Vx(),partparticle->Vy()); } TH1* GetResult(){return fResult;} - protected: - private: ClassDef(AliHBTMonRtDistributionVsVzFctn,1) }; diff --git a/HBTAN/AliHBTPair.cxx b/HBTAN/AliHBTPair.cxx index fe5c020bd9f..02e3e0a4a1e 100644 --- a/HBTAN/AliHBTPair.cxx +++ b/HBTAN/AliHBTPair.cxx @@ -1,4 +1,15 @@ #include "AliHBTPair.h" +//_________________________________________________________________________ +/////////////////////////////////////////////////////////////////////////// +// +// class AliHBTPair +// +// class implements pair of particles and taking care of caluclation (almost) +// all of pair properties (Qinv, InvMass,...) +// more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html +// +//////////////////////////////////////////////////////////////////////////// + #include "AliHBTParticle.h" #include "AliHBTWeights.h" @@ -140,6 +151,7 @@ Double_t AliHBTPair::GetQSideCMSLC() /************************************************************************/ Double_t AliHBTPair::GetQOutCMSLC() { + //caculates Qout in Center Of Mass Longitudionally Co-Moving if(fQOutCMSLCNotCalc) { CalculateSums(); @@ -212,6 +224,7 @@ Double_t AliHBTPair::GetQOutCMSLC() /************************************************************************/ Double_t AliHBTPair::GetQLongCMSLC() { + //return Q Long in Central Of Mass System in Longitudialy Comoving Frame if (fQLongCMSLCNotCalc) { CalculateSums(); @@ -225,6 +238,7 @@ Double_t AliHBTPair::GetQLongCMSLC() /************************************************************************/ Double_t AliHBTPair::GetKt() { + //calculates the evarage momentum of the pair if(fKtNotCalc) { CalculateSums(); @@ -237,6 +251,7 @@ Double_t AliHBTPair::GetKt() Double_t AliHBTPair::GetKStar() { + //calculates invariant velocity difference if (fKStarNotCalc) { CalculateSums(); @@ -282,6 +297,7 @@ Double_t AliHBTPair::GetQInv() Double_t AliHBTPair::GetGammaToCMSLC() { + //calculates gamma factor of the boost to CMSLC if(fGammaCMSLCNotCalc) { CalculateSums(); @@ -295,6 +311,7 @@ Double_t AliHBTPair::GetGammaToCMSLC() Double_t AliHBTPair::GetMt() { + //Calculates transverse mass of the pair if (fMtNotCalc) { CalculateSums(); @@ -307,6 +324,7 @@ Double_t AliHBTPair::GetMt() Double_t AliHBTPair::GetWeight() { + //returns and buffers weight for this pair if (fWeightNotCalc) { fWeight = AliHBTWeights::Weight(this); diff --git a/HBTAN/AliHBTPair.h b/HBTAN/AliHBTPair.h index 7c79d6752ea..f27b7f129f5 100644 --- a/HBTAN/AliHBTPair.h +++ b/HBTAN/AliHBTPair.h @@ -1,13 +1,21 @@ #ifndef ALIHBTPAIR_H #define ALIHBTPAIR_H +//_________________________________________________________________________ +/////////////////////////////////////////////////////////////////////////// +// +// class AliHBTPair +// +// class implements pair of particles and taking care of caluclation (almost) +// all of pair properties (Qinv, InvMass,...) +// more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html +// +//////////////////////////////////////////////////////////////////////////// #include #include "AliHBTParticle.h" -//class implements pair of particles and taking care of caluclation (almost) -//all of pair properties (Qinv, InvMass,...) -//more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html + class AliHBTPair: public TObject { @@ -82,42 +90,41 @@ class AliHBTPair: public TObject Double_t fQLong;//Q Long Double_t fMt;//Transverse coordinate of Inv. Mass - Bool_t fMtNotCalc;//flag indicating if Mt is calculated + Bool_t fMtNotCalc;//flag indicating if Mt is calculated for current pair Double_t fInvMassSqr;//squre of invariant mass Bool_t fMassSqrNotCalc; // void CalculateInvMassSqr(); - Double_t fQInvL; - Bool_t fQInvLNotCalc; + Double_t fQInvL; //Qinv in longitudional direction + Bool_t fQInvLNotCalc;//flag indicating if fQInvL is calculated for current pair void CalculateQInvL(); - Double_t fWeight; - Bool_t fWeightNotCalc; - - Double_t fPxSum; - Double_t fPySum; - Double_t fPzSum; - Double_t fESum; - Bool_t fSumsNotCalc; + Double_t fWeight;//Value of the weight + Bool_t fWeightNotCalc;//flag indicating if fWeight is calculated for current pair + + Double_t fPxSum;// Sum of Px momenta + Double_t fPySum;// Sum of Py momenta + Double_t fPzSum;// Sum of Pz momenta + Double_t fESum;// Sum of energies + Bool_t fSumsNotCalc;//flag indicating if fPxSum,fPxSum,fPxSum and fESum is calculated for current pair void CalculateSums(); - Double_t fPxDiff; - Double_t fPyDiff; - Double_t fPzDiff; - Double_t fEDiff; - Bool_t fDiffsNotCalc; + Double_t fPxDiff;// Difference of Px momenta + Double_t fPyDiff;// Difference of Px momenta + Double_t fPzDiff;// Difference of Px momenta + Double_t fEDiff;// Difference of Px momenta + Bool_t fDiffsNotCalc;//flag indicating if fPxDiff,fPxDiff,fPxDiff and fEDiff is calculated for current pair void CalculateDiffs(); - Double_t fGammaCMSLC; - Bool_t fGammaCMSLCNotCalc; + Double_t fGammaCMSLC;//gamma of boost in CMSLC + Bool_t fGammaCMSLCNotCalc;//flag indicating if fGammaCMSLC is calculated for current pair /***************************************************/ void CalculateBase(); - Bool_t fChanged; + Bool_t fChanged;//flag indicating if object has been changed private: - public: ClassDef(AliHBTPair,1) }; /****************************************************************/ @@ -159,6 +166,7 @@ void AliHBTPair::Changed() inline void AliHBTPair::CalculateInvMassSqr() { + //calculates square of qinv if (fMassSqrNotCalc) { CalculateSums(); @@ -186,6 +194,7 @@ void AliHBTPair::CalculateQInvL() inline void AliHBTPair::CalculateSums() { + //calculates momenta and energy sums if(fSumsNotCalc) { fPxSum = fPart1->Px()+fPart2->Px(); @@ -199,6 +208,7 @@ void AliHBTPair::CalculateSums() inline void AliHBTPair::CalculateDiffs() { + //calculates momenta and energy differences if(fDiffsNotCalc) { fPxDiff = fPart1->Px()-fPart2->Px(); @@ -213,6 +223,7 @@ void AliHBTPair::CalculateDiffs() inline Double_t AliHBTPair::GetDeltaP() //return difference of momenta { + //returns difference of momenta CalculateDiffs(); return TMath::Sqrt(fPxDiff*fPxDiff + fPyDiff*fPyDiff + fPzDiff*fPzDiff); } @@ -220,6 +231,7 @@ Double_t AliHBTPair::GetDeltaP() //return difference of momenta inline Double_t AliHBTPair::GetDeltaPx() { + //returns difference of Pz CalculateDiffs(); return fPxDiff; } @@ -227,6 +239,7 @@ Double_t AliHBTPair::GetDeltaPx() inline Double_t AliHBTPair::GetDeltaPy() { + //returns difference of Py CalculateDiffs(); return fPyDiff; } @@ -235,6 +248,7 @@ Double_t AliHBTPair::GetDeltaPy() inline Double_t AliHBTPair::GetDeltaPz() { + //returns difference of Pz CalculateDiffs(); return fPzDiff; } diff --git a/HBTAN/AliHBTQResolutionFctns.h b/HBTAN/AliHBTQResolutionFctns.h index 0de8f711e95..426a111f8f9 100644 --- a/HBTAN/AliHBTQResolutionFctns.h +++ b/HBTAN/AliHBTQResolutionFctns.h @@ -60,9 +60,7 @@ class AliHBTKtResolVsQInvFctn: public AliHBTTwoPairFctn2D y = partpair->GetKt() - trackpair->GetKt(); x = partpair->GetQInv(); } - protected: - private: - ClassDef(AliHBTKtResolVsQInvFctn,1) + ClassDef(AliHBTKtResolVsQInvFctn,1) }; @@ -82,9 +80,7 @@ class AliHBTQInvResolVsQInvFctn: public AliHBTTwoPairFctn2D y = partpair->GetQInv() - trackpair->GetQInv(); x = partpair->GetQInv(); } - protected: - private: - ClassDef(AliHBTQInvResolVsQInvFctn,1) + ClassDef(AliHBTQInvResolVsQInvFctn,1) }; @@ -106,9 +102,7 @@ class AliHBTQOutResolVsQInvFctn: public AliHBTTwoPairFctn2D if (tqout < 0.0) y = -y; x = partpair->GetQInv(); } - protected: - private: - ClassDef(AliHBTQOutResolVsQInvFctn,1) + ClassDef(AliHBTQOutResolVsQInvFctn,1) }; /***********************************************************************/ @@ -127,9 +121,7 @@ class AliHBTQSideResolVsQInvFctn: public AliHBTTwoPairFctn2D x = partpair->GetQInv(); } TH1* GetResult(){return fNumerator;} - protected: - private: - ClassDef(AliHBTQSideResolVsQInvFctn,1) + ClassDef(AliHBTQSideResolVsQInvFctn,1) }; /***********************************************************************/ @@ -148,9 +140,7 @@ class AliHBTQLongResolVsQInvFctn: public AliHBTTwoPairFctn2D x = partpair->GetQInv(); } TH1* GetResult(){return fNumerator;} - protected: - private: - ClassDef(AliHBTQLongResolVsQInvFctn,1) + ClassDef(AliHBTQLongResolVsQInvFctn,1) }; /***********************************************************************/ @@ -168,9 +158,7 @@ class AliHBTQInvResolVsKtFctn: public AliHBTTwoPairFctn2D x = partpair->GetKt(); } TH1* GetResult(){return fNumerator;} - protected: - private: - ClassDef(AliHBTQInvResolVsKtFctn,1) + ClassDef(AliHBTQInvResolVsKtFctn,1) }; /***********************************************************************/ /***********************************************************************/ @@ -187,9 +175,7 @@ class AliHBTQOutResolVsKtFctn: public AliHBTTwoPairFctn2D if (trackpair->GetQOutCMSLC() < 0.0) y = -y; x = partpair->GetKt(); } - protected: - private: - ClassDef(AliHBTQOutResolVsKtFctn,1) + ClassDef(AliHBTQOutResolVsKtFctn,1) }; /***********************************************************************/ /***********************************************************************/ @@ -206,9 +192,7 @@ class AliHBTQSideResolVsKtFctn: public AliHBTTwoPairFctn2D if (trackpair->GetQSideCMSLC() < 0.0) y = -y; x = partpair->GetKt(); } - protected: - private: - ClassDef(AliHBTQSideResolVsKtFctn,1) + ClassDef(AliHBTQSideResolVsKtFctn,1) }; /***********************************************************************/ /***********************************************************************/ @@ -226,9 +210,7 @@ class AliHBTQLongResolVsKtFctn: public AliHBTTwoPairFctn2D x = partpair->GetKt(); } TH1* GetResult(){return fNumerator;} - protected: - private: - ClassDef(AliHBTQLongResolVsKtFctn,1) + ClassDef(AliHBTQLongResolVsKtFctn,1) }; /***********************************************************************/ /***********************************************************************/ @@ -245,9 +227,7 @@ class AliHBTQOutResolVsQOutFctn: public AliHBTTwoPairFctn2D y = x - trackpair->GetQOutCMSLC(); } TH1* GetResult(){return fNumerator;} - protected: - private: - ClassDef(AliHBTQOutResolVsQOutFctn,1) + ClassDef(AliHBTQOutResolVsQOutFctn,1) }; /***********************************************************************/ @@ -266,9 +246,7 @@ class AliHBTQSideResolVsQSideFctn: public AliHBTTwoPairFctn2D y = x - trackpair->GetQSideCMSLC(); } TH1* GetResult(){return fNumerator;} - protected: - private: - ClassDef(AliHBTQSideResolVsQSideFctn,1) + ClassDef(AliHBTQSideResolVsQSideFctn,1) }; @@ -288,9 +266,7 @@ class AliHBTQLongResolVsQLongFctn: public AliHBTTwoPairFctn2D y = x - trackpair->GetQLongCMSLC(); } TH1* GetResult(){return fNumerator;} - protected: - private: - ClassDef(AliHBTQLongResolVsQLongFctn,1) + ClassDef(AliHBTQLongResolVsQLongFctn,1) }; @@ -312,9 +288,7 @@ class AliHBTPairThetaResolVsQInvFctn: public AliHBTTwoPairFctn2D y = partTheta - trackTheta; x = partpair->GetQInv(); } - protected: - private: - ClassDef(AliHBTPairThetaResolVsQInvFctn,1) + ClassDef(AliHBTPairThetaResolVsQInvFctn,1) }; /***********************************************************************/ @@ -336,9 +310,7 @@ class AliHBTPairThetaResolVsPairThetaFctn: public AliHBTTwoPairFctn2D if (trackTheta < 0.0) y = -y; x = trackTheta; } - protected: - private: - ClassDef(AliHBTPairThetaResolVsPairThetaFctn,1) + ClassDef(AliHBTPairThetaResolVsPairThetaFctn,1) }; @@ -360,9 +332,7 @@ class AliHBTPairPhiResolVsQInvFctn: public AliHBTTwoPairFctn2D y = partPhi - trackPhi; x = partpair->GetQInv(); } - protected: - private: - ClassDef(AliHBTPairPhiResolVsQInvFctn,1) + ClassDef(AliHBTPairPhiResolVsQInvFctn,1) }; /***********************************************************************/ @@ -383,9 +353,7 @@ class AliHBTPairThetaResolVsKtFctn: public AliHBTTwoPairFctn2D y = partTheta - trackTheta; x = partpair->GetKt(); } - protected: - private: - ClassDef(AliHBTPairThetaResolVsKtFctn,1) + ClassDef(AliHBTPairThetaResolVsKtFctn,1) }; /***********************************************************************/ @@ -406,9 +374,7 @@ class AliHBTPairPhiResolVsKtFctn: public AliHBTTwoPairFctn2D y = partPhi - trackPhi; x = partpair->GetKt(); } - protected: - private: - ClassDef(AliHBTPairPhiResolVsKtFctn,1) + ClassDef(AliHBTPairPhiResolVsKtFctn,1) }; #endif @@ -430,9 +396,6 @@ class AliHBTPairPhiResolVsPairPhiFctn: public AliHBTTwoPairFctn2D y = partPhi - trackPhi; x = trackPhi; } - protected: - private: - ClassDef(AliHBTPairPhiResolVsPairPhiFctn,1) + ClassDef(AliHBTPairPhiResolVsPairPhiFctn,1) }; - -- 2.43.0