Changeset 540 for BAORadio/AmasNancay/proc_rawonoff.sh

Timestamp:

Oct 3, 2011, 10:58:41 AM (13 years ago)

Author:

campagne

Message:

avoid the link to a specif bao daq date (jec)

File:

• BAORadio/AmasNancay/proc_rawonoff.sh (modified) (13 diffs)

BAORadio/AmasNancay/proc_rawonoff.sh

@@ -126 +126 @@
 $ECHO "DEBUG (${scriptName}): START call getscafiles.sh ${sourceRadio} ${dateSelected}"
 OUT1=./getScaStatus.$$
-$RM -f ${tmppublicpath}/getscafiles.finished
+#JEC 29/9/11 avoid finished stuff
+#$RM -f ${tmppublicpath}/getscafiles.finished
 ${scriptpath}/getscafiles.sh ${sourceRadio} ${dateSelected} > ${OUT1} 2>&1
-while [ ! -f "${tmppublicpath}/getscafiles.finished" ]; do
-    $ECHO "INFO (${scriptName}): waiting for ${tmppublicpath}/getscafiles.finished"
-    date +%T
-    sleep 30
-done
-$RM -f ${tmppublicpath}/getscafiles.finished
+#while [ ! -f "${tmppublicpath}/getscafiles.finished" ]; do
+#    $ECHO "INFO (${scriptName}): waiting for ${tmppublicpath}/getscafiles.finished"
+#    date +%T
+#    sleep 30
+#done
+#$RM -f ${tmppublicpath}/getscafiles.finished
 $ECHO "DEBUG (${scriptName}): END"
 
@@ -144 +145 @@
   $CAT ${OUT1}
   $ECHO "DEBUG (${scriptName}): END"
-  touch ${tmppublicpath}/proc_script.finished
+#JEC 29/9/11 avoid finished stuff
+#  touch ${tmppublicpath}/proc_script.finished
   exit 1
 fi
@@ -155 +157 @@
   $CAT ${OUT1}
   $ECHO "DEBUG (${scriptName}): END"
-  touch ${tmppublicpath}/proc_script.finished
+#JEC 29/9/11 avoid finished stuff
+#  touch ${tmppublicpath}/proc_script.finished
   exit 1
 fi
@@ -189 +192 @@
           $ECHO "FATAL (${scriptName}): error while iget:"
           $ECHO $igetStatus
-          touch ${tmppublicpath}/proc_script.finished
+#JEC 29/9/11 avoid finished stuff
+#         touch ${tmppublicpath}/proc_script.finished
           exit 1
       fi
@@ -200 +204 @@
 #Get list of file to process
 headerFileSelected=./selectSignal.$$
-$RM -f ${tmppublicpath}/select.finished
+#JEC 29/9/11 avoid finished stuff
+#$RM -f ${tmppublicpath}/select.finished
 ${scriptpath}/select.sh ${scaFileSummarized} ${dirFiberfile} ${typeofproc} | $GREP "^#[0-9]" | $SED "s/^#//" > $headerFileSelected
-while [ ! -f "${tmppublicpath}/select.finished" ]; do
-    $ECHO "INFO (${scriptName}): waiting for ${tmppublicpath}/select.finished"
-    date +%T
-    sleep 30
-done
-$RM ${tmppublicpath}/select.finished
+#while [ ! -f "${tmppublicpath}/select.finished" ]; do
+#    $ECHO "INFO (${scriptName}): waiting for ${tmppublicpath}/select.finished"
+#    date +%T
+#    sleep 30
+#done
+#$RM ${tmppublicpath}/select.finished
 #
 $ECHO "DEBUG (${scriptName}): END"
@@ -229 +234 @@
 if [ ${#cycleArray[*]} -eq 0 -o ${#filesArray[*]} -eq 0 ]; then
    $ECHO "FATAL (${scriptName}): no header file selected (${#cycleArray[*]}, ${#filesArray[*]})"
-   touch ${tmppublicpath}/proc_script.finished
+#JEC 29/9/11 avoid finished stuff
+#   touch ${tmppublicpath}/proc_script.finished
    exit 1
 else
@@ -326 +332 @@
     $ECHO "FATAL (${scriptName}): type of processing"
     usage
-    touch ${tmppublicpath}/proc_script.finished
+#JEC 29/9/11 avoid finished stuff
+#    touch ${tmppublicpath}/proc_script.finished
     exit 1
     ;;
@@ -387 +394 @@
 if [ ! -e $prg ]; then
     $ECHO "FATAL (${scriptName}): $prg not found"
-    touch ${tmppublicpath}/proc_script.finished
+#JEC 29/9/11 avoid finished stuff
+#    touch ${tmppublicpath}/proc_script.finished
     exit 1
 fi
@@ -417 +425 @@
         $ECHO "FATAL (${scriptName}): error while iget:"
         $ECHO $igetStatus
-        touch ${tmppublicpath}/${jobBatchName}.finished
+#JEC 29/9/11 avoid finished stuff
+#       touch ${tmppublicpath}/${jobBatchName}.finished
         exit 1
     fi
@@ -426 +435 @@
 for ((i=${firstCycleId};i<${lastp1CycleId};i++)); do
 #
+
+####
+# Check daq status
+#JEC 1/10/11 Use generic baodaqstatus name 
+####
+#get the daq current irod status
+#tag=`${DATE} +%F`
+#OUT1=${publicpath}/baodaqstatus-${tag}.txt
+OUT1=${publicpath}/baodaqstatus-current.txt
+
+if [ ! -e ${OUT1}  -o ! -r ${OUT1} ]; then
+    $ECHO "FATAL (${scriptName}): ${OUT1} has a problem"
+    exit 1
+#    $ECHO "We should bring the DAQ status more up to date, this take 1 or 2min..."
+#JEC 29/9/11 avoid finished stuff
+#    $RM -f ${tmppublicpath}/statusdaq.finished
+#    ${scriptpath}/statusdaq.sh > ${OUT1}
+#    while [ ! -f "${tmppublicpath}/statusdaq.finished" ]; do
+#       sleep 30
+#    done
+#    $RM ${tmppublicpath}/statusdaq.finished
+#protect against remove/rewriting    
+#    $CHMOD -v 444 ${OUT1} 
+fi
+
 #time window selection
     tmproc="-tmproc ${timeArray[${i}]},${timeDuration}"
@@ -455 +489 @@
 #get signals files
     OUT3=./getsignals.$$
-    $RM -f ${tmppublicpath}/getsignalfiles.finished
+#JEC 29/9/11 avoid finished stuff
+#    $RM -f ${tmppublicpath}/getsignalfiles.finished
     ${scriptpath}/getsignalfiles.sh ${sourceRadio} ${dateSelected} ${firstFile}  ${lastFile} > ${OUT3} 2>&1
-    while [ ! -f "${tmppublicpath}/getsignalfiles.finished" ]; do
-        $ECHO "INFO (${scriptName}): waiting for ${tmppublicpath}/getsignalfiles.finished"
-        date +%T
-        sleep 30
-    done
-    $RM ${tmppublicpath}/getsignalfiles.finished
+#    while [ ! -f "${tmppublicpath}/getsignalfiles.finished" ]; do
+#       $ECHO "INFO (${scriptName}): waiting for ${tmppublicpath}/getsignalfiles.finished"
+#       date +%T
+#       sleep 30
+#    done
+#    $RM ${tmppublicpath}/getsignalfiles.finished
 
     getSignals=`$GREP "^FATAL" ${OUT3}`
@@ -468 +503 @@
         $ECHO "FATAL (${scriptName}): error while get signals"
         $ECHO $getSignals
-        touch ${tmppublicpath}/${jobBatchName}.finished
+#JEC 29/9/11 avoid finished stuff
+#       touch ${tmppublicpath}/${jobBatchName}.finished
         exit 1
     fi
@@ -511 +547 @@
 $ECHO "DEBUG (${scriptName}): END loop on cycles"
 #
-touch ${tmppublicpath}/proc_script.finished
+#JEC 29/9/11 avoid finished stuff
+#touch ${tmppublicpath}/proc_script.finished
 exit 0