Added methods to set/get centrailty from clusters in outer layer, which is less noisy...
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 9 Nov 2010 09:36:56 +0000 (09:36 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 9 Nov 2010 09:36:56 +0000 (09:36 +0000)
(A. Toia)

ANALYSIS/AliCentralitySelectionTask.cxx
ANALYSIS/AliCentralitySelectionTask.h
STEER/AliESDCentrality.cxx
STEER/AliESDCentrality.h

index f3f157f..b9f750d 100644 (file)
@@ -76,6 +76,7 @@ AliAnalysisTaskSE(),
   fCentTRK(0),
   fCentTKL(0),
   fCentCL0(0),
   fCentTRK(0),
   fCentTKL(0),
   fCentCL0(0),
+  fCentCL1(0),
   fCentV0MvsFMD(0),
   fCentTKLvsV0M(0),
   fCentZEMvsZDC(0),
   fCentV0MvsFMD(0),
   fCentTKLvsV0M(0),
   fCentZEMvsZDC(0),
@@ -84,6 +85,7 @@ AliAnalysisTaskSE(),
   fHtempTRK(0),
   fHtempTKL(0),
   fHtempCL0(0),
   fHtempTRK(0),
   fHtempTKL(0),
   fHtempCL0(0),
+  fHtempCL1(0),
   fHtempV0MvsFMD(0),
   fHtempTKLvsV0M(0),
   fHtempZEMvsZDC(0)
   fHtempV0MvsFMD(0),
   fHtempTKLvsV0M(0),
   fHtempZEMvsZDC(0)
@@ -106,6 +108,7 @@ AliCentralitySelectionTask::AliCentralitySelectionTask(const char *name):
   fCentTRK(0),
   fCentTKL(0),
   fCentCL0(0),
   fCentTRK(0),
   fCentTKL(0),
   fCentCL0(0),
+  fCentCL1(0),
   fCentV0MvsFMD(0),
   fCentTKLvsV0M(0),
   fCentZEMvsZDC(0),
   fCentV0MvsFMD(0),
   fCentTKLvsV0M(0),
   fCentZEMvsZDC(0),
@@ -114,6 +117,7 @@ AliCentralitySelectionTask::AliCentralitySelectionTask(const char *name):
   fHtempTRK(0),
   fHtempTKL(0),
   fHtempCL0(0),
   fHtempTRK(0),
   fHtempTKL(0),
   fHtempCL0(0),
+  fHtempCL1(0),
   fHtempV0MvsFMD(0),
   fHtempTKLvsV0M(0),
   fHtempZEMvsZDC(0)
   fHtempV0MvsFMD(0),
   fHtempTKLvsV0M(0),
   fHtempZEMvsZDC(0)
@@ -146,6 +150,7 @@ AliCentralitySelectionTask::AliCentralitySelectionTask(const AliCentralitySelect
   fCentTRK(ana.fCentTRK),
   fCentTKL(ana.fCentTKL),
   fCentCL0(ana.fCentCL0),
   fCentTRK(ana.fCentTRK),
   fCentTKL(ana.fCentTKL),
   fCentCL0(ana.fCentCL0),
+  fCentCL1(ana.fCentCL1),
   fCentV0MvsFMD(ana.fCentV0MvsFMD),
   fCentTKLvsV0M(ana.fCentTKLvsV0M),
   fCentZEMvsZDC(ana.fCentZEMvsZDC),
   fCentV0MvsFMD(ana.fCentV0MvsFMD),
   fCentTKLvsV0M(ana.fCentTKLvsV0M),
   fCentZEMvsZDC(ana.fCentZEMvsZDC),
@@ -154,6 +159,7 @@ AliCentralitySelectionTask::AliCentralitySelectionTask(const AliCentralitySelect
   fHtempTRK(ana.fHtempTRK),
   fHtempTKL(ana.fHtempTKL),
   fHtempCL0(ana.fHtempCL0),
   fHtempTRK(ana.fHtempTRK),
   fHtempTKL(ana.fHtempTKL),
   fHtempCL0(ana.fHtempCL0),
+  fHtempCL1(ana.fHtempCL1),
   fHtempV0MvsFMD(ana.fHtempV0MvsFMD),
   fHtempTKLvsV0M(ana.fHtempTKLvsV0M),
   fHtempZEMvsZDC(ana.fHtempZEMvsZDC)
   fHtempV0MvsFMD(ana.fHtempV0MvsFMD),
   fHtempTKLvsV0M(ana.fHtempTKLvsV0M),
   fHtempZEMvsZDC(ana.fHtempZEMvsZDC)
@@ -180,14 +186,14 @@ void AliCentralitySelectionTask::UserExec(Option_t */*option*/)
   // Execute analysis for current event:
   if(fDebug>1) printf(" **** AliCentralitySelectionTask::UserExec() \n");
   
   // Execute analysis for current event:
   if(fDebug>1) printf(" **** AliCentralitySelectionTask::UserExec() \n");
   
-  Float_t  zncEnergy;               //  ZNC Energy
-  Float_t  zpcEnergy;               //  ZPC Energy
-  Float_t  znaEnergy;               //  ZNA Energy
-  Float_t  zpaEnergy;               //  ZPA Energy
+  Float_t  zncEnergy;          //  ZNC Energy
+  Float_t  zpcEnergy;          //  ZPC Energy
+  Float_t  znaEnergy;          //  ZNA Energy
+  Float_t  zpaEnergy;          //  ZPA Energy
   Float_t  zem1Energy = 0.;         //  ZEM1 Energy
   Float_t  zem2Energy = 0.;         //  ZEM2 Energy
   
   Float_t  zem1Energy = 0.;         //  ZEM1 Energy
   Float_t  zem2Energy = 0.;         //  ZEM2 Energy
   
-  Int_t    nTracks    = 0;          //  no. tracks
+  Int_t    nTracks = 0;             //  no. tracks
   Int_t    nTracklets = 0;          //  no. tracklets
   Int_t    nClusters[6];            //  no. clusters on 6 ITS layers
   Int_t    nChips[2];               //  no. chips on 2 SPD layers
   Int_t    nTracklets = 0;          //  no. tracklets
   Int_t    nClusters[6];            //  no. clusters on 6 ITS layers
   Int_t    nChips[2];               //  no. chips on 2 SPD layers
@@ -284,6 +290,7 @@ void AliCentralitySelectionTask::UserExec(Option_t */*option*/)
   fCentTRK = fHtempTRK->GetBinContent(fHtempTRK->FindBin(nTracks));
   fCentTKL = fHtempTKL->GetBinContent(fHtempTKL->FindBin(nTracklets));
   fCentCL0 = fHtempCL0->GetBinContent(fHtempCL0->FindBin(nClusters[0]));
   fCentTRK = fHtempTRK->GetBinContent(fHtempTRK->FindBin(nTracks));
   fCentTKL = fHtempTKL->GetBinContent(fHtempTKL->FindBin(nTracklets));
   fCentCL0 = fHtempCL0->GetBinContent(fHtempCL0->FindBin(nClusters[0]));
+  fCentCL1 = fHtempCL1->GetBinContent(fHtempCL1->FindBin(nClusters[1]));
   
   fCentV0MvsFMD = fHtempV0MvsFMD->GetBinContent(fHtempV0MvsFMD->FindBin((multV0A+multV0C)));
   fCentTKLvsV0M = fHtempTKLvsV0M->GetBinContent(fHtempTKLvsV0M->FindBin(nTracklets));
   
   fCentV0MvsFMD = fHtempV0MvsFMD->GetBinContent(fHtempV0MvsFMD->FindBin((multV0A+multV0C)));
   fCentTKLvsV0M = fHtempTKLvsV0M->GetBinContent(fHtempTKLvsV0M->FindBin(nTracklets));
@@ -294,6 +301,7 @@ void AliCentralitySelectionTask::UserExec(Option_t */*option*/)
   esdCent->SetCentralityTRK(fCentTRK);
   esdCent->SetCentralityTKL(fCentTKL);
   esdCent->SetCentralityCL0(fCentCL0);
   esdCent->SetCentralityTRK(fCentTRK);
   esdCent->SetCentralityTKL(fCentTKL);
   esdCent->SetCentralityCL0(fCentCL0);
+  esdCent->SetCentralityCL1(fCentCL1);
   esdCent->SetCentralityV0MvsFMD(fCentV0MvsFMD);
   esdCent->SetCentralityTKLvsV0M(fCentTKLvsV0M);
   esdCent->SetCentralityZEMvsZDC(fCentZEMvsZDC);
   esdCent->SetCentralityV0MvsFMD(fCentV0MvsFMD);
   esdCent->SetCentralityTKLvsV0M(fCentTKLvsV0M);
   esdCent->SetCentralityZEMvsZDC(fCentZEMvsZDC);
@@ -308,6 +316,7 @@ void AliCentralitySelectionTask::ReadCentralityHistos()
   fHtempTRK  = (TH1D*) (fFile->Get("hNtracks_percentile")); 
   fHtempTKL  = (TH1D*) (fFile->Get("hNtracklets_percentile")); 
   fHtempCL0  = (TH1D*) (fFile->Get("hNclusters0_percentile")); 
   fHtempTRK  = (TH1D*) (fFile->Get("hNtracks_percentile")); 
   fHtempTKL  = (TH1D*) (fFile->Get("hNtracklets_percentile")); 
   fHtempCL0  = (TH1D*) (fFile->Get("hNclusters0_percentile")); 
+  fHtempCL1  = (TH1D*) (fFile->Get("hNclusters1_percentile")); 
 }  
   
 void AliCentralitySelectionTask::ReadCentralityHistos2() 
 }  
   
 void AliCentralitySelectionTask::ReadCentralityHistos2() 
index bad48a5..7d0c90f 100644 (file)
@@ -52,6 +52,7 @@ class AliCentralitySelectionTask : public AliAnalysisTaskSE {
   Float_t  fCentTRK;            // percentile centrality from tracks
   Float_t  fCentTKL;            // percentile centrality from tracklets
   Float_t  fCentCL0;            // percentile centrality from clusters in layer 0
   Float_t  fCentTRK;            // percentile centrality from tracks
   Float_t  fCentTKL;            // percentile centrality from tracklets
   Float_t  fCentCL0;            // percentile centrality from clusters in layer 0
+  Float_t  fCentCL1;            // percentile centrality from clusters in layer 0
   Float_t  fCentV0MvsFMD;       // percentile centrality from V0 vs FMD
   Float_t  fCentTKLvsV0M;       // percentile centrality from tracklets vs V0
   Float_t  fCentZEMvsZDC;       // percentile centrality from ZEM vs ZDC
   Float_t  fCentV0MvsFMD;       // percentile centrality from V0 vs FMD
   Float_t  fCentTKLvsV0M;       // percentile centrality from tracklets vs V0
   Float_t  fCentZEMvsZDC;       // percentile centrality from ZEM vs ZDC
@@ -61,6 +62,7 @@ class AliCentralitySelectionTask : public AliAnalysisTaskSE {
   TH1D    *fHtempTRK;           // histogram with centrality vs multiplicity using tracks
   TH1D    *fHtempTKL;           // histogram with centrality vs multiplicity using tracklets
   TH1D    *fHtempCL0;           // histogram with centrality vs multiplicity using clusters in layer 0
   TH1D    *fHtempTRK;           // histogram with centrality vs multiplicity using tracks
   TH1D    *fHtempTKL;           // histogram with centrality vs multiplicity using tracklets
   TH1D    *fHtempCL0;           // histogram with centrality vs multiplicity using clusters in layer 0
+  TH1D    *fHtempCL1;           // histogram with centrality vs multiplicity using clusters in layer 0
   TH1D    *fHtempV0MvsFMD;           // histogram with centrality vs multiplicity using V0 vs FMD   
   TH1D    *fHtempTKLvsV0M;           // histogram with centrality vs multiplicity using tracklets vs V0
   TH1D    *fHtempZEMvsZDC;           // histogram with centrality vs multiplicity using ZEM vs ZDC 
   TH1D    *fHtempV0MvsFMD;           // histogram with centrality vs multiplicity using V0 vs FMD   
   TH1D    *fHtempTKLvsV0M;           // histogram with centrality vs multiplicity using tracklets vs V0
   TH1D    *fHtempZEMvsZDC;           // histogram with centrality vs multiplicity using ZEM vs ZDC 
index d6b473b..4da35e0 100644 (file)
@@ -29,6 +29,7 @@ AliESDCentrality::AliESDCentrality() : TNamed("ESDCentrality", "Centrality"),
   fCentralityTRK(0),
   fCentralityTKL(0),
   fCentralityCL0(0),
   fCentralityTRK(0),
   fCentralityTKL(0),
   fCentralityCL0(0),
+  fCentralityCL1(0),
   fCentralityV0MvsFMD(0),
   fCentralityTKLvsV0M(0),
   fCentralityZEMvsZDC(0)
   fCentralityV0MvsFMD(0),
   fCentralityTKLvsV0M(0),
   fCentralityZEMvsZDC(0)
@@ -43,6 +44,7 @@ AliESDCentrality::AliESDCentrality(const AliESDCentrality& cnt) :
   fCentralityTRK(cnt.fCentralityTRK),
   fCentralityTKL(cnt.fCentralityTKL),
   fCentralityCL0(cnt.fCentralityCL0),
   fCentralityTRK(cnt.fCentralityTRK),
   fCentralityTKL(cnt.fCentralityTKL),
   fCentralityCL0(cnt.fCentralityCL0),
+  fCentralityCL1(cnt.fCentralityCL1),
   fCentralityV0MvsFMD(cnt.fCentralityV0MvsFMD),
   fCentralityTKLvsV0M(cnt.fCentralityTKLvsV0M),
   fCentralityZEMvsZDC(cnt.fCentralityZEMvsZDC)
   fCentralityV0MvsFMD(cnt.fCentralityV0MvsFMD),
   fCentralityTKLvsV0M(cnt.fCentralityTKLvsV0M),
   fCentralityZEMvsZDC(cnt.fCentralityZEMvsZDC)
@@ -60,6 +62,7 @@ AliESDCentrality& AliESDCentrality::operator=(const AliESDCentrality& c)
     fCentralityTRK = c.fCentralityTRK;
     fCentralityTKL = c.fCentralityTKL;
     fCentralityCL0 = c.fCentralityCL0;
     fCentralityTRK = c.fCentralityTRK;
     fCentralityTKL = c.fCentralityTKL;
     fCentralityCL0 = c.fCentralityCL0;
+    fCentralityCL1 = c.fCentralityCL1;
     fCentralityV0MvsFMD = c.fCentralityV0MvsFMD;
     fCentralityTKLvsV0M = c.fCentralityTKLvsV0M;
     fCentralityZEMvsZDC = c.fCentralityZEMvsZDC;
     fCentralityV0MvsFMD = c.fCentralityV0MvsFMD;
     fCentralityTKLvsV0M = c.fCentralityTKLvsV0M;
     fCentralityZEMvsZDC = c.fCentralityZEMvsZDC;
@@ -81,6 +84,7 @@ Float_t AliESDCentrality::GetCentralityPercentile(const char *x)
   if(method.CompareTo("TRK")==0)      return fCentralityTRK;
   if(method.CompareTo("TKL")==0)      return fCentralityTKL;
   if(method.CompareTo("CL0")==0)      return fCentralityCL0;
   if(method.CompareTo("TRK")==0)      return fCentralityTRK;
   if(method.CompareTo("TKL")==0)      return fCentralityTKL;
   if(method.CompareTo("CL0")==0)      return fCentralityCL0;
+  if(method.CompareTo("CL1")==0)      return fCentralityCL1;
   if(method.CompareTo("V0MvsFMD")==0) return fCentralityV0MvsFMD;
   if(method.CompareTo("TKLvsV0M")==0) return fCentralityTKLvsV0M;
   if(method.CompareTo("ZENvsZDC")==0) return fCentralityZEMvsZDC;
   if(method.CompareTo("V0MvsFMD")==0) return fCentralityV0MvsFMD;
   if(method.CompareTo("TKLvsV0M")==0) return fCentralityTKLvsV0M;
   if(method.CompareTo("ZENvsZDC")==0) return fCentralityZEMvsZDC;
@@ -95,6 +99,7 @@ Int_t AliESDCentrality::GetCentralityClass10(const char *x)
   if(method.CompareTo("TRK")==0)      return (Int_t) (fCentralityTRK / 10.0);
   if(method.CompareTo("TKL")==0)      return (Int_t) (fCentralityTKL / 10.0);
   if(method.CompareTo("CL0")==0)      return (Int_t) (fCentralityCL0 / 10.0);
   if(method.CompareTo("TRK")==0)      return (Int_t) (fCentralityTRK / 10.0);
   if(method.CompareTo("TKL")==0)      return (Int_t) (fCentralityTKL / 10.0);
   if(method.CompareTo("CL0")==0)      return (Int_t) (fCentralityCL0 / 10.0);
+  if(method.CompareTo("CL1")==0)      return (Int_t) (fCentralityCL1 / 10.0);
   if(method.CompareTo("V0MvsFMD")==0) return (Int_t) (fCentralityV0MvsFMD / 10.0);
   if(method.CompareTo("TKLvsV0M")==0) return (Int_t) (fCentralityTKLvsV0M / 10.0);
   if(method.CompareTo("ZENvsZDC")==0) return (Int_t) (fCentralityZEMvsZDC / 10.0);
   if(method.CompareTo("V0MvsFMD")==0) return (Int_t) (fCentralityV0MvsFMD / 10.0);
   if(method.CompareTo("TKLvsV0M")==0) return (Int_t) (fCentralityTKLvsV0M / 10.0);
   if(method.CompareTo("ZENvsZDC")==0) return (Int_t) (fCentralityZEMvsZDC / 10.0);
@@ -109,6 +114,7 @@ Int_t AliESDCentrality::GetCentralityClass5(const char *x)
   if(method.CompareTo("TRK")==0)      return (Int_t) (fCentralityTRK / 5.0);
   if(method.CompareTo("TKL")==0)      return (Int_t) (fCentralityTKL / 5.0);
   if(method.CompareTo("CL0")==0)      return (Int_t) (fCentralityCL0 / 5.0);
   if(method.CompareTo("TRK")==0)      return (Int_t) (fCentralityTRK / 5.0);
   if(method.CompareTo("TKL")==0)      return (Int_t) (fCentralityTKL / 5.0);
   if(method.CompareTo("CL0")==0)      return (Int_t) (fCentralityCL0 / 5.0);
+  if(method.CompareTo("CL1")==0)      return (Int_t) (fCentralityCL1 / 5.0);
   if(method.CompareTo("V0MvsFMD")==0) return (Int_t) (fCentralityV0MvsFMD / 5.0);
   if(method.CompareTo("TKLvsV0M")==0) return (Int_t) (fCentralityTKLvsV0M / 5.0);
   if(method.CompareTo("ZENvsZDC")==0) return (Int_t) (fCentralityZEMvsZDC / 5.0);
   if(method.CompareTo("V0MvsFMD")==0) return (Int_t) (fCentralityV0MvsFMD / 5.0);
   if(method.CompareTo("TKLvsV0M")==0) return (Int_t) (fCentralityTKLvsV0M / 5.0);
   if(method.CompareTo("ZENvsZDC")==0) return (Int_t) (fCentralityZEMvsZDC / 5.0);
@@ -123,6 +129,7 @@ Bool_t AliESDCentrality::IsEventInCentralityClass(Float_t a, Float_t b, const ch
   if ((method.CompareTo("TRK")==0) && (fCentralityTRK >=a && fCentralityTRK < b)) return kTRUE;
   if ((method.CompareTo("TKL")==0) && (fCentralityTKL >=a && fCentralityTKL < b)) return kTRUE;
   if ((method.CompareTo("CL0")==0) && (fCentralityCL0 >=a && fCentralityCL0 < b)) return kTRUE;
   if ((method.CompareTo("TRK")==0) && (fCentralityTRK >=a && fCentralityTRK < b)) return kTRUE;
   if ((method.CompareTo("TKL")==0) && (fCentralityTKL >=a && fCentralityTKL < b)) return kTRUE;
   if ((method.CompareTo("CL0")==0) && (fCentralityCL0 >=a && fCentralityCL0 < b)) return kTRUE;
+  if ((method.CompareTo("CL1")==0) && (fCentralityCL1 >=a && fCentralityCL1 < b)) return kTRUE;
   if ((method.CompareTo("V0MvsFMD")==0) && (fCentralityV0MvsFMD >=a && fCentralityV0MvsFMD < b)) return kTRUE;
   if ((method.CompareTo("TKLvsV0M")==0) && (fCentralityTKLvsV0M >=a && fCentralityTKLvsV0M < b)) return kTRUE;
   if ((method.CompareTo("ZEMvsZDC")==0) && (fCentralityZEMvsZDC >=a && fCentralityZEMvsZDC < b)) return kTRUE;
   if ((method.CompareTo("V0MvsFMD")==0) && (fCentralityV0MvsFMD >=a && fCentralityV0MvsFMD < b)) return kTRUE;
   if ((method.CompareTo("TKLvsV0M")==0) && (fCentralityTKLvsV0M >=a && fCentralityTKLvsV0M < b)) return kTRUE;
   if ((method.CompareTo("ZEMvsZDC")==0) && (fCentralityZEMvsZDC >=a && fCentralityZEMvsZDC < b)) return kTRUE;
index f98f0f2..758a69e 100644 (file)
@@ -27,6 +27,7 @@ class AliESDCentrality : public TNamed
   void SetCentralityTRK(Float_t cent) {fCentralityTRK = cent;}
   void SetCentralityTKL(Float_t cent) {fCentralityTKL = cent;}
   void SetCentralityCL0(Float_t cent) {fCentralityCL0 = cent;}
   void SetCentralityTRK(Float_t cent) {fCentralityTRK = cent;}
   void SetCentralityTKL(Float_t cent) {fCentralityTKL = cent;}
   void SetCentralityCL0(Float_t cent) {fCentralityCL0 = cent;}
+  void SetCentralityCL1(Float_t cent) {fCentralityCL1 = cent;}
   void SetCentralityV0MvsFMD(Float_t cent) {fCentralityV0MvsFMD = cent;}
   void SetCentralityTKLvsV0M(Float_t cent) {fCentralityTKLvsV0M = cent;}
   void SetCentralityZEMvsZDC(Float_t cent) {fCentralityZEMvsZDC = cent;}
   void SetCentralityV0MvsFMD(Float_t cent) {fCentralityV0MvsFMD = cent;}
   void SetCentralityTKLvsV0M(Float_t cent) {fCentralityTKLvsV0M = cent;}
   void SetCentralityZEMvsZDC(Float_t cent) {fCentralityZEMvsZDC = cent;}
@@ -43,6 +44,7 @@ class AliESDCentrality : public TNamed
   Float_t fCentralityTRK;   // Centrality from tracks
   Float_t fCentralityTKL;   // Centrality from tracklets
   Float_t fCentralityCL0;   // Centrality from Clusters in layer 0
   Float_t fCentralityTRK;   // Centrality from tracks
   Float_t fCentralityTKL;   // Centrality from tracklets
   Float_t fCentralityCL0;   // Centrality from Clusters in layer 0
+  Float_t fCentralityCL1;   // Centrality from Clusters in layer 0
   Float_t fCentralityV0MvsFMD;   // Centrality from V0 vs FMD
   Float_t fCentralityTKLvsV0M;   // Centrality from tracklets vs V0
   Float_t fCentralityZEMvsZDC;   // Centrality from ZEM vs ZDC
   Float_t fCentralityV0MvsFMD;   // Centrality from V0 vs FMD
   Float_t fCentralityTKLvsV0M;   // Centrality from tracklets vs V0
   Float_t fCentralityZEMvsZDC;   // Centrality from ZEM vs ZDC