Updates according to

http://savannah.cern.ch/bugs/?74124

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index 65d0fc80807acad525043be0bcdf572477f7ba08..fd9f1950db8af4d87cd8a3115e42a7f5403573cd 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -21,6 +21,7 @@
 #include <TArrayI.h>\r
 #include <TRandom.h>\r
 #include <TParticle.h>\r
+#include <TFile.h>\r
 \r
 #include "AliAnalysisTaskESDfilter.h"\r
 #include "AliAnalysisManager.h"\r
@@ -160,6 +161,12 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
     \r
     header->SetRunNumber(esd->GetRunNumber());\r
     header->SetOfflineTrigger(fInputHandler->IsEventSelected()); // propagate the decision of the physics selection\r
+    TTree* tree = fInputHandler->GetTree();\r
+    if (tree) {\r
+       TFile* file = tree->GetCurrentFile();\r
+       if (file) header->SetESDFileName(file->GetName());\r
+    }\r
+    \r
     if (old) {\r
        header->SetBunchCrossNumber(0);\r
        header->SetOrbitNumber(0);\r
@@ -172,13 +179,16 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        header->SetOrbitNumber(esd->GetOrbitNumber());\r
        header->SetPeriodNumber(esd->GetPeriodNumber());\r
        header->SetEventType(esd->GetEventType());\r
-       header->SetCentrality(-999.);        // FIXME\r
+       header->SetCentrality(-999.);\r
+       header->SetEventNumberESDFile(esd->GetHeader()->GetEventNumberInFile());\r
     }\r
     // Trigger\r
     header->SetFiredTriggerClasses(esd->GetFiredTriggerClasses());\r
     header->SetTriggerMask(esd->GetTriggerMask()); \r
     header->SetTriggerCluster(esd->GetTriggerCluster());\r
-    \r
+    header->SetL0TriggerInputs(esd->GetHeader()->GetL0TriggerInputs());    \r
+    header->SetL1TriggerInputs(esd->GetHeader()->GetL1TriggerInputs());    \r
+    header->SetL2TriggerInputs(esd->GetHeader()->GetL2TriggerInputs());    \r
 \r
     header->SetMagneticField(esd->GetMagneticField());\r
     header->SetMuonMagFieldScale(esd->GetCurrentDip()/6000.);\r

diff --git a/STEER/AliAODHeader.cxx b/STEER/AliAODHeader.cxx
index 5fd291afddd9c802b736f721853fd36757a6f97a..22f8fcdf91ce991dc06b93d4320a6a5070d38f98 100644 (file)
--- a/STEER/AliAODHeader.cxx
+++ b/STEER/AliAODHeader.cxx
@@ -53,7 +53,12 @@ AliAODHeader::AliAODHeader() :
   fTriggerCluster(0), 
   fDiamondZ(0.), 
   fDiamondSig2Z(0.),
-  fOfflineTrigger(0)
+  fOfflineTrigger(0),
+  fESDFileName(""),
+  fEventNumberESDFile(-1),
+  fL0TriggerInputs(0),
+  fL1TriggerInputs(0),
+  fL2TriggerInputs(0)
 {
   // default constructor
 
@@ -97,7 +102,12 @@ AliAODHeader::AliAODHeader(Int_t nRun,
   fTriggerCluster(0), 
   fDiamondZ(0.), 
   fDiamondSig2Z(0.),
-  fOfflineTrigger(0)
+  fOfflineTrigger(0),
+  fESDFileName(""),
+  fEventNumberESDFile(-1),
+  fL0TriggerInputs(0),
+  fL1TriggerInputs(0),
+  fL2TriggerInputs(0)
 {
   // constructor
 
@@ -158,7 +168,12 @@ AliAODHeader::AliAODHeader(Int_t nRun,
   fTriggerCluster(trigClus),
   fDiamondZ(0.), 
   fDiamondSig2Z(0.),
-  fOfflineTrigger(0)
+  fOfflineTrigger(0),
+  fESDFileName(""),
+  fEventNumberESDFile(-1),
+  fL0TriggerInputs(0),
+  fL1TriggerInputs(0),
+  fL2TriggerInputs(0)
 {
   // constructor
 
@@ -207,7 +222,12 @@ AliAODHeader::AliAODHeader(const AliAODHeader& hdr) :
   fTriggerCluster(hdr.fTriggerCluster), 
   fDiamondZ(hdr.fDiamondZ), 
   fDiamondSig2Z(hdr.fDiamondSig2Z),
-  fOfflineTrigger(hdr.fOfflineTrigger)
+  fOfflineTrigger(hdr.fOfflineTrigger),
+  fESDFileName(hdr.fESDFileName),
+  fEventNumberESDFile(hdr.fEventNumberESDFile),
+  fL0TriggerInputs(hdr.fL0TriggerInputs),
+  fL1TriggerInputs(hdr.fL1TriggerInputs),
+  fL2TriggerInputs(hdr.fL2TriggerInputs)
 {
   // Copy constructor.
   
@@ -266,7 +286,11 @@ AliAODHeader& AliAODHeader::operator=(const AliAODHeader& hdr)
     fDiamondZ         = hdr.fDiamondZ;
     fDiamondSig2Z     = hdr.fDiamondSig2Z;
     fOfflineTrigger   = hdr.fOfflineTrigger;
-
+    fESDFileName      = hdr.fESDFileName;
+    fEventNumberESDFile = hdr.fEventNumberESDFile;
+    fL0TriggerInputs    = hdr.fL0TriggerInputs;
+    fL1TriggerInputs    = hdr.fL1TriggerInputs;
+    fL2TriggerInputs    = hdr.fL2TriggerInputs;
 
     SetName(hdr.fName);
     SetTitle(hdr.fTitle);

diff --git a/STEER/AliAODHeader.h b/STEER/AliAODHeader.h
index 44a5e98cc85846448aa4a04dfff7f78e1e5dbcdf..322efab53fdc0ce42111888e13d7ccbafa7b07c0 100644 (file)
--- a/STEER/AliAODHeader.h
+++ b/STEER/AliAODHeader.h
@@ -12,6 +12,7 @@
 
 #include "AliVHeader.h"
 #include "AliAODVertex.h"
+#include <TString.h>
 
 class TGeoHMatrix;
 class TString;
@@ -47,8 +48,9 @@ class AliAODHeader : public AliVHeader {
   virtual ~AliAODHeader();
   AliAODHeader(const AliAODHeader& evt); 
   AliAODHeader& operator=(const AliAODHeader& evt);
-  
-  Int_t     GetRunNumber()          const { return fRunNumber; }
+
+  Int_t     GetRunNumber()          const { return fRunNumber;}
+  Int_t     GetEventNumberESDFile() const { return fEventNumberESDFile;}
   UShort_t  GetBunchCrossNumber()   const { return fBunchCrossNumber; }
   UInt_t    GetOrbitNumber()        const { return fOrbitNumber; }
   UInt_t    GetPeriodNumber()       const { return fPeriodNumber; }
@@ -83,8 +85,13 @@ class AliAODHeader : public AliVHeader {
   void GetDiamondCovXY(Float_t cov[3]) const {
     for(Int_t i=0;i<3;i++) cov[i]=fDiamondCovXY[i]; return;
   }
+  UInt_t   GetL0TriggerInputs() const {return fL0TriggerInputs;}  
+  UInt_t   GetL1TriggerInputs() const {return fL1TriggerInputs;} 
+  UShort_t GetL2TriggerInputs() const {return fL2TriggerInputs;} 
+
   
   void SetRunNumber(Int_t nRun)                { fRunNumber = nRun; }
+  void SetEventNumberESDFile(Int_t n)          { fEventNumberESDFile=n; }
   void SetBunchCrossNumber(UShort_t nBx)       { fBunchCrossNumber = nBx; }
   void SetOrbitNumber(UInt_t nOr)              { fOrbitNumber = nOr; }
   void SetPeriodNumber(UInt_t nPer)            { fPeriodNumber = nPer; }
@@ -118,7 +125,10 @@ class AliAODHeader : public AliVHeader {
   void SetDiamondZ(Float_t z, Float_t sig2z){
     fDiamondZ=z; fDiamondSig2Z=sig2z;
   }
-
+  void SetL0TriggerInputs(UInt_t n)   {fL0TriggerInputs=n;}
+  void SetL1TriggerInputs(UInt_t n)   {fL1TriggerInputs=n;}
+  void SetL2TriggerInputs(UShort_t n) {fL2TriggerInputs=n;}
+  void SetESDFileName(TString name)   {fESDFileName = name;}
   void Print(Option_t* option = "") const;
 
   void    SetPHOSMatrix(TGeoHMatrix*matrix, Int_t i) {
@@ -137,7 +147,7 @@ class AliAODHeader : public AliVHeader {
   
   UInt_t GetOfflineTrigger() { return fOfflineTrigger; }
   void SetOfflineTrigger(UInt_t trigger) { fOfflineTrigger = trigger; }
-  
+  TString GetESDFileName()   {return fESDFileName;}
   enum {kNPHOSMatrix = 5};
   enum {kNEMCALMatrix = 12};
   
@@ -173,8 +183,12 @@ class AliAODHeader : public AliVHeader {
   TGeoHMatrix*    fPHOSMatrix[kNPHOSMatrix];   //PHOS module position and orientation matrices
   TGeoHMatrix*    fEMCALMatrix[kNEMCALMatrix]; //EMCAL supermodule position and orientation matrices
   UInt_t      fOfflineTrigger;      // fired offline triggers for this event
-
-  ClassDef(AliAODHeader,12);
+  TString     fESDFileName;         // ESD file name to which this event belongs
+  Int_t       fEventNumberESDFile;  // Event number in ESD file
+  UInt_t      fL0TriggerInputs;     // L0 Trigger Inputs (mask)
+  UInt_t      fL1TriggerInputs;     // L1 Trigger Inputs (mask)
+  UShort_t    fL2TriggerInputs;     // L2 Trigger Inputs (mask)
+  ClassDef(AliAODHeader, 13);
 };
 
 #endif