Updating jdls (arguments correctly passed and used), and script to perform merging...

diff --git a/ANALYSIS/CalibMacros/MergeCalibration/MergeJob.jdl b/ANALYSIS/CalibMacros/MergeCalibration/MergeJob.jdl
index 9746c3f001616191f1621670f364da9366c2dfa5..5a2167fb604e1be9ed78e25cb112b64653678048 100644 (file)
--- a/ANALYSIS/CalibMacros/MergeCalibration/MergeJob.jdl
+++ b/ANALYSIS/CalibMacros/MergeCalibration/MergeJob.jdl
@@ -1,6 +1,6 @@
 Executable="/alice/cern.ch/user/z/zampolli/bin/mergeCalibObjects.sh";
 
-Packages={"VO_ALICE@AliRoot::v4-19-04-AN","VO_ALICE@ROOT::v5-26-00b-1","VO_ALICE@APISCONFIG::V1.1x"};
+Packages={"VO_ALICE@AliRoot::v4-19-04-AN","VO_ALICE@ROOT::v5-26-00b-2","VO_ALICE@APISCONFIG::V1.1x"};
 Jobtag =
            {
               "Merging Calibration Objects from calib train"
@@ -10,13 +10,13 @@ GUIDFILE="guid.txt";
 TTL = "28000";
 Price = 1;
 
-Requirements = ( other.CE == "ALICE::CERN::LCG" );
-
 Validationcommand ="/alice/cern.ch/user/z/zampolli/CalibTrain/validationMerging.sh";
 
 JDLVariables={"Packages", "OutputDir"};
 GUIDFILE="guid.txt";
 
+Arguments = "$1"; 
+
 Workdirectorysize={"6000MB"};
 
 InputFile={"LF:/alice/cern.ch/user/z/zampolli/CalibTrain/mergeCalibObjects.C",

diff --git a/ANALYSIS/CalibMacros/MergeCalibration/mergeMakeOCDB.jdl b/ANALYSIS/CalibMacros/MergeCalibration/mergeMakeOCDB.jdl
index 61b604d2014b0c9ac9b730123f27fe6a8c0b7525..b7889a129e7ade6af94b66d043e3746b99cbb4cb 100644 (file)
--- a/ANALYSIS/CalibMacros/MergeCalibration/mergeMakeOCDB.jdl
+++ b/ANALYSIS/CalibMacros/MergeCalibration/mergeMakeOCDB.jdl
@@ -1,6 +1,6 @@
 Executable="/alice/cern.ch/user/z/zampolli/bin/mergeMakeOCDB.sh";
 
-Packages={"VO_ALICE@AliRoot::v4-19-04-AN","VO_ALICE@ROOT::v5-26-00b-1","VO_ALICE@APISCONFIG::V1.1x"};
+Packages={"VO_ALICE@AliRoot::v4-19-04-AN","VO_ALICE@ROOT::v5-26-00b-2","VO_ALICE@APISCONFIG::V1.1x"};
 Jobtag =
            {
               "Merging Calibration Objects from calib train"
@@ -10,13 +10,13 @@ GUIDFILE="guid.txt";
 TTL = "28000";
 Price = 1;
 
-Requirements = ( other.CE == "ALICE::CERN::LCG" );
-
 Validationcommand ="/alice/cern.ch/user/z/zampolli/bin/CalibPass0/validationMerging.sh";
 
 JDLVariables={"Packages", "OutputDir"};
 GUIDFILE="guid.txt";
 
+Arguments = "$1 $2 $3";
+
 Workdirectorysize={"6000MB"}; 
 
 InputFile={"LF:/alice/cern.ch/user/m/miranov/CalibPass0/CalibTimeGain.C",

diff --git a/ANALYSIS/CalibMacros/MergeCalibration/mergeMakeOCDB.sh b/ANALYSIS/CalibMacros/MergeCalibration/mergeMakeOCDB.sh
index c2931121502c48bc9a382981fc5994a8018bb87c..17ae45f8cc05232861df2fb5b536944e54010fad 100755 (executable)
--- a/ANALYSIS/CalibMacros/MergeCalibration/mergeMakeOCDB.sh
+++ b/ANALYSIS/CalibMacros/MergeCalibration/mergeMakeOCDB.sh
@@ -3,26 +3,22 @@
 # Script to merge objects coming out of the calibration train:
 # Arguments:
 #    1 - directory on which to look for the files to be merged 
-#    2 - OCDB output path
+#    2 - run number
+#    3 - OCDB output path
+
 # example:
-# mergeMakeOCDB.sh /alice/cern.ch/user/z/zampolli/CalibTrain/output/
+# mergeMakeOCDB.sh /alice/cern.ch/user/z/zampolli/CalibTrain/output/ 000114798 alien://folder=/alice/cern.ch/user/z/zampolli/MergeCalib/OCDB
 
 #ALIEN setting
 # $1 = directory where to perform the find 
-#runnum=$1
-#ocdbStorage=$2
-#echo Directory to look into = $1
-
-echo Run path $1
-echo OCDB output path $2
-runNum=`basename $1`
-echo RunNumber $runNum
+# $2 = run number
+# $3 = OCDB path
 
 echo ">>>>>>> Running AliRoot to merge calib objects found in $1"
 aliroot -l -b -q merge.C\(\"$1\"\) 2>&1 | tee merge.log
 
-echo ">>>>>>> Extract OCDB entries"
-aliroot -l -b -q makeOCDB.C\(\"$runNum\",\"$2\"\) 2>&1 | tee ocdb.log
+echo ">>>>>>> Extract OCDB entries for run = $2, to be stored in $3"
+aliroot -l -b -q makeOCDB.C\(\"$2\",\"$3\"\) 2>&1 | tee ocdb.log