Changeset 583 for BAORadio

Timestamp:

Oct 21, 2011, 3:25:35 PM (13 years ago)

Author:

torrento

Message:

Comment while in anagainmaker.sh; add date arg in submit2ge-anagainmaker.sh; minor cosmetic changes

Location:

BAORadio/AmasNancay/trunk

Files:

• anagainmaker.sh (modified) (3 diffs)
• submit2ge-anacalibmaker.sh (modified) (1 diff)
• submit2ge-anagainmaker.sh (modified) (3 diffs)

BAORadio/AmasNancay/trunk/anagainmaker.sh

@@ -39 +39 @@
   case "$1" in
       -src)  sourceRadio=$2; shift;;
-      -date) dateSelected=$2;     shift;;
+      -date) dateSelected=$2; shift;;
        -sim) simulationMode=On;;
         -h)
@@ -145 +145 @@
 # So the input files are there, so the fits file can be determined
   mode="Off"
+
+  input4gainOk1=`ils ${i}/Off 2>&1 | $GREP -i "^ERROR" | $WC -l` 
+  input4gainOk2=`ils ${i}/Off 2>&1 | $GREP -i "gaincycle"` 
+  if [ $input4gainOk1 -eq 0 -a "<${input4gainOk2}>" != "<>"  ]; then
+      gaincycle=`$ECHO ${input4gainOk2} | $AWK '($1 == "C-"){print $2}'| $XARGS -i basename {}`
+  else
+      $ECHO "INFO ${scriptName}: no gaincycle for ${i}"
+      continue
+  fi
+
   spectraGenDirName=`$ECHO ${gaincycle} | $AWK '{match($0,"[a-zA-Z]+",arr); print arr[0]}'`
   cycleNumber=`$ECHO ${gaincycle} | $AWK '{match($0,"[0-9]+",arr); print arr[0]}'`
@@ -168 +178 @@
   $RM -f ${tmppublicpath}/getscafiles.finished
   ${scriptpath}/getscafiles.sh ${sourceRadio} ${dateDAQ} > ${OUT1} 2>&1
-  while [ ! -f "${tmppublicpath}/getscafiles.finished" ]; do
-      $ECHO "INFO (${scriptName}): waiting for ${tmppublicpath}/getscafiles.finished"
-      date +%T
-      sleep 30
-  done
+# AST 21/10/2011: comment while as it blocks the job
+#  while [ ! -f "${tmppublicpath}/getscafiles.finished" ]; do
+#      $ECHO "INFO (${scriptName}): waiting for ${tmppublicpath}/getscafiles.finished"
+#      date +%T
+#      sleep 30
+#  done
   $RM ${tmppublicpath}/getscafiles.finished
   $ECHO "DEBUG (${scriptName}): END"

BAORadio/AmasNancay/trunk/submit2ge-anacalibmaker.sh

@@ -23 +23 @@
         -h)
         echo >&2 \
-            "usage: $0 -src souce -date YYYYMMDD [-freq freq in MHz (default ${freqBAOCalib})] [-bwd bandwidth in MHz (default ${bwBAOCalib})]"
+            "usage: $0 -src source -date YYYYMMDD [-freq freq in MHz (default ${freqBAOCalib})] [-bwd bandwidth in MHz (default ${bwBAOCalib})]"
         exit 1;;
         *)  break;;     # terminate while loop

BAORadio/AmasNancay/trunk/submit2ge-anagainmaker.sh

@@ -3 +3 @@
 #Process cmd line args: the -src option is mandatory (source name as Abell85)
 sourceRadio=
+dateSelected=
 #use -sim option to simulate processing (debug the script as if...)
 simulationMode=""
@@ -9 +10 @@
   case "$1" in
       -src)  sourceRadio=$2; shift;;
-      -sim) simulationMode="-sim";;
+      -date) dateSelected="-date $2"; dateJob="$2"; shift;;
+      -sim)  simulationMode="-sim";;
         -h)
             echo >&2 \
-            "usage: $0 -src souce [-sim]"
+            "usage: $0 -src source -date YYYYMMDD [-sim]"
             exit 1;;
         *)  break;;     # terminate while loop
@@ -19 +21 @@
 done
 
-jobBatchName="gains-$sourceRadio"
+
+if [ "<${sourceRadio}>" = "<>" ]; then
+    $ECHO "FATAL: You have forgotten to select the source option (-src)"
+    exit 1
+fi
+
+jobBatchName="gains-${sourceRadio}${dateJob}"
 jobLogName="${jobBatchName}.log.$$"
 
 qsub -P P_baoradio -l sps=1,irods=1,ct=2400,vmem=1000M,fsize=500M -o $jobLogName -j yes -N $jobBatchName -m be -M ${LOGNAME}@lal.in2p3.fr -V <<EOF
 
-${SCRIPTPATH}/gainmaker.sh  -src ${sourceRadio} ${simulationMode}
+${SCRIPTPATH}/anagainmaker.sh -src ${sourceRadio} ${dateSelected} ${simulationMode}
 EOF