From Davide Caffarri: fix coding convention violations and some other minor corrections.

diff --git a/EVE/EveBase/AliEveHF.cxx b/EVE/EveBase/AliEveHF.cxx
index dfa7b7a90b01eaa24c6c02e6545d956ef4a2edef..769cadf1f7edaa6921cc9952531792d8d0489272 100644 (file)
--- a/EVE/EveBase/AliEveHF.cxx
+++ b/EVE/EveBase/AliEveHF.cxx
@@ -40,7 +40,7 @@ AliEveHF::AliEveHF():
   fAODobj(0x0),
   fRecBirthHF(0,0,0),
   fRecDecayHF(0,0,0),
-  fRecDecayP_HF(0,0,0),
+  fRecDecayMomHF(0,0,0),
   fPointingAngleHF(0),
 
   fNegTrack(0),
@@ -69,14 +69,14 @@ AliEveHF::AliEveHF():
 }
 
 //______________________________________________________________________________
-AliEveHF::AliEveHF(TEveRecTrack* tNeg, TEveRecTrack* tPos, Double_t primVtx[3], AliAODRecoDecay* aodObj, Double_t /*firstPointTrack*/[3], TEveTrackPropagator* rs) :
+AliEveHF::AliEveHF(TEveRecTrack* tNeg, TEveRecTrack* tPos, Double_t primVtx[3], AliAODRecoDecay* aodObj, TEveTrackPropagator* rs) :
 
   TEvePointSet(),
 
   fAODobj(aodObj),
   fRecBirthHF(primVtx[0], primVtx[1], primVtx[2]),
   fRecDecayHF(aodObj->GetSecVtxX(), aodObj->GetSecVtxY(), aodObj->GetSecVtxZ()),
-  fRecDecayP_HF(aodObj->Px(),aodObj->Py(),aodObj->Pz()),
+  fRecDecayMomHF(aodObj->Px(),aodObj->Py(),aodObj->Pz()),
   fPointingAngleHF(aodObj->CosPointingAngle(primVtx)),
 
   fNegTrack(new TEveTrack(tNeg, rs)),
@@ -158,7 +158,7 @@ void AliEveHF::SetMaxProbPdgPid()
   for (Int_t ip=0; ip<fnProng; ip++){
     fAODobj->GetPIDProng(ip, pid);
 
-    fProngMaxProbPid[ip]=pid[0]; //lascio cosi perchè mi da errore se lo uso come puntatore
+    fProngMaxProbPid[ip]=pid[0]; 
     for (Int_t pp=1; pp<5; pp++)
       if (pid[pp]>pid[pp-1]) {
        fProngMaxProbPid[ip]=pid[pp];
@@ -183,6 +183,8 @@ void AliEveHF::SetMaxProbPdgPid()
 //________________________________________________________________________________________
 void AliEveHF::CalculateInvMass(Int_t decay)
 {
+
+  //Method to calculate the invariant mass of the particle and the antiparticle. 
   UInt_t   pdg2[2];
   Double_t mPDG,minv;
 
@@ -205,6 +207,8 @@ void AliEveHF::CalculateInvMass(Int_t decay)
 //______________________________________________________________________________
 Bool_t AliEveHF::SelectInvMass(Int_t decay, Float_t decayCuts)
 {
+
+  //Member fuction to select particles using the invariant mass cuts. 
   UInt_t   pdg2[2];
   Double_t mPDG,minv;
 
@@ -370,11 +374,12 @@ void AliEveHFList::MakeHFs()
 void AliEveHFList::FilterByPt(Float_t minPt, Float_t maxPt)
 {
 
+  //Select visibility of elements based on their Pt
 
   fMinPt = minPt;
   fMaxPt = maxPt;
 
-  for(List_i i = fChildren.begin(); i != fChildren.end(); ++i)//lista gli HF!!!
+  for(List_i i = fChildren.begin(); i != fChildren.end(); ++i)
     {
       AliEveHF *hf = (AliEveHF*) *i;
       Float_t  pt  = hf->GetPt();
@@ -392,7 +397,7 @@ void AliEveHFList::FilterByRadius(Float_t minR, Float_t maxR)
   fMinRCut = minR;
   fMaxRCut = maxR;
 
-  for(List_i i = fChildren.begin(); i != fChildren.end(); ++i)//lista gli HF!!!
+  for(List_i i = fChildren.begin(); i != fChildren.end(); ++i)
     {
       AliEveHF *hf = (AliEveHF*) *i;
       Float_t  rad = hf->GetRadius();
@@ -409,13 +414,13 @@ void AliEveHFList::FilterByRadius(Float_t minR, Float_t maxR)
 //______________________________________________________________________________
 void AliEveHFList::FilterByCosPointingAngle(Float_t minCosPointingAngle, Float_t maxCosPointingAngle)
 {
-  // Select visibility of elements based on the V0 pt.
+  // Select visibility of elements based on the HF cosine of the pointing angle
 
   fMinCosPointingAngle = minCosPointingAngle;
   fMaxCosPointingAngle = maxCosPointingAngle;
 
 
-  for(List_i i = fChildren.begin(); i != fChildren.end(); ++i)//lista gli HF!!!
+  for(List_i i = fChildren.begin(); i != fChildren.end(); ++i)
     {
       AliEveHF *hf = (AliEveHF*) *i;
       Float_t  cosPointingAngle = hf->GetCosPointingAngle();
@@ -429,7 +434,7 @@ void AliEveHFList::FilterByCosPointingAngle(Float_t minCosPointingAngle, Float_t
 //______________________________________________________________________________
 void AliEveHFList::FilterByd0(Float_t mind0, Float_t maxd0)
 {
-  // Select visibility of elements based on the V0 pt.
+  // Select visibility of elements based on the HF impact parameter.
 
   fMind0 = mind0;
   fMaxd0 = maxd0;

diff --git a/EVE/EveBase/AliEveHF.h b/EVE/EveBase/AliEveHF.h
index 76b54fc62f435ada3c41da0fc02936c412f70aab..22e66703d27ea71fe6631db0b69efb557851b17d 100644 (file)
--- a/EVE/EveBase/AliEveHF.h
+++ b/EVE/EveBase/AliEveHF.h
@@ -1,5 +1,6 @@
 // $Id$
 // Main author: Davide Caffarri 2009
+// Base header class to HF visualization
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
@@ -27,12 +28,12 @@ class AliEveHFList;
 
 class AliEveHF : public TEvePointSet
 {
-  friend class AliEveHFList;
-  friend class AliEveHFEditor;
+  friend class AliEveHFList; //friend class for the list of HF in the same event
+  friend class AliEveHFEditor; //friend class for the list of HF visualization
 
 public:
   AliEveHF();
-  AliEveHF(TEveRecTrack* tNeg, TEveRecTrack* tPos, Double_t primVtx[3], AliAODRecoDecay* aodObj, Double_t firstPointTrack[3], TEveTrackPropagator* rs);
+  AliEveHF(TEveRecTrack* tNeg, TEveRecTrack* tPos, Double_t primVtx[3], AliAODRecoDecay* aodObj, TEveTrackPropagator* rs);
   virtual ~AliEveHF();
 
   void MakeHF();
@@ -48,17 +49,17 @@ public:
   //HF Property
 
   Float_t GetPhi()     { return fRecDecayHF.Phi(); }
-  Float_t GetEta()     { return fRecDecayP_HF.Eta(); }
+  Float_t GetEta()     { return fRecDecayMomHF.Eta(); }
   Float_t GetRadius()  { return fRecDecayHF.Perp(); }
-  Float_t GetPt()      { return fRecDecayP_HF.Perp(); }
+  Float_t GetPt()      { return fRecDecayMomHF.Perp(); }
 
   Double_t GetInvariantMassPart()     { CalculateInvMass(fDecay); return fInvariantMassPart; }
   Double_t GetInvariantMassAntiPart() { CalculateInvMass(fDecay); return fInvariantMassAntiPart; }
 
-  Float_t GetChi2Vtx()  { return fChi2SecondVtx; }
-  Float_t GetCosPointingAngle() {return fPointingAngleHF; }
+  Float_t GetChi2Vtx() const { return fChi2SecondVtx; }
+  Float_t GetCosPointingAngle() const {return fPointingAngleHF; }
 
-  AliAODRecoDecay *GetAODobj() {return fAODobj; }
+  AliAODRecoDecay *GetAODobj() const {return fAODobj; }
 
   Int_t GetAODIndex() const { return fAODIndex; }
   void  SetAODIndex(Int_t ind) { fAODIndex = ind;}
@@ -68,10 +69,10 @@ public:
 
   //Prongs Property
 
-  Double_t GetProngDCA(Int_t iProng) { return fProngDCA[iProng]; }
+  Double_t GetProngDCA(Int_t iProng)const { return fProngDCA[iProng]; }
   void SetProngDCA() const ;
 
-  Double_t Getd0Prong(Int_t iProng)  { return fProngd0[iProng]; }
+  Double_t Getd0Prong(Int_t iProng)const  { return fProngd0[iProng]; }
   void Setd0Prong() const ;
 
   void CalculateInvMass(Int_t decay);
@@ -79,31 +80,31 @@ public:
   Bool_t SelectInvMass(Int_t decay, Float_t decayCuts);
 
   void      SetMaxProbPdgPid();
-  Int_t     GetPdgProngMaxProb(Int_t iProng) { return fProngMaxProbPdg[iProng]; }
-  Double_t  GetPidProngMaxProb(Int_t iProng) { return fProngMaxProbPid[iProng]; }
+  Int_t     GetPdgProngMaxProb(Int_t iProng)const { return fProngMaxProbPdg[iProng]; }
+  Double_t  GetPidProngMaxProb(Int_t iProng)const { return fProngMaxProbPid[iProng]; }
 
   TEveTrackPropagator* GetPropagator() const  { return fRnrStyle; }
 
-  TEveTrack* GetNegTrack() { return fNegTrack; }
-  TEveTrack* GetPosTrack() { return fPosTrack; }
+  TEveTrack* GetNegTrack()const { return fNegTrack; }
+  TEveTrack* GetPosTrack()const { return fPosTrack; }
 
-  TEveLine*  GetPointingLine() { return fPointingLine; }
+  TEveLine*  GetPointingLine()const { return fPointingLine; }
 
 protected:
 
-  AliAODRecoDecay  *fAODobj;
+  AliAODRecoDecay  *fAODobj;  //AOD object of the HF decay. 
 
   TEveVector  fRecBirthHF;    // Reconstucted birth point of neutral particle
   TEveVector  fRecDecayHF;    // Point of closest approach
-  TEveVector  fRecDecayP_HF;
+  TEveVector  fRecDecayMomHF;   // Momentum of the HF 
   Double_t    fPointingAngleHF; // Track Pointing Angle
 
-  TEveTrack        *fNegTrack;
-  TEveTrack        *fPosTrack;
+  TEveTrack        *fNegTrack;  //Negative daughter of the HF
+  TEveTrack        *fPosTrack;  //Positive daughter of the HF
 
-  TEveTrackPropagator *fRnrStyle;
+  TEveTrackPropagator *fRnrStyle;  //Eve propagator for the track 
 
-  TEveLine         *fPointingLine;
+  TEveLine         *fPointingLine;  //Flight Line of the HF 
 
   Int_t             fnProng;      // Number of Prong.
   Int_t             fAODIndex;    // Index in HF loop array.
@@ -114,10 +115,10 @@ protected:
   Int_t             *fProngMaxProbPdg;//[fnProng] Maximum PDG probability for the negative daughter
   Double_t          *fProngMaxProbPid;//[fnProng] Maximum PID probability for the negative daughter
 
-  Double_t           fInvariantMassPart;
-  Double_t           fInvariantMassAntiPart;
+  Double_t           fInvariantMassPart; //Invariant Mass of the particle
+  Double_t           fInvariantMassAntiPart; //Invariant Mass of the Antiparticle
 
-  Int_t              fDecay;
+  Int_t              fDecay; //Index for the type of decay
 
  private:
   AliEveHF(const AliEveHF&);            // Not implemented
@@ -132,8 +133,8 @@ protected:
 /******************************************************************************/
 class AliEveHFList : public TEveElementList
 {
-  friend class AliEveHFListEditor;
-  //  friend class AliEveHF;
+  friend class AliEveHFListEditor; //Class for the list of HF visualization 
+
 
 public:
   AliEveHFList();
@@ -172,37 +173,37 @@ public:
   void   FilterByInvariantMass (Int_t decay, Float_t deltaInvariantMass);
 
 protected:
-  TString              fTitle;
+  TString              fTitle; 
 
   TEveTrackPropagator *fRnrStyle;
 
-  Bool_t               fRnrDaughters;
-  Bool_t               fRnrHFvtx;
-  Bool_t               fRnrHFpath;
+  Bool_t               fRnrDaughters; //variable for HF daughters visualization
+  Bool_t               fRnrHFvtx; //variable for the HF vertex visualization
+  Bool_t               fRnrHFpath; //variable for the visualization of the HF line
 
   Color_t*             fProngColor;//[fnProng]
 
-  Float_t              fMinRCut;
-  Float_t              fMaxRCut;
+  Float_t              fMinRCut; //minimum cut for the radius 
+  Float_t              fMaxRCut; //maximum cut for the radius
 
-  Float_t              fMinDaughterDCA;
-  Float_t              fMaxDaughterDCA;
+  Float_t              fMinDaughterDCA; //minimum cut for the DCA of the daughter particles
+  Float_t              fMaxDaughterDCA; //maximum cut for the DCA of the daughter particles
 
-  Float_t              fMinPt;
-  Float_t              fMaxPt;
+  Float_t              fMinPt; //minimum cut for the Pt
+  Float_t              fMaxPt; //maximum cut for the Pt
 
-  Float_t              fMinCosPointingAngle;
-  Float_t              fMaxCosPointingAngle;
+  Float_t              fMinCosPointingAngle; //minimum cut for the cosine of the pointing angle 
+  Float_t              fMaxCosPointingAngle; //maximum cut for the cosine of the pointing angle 
 
-  Float_t              fMind0;
-  Float_t              fMaxd0;
+  Float_t              fMind0; //minimum cut for the impact parameter
+  Float_t              fMaxd0; //maximum cut for the impact parameter
 
   Int_t*               fProngCheckedPid;//[fnProng]
 
   Float_t*             fProngCheckedProb;//[fnProng]
 
-  Float_t              fDeltaInvariantMass;
-  Int_t                fDecay;
+  Float_t              fDeltaInvariantMass; //invariant mass window to select the candidate
+  Int_t                fDecay; //index for the type of decay
 
 private:
   void Init();

diff --git a/EVE/EveBase/AliEveHFEditor.cxx b/EVE/EveBase/AliEveHFEditor.cxx
index 8336075620ae751267d54d46f95d1e272eea070b..ef043b4e24fa4cad69c3bb6f34de1a048217d13f 100644 (file)
--- a/EVE/EveBase/AliEveHFEditor.cxx
+++ b/EVE/EveBase/AliEveHFEditor.cxx
@@ -129,7 +129,7 @@ void AliEveHFEditor::DisplayDetailed()
   lhfTransverseMomentumDirection->SetLineWidth(2);
   Float_t scalePt = 100.; // this needs to be available as a ruler
   lhfTransverseMomentumDirection->SetPoint(0,fM->fRecDecayHF.fX, fM->fRecDecayHF.fY, fM->fRecDecayHF.fZ);
-  lhfTransverseMomentumDirection->SetPoint(1,scalePt*fM->fRecDecayP_HF.fX, scalePt*fM->fRecDecayP_HF.fY,0);
+  lhfTransverseMomentumDirection->SetPoint(1,scalePt*fM->fRecDecayMomHF.fX, scalePt*fM->fRecDecayMomHF.fY,0);
 
   TEvePointSet *pvlocation = new TEvePointSet("PV location");
   pvlocation->SetNextPoint(fM->fRecBirthHF.fX, fM->fRecBirthHF.fY, fM->fRecBirthHF.fZ);

diff --git a/EVE/EveBase/AliEveHFListEditor.cxx b/EVE/EveBase/AliEveHFListEditor.cxx
index 1e562099158e139fc8790eb40ca615e7271b94aa..e9e32007b1ec5fbf60e1db58a3bab243932ddf8e 100644 (file)
--- a/EVE/EveBase/AliEveHFListEditor.cxx
+++ b/EVE/EveBase/AliEveHFListEditor.cxx
@@ -69,7 +69,7 @@ AliEveHFListEditor::AliEveHFListEditor(const TGWindow *p, Int_t width, Int_t hei
    AddFrame(fMinMaxCosPointingAngle, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1));
 
 
-   fValueInvMass = new TEveGDoubleValuator(this, "Invariant Mass:", 80, 0);
+   fValueInvMass = new TEveGDoubleValuator(this, "Delta Invariant Mass:", 80, 0);
    fValueInvMass->SetNELength(5);
    fValueInvMass->SetLabelWidth(120);
    fValueInvMass->Build();

diff --git a/EVE/alice-macros/aod_HF.C b/EVE/alice-macros/aod_HF.C
index 41344ed8fc7ffceab2c4349c105581f358b3e243..3724fa116ae534af5723f307f0dea070bad35d9f 100644 (file)
--- a/EVE/alice-macros/aod_HF.C
+++ b/EVE/alice-macros/aod_HF.C
@@ -48,7 +48,7 @@ AliEveHF* aod_make_HF(TEveTrackPropagator* rnrStyle, AliAODVertex* primAODVtx,
   aod_hf_init_rectrack(rcPos, pos);
   //rcPos.fIndex = v0->GetPindex();
 
-  AliEveHF* myHF = new AliEveHF(&rcNeg, &rcPos, primVtx ,rd, v, rnrStyle);
+  AliEveHF* myHF = new AliEveHF(&rcNeg, &rcPos, primVtx ,rd, rnrStyle);
   myHF->SetElementName(Form("D0->Kpi %d", i));
   myHF->SetElementTitle(Form("CosPointingAngle %f", rd->CosPointingAngle()));
   myHF->SetAODIndex(i);