From: loizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 24 Mar 2011 15:24:59 +0000 (+0000)
Subject: Coverty plus minE threshold
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=3c661da5447cdb8a249e2324d09a20a1ac500458;p=u%2Fmrichter%2FAliRoot.git

Coverty plus minE threshold
---

diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.cxx b/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.cxx
index 33eae5ba03d..14eb56df810 100644
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.cxx
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.cxx
@@ -36,6 +36,7 @@ AliAnalysisTaskEMCALPi0PbPb::AliAnalysisTaskEMCALPi0PbPb(const char *name)
     fDoAfterburner(0),
     fAsymMax(1),
     fNminCells(1),
+    fMinE(0.100),
     fMinErat(0),
     fMinEcc(0),
     fNEvs(0),
@@ -286,6 +287,7 @@ void AliAnalysisTaskEMCALPi0PbPb::UserExec(Option_t *)
   } else {
     fAodEv = dynamic_cast<AliAODEvent*>(InputEvent());
     am->LoadBranch("vertices");
+    if (!fAodEv) return;
   }
 
   const AliVVertex *vertex = InputEvent()->GetPrimaryVertex();
@@ -529,13 +531,13 @@ void AliAnalysisTaskEMCALPi0PbPb::FillPionHists()
         continue;
       if (!clus1->IsEMCAL()) 
         continue;
-      if (clus1->E()<0.010)
+      if (clus1->E()<fMinE)
         continue;
       if (clus1->GetNCells()<fNminCells)
         continue;
       if (GetMaxCellEnergy(clus1)/clus1->E()<fMinErat)
         continue;
-      if (clus1->Chi2()<fMinEcc)
+      if (clus1->Chi2()<fMinEcc) // eccentricity cut
         continue;
       clus1->GetMomentum(clusterVec1,vertex);
       for (Int_t j = i+1; j<nclus; ++j) {
@@ -544,13 +546,13 @@ void AliAnalysisTaskEMCALPi0PbPb::FillPionHists()
           continue;
         if (!clus2->IsEMCAL()) 
           continue;
-        if (clus2->E()<0.010)
+        if (clus2->E()<fMinE)
           continue;
         if (clus2->GetNCells()<fNminCells)
           continue;
         if (GetMaxCellEnergy(clus2)/clus2->E()<fMinErat)
           continue;
-        if (clus2->Chi2()<fMinEcc)
+        if (clus2->Chi2()<fMinEcc) // eccentricity cut
           continue;
         clus2->GetMomentum(clusterVec2,vertex);
         pionVec = clusterVec1 + clusterVec2;
@@ -625,7 +627,6 @@ void  AliAnalysisTaskEMCALPi0PbPb::ClusterAfterburner()
     AliVCluster *clus = static_cast<AliVCluster*>(clusters->At(i));
     Int_t nc = clus->GetNCells();
     Double_t clusE = 0;
-    Short_t nc2 = 0;
     UShort_t ids[100] = {0};
     Double_t fra[100] = {0};
     for (Int_t j = 0; j<nc; ++j) {
@@ -641,7 +642,8 @@ void  AliAnalysisTaskEMCALPi0PbPb::ClusterAfterburner()
       clusters->RemoveAt(i);
       continue;
     }
-    for (Int_t j = 0; j<nc2; ++j) {
+
+    for (Int_t j = 0; j<nc; ++j) {
       Short_t id = ids[j];
       Double_t cen = cells->GetCellAmplitude(id);
       fra[j] = cen/clusE;
@@ -650,7 +652,7 @@ void  AliAnalysisTaskEMCALPi0PbPb::ClusterAfterburner()
     AliAODCaloCluster *aodclus = dynamic_cast<AliAODCaloCluster*>(clus);
     if (aodclus) {
       aodclus->Clear("");
-      aodclus->SetNCells(nc2);
+      aodclus->SetNCells(nc);
       aodclus->SetCellsAmplitudeFraction(fra);
       aodclus->SetCellsAbsId(ids);
     }
diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.h b/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.h
index 69cf27277ee..d6bb8d7e271 100644
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.h
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.h
@@ -31,6 +31,7 @@ class AliAnalysisTaskEMCALPi0PbPb : public AliAnalysisTaskSE {
   void         SetAsymMax(Double_t asymMax)                   { fAsymMax = asymMax;         }
   void         SetCentrality(const char *name)                { fCentVar = name;            }
   void         SetCentralityRange(Double_t from, Double_t to) { fCentFrom=from; fCentTo=to; }
+  void         SetMinClusEnergy(Double_t e)                   { fMinE = e;                  }
   void         SetClusName(const char *name)                  { fClusName = name;           }
   void         SetDoAfterburner(Bool_t b)                     { fDoAfterburner = b;         }
   void         SetFillNtuple(Bool_t b)                        { fDoNtuple = b;              }
@@ -61,6 +62,7 @@ class AliAnalysisTaskEMCALPi0PbPb : public AliAnalysisTaskSE {
   Bool_t                 fDoAfterburner;          // if true run after burner
   Double_t               fAsymMax;                // maximum energy asymmetry (def=1)
   Int_t                  fNminCells;              // minimum number of cells attached to cluster (def=1)
+  Double_t               fMinE;                   // minimum cluster energy (def=0.1)
   Double_t               fMinErat;                // minimum emax/ec ratio (def=0)
   Double_t               fMinEcc;                 // minimum eccentricity (def=0)
     // derived members (ie with ! after //)
@@ -102,7 +104,7 @@ class AliAnalysisTaskEMCALPi0PbPb : public AliAnalysisTaskSE {
   TH2F                  *fHPionMggPt;             //!histo for pion mass vs. pT
   TH2F                  *fHPionMggAsym;           //!histo for pion mass vs. asym
   TH2F                  *fHPionMggDgg;            //!histo for pion mass vs. opening angle
-  TH1F                  *fHPionInvMasses[20];     //!histos for invariant mass plots 
+  TH1F                  *fHPionInvMasses[21];     //!histos for invariant mass plots 
 
  private:
   AliAnalysisTaskEMCALPi0PbPb(const AliAnalysisTaskEMCALPi0PbPb&);            // not implemented