From c1f55a27ed973d66ed20fb131e3b8a4221020ef7 Mon Sep 17 00:00:00 2001 From: kleinb Date: Thu, 31 Jul 2008 08:55:53 +0000 Subject: [PATCH] Add config for AOD, avoid fLego creation in gDirectory, added delete in dtor --- JETAN/AliUA1JetFinderV1.cxx | 6 ++++-- JETAN/ConfigJetAnalysis.C | 2 ++ JETAN/ConfigJetAnalysisAOD.C | 35 +++++++++++++++++++++++++++++++++++ JETAN/ConfigJetAnalysisMC.C | 3 --- 4 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 JETAN/ConfigJetAnalysisAOD.C diff --git a/JETAN/AliUA1JetFinderV1.cxx b/JETAN/AliUA1JetFinderV1.cxx index ee5281a3b9b..4a625f0dd8e 100644 --- a/JETAN/AliUA1JetFinderV1.cxx +++ b/JETAN/AliUA1JetFinderV1.cxx @@ -54,6 +54,8 @@ AliUA1JetFinderV1::~AliUA1JetFinderV1() { // destructor + delete fLego; + fLego = 0; } //////////////////////////////////////////////////////////////////////// @@ -825,12 +827,12 @@ void AliUA1JetFinderV1::Init() { // initializes some variables AliUA1JetHeaderV1* header = (AliUA1JetHeaderV1*) fHeader; - // book lego fLego = new TH2F("legoH","eta-phi", header->GetLegoNbinEta(), header->GetLegoEtaMin(), header->GetLegoEtaMax(), header->GetLegoNbinPhi(), header->GetLegoPhiMin(), header->GetLegoPhiMax()); - + // Do not store in current dir + fLego->SetDirectory(0); } diff --git a/JETAN/ConfigJetAnalysis.C b/JETAN/ConfigJetAnalysis.C index 419f33bf1d6..bc596738b8c 100644 --- a/JETAN/ConfigJetAnalysis.C +++ b/JETAN/ConfigJetAnalysis.C @@ -31,8 +31,10 @@ AliJetFinder* ConfigJetAnalysis() jetFinder = new AliUA1JetFinderV1(); jetFinder->SetJetHeader(jh); jetFinder->SetJetReader(er); + /* jetFinder->SetPlotMode(kTRUE); jetFinder->SetOutputFile("jets.root"); + */ // return jetFinder; } diff --git a/JETAN/ConfigJetAnalysisAOD.C b/JETAN/ConfigJetAnalysisAOD.C new file mode 100644 index 00000000000..420f46a6e37 --- /dev/null +++ b/JETAN/ConfigJetAnalysisAOD.C @@ -0,0 +1,35 @@ +AliJetFinder* ConfigJetAnalysis() +{ + // + // Configuration goes here + // + printf("ConfigJetAnalysis() \n"); + printf("Reading AODs"); + AliJetAODReaderHeader *jrh = new AliJetAODReaderHeader(); + jrh->SetComment("AOD Reader"); + jrh->SetPtCut(0.); + jrh->SetTestFilterMask(1<<0); + // Define reader and set its header + AliJetAODReader *er = new AliJetAODReader(); + er->SetReaderHeader(jrh); + + + // Define jet header + AliUA1JetHeaderV1 *jh=new AliUA1JetHeaderV1(); + jh->SetComment("UA1 jet code with default parameters"); + jh->BackgMode(0); + jh->SetRadius(1.0); + jh->SetEtSeed(2.); + jh->SetLegoNbinPhi(420.); + jh->SetLegoNbinEta(120.); + jh->SetLegoEtaMin(-1.9); + jh->SetLegoEtaMax(+1.9); + jh->SetMinJetEt(5.); + + // Define jet finder. Set its header and reader + jetFinder = new AliUA1JetFinderV1(); + jetFinder->SetJetHeader(jh); + jetFinder->SetJetReader(er); + // + return jetFinder; +} diff --git a/JETAN/ConfigJetAnalysisMC.C b/JETAN/ConfigJetAnalysisMC.C index 8a0269febff..77831bccf49 100644 --- a/JETAN/ConfigJetAnalysisMC.C +++ b/JETAN/ConfigJetAnalysisMC.C @@ -32,8 +32,5 @@ AliJetFinder* ConfigJetAnalysis() jetFinder = new AliUA1JetFinderV1(); jetFinder->SetJetHeader(jh); jetFinder->SetJetReader(er); - jetFinder->SetPlotMode(kTRUE); - jetFinder->SetOutputFile("jetsMC.root"); - // return jetFinder; } -- 2.39.3