AliCentrality for ESD and AOD analysis

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index d9c76f824e62da663f9e93576402d04d345c28a1..1576ad18b80356cd9e5bf311d1001e56786d35be 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -37,7 +37,7 @@
 #include "AliAnalysisFilter.h"\r
 #include "AliESDMuonTrack.h"\r
 #include "AliESDVertex.h"\r
-#include "AliESDCentrality.h"\r
+#include "AliCentrality.h"\r
 #include "AliESDv0.h"\r
 #include "AliESDkink.h"\r
 #include "AliESDcascade.h"\r
@@ -178,7 +178,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        header->SetPeriodNumber(0);\r
        header->SetEventType(0);\r
        header->SetMuonMagFieldScale(-999.);\r
-       header->SetCentrality(-999.);       \r
+       header->SetCentrality(0);       \r
     } else {\r
        header->SetBunchCrossNumber(esd->GetBunchCrossNumber());\r
        header->SetOrbitNumber(esd->GetOrbitNumber());\r
@@ -187,10 +187,10 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
 \r
        header->SetEventNumberESDFile(esd->GetHeader()->GetEventNumberInFile());\r
        if(esd->GetCentrality()){\r
-         header->SetCentrality(esd->GetCentrality()->GetCentralityPercentile("V0M"));\r
+         header->SetCentrality(new AliCentrality(*(esd->GetCentrality())));\r
        }\r
        else{\r
-         header->SetCentrality(-999.);\r
+         header->SetCentrality(0);\r
        }\r
     }\r
     \r

diff --git a/ANALYSIS/AliCentralitySelectionTask.cxx b/ANALYSIS/AliCentralitySelectionTask.cxx
index b219971943583ad8096186a1da8e00f1923886b1..0be76bcef34ec54562f30d83fb4ff679373e3965 100644 (file)
--- a/ANALYSIS/AliCentralitySelectionTask.cxx
+++ b/ANALYSIS/AliCentralitySelectionTask.cxx
@@ -44,7 +44,7 @@
 #include "AliESDZDC.h"
 #include "AliESDFMD.h"
 #include "AliESDVZERO.h"
-#include "AliESDCentrality.h"
+#include "AliCentrality.h"
 #include "AliESDtrackCuts.h"
 #include "AliMultiplicity.h"
 #include "AliAODHandler.h"
@@ -344,7 +344,7 @@ void AliCentralitySelectionTask::UserExec(Option_t */*option*/)
 
   Float_t zvtx =0;                  // z-vertex SPD
  
-  AliESDCentrality *esdCent = 0;
+  AliCentrality *esdCent = 0;
 
   if(fAnalysisInput.CompareTo("ESD")==0){
 

diff --git a/STEER/AliESDCentrality.cxx b/STEER/AliCentrality.cxx
similarity index 89%
rename from STEER/AliESDCentrality.cxx
rename to STEER/AliCentrality.cxx
index 4da35e0673ecedc61d4e197cc0214048a6ff23c2..8180a614f972bf8dbc9eaab7b986894b9d698991 100644 (file)
--- a/STEER/AliESDCentrality.cxx
+++ b/STEER/AliCentrality.cxx
@@ -17,13 +17,13 @@
 //   Class AliCentralitySelectionTask
 //   author: Alberica Toia
 //*****************************************************
-/// A container for the centrality stored in the ESD.
+/// A container for the centrality stored in AOD in ESD
  
-#include "AliESDCentrality.h"
+#include "AliCentrality.h"
 
-ClassImp(AliESDCentrality)
+ClassImp(AliCentrality)
 
-AliESDCentrality::AliESDCentrality() : TNamed("ESDCentrality", "Centrality"),
+AliCentrality::AliCentrality() : TNamed("Centrality", "Centrality"),
   fCentralityV0M(0),
   fCentralityFMD(0),
   fCentralityTRK(0),
@@ -37,7 +37,7 @@ AliESDCentrality::AliESDCentrality() : TNamed("ESDCentrality", "Centrality"),
   /// constructor
 }
 
-AliESDCentrality::AliESDCentrality(const AliESDCentrality& cnt) : 
+AliCentrality::AliCentrality(const AliCentrality& cnt) : 
   TNamed(cnt), 
   fCentralityV0M(cnt.fCentralityV0M),
   fCentralityFMD(cnt.fCentralityFMD),
@@ -52,7 +52,7 @@ AliESDCentrality::AliESDCentrality(const AliESDCentrality& cnt) :
   /// Copy constructor
 }
 
-AliESDCentrality& AliESDCentrality::operator=(const AliESDCentrality& c)
+AliCentrality& AliCentrality::operator=(const AliCentrality& c)
 {
   /// Assignment operator
   if (this!=&c) {
@@ -71,12 +71,12 @@ AliESDCentrality& AliESDCentrality::operator=(const AliESDCentrality& c)
   return *this;
 }
 
-AliESDCentrality::~AliESDCentrality()
+AliCentrality::~AliCentrality()
 {
   /// destructor
 }
 
-Float_t AliESDCentrality::GetCentralityPercentile(const char *x)
+Float_t AliCentrality::GetCentralityPercentile(const char *x)
 {
   TString method = x;
   if(method.CompareTo("V0M")==0)      return fCentralityV0M;
@@ -91,7 +91,7 @@ Float_t AliESDCentrality::GetCentralityPercentile(const char *x)
   return -1;
 }
 
-Int_t AliESDCentrality::GetCentralityClass10(const char *x)
+Int_t AliCentrality::GetCentralityClass10(const char *x)
 {
   TString method = x;
   if(method.CompareTo("V0M")==0)      return (Int_t) (fCentralityV0M / 10.0);
@@ -106,7 +106,7 @@ Int_t AliESDCentrality::GetCentralityClass10(const char *x)
   return -1;
 }
 
-Int_t AliESDCentrality::GetCentralityClass5(const char *x)
+Int_t AliCentrality::GetCentralityClass5(const char *x)
 {
  TString method = x;
   if(method.CompareTo("V0M")==0)      return (Int_t) (fCentralityV0M / 5.0);
@@ -121,7 +121,7 @@ Int_t AliESDCentrality::GetCentralityClass5(const char *x)
   return -1;
 }
 
-Bool_t AliESDCentrality::IsEventInCentralityClass(Float_t a, Float_t b, const char *x)
+Bool_t AliCentrality::IsEventInCentralityClass(Float_t a, Float_t b, const char *x)
 {
   TString method = x;
   if ((method.CompareTo("V0M")==0) && (fCentralityV0M >=a && fCentralityV0M < b)) return kTRUE;

diff --git a/STEER/AliESDCentrality.h b/STEER/AliCentrality.h
similarity index 83%
rename from STEER/AliESDCentrality.h
rename to STEER/AliCentrality.h
index 758a69ec488f91aa57351c9e42238780756d22c6..1044959c31a4f2a54578bc169504f8b01c90c7a0 100644 (file)
--- a/STEER/AliESDCentrality.h
+++ b/STEER/AliCentrality.h
@@ -1,6 +1,6 @@
 //-*- Mode: C++ -*-
-#ifndef ALIESDCentrality_H
-#define ALIESDCentrality_H
+#ifndef ALICentrality_H
+#define ALICentrality_H
 /* This file is property of and copyright by the ALICE HLT Project        *
  * ALICE Experiment at CERN, All rights reserved.                         *
  * See cxx source for full Copyright notice                               */
@@ -12,14 +12,14 @@
 
 #include "TNamed.h"
 
-class AliESDCentrality : public TNamed
+class AliCentrality : public TNamed
 {
  public:
 
-  AliESDCentrality();  /// constructor
-  ~AliESDCentrality();  /// destructor
-  AliESDCentrality(const AliESDCentrality& cnt); /// copy constructor
-  AliESDCentrality& operator=(const AliESDCentrality& cnt);   /// assignment operator
+  AliCentrality();  /// constructor
+  ~AliCentrality();  /// destructor
+  AliCentrality(const AliCentrality& cnt); /// copy constructor
+  AliCentrality& operator=(const AliCentrality& cnt);   /// assignment operator
 
   /// set centrality result
   void SetCentralityV0M(Float_t cent) {fCentralityV0M = cent;} 
@@ -49,6 +49,6 @@ class AliESDCentrality : public TNamed
   Float_t fCentralityTKLvsV0M;   // Centrality from tracklets vs V0
   Float_t fCentralityZEMvsZDC;   // Centrality from ZEM vs ZDC
 
-  ClassDef(AliESDCentrality, 1)
+  ClassDef(AliCentrality, 1)
 };
-#endif //ALIESDCENTRALITY_H
+#endif //ALICENTRALITY_H

diff --git a/STEER/AliESDEvent.cxx b/STEER/AliESDEvent.cxx
index 081da284b40a74f3bc764cdbf5ec5e06e54160b8..a3082187bbb061d73e5e1af7f1e362ea7167754f 100644 (file)
--- a/STEER/AliESDEvent.cxx
+++ b/STEER/AliESDEvent.cxx
@@ -66,7 +66,7 @@
 #include "AliLog.h"
 #include "AliESDACORDE.h"
 #include "AliESDHLTDecision.h"
-#include "AliESDCentrality.h"
+#include "AliCentrality.h"
 
 ClassImp(AliESDEvent)
 
@@ -174,7 +174,7 @@ AliESDEvent::AliESDEvent(const AliESDEvent& esd):
   fConnected(esd.fConnected),
   fUseOwnList(esd.fUseOwnList),
   fTOFHeader(new AliTOFHeader(*esd.fTOFHeader)),
-  fCentrality(new AliESDCentrality(*esd.fCentrality))
+  fCentrality(new AliCentrality(*esd.fCentrality))
 {
   // CKB init in the constructor list and only add here ...
   AddObject(fESDRun);
@@ -1745,8 +1745,8 @@ void  AliESDEvent::SetTOFHeader(const AliTOFHeader *header)
 
 }
 
-AliESDCentrality* AliESDEvent::GetCentrality()
+AliCentrality* AliESDEvent::GetCentrality()
 {
-    if (!fCentrality) fCentrality = new AliESDCentrality();
+    if (!fCentrality) fCentrality = new AliCentrality();
     return  fCentrality;
 }

diff --git a/STEER/AliESDEvent.h b/STEER/AliESDEvent.h
index d2918edf29522b185568f10ee824c4676e2c08ba..bec40cef8323815d0777b549798dcd6bf3ad4ec9 100644 (file)
--- a/STEER/AliESDEvent.h
+++ b/STEER/AliESDEvent.h
@@ -56,7 +56,7 @@ class AliESDTrdTrack;
 class AliESDMuonTrack;
 class AliESD;
 class AliESDcascade;
-class AliESDCentrality;
+class AliCentrality;
 class TRefArray;
 class AliESDACORDE;
 class AliESDHLTDecision;
@@ -186,7 +186,7 @@ public:
   Double_t GetZDCP2Energy() const {return fESDZDC?fESDZDC->GetZDCP2Energy():0;}
   Double_t GetZDCEMEnergy(Int_t i=0) const {return fESDZDC?fESDZDC->GetZDCEMEnergy(i):0;}
   Int_t    GetZDCParticipants() const {return fESDZDC?fESDZDC->GetZDCParticipants():0;}
-  AliESDCentrality* GetCentrality();
+  AliCentrality* GetCentrality();
     
 
   void     SetZDC(Float_t n1Energy, Float_t p1Energy, Float_t em1Energy, Float_t em2Energy,
@@ -469,7 +469,7 @@ protected:
                             //  combinatorial algorithm.
                              //  It contains also TOF time resolution
                              //  and T0spread as written in OCDB
-  AliESDCentrality *fCentrality; //! Centrality for AA collision
+  AliCentrality *fCentrality; //! Centrality for AA collision
   ClassDef(AliESDEvent,12)  //ESDEvent class 
 };
 #endif 

diff --git a/STEER/ESDLinkDef.h b/STEER/ESDLinkDef.h
index 9c502d336579cece7fb6b2ca390f001dd41b7966..2a8caacd94d6744464b138bf199a5402aafbbc02 100644 (file)
--- a/STEER/ESDLinkDef.h
+++ b/STEER/ESDLinkDef.h
@@ -78,7 +78,6 @@
 
 #pragma link C++ class  AliMeanVertex+;
 #pragma link C++ class  AliESDCaloCells+;
-#pragma link C++ class  AliESDCentrality+;
 
 #pragma link C++ class  AliTriggerIR+;
 

diff --git a/STEER/STEERBaseLinkDef.h b/STEER/STEERBaseLinkDef.h
index 7a86b8804149fbe2a4d2ba41f1e3f79d51e7fdc2..ec9ca1baec30304832c6c05701ae4e78045de535 100644 (file)
--- a/STEER/STEERBaseLinkDef.h
+++ b/STEER/STEERBaseLinkDef.h
@@ -20,6 +20,7 @@
 #pragma link C++ class AliVEventHandler+;
 #pragma link C++ class AliVEventPool+;
 #pragma link C++ class AliVCuts+;
+#pragma link C++ class AliCentrality+;
 
 
 #pragma link C++ class AliMixedEvent+;

diff --git a/STEER/libESD.pkg b/STEER/libESD.pkg
index 84e569e7cd0e0ca4a1dede04ab801a70629d16a1..4111813fb4c9f329a0bd51faa4c19dc584f58846 100644 (file)
--- a/STEER/libESD.pkg
+++ b/STEER/libESD.pkg
@@ -23,7 +23,6 @@ SRCS = AliESDEvent.cxx AliESDInputHandler.cxx AliESDInputHandlerRP.cxx AliESDfri
        AliESDTZERO.cxx \
        AliESDTZEROfriend.cxx \
        AliESDCaloTrigger.cxx \
-       AliESDCentrality.cxx \
        AliRawDataErrorLog.cxx \
        AliMeanVertex.cxx \
        AliESDCaloCells.cxx \

diff --git a/STEER/libSTEERBase.pkg b/STEER/libSTEERBase.pkg
index 7d7ff0cac7900ced64474a189571513750820adf..240dbf7b3040b33dcbd845a5d97743e4393badfe 100644 (file)
--- a/STEER/libSTEERBase.pkg
+++ b/STEER/libSTEERBase.pkg
@@ -10,6 +10,7 @@ SRCS = AliVParticle.cxx \
        AliVEventHandler.cxx \
        AliVEventPool.cxx \
        AliVCuts.cxx \
+       AliCentrality.cxx \
        AliPID.cxx AliLog.cxx \
        AliRunTag.cxx AliLHCTag.cxx AliDetectorTag.cxx AliEventTag.cxx AliFileTag.cxx \
        AliEventTagCuts.cxx AliRunTagCuts.cxx \