Updating scripts, to have the same in master as those in alien

[u/mrichter/AliRoot.git] / PWGPP / CalibMacros / CPass0 / mergeMakeOCDB.byComponent.sh

diff --git a/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.byComponent.sh b/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.byComponent.sh
old mode 100755 (executable)
new mode 100644 (file)
index 8590d6e..5720fca
--- a/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.byComponent.sh
+++ b/PWGPP/CalibMacros/CPass0/mergeMakeOCDB.byComponent.sh
@@ -67,8 +67,8 @@ maxTimeToLive=53000
 [[ -n ${ALIEN_JDL_TTL} ]] && maxTimeToLive=$(( ${ALIEN_JDL_TTL}-2000 ))
 
 # setup components to be merged
-#components="TOF MeanVertex T0 SDD TRD TPCCalib TPCCluster TPCAlign"
-components="TOF MeanVertex T0 SDD TRD TPCCalib"
+components="TOF MeanVertex T0 SDD TRD TPCCalib TPCCluster TPCAlign"
+#components="TOF MeanVertex T0 SDD TRD TPCCalib"
 
 #################################################################
 echo "" | tee -a merge.log
@@ -180,8 +180,8 @@ mergeByComponent()
     echo "processing following files from ${fileList}_${det}:"
     cat ${fileList}_${det}
 
-    echo aliroot -b -q "mergeByComponent.C(\"${det}\",\"${fileList}_${det}\")"
-    aliroot -b -q "mergeByComponent.C(\"${det}\",\"${fileList}_${det}\")" 2>&1 | tee -a merge_${det}.log
+    echo aliroot -b -q "mergeByComponent.C(\"${det}\", \"${fileList}_${det}\")"
+    aliroot -b -q "mergeByComponent.C(\"${det}\", \"${fileList}_${det}\")" 2>&1 | tee -a merge_${det}.log
     if validateMerging ${det}; then
       echo "### merge OK: mv CalibObjects.root ../CalibObjects_${det}.root"
       mv -f CalibObjects.root ../CalibObjects_${det}.root
@@ -291,8 +291,8 @@ if [[ $isLocal -eq 0 ]]; then
     echo "alien_find done"
     echo
   else 
-    echo aliroot -b -q "mergeByComponent.C(\"MAKEALIENLIST\",\"$alienFileList\",\"$path\",\"AliESDfriends_v1.root\")" 2>&1 | tee -a copy.log
-    aliroot -b -q "mergeByComponent.C(\"MAKEALIENLIST\",\"$alienFileList\",\"$path\",\"AliESDfriends_v1.root\")" 2>&1 | tee -a copy.log
+    echo aliroot -b -q "mergeByComponent.C(\"MAKEALIENLIST\",\"$alienFileList\", \"$path\", \"AliESDfriends_v1.root\")" 2>&1 | tee -a copy.log
+    aliroot -b -q "mergeByComponent.C(\"MAKEALIENLIST\",\"$alienFileList\", \"$path\", \"AliESDfriends_v1.root\")" 2>&1 | tee -a copy.log
     echo "MAKEALIENLIST done"
     echo
   fi
@@ -372,8 +372,8 @@ else
   echo "***********************"
   finalCalibObjectsList="finalObjects.list"
   ls -1 CalibObjects_*.root > $finalCalibObjectsList
-  echo aliroot -b -q "mergeByComponent.C(\"ALL\",\"$finalCalibObjectsList\")" | tee -a merge.log
-  aliroot -b -q "mergeByComponent.C(\"ALL\",\"$finalCalibObjectsList\")" 2>&1 | tee -a merge.log
+  echo aliroot -b -q "mergeByComponent.C(\"ALL\", \"$finalCalibObjectsList\")" | tee -a merge.log
+  aliroot -b -q "mergeByComponent.C(\"ALL\", \"$finalCalibObjectsList\")" 2>&1 | tee -a merge.log
   mv -f syswatch.log syswatch_merge_ALL.log
 fi
 
@@ -393,8 +393,8 @@ rm -f $localFileList
 echo "***********************" 2>&1 | tee -a ocdb.log
 echo making ${det} OCDB 2>&1 | tee -a ocdb.log
 echo "***********************" 2>&1 | tee -a ocdb.log
-echo aliroot -b -q "makeOCDB.C($run,\"$ocdb\",\"$defaultOCDB\")" 2>&1 | tee -a ocdb.log
-aliroot -b -q "makeOCDB.C($run,\"$ocdb\",\"$defaultOCDB\")" 2>&1 | tee -a ocdb.log
+echo aliroot -b -q "makeOCDB.C($run, \"$ocdb\", \"$defaultOCDB\")" 2>&1 | tee -a ocdb.log
+aliroot -b -q "makeOCDB.C($run, \"$ocdb\", \"$defaultOCDB\")" 2>&1 | tee -a ocdb.log
 mv syswatch.log syswatch_makeOCDB.log
 
 # summary