From: marian <marian@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Mon, 7 May 2012 21:08:52 +0000 (+0000)
Subject: M       CPass0/mergeMakeOCDB.byComponent.sh  - Adding merging of new TPC calibration... 
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=22019e94e305c5da6c11a2f29867625f19742aeb;p=u%2Fmrichter%2FAliRoot.git

M       CPass0/mergeMakeOCDB.byComponent.sh  - Adding merging of new TPC calibration components
M       CPass1/mergeMakeOCDB.byComponent.sh  - Adding merging of new TPC calibration components
---

diff --git a/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.byComponent.sh b/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.byComponent.sh
index 9a3530538ba..455f98b2479 100755
--- a/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.byComponent.sh
+++ b/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.byComponent.sh
@@ -22,17 +22,18 @@ path=$1
 run=$2
 ocdb=$3
 isLocal=0
-[[ -f path ]] && isLocal=1
+[[ -f $path ]] && isLocal=1
 
 echo "***********************" 2>&1 | tee -a merge.log
-echo mergeMakeOCDB.sh started 2>&1 | tee -a merge.log
+echo mergeMakeOCDB.byComponent.sh started 2>&1 | tee -a merge.log
 echo path = $path 2>&1 | tee -a merge.log
 echo run  = $run 2>&1 | tee -a merge.log
 echo ocdb = $ocdb 2>&1 | tee -a merge.log
+echo isLocal = $isLocal 2>&1 | tee -a merge.log
 echo "***********************" 2>&1 | tee -a merge.log
 
 # setup components
-components="TOF MeanVertex T0 TRD TPC SDD"
+components="TOF MeanVertex T0 SDD TRD TPCCalib  TPCAlign TPCCluster"
 
 # copy
 if [ $isLocal -eq 0 ]; then
@@ -40,8 +41,10 @@ if [ $isLocal -eq 0 ]; then
     echo copying files for run $run 2>&1 | tee -a merge.log
     echo from $path 2>&1 | tee -a merge.log
     echo "***********************" 2>&1 | tee -a merge.log
-    aliroot -b -q "$ALICE_ROOT/PWGPP/CalibMacros/CPass0/mergeByComponent.C(\"COPY\",0,  \"$path\", \"$pattern\")" 2>&1 | tee -a merge.log
+    aliroot -b -q "$ALICE_ROOT/PWGPP/CalibMacros/CPass0/mergeByComponent.C(\"COPY\",0,  \"$path\", \"AliESDfriends_v1.root\")" 2>&1 | tee -a merge.log
 #mv syswatch.log copy_syswatch.log
+else
+  cp $path calib.list
 fi;
 
 # process by component
diff --git a/PWGPP/CalibMacros/CPass1/mergeMakeOCDB.byComponent.sh b/PWGPP/CalibMacros/CPass1/mergeMakeOCDB.byComponent.sh
index 7f80f73a35b..0fe0e2ad26c 100755
--- a/PWGPP/CalibMacros/CPass1/mergeMakeOCDB.byComponent.sh
+++ b/PWGPP/CalibMacros/CPass1/mergeMakeOCDB.byComponent.sh
@@ -12,7 +12,7 @@ echo ocdb = $ocdb 2>&1 | tee -a merge.log
 echo "***********************" 2>&1 | tee -a merge.log
 
 # setup components
-components="TOF MeanVertex T0 TRD TPC SDD"
+components="TOF MeanVertex T0 SDD TRD TPCCalib TPCAlign TPCCluster"
 
 # copy
 echo "***********************" 2>&1 | tee -a merge.log