From c5ac19f60d49f8e5d6287ab881c6fb9da168aa63 Mon Sep 17 00:00:00 2001 From: mcosenti Date: Wed, 21 Nov 2012 16:49:05 +0000 Subject: [PATCH] including input file tag to get the correct normalization in mc productions --- PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx | 9 +++++++-- PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.h | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx index c502c4a8ed7..7578ffe4911 100644 --- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx +++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx @@ -262,8 +262,9 @@ void AliAnalysisTaskEMCALPhoton::UserExec(Option_t *) isSelected = (((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected() & AliVEvent::kEMCEGA); } - if(fIsMC) - isSelected = kTRUE; + if(fIsMC){ + isSelected = kTRUE; + } // Post output data. @@ -279,6 +280,9 @@ void AliAnalysisTaskEMCALPhoton::UserExec(Option_t *) if(TMath::Abs(pv->GetZ())>15) return; + TTree *tree = ((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->GetTree(); + TFile *inpfile = (TFile*)tree->GetCurrentFile(); + // Track loop to fill a pT spectrum for (Int_t iTracks = 0; iTracks < fESD->GetNumberOfTracks(); iTracks++) { AliESDtrack* track = fESD->GetTrack(iTracks); @@ -294,6 +298,7 @@ void AliAnalysisTaskEMCALPhoton::UserExec(Option_t *) fSelPrimTracks->Add(track); } //track loop + fHeader->fInputFileName = inpfile->GetName(); fHeader->fTrClassMask = fESD->GetHeader()->GetTriggerMask(); fHeader->fTrCluster = fESD->GetHeader()->GetTriggerCluster(); AliCentrality *cent = InputEvent()->GetCentrality(); diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.h index 43a6d4a326d..fed5652b483 100644 --- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.h +++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.h @@ -83,6 +83,7 @@ class AliAnalysisTaskEMCALPhoton : public AliAnalysisTaskSE { Double_t fClusThresh; //!energy threshold for cluster be saved AliAnalysisTaskEMCALClusterizeFast *fClusterizer; //!pointer for alternative clusterizer TString fCaloClustersName; //alternative clusterizer name + private: @@ -117,9 +118,10 @@ class AliAnalysisTaskEMCALPhoton : public AliAnalysisTaskSE { class AliPhotonHeaderObj : public TObject { public: AliPhotonHeaderObj() : - TObject(), fTrClassMask(0), fTrCluster(0), fV0Cent(0), fV0(0), fCl1Cent(0), + TObject(), fInputFileName(""), fTrClassMask(0), fTrCluster(0), fV0Cent(0), fV0(0), fCl1Cent(0), fCl1(0), fTrCent(0), fTr(0), fNClus(0), fNCells(0), fTrackMult(0) {;} public: + TString fInputFileName; // used for normalization purposes in MC productions ULong64_t fTrClassMask; // trigger class mask UChar_t fTrCluster; // trigger cluster mask Double32_t fV0Cent; //[0,0,16] v0 cent @@ -132,7 +134,7 @@ class AliPhotonHeaderObj : public TObject Int_t fNCells; Int_t fTrackMult; - ClassDef(AliPhotonHeaderObj,3) + ClassDef(AliPhotonHeaderObj,4) }; class AliPhotonConvObj : public TObject -- 2.43.0