Changeset 570

Timestamp:

Oct 11, 2011, 11:29:33 AM (13 years ago)

Author:

campagne

Message:

prepare new way to process the data: first perform specmfib, second perform post-analysis (jec)

Location:

BAORadio/AmasNancay/trunk

Files:

• anacalibmaker.sh (added)
• anagainmaker.sh (added)
• anarawonoffmaker.sh (modified) (2 diffs)
• proc_specmfib.sh (modified) (2 diffs)
• submit2bqs-anacalibmaker.sh (added)
• submit2bqs-anagainmaker.sh (added)
• submit2bqs-gainmaker.sh (modified) (3 diffs)

BAORadio/AmasNancay/trunk/anarawonoffmaker.sh

@@ -111 +111 @@
     $ECHO "FATAL (${scriptName}): ${OUT1} has a problem"
     exit 1
-#    $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
 
@@ -145 +136 @@
   $LS -lrt
 
-
-#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}
-#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
-#protect against remove/rewriting    
-#      $CHMOD -v 444 ${OUT1} 
-#  fi
-#
-# look if the gain & calibration files exist
-#
   gainDone=`ils ${i} 2>&1 | $GREP -i "gain_.*\.fits" | $WC -l`
   if [ ! ${gainDone} -gt 0 ]; then

BAORadio/AmasNancay/trunk/proc_specmfib.sh

@@ -86 +86 @@
     $ECHO "FATAL: You have forgotten to select the type option (-type)"
     exit 1
-else
-    offtype=`$ECHO ${typeofproc} | $GREP -i OFF | $WC -l`
-    ontype=`$ECHO ${typeofproc} | $GREP -i ON | $WC -l`
-    if [ "<${offtype}>" = "<1>" -a  "<${ontype}>" = "<0>" ]; then
-        datatype="OFF"
-    elif [ "<${offtype}>" = "<0>" -a  "<${ontype}>" = "<1>" ]; then
-        datatype="ON"
-    else
-        $ECHO "FATAL: not supported: -type ${typeofproc}"
-        exit 1
-    fi
-fi
+
+fi
+#else
+#    offtype=`$ECHO ${typeofproc} | $GREP -i OFF | $WC -l`
+#    ontype=`$ECHO ${typeofproc} | $GREP -i ON | $WC -l`
+#    if [ "<${offtype}>" = "<1>" -a  "<${ontype}>" = "<0>" ]; then
+#       datatype="OFF"
+#    elif [ "<${offtype}>" = "<0>" -a  "<${ontype}>" = "<1>" ]; then
+#       datatype="ON"
+#    else
+#       $ECHO "FATAL: not supported: -type ${typeofproc}"
+#       exit 1
+#    fi
+#fi
 
 
@@ -220 +222 @@
 #JEC 29/9/11 avoid finished stuff
 #$RM -f ${tmppublicpath}/select.finished
-${scriptpath}/select.sh ${scaFileSummarized} ${dirFiberfile} ${datatype} | $GREP "^#[0-9]" | $SED "s/^#//" > $headerFileSelected
+${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"

BAORadio/AmasNancay/trunk/submit2bqs-gainmaker.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;;
+      -date) dateSelected="-date $2"; dateJob="$2";     shift;;
       -sim) simulationMode="-sim";;
         -h)
             echo >&2 \
-            "usage: $0 -src souce [-sim]"
+            "usage: $0 -src souce -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="anagains-${sourceRadio}${dateJob}"
 jobLogName="${jobBatchName}.log.$$"
 
 qsub -l u_sps_baoradio,u_irods,T=120000,M=1000MB,scratch=500MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
-/afs/in2p3.fr/home/c/campagne/private/work/AmasNancay/gainmaker.sh  -src ${sourceRadio} ${simulationMode}
+/afs/in2p3.fr/home/c/campagne/private/work/AmasNancay/anagainmaker.sh  -src ${sourceRadio} ${dateSelected} ${simulationMode}
 EOF