From 92d850d574d339ea11396a3061401afd0436506c Mon Sep 17 00:00:00 2001 From: kleinb Date: Tue, 26 Oct 2010 08:41:20 +0000 Subject: [PATCH] Adding Eva's minijet task to the compilation, updated call to AddTaskMinijet --- PWG4/CMakelibPWG4JetTasks.pkg | 2 +- PWG4/PWG4JetTasksLinkDef.h | 1 + PWG4/libPWG4JetTasks.pkg | 2 +- PWG4/macros/AnalysisTrainPWG4Jets.C | 10 +++++----- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/PWG4/CMakelibPWG4JetTasks.pkg b/PWG4/CMakelibPWG4JetTasks.pkg index ca076b109fd..ffcea964302 100644 --- a/PWG4/CMakelibPWG4JetTasks.pkg +++ b/PWG4/CMakelibPWG4JetTasks.pkg @@ -25,7 +25,7 @@ # SHLIBS - Shared Libraries and objects for linking (Executables only) # #--------------------------------------------------------------------------------# -set ( SRCS JetTasks/AliAnalysisTaskUE.cxx JetTasks/AliHistogramsUE.cxx JetTasks/AliAnalyseUE.cxx JetTasks/AliAnalysisTaskJetSpectrum.cxx JetTasks/AliAnalysisTaskJetSpectrum2.cxx JetTasks/AliAnalysisHelperJetTasks.cxx JetTasks/AliAnalysisTaskJetServices.cxx JetTasks/AliAnalysisTaskPWG4PidDetEx.cxx JetTasks/AliJetSpectrumUnfolding.cxx JetTasks/AliAnalysisTaskJFSystematics.cxx JetTasks/AliAnalysisTaskJetCorrections.cxx JetTasks/AliAnalysisTaskThreeJets.cxx JetTasks/AliPWG4HighPtQATPConly.cxx JetTasks/AliPWG4HighPtQAMC.cxx JetTasks/AliPWG4HighPtSpectra.cxx JetTasks/AliPWG4CosmicCandidates.cxx JetTasks/AliAnalysisTaskJetChem.cxx JetTasks/AliAnalysisTaskFragmentationFunction.cxx JetTasks/AliUEHist.cxx JetTasks/AliUEHistograms.cxx JetTasks/AliAnalyseLeadingTrackUE.cxx JetTasks/AliAnalysisTaskLeadingTrackUE.cxx JetTasks/AliAnalysisTaskQGSep.cxx JetTasks/AliAnalysisTaskJetsTM.cxx) +set ( SRCS JetTasks/AliAnalysisTaskUE.cxx JetTasks/AliHistogramsUE.cxx JetTasks/AliAnalyseUE.cxx JetTasks/AliAnalysisTaskJetSpectrum.cxx JetTasks/AliAnalysisTaskJetSpectrum2.cxx JetTasks/AliAnalysisHelperJetTasks.cxx JetTasks/AliAnalysisTaskJetServices.cxx JetTasks/AliAnalysisTaskPWG4PidDetEx.cxx JetTasks/AliJetSpectrumUnfolding.cxx JetTasks/AliAnalysisTaskJFSystematics.cxx JetTasks/AliAnalysisTaskJetCorrections.cxx JetTasks/AliAnalysisTaskThreeJets.cxx JetTasks/AliPWG4HighPtQATPConly.cxx JetTasks/AliPWG4HighPtQAMC.cxx JetTasks/AliPWG4HighPtSpectra.cxx JetTasks/AliPWG4CosmicCandidates.cxx JetTasks/AliAnalysisTaskJetChem.cxx JetTasks/AliAnalysisTaskFragmentationFunction.cxx JetTasks/AliAnalysisTaskMinijet.cxx JetTasks/AliUEHist.cxx JetTasks/AliUEHistograms.cxx JetTasks/AliAnalyseLeadingTrackUE.cxx JetTasks/AliAnalysisTaskLeadingTrackUE.cxx JetTasks/AliAnalysisTaskQGSep.cxx JetTasks/AliAnalysisTaskJetsTM.cxx) string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) diff --git a/PWG4/PWG4JetTasksLinkDef.h b/PWG4/PWG4JetTasksLinkDef.h index 10069c1c7be..c4895e4046b 100644 --- a/PWG4/PWG4JetTasksLinkDef.h +++ b/PWG4/PWG4JetTasksLinkDef.h @@ -28,6 +28,7 @@ #pragma link C++ class AliAnalysisTaskFragmentationFunction::AliFragFuncIntraJetHistos+; #pragma link C++ class AliAnalysisTaskFragmentationFunction::AliFragFuncQATrackHistos+; #pragma link C++ class AliAnalysisTaskFragmentationFunction::AliFragFuncQAJetHistos+; +#pragma link C++ class AliAnalysisTaskMinijet+; #pragma link C++ class AliUEHist+; #pragma link C++ class AliUEHistograms+; #pragma link C++ class AliAnalyseLeadingTrackUE+; diff --git a/PWG4/libPWG4JetTasks.pkg b/PWG4/libPWG4JetTasks.pkg index 15880276ceb..b9be92e2942 100644 --- a/PWG4/libPWG4JetTasks.pkg +++ b/PWG4/libPWG4JetTasks.pkg @@ -1,6 +1,6 @@ #-*- Mode: Makefile -*- -SRCS = JetTasks/AliAnalysisTaskUE.cxx JetTasks/AliHistogramsUE.cxx JetTasks/AliAnalyseUE.cxx JetTasks/AliAnalysisTaskJetSpectrum.cxx JetTasks/AliAnalysisTaskJetSpectrum2.cxx JetTasks/AliAnalysisHelperJetTasks.cxx JetTasks/AliAnalysisTaskJetServices.cxx JetTasks/AliAnalysisTaskPWG4PidDetEx.cxx JetTasks/AliJetSpectrumUnfolding.cxx JetTasks/AliAnalysisTaskJFSystematics.cxx JetTasks/AliAnalysisTaskJetCorrections.cxx JetTasks/AliAnalysisTaskThreeJets.cxx JetTasks/AliPWG4HighPtQATPConly.cxx JetTasks/AliPWG4HighPtQAMC.cxx JetTasks/AliPWG4HighPtSpectra.cxx JetTasks/AliPWG4CosmicCandidates.cxx JetTasks/AliAnalysisTaskJetChem.cxx JetTasks/AliAnalysisTaskFragmentationFunction.cxx JetTasks/AliUEHist.cxx JetTasks/AliUEHistograms.cxx JetTasks/AliAnalyseLeadingTrackUE.cxx JetTasks/AliAnalysisTaskLeadingTrackUE.cxx JetTasks/AliAnalysisTaskQGSep.cxx JetTasks/AliAnalysisTaskJetsTM.cxx +SRCS = JetTasks/AliAnalysisTaskUE.cxx JetTasks/AliHistogramsUE.cxx JetTasks/AliAnalyseUE.cxx JetTasks/AliAnalysisTaskJetSpectrum.cxx JetTasks/AliAnalysisTaskJetSpectrum2.cxx JetTasks/AliAnalysisHelperJetTasks.cxx JetTasks/AliAnalysisTaskJetServices.cxx JetTasks/AliAnalysisTaskPWG4PidDetEx.cxx JetTasks/AliJetSpectrumUnfolding.cxx JetTasks/AliAnalysisTaskJFSystematics.cxx JetTasks/AliAnalysisTaskJetCorrections.cxx JetTasks/AliAnalysisTaskThreeJets.cxx JetTasks/AliPWG4HighPtQATPConly.cxx JetTasks/AliPWG4HighPtQAMC.cxx JetTasks/AliPWG4HighPtSpectra.cxx JetTasks/AliPWG4CosmicCandidates.cxx JetTasks/AliAnalysisTaskJetChem.cxx JetTasks/AliAnalysisTaskFragmentationFunction.cxx JetTasks/AliAnalysisTaskMinijet.cxx JetTasks/AliUEHist.cxx JetTasks/AliUEHistograms.cxx JetTasks/AliAnalyseLeadingTrackUE.cxx JetTasks/AliAnalysisTaskLeadingTrackUE.cxx JetTasks/AliAnalysisTaskQGSep.cxx JetTasks/AliAnalysisTaskJetsTM.cxx HDRS:= $(SRCS:.cxx=.h) diff --git a/PWG4/macros/AnalysisTrainPWG4Jets.C b/PWG4/macros/AnalysisTrainPWG4Jets.C index a97e257722a..87c321a4b56 100644 --- a/PWG4/macros/AnalysisTrainPWG4Jets.C +++ b/PWG4/macros/AnalysisTrainPWG4Jets.C @@ -138,7 +138,7 @@ Int_t kProofOffset = 0; //== grid plugin setup variables Bool_t kPluginUse = kTRUE; // do not change Bool_t kPluginUseProductionMode = kFALSE; // use the plugin in production mode -TString kPluginRootVersion = "v5-27-06"; // *CHANGE ME IF MORE RECENT IN GRID* +TString kPluginRootVersion = "v5-27-06a-1"; // *CHANGE ME IF MORE RECENT IN GRID* TString kPluginAliRootVersion = "v4-19-15-AN"; // *CHANGE ME IF MORE RECENT IN GRID* Bool_t kPluginMergeViaJDL = kTRUE; // merge via JDL Bool_t kPluginFastReadOption = kFALSE; // use xrootd tweaks @@ -631,7 +631,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local", if(iPWG4Minijet){ gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskMinijet.C"); - AliAnalysisTaskMinijet *taskMinijet = AddTaskMinjet("esd",kUseMC); + AliAnalysisTaskMinijet *taskMinijet = AddTaskMinjet("esd",kUseMC,kGridDataSet); // if we ha highmult trigger add another task if(!taskMini)::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskMinjet cannot run for this train conditions - EXCLUDED"); } @@ -1947,9 +1947,9 @@ Bool_t PatchAnalysisMacro(){ } // do not exclude the extra files from merign, this is done explicitly in this train script - index = st2.Index("mergeExcludes +="); // uncommen $ALICE_ROOT include for par files - if(index<0)Printf("%s:%d index out of bounds",(char*)__FILE__,__LINE__); - st2.Insert(index,"// CKB comment out, handled explicitly by the train macro \n //"); + // index = st2.Index("mergeExcludes +="); // uncommen $ALICE_ROOT include for par files + // if(index<0)Printf("%s:%d index out of bounds",(char*)__FILE__,__LINE__); + // st2.Insert(index,"// CKB comment out, handled explicitly by the train macro \n //"); ofstream out2; -- 2.39.3