Added combined mult.estimater in |eta|<0.5 and <0.8 ranges to AOD header

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index ab1ca67c40eed77cebc4a96eaac977e569719ff6..c91382ca212f512643f55a28df883facb15a3f7d 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -410,7 +410,9 @@ AliAODHeader* AliAnalysisTaskESDfilter::ConvertHeader(const AliESDEvent& esd)
   // TPC only Reference Multiplicty
   Int_t refMult  = fTPCaloneTrackCuts ? (Short_t)fTPCaloneTrackCuts->GetReferenceMultiplicity(&esd, kTRUE) : -1;
   header->SetTPConlyRefMultiplicity(refMult);
-  
+  //
+  header->SetRefMultiplicityComb05(AliESDtrackCuts::GetReferenceMultiplicity(&esd,AliESDtrackCuts::kTrackletsITSTPC,0.5));
+  header->SetRefMultiplicityComb08(AliESDtrackCuts::GetReferenceMultiplicity(&esd,AliESDtrackCuts::kTrackletsITSTPC,0.8));
   //
   Float_t diamxy[2]={esd.GetDiamondX(),esd.GetDiamondY()};
   Float_t diamcov[3]; 

diff --git a/STEER/AOD/AliAODHeader.cxx b/STEER/AOD/AliAODHeader.cxx
index 4efe07ee88f62e6666c128b14875fade0552a61d..d4e56d6dfe7bbdcd36879d2e1749d59e1d34e03d 100644 (file)
--- a/STEER/AOD/AliAODHeader.cxx
+++ b/STEER/AOD/AliAODHeader.cxx
@@ -54,6 +54,8 @@ AliAODHeader::AliAODHeader() :
   fOrbitNumber(0),
   fPeriodNumber(0),
   fBunchCrossNumber(0),
+  fRefMultComb05(-999),
+  fRefMultComb08(-999),
   fTriggerCluster(0), 
   fDiamondZ(0.), 
   fDiamondSig2Z(0.),
@@ -111,6 +113,8 @@ AliAODHeader::AliAODHeader(Int_t nRun,
   fOrbitNumber(nOrbit),
   fPeriodNumber(nPeriod),
   fBunchCrossNumber(nBunchX),
+  fRefMultComb05(-999),
+  fRefMultComb08(-999),
   fTriggerCluster(0), 
   fDiamondZ(0.), 
   fDiamondSig2Z(0.),
@@ -146,6 +150,8 @@ AliAODHeader::AliAODHeader(Int_t nRun,
                           Int_t refMult,
                           Int_t refMultPos,
                           Int_t refMultNeg,
+                          Int_t refMultComb05,
+                          Int_t refMultComb08,
                           Double_t magField,
                           Double_t muonMagFieldScale,
                           Double_t cent,
@@ -185,6 +191,8 @@ AliAODHeader::AliAODHeader(Int_t nRun,
   fOrbitNumber(nOrbit),
   fPeriodNumber(nPeriod),
   fBunchCrossNumber(nBunchX),
+  fRefMultComb05(refMultComb05),
+  fRefMultComb08(refMultComb08),
   fTriggerCluster(trigClus),
   fDiamondZ(0.), 
   fDiamondSig2Z(0.),
@@ -248,6 +256,8 @@ AliAODHeader::AliAODHeader(const AliAODHeader& hdr) :
   fOrbitNumber(hdr.fOrbitNumber),
   fPeriodNumber(hdr.fPeriodNumber),
   fBunchCrossNumber(hdr.fBunchCrossNumber),
+  fRefMultComb05(hdr.fRefMultComb05), 
+  fRefMultComb08(hdr.fRefMultComb08), 
   fTriggerCluster(hdr.fTriggerCluster), 
   fDiamondZ(hdr.fDiamondZ), 
   fDiamondSig2Z(hdr.fDiamondSig2Z),
@@ -317,6 +327,9 @@ AliAODHeader& AliAODHeader::operator=(const AliAODHeader& hdr)
     fOrbitNumber      = hdr.fOrbitNumber;
     fPeriodNumber     = hdr.fPeriodNumber;
     fBunchCrossNumber = hdr.fBunchCrossNumber;
+    fRefMultComb05    = hdr.fRefMultComb05;
+    fRefMultComb08    = hdr.fRefMultComb08;
+
     fTriggerCluster   = hdr.fTriggerCluster;
     fNMuons           = hdr.fNMuons;
     fNDimuons         = hdr.fNDimuons;
@@ -459,6 +472,8 @@ void AliAODHeader::Print(Option_t* /*option*/) const
   printf("ref. Multiplicity       : %d\n", fRefMult);
   printf("ref. Multiplicity (pos) : %d\n", fRefMultPos);
   printf("ref. Multiplicity (neg) : %d\n", fRefMultNeg);
+  printf("ref. Mult.Comb |eta|<.5 : %d\n", fRefMultComb05);
+  printf("ref. Mult.Comb |eta|<.8 : %d\n", fRefMultComb08);
   printf("number of muons         : %d\n", fNMuons);
   printf("number of dimuons       : %d\n", fNDimuons);
   printf("offline trigger         : %u\n", fOfflineTrigger);

diff --git a/STEER/AOD/AliAODHeader.h b/STEER/AOD/AliAODHeader.h
index f90d0c1a1c8b01a43c1d5bb2d124d3ff784be052..67ea4565a78ebb4d50456a2231fe699093add41c 100644 (file)
--- a/STEER/AOD/AliAODHeader.h
+++ b/STEER/AOD/AliAODHeader.h
@@ -35,6 +35,8 @@ class AliAODHeader : public AliVHeader {
               Int_t refMult,
               Int_t refMultPos,
               Int_t refMultNeg,
+              Int_t refMultComb05,
+              Int_t refMultComb08,
               Double_t magField,
               Double_t muonMagFieldScale,
               Double_t cent,
@@ -81,6 +83,8 @@ class AliAODHeader : public AliVHeader {
   Int_t     GetRefMultiplicityNeg() const { return fRefMultNeg; }
   Int_t     GetNumberOfMuons()      const { return fNMuons; }
   Int_t     GetNumberOfDimuons()    const { return fNDimuons; }
+  Int_t     GetRefMultiplicityComb05() const { return fRefMultComb05; }
+  Int_t     GetRefMultiplicityComb08() const { return fRefMultComb08; }
 
   Double_t  GetQTheta(UInt_t i) const;
   UInt_t    GetNQTheta() const { return (UInt_t)fNQTheta; }
@@ -125,7 +129,9 @@ class AliAODHeader : public AliVHeader {
   void SetRefMultiplicityNeg(Int_t refMultNeg) { fRefMultNeg = refMultNeg; }
   void SetNumberOfMuons(Int_t nMuons) { fNMuons = nMuons; }
   void SetNumberOfDimuons(Int_t nDimuons) { fNDimuons = nDimuons; }
-  
+  void SetRefMultiplicityComb05(Int_t refMult)   { fRefMultComb05 = refMult; }
+  void SetRefMultiplicityComb08(Int_t refMult)   { fRefMultComb08 = refMult; }  
+
   void SetQTheta(Double_t *QTheta, UInt_t size = 5);  
   void RemoveQTheta();
 
@@ -208,6 +214,8 @@ class AliAODHeader : public AliVHeader {
   UInt_t      fOrbitNumber;         // Orbit Number
   UInt_t      fPeriodNumber;        // Period Number
   UShort_t    fBunchCrossNumber;    // BunchCrossingNumber
+  Short_t     fRefMultComb05;       // combined reference multiplicity (tracklets + ITSTPC) in |eta|<0.5
+  Short_t     fRefMultComb08;       // combined reference multiplicity (tracklets + ITSTPC) in |eta|<0.8
   UChar_t     fTriggerCluster;      // Trigger cluster (mask)
   Double32_t      fDiamondXY[2];    // Interaction diamond (x,y) in RUN
   Double32_t      fDiamondCovXY[3]; // Interaction diamond covariance (x,y) in RUN
@@ -227,7 +235,7 @@ class AliAODHeader : public AliVHeader {
   AliEventplane* fEventplaneP;     // Pointer to full event plane information
   Float_t     fVZEROEqFactors[64];  // V0 channel equalization factors for event-plane reconstruction
   Float_t     fT0spread[kT0SpreadSize]; // spread of time distributions: (TOA+T0C/2), T0A, T0C, (T0A-T0C)/2
-  ClassDef(AliAODHeader, 19);
+  ClassDef(AliAODHeader, 20);
 };
 inline
 void AliAODHeader::SetCentrality(const AliCentrality* cent)      {