test/runCPass0User.sh

test/mergeMakeOCDBUser.sh   - moving Pass0 -> CPass0
mergeMakeOCDB.jdl           - moving Pass0 -> CPass0
CPass0.jdl                  - moving Pass0 -> CPass0

diff --git a/PWGPP/CalibMacros/CPass0/CPass0.jdl b/PWGPP/CalibMacros/CPass0/CPass0.jdl
index 9ab00980f3842b9a510ed6b0e5be4d4c48325833..7308c1cbb3060fd4b7e3c82bcf58cdd9e5c2b5d4 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/CPass0.jdl
+++ b/PWGPP/CalibMacros/CPass0/CPass0.jdl
@@ -1,17 +1,17 @@
-Executable="/alice/cern.ch/user/j/jotwinow/bin/runPass0.sh";
+Executable="/alice/cern.ch/user/j/jotwinow/bin/runCPass0.sh";
 
 Packages= { "VO_ALICE@AliRoot::v5-02-Rev-04",
            "VO_ALICE@ROOT::v5-30-06-1",        
             "VO_ALICE@APISCONFIG::V1.1x"
 };
 
-Jobtag = { "Test Pass0 Calibration Train" };
+Jobtag = { "Test CPass0 Calibration Train" };
 
 GUIDFILE="guid.txt";
 TTL = "28000";
 Price = 1;
 
-Validationcommand ="/alice/cern.ch/user/j/jotwinow/Pass0/CalibMacros/validation.sh";
+Validationcommand ="/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/validation.sh";
 
 Split="file";
 
@@ -22,19 +22,19 @@ GUIDFILE="guid.txt";
 SplitArguments = {"/alice/data/2010/LHC10d/$1/raw/#alienfilename#"};
 Workdirectorysize={"6000MB"};
 
-InputFile={"LF:/alice/cern.ch/user/j/jotwinow/Pass0/CalibMacros/recPass0.C",
-           "LF:/alice/cern.ch/user/j/jotwinow/Pass0/CalibMacros/ConfigCalibTrain.C",
-           "LF:/alice/cern.ch/user/j/jotwinow/Pass0/CalibMacros/runCalibTrain.C",
-           "LF:/alice/cern.ch/user/j/jotwinow/Pass0/CalibMacros/AddTaskTPCCalib.C",
-           "LF:/alice/cern.ch/user/j/jotwinow/Pass0/CalibMacros/AddTaskTRDCalib.C",
-           "LF:/alice/cern.ch/user/j/jotwinow/Pass0/CalibMacros/AddTaskT0Calib.C",
-           "LF:/alice/cern.ch/user/j/jotwinow/Pass0/CalibMacros/AddTOFAnalysisTaskCalibPass0.C",
-           "LF:/alice/cern.ch/user/j/jotwinow/Pass0/CalibMacros/LoadLibraries.C"
+InputFile={"LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/recPass0.C",
+           "LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/ConfigCalibTrain.C",
+           "LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/runCalibTrain.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/AddTOFAnalysisTaskCalibPass0.C",
+           "LF:/alice/cern.ch/user/j/jotwinow/CPass0/CalibMacros/LoadLibraries.C"
 };
 
 InputDataCollection="LF:/alice/data/2010/LHC10d/$1/collection,nodownload";
 
-OutputDir="/alice/cern.ch/user/j/jotwinow/Pass0/output/$1/#alienfilename/.root//#";
+OutputDir="/alice/cern.ch/user/j/jotwinow/CPass0/output/$1/#alienfilename/.root//#";
 
 OutputArchive={"log_archive:*.log@disk=1",
               "root_archive.zip:AliESDfriends_v1.root,@disk=1"};

diff --git a/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.jdl b/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.jdl
index eab6890dfa7a7930eeda303409b9aa4c1fee7673..cbff816205454a012aedf59fddb9c0dfd9df3a57 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.jdl
+++ b/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.jdl
@@ -1,6 +1,8 @@
 Executable="/alice/cern.ch/user/j/jotwinow/bin/mergeMakeOCDB.sh";
 
-Packages= { "VO_ALICE@AliRoot::v5-01-Rev-19", "VO_ALICE@ROOT::v5-30-03-1", "VO_ALICE@APISCONFIG::V1.1x" };
+Packages= { "VO_ALICE@AliRoot::v5-02-Rev-04",
+            "VO_ALICE@ROOT::v5-30-06-1",
+       "VO_ALICE@APISCONFIG::V1.1x" };
 
 Jobtag = { "Merging Calibration Objects from calib train and make OCDB params" };
 
@@ -8,7 +10,7 @@ GUIDFILE="guid.txt";
 TTL = "28000";
 Price = 1;
 
-Validationcommand ="/alice/cern.ch/user/j/jotwinow/Pass0/MergeCalibration/validationMerging.sh";
+Validationcommand ="/alice/cern.ch/user/j/jotwinow/CPass0/MergeCalibration/validationMerging.sh";
 
 JDLVariables={"Packages", "OutputDir"};
 GUIDFILE="guid.txt";
@@ -17,13 +19,13 @@ Arguments = "$1 $2 $3";
 
 Workdirectorysize={"6000MB"}; 
 
-InputFile={"LF:/alice/cern.ch/user/j/jotwinow/Pass0/MergeCalibration/ConfigCalibTrain.C",
-           "LF:/alice/cern.ch/user/j/jotwinow/Pass0/MergeCalibration/LoadLibraries.C",
-           "LF:/alice/cern.ch/user/j/jotwinow/Pass0/MergeCalibration/makeOCDB.C",
-           "LF:/alice/cern.ch/user/j/jotwinow/Pass0/MergeCalibration/merge.C"
+InputFile={"LF:/alice/cern.ch/user/j/jotwinow/CPass0/MergeCalibration/ConfigCalibTrain.C",
+           "LF:/alice/cern.ch/user/j/jotwinow/CPass0/MergeCalibration/LoadLibraries.C",
+           "LF:/alice/cern.ch/user/j/jotwinow/CPass0/MergeCalibration/makeOCDB.C",
+           "LF:/alice/cern.ch/user/j/jotwinow/CPass0/MergeCalibration/merge.C"
 };
 
-OutputDir="/alice/cern.ch/user/j/jotwinow/Pass0/output/$2/";
+OutputDir="/alice/cern.ch/user/j/jotwinow/CPass0/output/$2/";
 
 OutputArchive={"log_archive:*.log@disk=1",
               "root_archive.zip:CalibObjects.root,meanITSVertex.root,fitITSVertex.root@disk=1"};

diff --git a/PWGPP/CalibMacros/CPass0/test/mergeMakeOCDBUser.sh b/PWGPP/CalibMacros/CPass0/test/mergeMakeOCDBUser.sh
index 762074e3c393b30d49f118cf3edcae68c91162bc..ce71befabb64d0e98e83c5a14974fd4cdaae1a59 100755 (executable)
--- a/PWGPP/CalibMacros/CPass0/test/mergeMakeOCDBUser.sh
+++ b/PWGPP/CalibMacros/CPass0/test/mergeMakeOCDBUser.sh
@@ -7,11 +7,11 @@
 # 1  -   alien user dir name                 - e.g  /m/miranov/
 # 2  -   input directory with data to merge  - e.g /alice/data/2011/LHC11h/000169926/cpass0_HLT/
 # 3  -   run number                          - e.g run number 169926
-# 4  -   OCDB output path                    - alien://folder=/alice/cern.ch/user/m/miranov/Pass0/169926
+# 4  -   OCDB output path                    - alien://folder=/alice/cern.ch/user/m/miranov/CPass0/169926
 # Example:
 # run=170572
 # AlienName=/m/miranov/
-# $ALICE_ROOT/PWGPP/CalibMacros/Pass0/test/mergeMakeOCDBUser.sh $AlienName /alice/data/2011/LHC11h/000$Run/cpass0_HLT/  $Run alien://folder=/alice/cern.ch/user/m/miranov/Pass0/$Run
+# $ALICE_ROOT/PWGPP/CalibMacros/CPass0/test/mergeMakeOCDBUser.sh $AlienName /alice/data/2011/LHC11h/000$Run/cpass0_HLT/  $Run alien://folder=/alice/cern.ch/user/m/miranov/CPass0/$Run
 #
 # authors:   marian.ivanov#cern.ch, mikolaj.krzewicki@cern.ch 
 
@@ -19,7 +19,7 @@ AlienName=$1
 InputDataDir=$2
 Run=$3
 OCDBPath=$4
-InputMacros=$ALICE_ROOT/PWGPP/CalibMacros/Pass0/
+InputMacros=$ALICE_ROOT/PWGPP/CalibMacros/CPass0/
 
 echo xxxxxxxxxxxxxxxxxxxxxxxxxx
 echo SETUP
@@ -27,14 +27,14 @@ echo AlienName=$1
 echo InputDataDir=$2
 echo Run=$3
 echo OCDBPath=$4
-echo InputMacros=$ALICE_ROOT/PWGPP/CalibMacros/Pass0/
+echo InputMacros=$ALICE_ROOT/PWGPP/CalibMacros/CPass0/
 echo xxxxxxxxxxxxxxxxxxxxxxxxxx
 
 #
 # 1. copy macroses and sh to the predefiend alien directory
 #
-OutputMacros=`echo /alice/cern.ch/user/j/jotwinow/Pass0/MergeCalibration/ | sed s_\/j\/jotwinow\/_$AlienName\_ `
-alien_mkdir  $OutputMacros
+OutputMacros=`echo /alice/cern.ch/user/j/jotwinow/CPass0/MergeCalibration/ | sed s_\/j\/jotwinow\/_$AlienName\_ `
+alien_mkdir -p  $OutputMacros
 
 for lfile in `ls $InputMacros/{*C,*sh,*jdl} | grep -v AddTask`; do
     bname=`basename $lfile`  

diff --git a/PWGPP/CalibMacros/CPass0/test/runCPass0User.sh b/PWGPP/CalibMacros/CPass0/test/runCPass0User.sh
index 5d432de1e590dcee0a7eea9513754ed389185577..5bf97f91c3e96cfab0a1ff072d72a88456a3a297 100755 (executable)
--- a/PWGPP/CalibMacros/CPass0/test/runCPass0User.sh
+++ b/PWGPP/CalibMacros/CPass0/test/runCPass0User.sh
@@ -10,7 +10,7 @@
 # Run=000146807
 # AlienName=/m/miranov/
 # RawPath=/alice/data/2011/LHC11a/
-# $ALICE_ROOT/PWGPP/CalibMacros/Pass0/test/runPass0User.sh  $AlienName $RawPath  $Run 
+# $ALICE_ROOT/PWGPP/CalibMacros/CPass0/test/runCPass0User.sh  $AlienName $RawPath  $Run 
 #
 # authors:   marian.ivanov#cern.ch, mikolaj.krzewicki@cern.ch