Changeset 540 for BAORadio/AmasNancay/gainmaker.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/gainmaker.sh (modified) (2 diffs)

BAORadio/AmasNancay/gainmaker.sh

@@ -101 +101 @@
 
 
+#JEC 1/10/11 Use generic baodaqstatus name 
 #get the daq current irod status
-tag=`${DATE} +%F`
-OUT1=${publicpath}/baodaqstatus-${tag}.txt
+#tag=`${DATE} +%F`
+#OUT1=${publicpath}/baodaqstatus-${tag}.txt
+OUT1=${publicpath}/baodaqstatus-current.txt
 
 if [ ! -e ${OUT1}  -o ! -r ${OUT1} ]; then
-    $ECHO "We should bring the DAQ status more up to date, this take 1 or 2sec..."
-    $RM -f ${tmppublicpath}/statusdaq.finished
-    ${scriptpath}/statusdaq.sh > ${OUT1}
-    while [ ! -f "${tmppublicpath}/statusdaq.finished" ]; do
-        sleep 30
-    done
-    $RM ${tmppublicpath}/statusdaq.finished
+    $ECHO "FATAL (${scriptName}): ${OUT1} has a problem"
+    exit 1
+#    $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} 
+#    $CHMOD -v 444 ${OUT1} 
+#
 fi
 
@@ -136 +140 @@
   $ECHO "DEBUG (${scriptName}): irods root dir $i"
   dateDAQ=`$ECHO ${i} | $AWK '{split($0,a,"/"); print a[6];}' | $AWK "{sub(/${srclower}/,\"\"); print}"`
+#JEC 1/10/11 Use generic baodaqstatus name 
 #Look if the date has changed since beginning of the job!
-  curtag=`${DATE} +%F`
-  if [ "<${curtag}>" != "<${tag}>" ]; then
-      tag=${curtag}
+#  curtag=`${DATE} +%F`
+#  if [ "<${curtag}>" != "<${tag}>" ]; then
+#      tag=${curtag}
 #it is necessary to update the daq status as the day has changed during the processing... (batch can take a long time...)
-      OUT1=${publicpath}/baodaqstatus-${curtag}.txt
-      $ECHO "We should bring the DAQ status more up to date, this take 1 or 2sec..."
-      $RM -f ${tmppublicpath}/statusdaq.finished
-      ${scriptpath}/statusdaq.sh > ${OUT1}
-      while [ ! -f "${tmppublicpath}/statusdaq.finished" ]; do
-          sleep 30
-      done
-      $RM ${tmppublicpath}/statusdaq.finished
+#      OUT1=${publicpath}/baodaqstatus-${curtag}.txt
+#      $ECHO "We should bring the DAQ status more up to date, this take 1 or 2sec..."
+#      $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
+#      $CHMOD -v 444 ${OUT1} 
+#  fi
 #
 # look if the fits file of the gains already exists