From ca1ed0f344a79b211a33335bb4fac978ebd74f95 Mon Sep 17 00:00:00 2001 From: marian Date: Wed, 28 Mar 2012 17:47:51 +0000 Subject: [PATCH] M CPass0/test/runCPass0User.sh - job info stored in log file M CPass0/mergeMakeOCDB.jdl - increasing TTL M CPass0/CPass0.jdl - adding missing detectors M CPass1/test/runCPass1User.sh - job info stored in log file M CPass1/mergeMakeOCDB.jdl - increasing TTL M CPass1/CPass1.jdl - adding missing detectors A + CPass1/recCPass1.C - adding the reconstruction macro --- PWGPP/CalibMacros/CPass0/CPass0.jdl | 4 +- PWGPP/CalibMacros/CPass0/mergeMakeOCDB.jdl | 2 +- .../CalibMacros/CPass0/test/runCPass0User.sh | 4 +- PWGPP/CalibMacros/CPass1/CPass1.jdl | 6 +- PWGPP/CalibMacros/CPass1/mergeMakeOCDB.jdl | 2 +- PWGPP/CalibMacros/CPass1/recCPass1.C | 66 +++++++++++++++++++ .../CalibMacros/CPass1/test/runCPass1User.sh | 4 +- 7 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 PWGPP/CalibMacros/CPass1/recCPass1.C diff --git a/PWGPP/CalibMacros/CPass0/CPass0.jdl b/PWGPP/CalibMacros/CPass0/CPass0.jdl index 833d6331534..1731001cad0 100644 --- a/PWGPP/CalibMacros/CPass0/CPass0.jdl +++ b/PWGPP/CalibMacros/CPass0/CPass0.jdl @@ -8,7 +8,7 @@ Packages= { "VO_ALICE@AliRoot::v5-02-Rev-04", Jobtag = { "Test CPass0 Calibration Train" }; GUIDFILE="guid.txt"; -TTL = "28000"; +TTL = "50000"; Price = 1; Validationcommand ="/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/validation.sh"; @@ -28,6 +28,8 @@ InputFile={"LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/recCPass0.C", "LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/AddTaskTPCCalib.C", "LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/AddTaskTRDCalib.C", "LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/AddTaskT0Calib.C", + "LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/AddTaskSDDCalib.C", + "LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/AddTaskMeanVertexCalib.C", "LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/AddTOFAnalysisTaskCalibPass0.C", "LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/LoadLibraries.C" }; diff --git a/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.jdl b/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.jdl index cbff8162054..46332f9687d 100644 --- a/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.jdl +++ b/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.jdl @@ -7,7 +7,7 @@ Packages= { "VO_ALICE@AliRoot::v5-02-Rev-04", Jobtag = { "Merging Calibration Objects from calib train and make OCDB params" }; GUIDFILE="guid.txt"; -TTL = "28000"; +TTL = "50000"; Price = 1; Validationcommand ="/alice/cern.ch/user/j/jotwinow/CPass0/MergeCalibration/validationMerging.sh"; diff --git a/PWGPP/CalibMacros/CPass0/test/runCPass0User.sh b/PWGPP/CalibMacros/CPass0/test/runCPass0User.sh index 5fd0cf62ae7..10fb27d4b62 100755 --- a/PWGPP/CalibMacros/CPass0/test/runCPass0User.sh +++ b/PWGPP/CalibMacros/CPass0/test/runCPass0User.sh @@ -59,7 +59,7 @@ alien_cp -n validation.sh alien:///$OutputMacros/validation.sh # # 4. Submit job # -echo nohup alien_submit alien:///$OutputMacros/CPass0.jdl $Run >submitJob$Run.txt -#nohup alien_submit alien:///$OutputMacros/CPass0.jdl $Run >submitJob$Run.txt +echo nohup alien_submit alien:///$OutputMacros/CPass0.jdl $Run +nohup alien_submit alien:///$OutputMacros/CPass0.jdl $Run >submitJob$Run.txt #echo Alien job submitted $! diff --git a/PWGPP/CalibMacros/CPass1/CPass1.jdl b/PWGPP/CalibMacros/CPass1/CPass1.jdl index f42fe29b19e..08ea36b84e5 100644 --- a/PWGPP/CalibMacros/CPass1/CPass1.jdl +++ b/PWGPP/CalibMacros/CPass1/CPass1.jdl @@ -8,7 +8,7 @@ Packages= { "VO_ALICE@AliRoot::v5-02-Rev-04", Jobtag = { "Test CPass1 Calibration Train" }; GUIDFILE="guid.txt"; -TTL = "86400"; +TTL = "50000"; Price = 1; Validationcommand ="/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/validation.sh"; @@ -28,8 +28,10 @@ InputFile={"LF:/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/recCPass1.C", "LF:/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/AddTaskTPCCalib.C", "LF:/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/AddTaskTRDCalib.C", "LF:/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/AddTaskT0Calib.C", + "LF:/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/AddTaskSDDCalib.C", + "LF:/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/AddTaskMeanVertexCalib.C", "LF:/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/AddTOFAnalysisTaskCalibPass0.C", - "LF:/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/LoadLibraries.C" + "LF:/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/LoadLibraries.C", "LF:/alice/cern.ch/user/j/jotwinow/CPass1/CalibMacros/QAtrain.C" }; diff --git a/PWGPP/CalibMacros/CPass1/mergeMakeOCDB.jdl b/PWGPP/CalibMacros/CPass1/mergeMakeOCDB.jdl index 19fa1935f76..9d49a594b55 100644 --- a/PWGPP/CalibMacros/CPass1/mergeMakeOCDB.jdl +++ b/PWGPP/CalibMacros/CPass1/mergeMakeOCDB.jdl @@ -7,7 +7,7 @@ Packages= { "VO_ALICE@AliRoot::v5-02-Rev-04", Jobtag = { "Merging Calibration Objects from calib train and make OCDB params" }; GUIDFILE="guid.txt"; -TTL = "28000"; +TTL = "50000"; Price = 1; Validationcommand ="/alice/cern.ch/user/j/jotwinow/CPass1/MergeCalibration/validationMerging.sh"; diff --git a/PWGPP/CalibMacros/CPass1/recCPass1.C b/PWGPP/CalibMacros/CPass1/recCPass1.C new file mode 100644 index 00000000000..8cabbd98d75 --- /dev/null +++ b/PWGPP/CalibMacros/CPass1/recCPass1.C @@ -0,0 +1,66 @@ +/* + rec.C to be used for pass0 + - reconstruction of raw data + - QA information switched off + - store all friends + - default OCDB storage set to "raw://" + + Example: + aliroot -b -q 'recCPass1.C("raw.root",100)' +*/ + +void recCPass1(const char *filename="raw.root",Int_t nevents=-1, const char *ocdb="raw://") +{ + // Load some system libs for Grid and monitoring + // Set the CDB storage location + AliCDBManager * man = AliCDBManager::Instance(); + man->SetDefaultStorage(ocdb); + // Reconstruction settings + AliReconstruction rec; + // Upload CDB entries from the snapshot (local root file) if snapshot exist + if (gSystem->AccessPathName("OCDB.root", kFileExists)==0) { + rec.SetFromCDBSnapshot("OCDB.root"); + } + // All friends + rec.SetFractionFriends(1.0); + + // AliReconstruction settings - hardwired MB trigger for calibration + + TString newfilename = filename; +// newfilename += "?Trigger=CPBI2_B1-B-NOPF-ALLNOTRD"; + rec.SetInput(newfilename.Data()); + + // Set protection against too many events in a chunk (should not happen) + if (nevents>0) rec.SetEventRange(0,nevents); + + // Remove recpoints after each event + rec.SetDeleteRecPoints("TPC TRD ITS"); + + // Switch off the V0 finder - saves time! + rec.SetRunMultFinder(kFALSE); + rec.SetRunV0Finder(kFALSE); + + // + // QA options - all QA is off + // + rec.SetRunQA(":"); + rec.SetRunGlobalQA(kFALSE); + + // AliReconstruction settings + rec.SetWriteESDfriend(kTRUE); + rec.SetWriteAlignmentData(); + rec.SetUseTrackingErrorsForAlignment("ITS"); + rec.SetRunReconstruction("ALL"); + rec.SetFillESD("ALL"); + rec.SetCleanESD(kFALSE); + + // Specific reco params for ZDC (why isn't this automatic?) +// rec.SetRecoParam("ZDC",AliZDCRecoParamPbPb::GetHighFluxParam(2760)); + + //Ignore SetStopOnError + rec.SetStopOnError(kFALSE); + + AliLog::Flush(); + rec.Run(); +} + diff --git a/PWGPP/CalibMacros/CPass1/test/runCPass1User.sh b/PWGPP/CalibMacros/CPass1/test/runCPass1User.sh index 9e7215d961b..148aee5bda3 100755 --- a/PWGPP/CalibMacros/CPass1/test/runCPass1User.sh +++ b/PWGPP/CalibMacros/CPass1/test/runCPass1User.sh @@ -59,7 +59,7 @@ alien_cp -n validation.sh alien:///$OutputMacros/validation.sh # # 4. Submit job # -echo nohup alien_submit alien:///$OutputMacros/CPass1.jdl $Run >submitJob$Run.txt -#nohup alien_submit alien:///$OutputMacros/CPass1.jdl $Run >submitJob$Run.txt +echo nohup alien_submit alien:///$OutputMacros/CPass1.jdl $Run +nohup alien_submit alien:///$OutputMacros/CPass1.jdl $Run >submitJob$Run.txt #echo Alien job submitted $! -- 2.43.5