From: kkanaki Date: Wed, 23 Mar 2011 13:46:15 +0000 (+0000) Subject: - removed ITS options X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=184b64ebec14c1c2a96b823dde47274ce9fb386b;p=u%2Fmrichter%2FAliRoot.git - removed ITS options - added the centrality task for the case of Pb-Pb data - modified the names of macros and scripts created while submitting a job to contain the name of the task - updated ROOT and AliRoot versions for running on the GRID --- diff --git a/HLT/QA/tasks/macros/CreateAlienHandler.C b/HLT/QA/tasks/macros/CreateAlienHandler.C index ec296aa33dc..4e70e94d383 100755 --- a/HLT/QA/tasks/macros/CreateAlienHandler.C +++ b/HLT/QA/tasks/macros/CreateAlienHandler.C @@ -23,8 +23,8 @@ AliAnalysisGrid* CreateAlienHandler(TString runNumber, TString dataDir, TString // check the versions available on alien with the command 'packages' plugin->SetAPIVersion("V1.1x"); - plugin->SetROOTVersion("v5-27-06d"); - plugin->SetAliROOTVersion("v4-21-16-AN"); + plugin->SetROOTVersion("v5-28-00a"); + plugin->SetAliROOTVersion("v4-21-18-AN"); cout << "===========================================================================================" << endl; cout << " " << endl; @@ -50,7 +50,7 @@ AliAnalysisGrid* CreateAlienHandler(TString runNumber, TString dataDir, TString plugin->SetGridOutputDir(gridOutputDir); // relative to working dir plugin->SetOverwriteMode(); // overwrites the contents of the working and output directory - Bool_t bTPC=kFALSE, bPHOS=kFALSE, bEMCAL=kFALSE, bITS=kFALSE, bGLOBAL=kFALSE, bD0=kFALSE, bCB=kFALSE; + Bool_t bTPC = kFALSE, bPHOS = kFALSE, bEMCAL = kFALSE, bGLOBAL = kFALSE, bD0 = kFALSE, bCB = kFALSE; TString allArgs = detectorTask; TString argument; @@ -73,10 +73,6 @@ AliAnalysisGrid* CreateAlienHandler(TString runNumber, TString dataDir, TString bEMCAL = kTRUE; continue; } - if(argument.CompareTo("its", TString::kIgnoreCase)==0){ - bITS = kTRUE; - continue; - } if(argument.CompareTo("global", TString::kIgnoreCase)==0){ bGLOBAL = kTRUE; continue; @@ -89,16 +85,6 @@ AliAnalysisGrid* CreateAlienHandler(TString runNumber, TString dataDir, TString bCB = kTRUE; continue; } - if(argument.CompareTo("all",TString::kIgnoreCase)==0){ - bTPC = kTRUE; - bPHOS = kTRUE; - bEMCAL = kTRUE; - bITS = kTRUE; - bGLOBAL = kTRUE; - bD0 = kTRUE; - bCB = kTRUE; - continue; - } else break; } } @@ -109,11 +95,6 @@ AliAnalysisGrid* CreateAlienHandler(TString runNumber, TString dataDir, TString plugin->SetAdditionalLibs("AliAnalysisTaskHLTTPC.h AliAnalysisTaskHLTTPC.cxx"); plugin->SetOutputFiles("HLT-OFFLINE-TPC-comparison.root"); } - if(bITS){ - plugin->SetAnalysisSource("AliAnalysisTaskHLTITS.cxx"); - plugin->SetAdditionalLibs("AliAnalysisTaskHLTITS.h AliAnalysisTaskHLTITS.cxx"); - plugin->SetOutputFiles("HLT-OFFLINE-ITS-comparison.root"); - } if(bPHOS && bEMCAL) { plugin->AddIncludePath("-I$ROOTSYS -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT -I$ALICE_ROOT/RAW -I$ALICE_ROOT/STEER -I$ALICE_ROOT/PHOS -I$ALICE_ROOT/HLT/BASE -I$ALICE_ROOT/HLT/BASE/util -I$ALICE_ROOT/HLT/global/physics"); plugin->SetAnalysisSource("AliAnalysisTaskHLTCalo.cxx AliAnalysisTaskHLTPHOS.cxx AliAnalysisTaskHLTEMCAL.cxx"); @@ -155,8 +136,10 @@ AliAnalysisGrid* CreateAlienHandler(TString runNumber, TString dataDir, TString plugin->SetOutputArchive("log_archive.zip:stdout,stderr"); // Optionally set a name for the generated analysis macro (default MyAnalysis.C) - plugin->SetAnalysisMacro("runComparison.C"); - plugin->SetExecutable("comparison.sh"); + plugin->SetAnalysisMacro(Form("%s.C",detectorTask)); + + //plugin->SetExecutable("comparison.sh"); + plugin->SetExecutable(Form("%s.sh",detectorTask)); plugin->SetSplitMaxInputFileNumber(100); @@ -172,7 +155,7 @@ AliAnalysisGrid* CreateAlienHandler(TString runNumber, TString dataDir, TString plugin->SetInputFormat("xml-single"); // Optionally modify the name of the generated JDL (default analysis.jdl) - plugin->SetJDLName("analysis.jdl"); + plugin->SetJDLName(Form("%s.jdl",detectorTask)); // Optionally modify job price (default 1) plugin->SetPrice(1); @@ -180,5 +163,12 @@ AliAnalysisGrid* CreateAlienHandler(TString runNumber, TString dataDir, TString // Optionally modify split mode (default 'se') plugin->SetSplitMode("se"); + // comment out the next line when using the "terminate" option, unless + // you want separate merged files for each run + //plugin->SetMergeViaJDL(); + + //plugin->SetOneStageMerging(kFALSE); + //plugin->SetMaxMergeStages(2); + return plugin; } diff --git a/HLT/QA/tasks/macros/compare-HLT-offline-grid.C b/HLT/QA/tasks/macros/compare-HLT-offline-grid.C index 4abd6eecd11..67f45ebb277 100644 --- a/HLT/QA/tasks/macros/compare-HLT-offline-grid.C +++ b/HLT/QA/tasks/macros/compare-HLT-offline-grid.C @@ -24,16 +24,17 @@ * @author Hege.Erdal@student.uib.no, Kalliopi.Kanaki@ift.uib.no */ -void compare_HLT_offline_grid(TString runNumber, - TString dataDir, - TString gridWorkingDir, - TString gridOutputDir, - const char* mode = "full", - const char* detectorTask="global", - TString taskFolder="$ALICE_ROOT/HLT/QA/tasks/", - TString beamType="p-p", - bool fUseHLTTrigger=kFALSE, - Long64_t nEvents=1234567890 +void compare_HLT_offline_grid( TString runNumber + ,TString dataDir + ,TString gridWorkingDir + ,TString gridOutputDir + ,const char* mode = "full" + ,const char* detectorTask="global" + ,TString taskFolder="$ALICE_ROOT/HLT/QA/tasks/" + ,TString beamType="p-p" + ,TString options="event-off event-hlt track-off track-hlt" + ,bool fUseHLTTrigger=kFALSE + ,Long64_t nEvents=1234567890 ) { @@ -59,7 +60,7 @@ void compare_HLT_offline_grid(TString runNumber, //gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C"); - Bool_t bAll=kFALSE, bTPC=kFALSE, bPHOS=kFALSE, bEMCAL=kFALSE, bITS=kFALSE, bGLOBAL=kFALSE, bD0=kFALSE, bCB=kFALSE; + Bool_t bTPC=kFALSE, bPHOS=kFALSE, bEMCAL=kFALSE, bGLOBAL=kFALSE, bD0=kFALSE, bCB=kFALSE; TString allArgs = detectorTask; TString argument; @@ -90,13 +91,6 @@ void compare_HLT_offline_grid(TString runNumber, bCB = kTRUE; continue; } - if(argument.CompareTo("all",TString::kIgnoreCase)==0){ - bPHOS = kTRUE; - bEMCAL = kTRUE; - bGLOBAL = kTRUE; - bAll = kTRUE; - continue; - } else break; } } @@ -209,7 +203,8 @@ void compare_HLT_offline_grid(TString runNumber, if(beamType.Contains("Pb-Pb")){ gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C"); AliCentralitySelectionTask *taskCentrality = AddTaskCentrality(); - } + } + taskCB->SetOptions(options); AliAnalysisDataContainer *coutputCB = mgr->CreateContainer("esd_thnsparse",TList::Class(), AliAnalysisManager::kOutputContainer, "HLT-OFFLINE-CentralBarrel-comparison.root"); mgr->ConnectInput(taskCB,0,mgr->GetCommonInputContainer()); mgr->ConnectOutput(taskCB,1,coutputCB);