X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWG4%2Fmacros%2FAnalysisTrainPWG4Jets.C;h=c3d3b8ec32b955f9b6bb4d659e4add02699f0270;hb=7a37a034e2d0b3d3ebcc1fc78832798137ddefc5;hp=a97e257722a03294bffbecc2b2ea5eac7d5cf6cc;hpb=5fde4a381d5746f99e4d237abe76b2f021fd6af3;p=u%2Fmrichter%2FAliRoot.git diff --git a/PWG4/macros/AnalysisTrainPWG4Jets.C b/PWG4/macros/AnalysisTrainPWG4Jets.C index a97e257722a..c3d3b8ec32b 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 @@ -150,6 +150,7 @@ TString kPluginExecutableCommand = "source /Users/kleinb/setup_32bit_aliroot // == grid plugin input and output variables TString kGridDatadir = "/alice/sim/PDC_08b/LHC09a1/AOD/"; Int_t kGridMaxRunsFromList = 999999999; +Int_t kGridOffsetRunFromList = 0; // skip the first n runs from the list TString kGridLocalRunList = ""; TString kGridOutdir = ""; // AliEn output directory. If blank will become output_ TString kGridDataSet = ""; // sub working directory not to confuse different run xmls @@ -187,7 +188,7 @@ class AliAnalysisAlien; //______________________________________________________________________________ void AnalysisTrainPWG4Jets(const char *analysis_mode="local", const char *plugin_mode="", - const char *config_file="",Int_t iOffset = 0) + const char *config_file="",Int_t iOffset = 0,Int_t iTotal = 0) { // Main analysis train macro. If a configuration file is provided, all parameters // are taken from there but may be altered by CheckModuleFlags. @@ -196,8 +197,11 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local", kPluginMode = plugin_mode; if (strlen(config_file) && !LoadConfig(config_file)) return; + if(iTotal>0)kGridMaxRunsFromList = iTotal; // overwrites the settings from config file + if(iOffset)kGridOffsetRunFromList = iOffset; + if(iOffset)kProofOffset = iOffset; + - if(iOffset)kProofOffset = iOffset; TString smode(analysis_mode); smode.ToUpper(); if (kSaveTrain)WriteConfig(); @@ -422,10 +426,16 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local", gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetCluster.C"); AliAnalysisTaskJetCluster *taskCl = 0; if(iPWG4Cluster&1){ - taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"KT",0.4,0,1); // this one is for the background jets - taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"KT",0.5,0,1); // this one is for the background jets + taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"KT",0.4,0,1); // this one is for the background random jets taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"KT",0.6,0,1); // this one is for the background jets - taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"KT",0.7,0,1); // this one is for the background jets + taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"ANTIKT",0.4,0,1); // this one is for the background random jets + + if(kUseAODMC){ + taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelection,"KT",0.6,0,1); // this one is for the background jets + taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelection,"KT",0.6,0,1); // this one is for the background jets + taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelection,"KT",0.4,0,1); // this one is for the background random jets + taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelection,"KT",0.4,0,1); // this one is for the background random jets + } if (!taskCl) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskCluster cannot run for this train conditions - EXCLUDED"); } @@ -434,6 +444,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local", if(!iAODanalysis) selection = 0xffffff; else selection = 1<<0|1<<1|1<<2|1<<3|1<<4|1<<5|1<<7|1<<8|1<<9; selection&=~(1<<4); // exluded R = .04 already the dafault + selection&=~(1<<6); // exluded R = .04 already the dafault AddTaskJetClusterDelta(kHighPtFilterMask,kUseAODMC,iPhysicsSelection,"KT",selection); } if(iPWG4Cluster&4){ @@ -443,6 +454,8 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local", selection &= ~(1<<1)&~(1<<3)&~(1<<5)&~(1<<7)&~(1<<9); } else selection = 1<<0|1<<1|1<<2|1<<3|1<<4|1<<5|1<<7|1<<8|1<<9; + selection&=~(1<<4); // exluded R = .04 already the dafault + selection&=~(1<<6); // exluded R = .04 already the dafault AddTaskJetClusterDelta(kHighPtFilterMask,kUseAODMC,iPhysicsSelection,"ANTIKT",selection); // AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"ANTIKT",0.4,0,1); @@ -631,7 +644,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local", if(iPWG4Minijet){ gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskMinijet.C"); - AliAnalysisTaskMinijet *taskMinijet = AddTaskMinjet("esd",kUseMC); + AliAnalysisTaskMinijet *taskMini = AddTaskMinijet(-1,"esd",kUseMC,kGridDataSet); // if we ha highmult trigger add another task if(!taskMini)::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskMinjet cannot run for this train conditions - EXCLUDED"); } @@ -1523,7 +1536,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode) ifstream in1; in1.open(kGridLocalRunList.Data()); int iRun; - + int icount = 0; /* char c; char cLine[250]; @@ -1549,8 +1562,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode) // just use run numbers, negatives will be excluded while(in1>>iRun){ - - if(iRun>=0&&(nRun= kGridOffsetRunFromList&&(nRunAddRunNumber(Form(kGridRunPattern.Data(),iRun)); nRun++; @@ -1733,7 +1745,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode) // Optionally resubmit threshold. // plugin->SetMasterResubmitThreshold(90); // Optionally set time to live (default 30000 sec) - plugin->SetTTL(50400); // 14h... + plugin->SetTTL(54000); // 15h... // Optionally set input format (default xml-single) plugin->SetInputFormat("xml-single"); // Optionally modify the name of the generated JDL (default analysis.jdl) @@ -1947,9 +1959,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;