Changeset 576 for BAORadio

Timestamp:

Oct 14, 2011, 2:49:14 PM (13 years ago)

Author:

campagne

Message:

u_irods_baoradio pour BQS (jec)

Location:

BAORadio/AmasNancay/trunk

Files:

• anacalibmaker.sh (modified) (1 diff)
• proc_script.sh (modified) (1 diff)
• scaextractor.sh (modified) (3 diffs)
• submit2bqs-anacalibmaker.sh (modified) (1 diff)
• submit2bqs-anagainmaker.sh (modified) (1 diff)
• submit2bqs-anarawonoffmaker.sh (modified) (1 diff)
• submit2bqs-calibmaker.sh (modified) (1 diff)
• submit2bqs-gainmaker.sh (modified) (1 diff)
• submit2bqs-hdrfitsextractor.sh (modified) (1 diff)
• submit2bqs-onoffmaker.sh (modified) (1 diff)
• submit2bqs-procspecmfib.sh (modified) (1 diff)
• submit2bqs-scaextractor.sh (modified) (3 diffs)

BAORadio/AmasNancay/trunk/anacalibmaker.sh

@@ -296 +296 @@
 #WARNING: the EOF must start at 1st column overwise the rest of the script is part of the file cat...
   else
-      ${scriptpath}/Objs/analyse -act calib -inPath ${iojobpath}  -source  ${sourceRadio} -date ${dateDAQ} -sca ${scaFile} -specdir calibcycle  -numcycle ${firstCycle},${lastCycle} -calibopt mean  -debuglev 1 -freqBAOCalib ${freqBAOCalib} -bwBAOCalib ${bwBAOCalib} >& ${logFile}
+      ${scriptpath}/Objs/analyse -act calib -inPath ${iojobpath}  -source  ${sourceRadio} -date ${dateDAQ} -sca ${scaFile} -specdir calibcycle  -numcycle ${firstCycle},${lastCycle} -calibopt mean  -debug 1 -freqBAOCalib ${freqBAOCalib} -bwBAOCalib ${bwBAOCalib} >& ${logFile}
   fi
 #

BAORadio/AmasNancay/trunk/proc_script.sh

@@ -500 +500 @@
 
 ##26/9/11 JEC use option -h to trig manualy the job on the queue...
-    qsub -h -l u_sps_baoradio,u_irods,T=${cpu},M=${virtualmem}MB,scratch=${scratchSize}MB,platform=LINUX -eo -o ${tmppublicpath}/${jobLogName} -N ${jobBatchName}  ${jobScriptName}
+    qsub -h -l u_sps_baoradio,u_irods,u_irods_baoradio,T=${cpu},M=${virtualmem}MB,scratch=${scratchSize}MB,platform=LINUX -eo -o ${tmppublicpath}/${jobLogName} -N ${jobBatchName}  ${jobScriptName}
 
 #    while [ ! -f "${tmppublicpath}/${jobBatchName}.finished" ]; do

BAORadio/AmasNancay/trunk/scaextractor.sh

@@ -23 +23 @@
 #which source to analyse
 sourceRadio=$1
+
+#force recomputation force=Yes
+force=$2
 
 #Path to public backupable path
@@ -66 +69 @@
     $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
-#       $ECHO "INFO (${scriptName}); waiting for ${tmppublicpath}/statusdaq.finished"
-#       date +%T
-#       sleep 30 
-#    done
-#    $RM ${tmppublicpath}/statusdaq.finished
-#    $ECHO "FATAL (${scriptName}): ${OUT1} is missing or not readable..."
-#JEC 29/9/11 avoid finished stuff
-#    touch ${tmppublicpath}/scaextractor.finished
-#    exit 1
 fi
 
@@ -104 +94 @@
   emptyfile=`$GREP -i "sca.*\.sum\.trans" ${OUT2} | $AWK '{print $4}'`
 #  echo "scrutinize directory <$i>: [$nblines] [$scatrans]" 
-  if [ "<${scatrans}>" = "<>" -o "<${emptyfile}>" = "<0>" ]; then
+  if [ "<${scatrans}>" = "<>" -o "<${emptyfile}>" = "<0>" -o "<${force}>" = "<Yes>" ]; then
       $ECHO "$i may be non prepared for analysis..."
       scafile=`$GREP -i "sca[0-9][0-9]*\.[0-9][0-9]*" ${OUT2} | $AWK '{print $NF}'`

BAORadio/AmasNancay/trunk/submit2bqs-anacalibmaker.sh

@@ -41 +41 @@
 jobLogName="${jobBatchName}.log.$$"
 
-qsub -l u_sps_baoradio,u_irods,T=120000,M=1000MB,scratch=1000MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
+qsub -l u_sps_baoradio,u_irods,u_irods_baoradio,T=120000,M=1000MB,scratch=1000MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
 /afs/in2p3.fr/home/c/campagne/private/work/AmasNancay/anacalibmaker.sh  -src ${sourceRadio} ${dateSelected} ${freqBAOCalib} ${bwBAOCalib} ${simulationMode}
 EOF

BAORadio/AmasNancay/trunk/submit2bqs-anagainmaker.sh

@@ -22 +22 @@
 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
+qsub -l u_sps_baoradio,u_irods,u_irods_baoradio,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}
 EOF

BAORadio/AmasNancay/trunk/submit2bqs-anarawonoffmaker.sh

@@ -38 +38 @@
 jobLogName="${jobBatchName}.log.$$"
 
-qsub -l u_sps_baoradio,u_irods,T=120000,M=1000MB,scratch=1000MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
+qsub -l u_sps_baoradio,u_irods,u_irods_baoradio,T=120000,M=1000MB,scratch=1000MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
 /afs/in2p3.fr/home/c/campagne/private/work/AmasNancay/anarawonoffmaker.sh  -src ${sourceRadio} ${dateSelected} ${simulationMode}
 EOF

BAORadio/AmasNancay/trunk/submit2bqs-calibmaker.sh

@@ -39 +39 @@
 jobLogName="${jobBatchName}.log.$$"
 
-qsub -l u_sps_baoradio,u_irods,T=120000,M=1000MB,scratch=1000MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
+qsub -l u_sps_baoradio,u_irods,u_irods_baoradio,T=120000,M=1000MB,scratch=1000MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
 /afs/in2p3.fr/home/c/campagne/private/work/AmasNancay/calibmaker.sh  -src ${sourceRadio} ${freqBAOCalib} ${bwBAOCalib} ${simulationMode}
 EOF

BAORadio/AmasNancay/trunk/submit2bqs-gainmaker.sh

@@ -29 +29 @@
 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
+qsub -l u_sps_baoradio,u_irods,u_irods_baoradio,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/anagainmaker.sh  -src ${sourceRadio} ${dateSelected} ${simulationMode}
 EOF

BAORadio/AmasNancay/trunk/submit2bqs-hdrfitsextractor.sh

@@ -19 +19 @@
 jobLogName="${jobBatchName}.log.$$"
 
-qsub -l u_sps_baoradio,u_irods,T=100000,M=256MB,scratch=700MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
+qsub -l u_sps_baoradio,u_irods,u_irods_baoradio,T=100000,M=256MB,scratch=700MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
 /afs/in2p3.fr/home/c/campagne/private/work/AmasNancay/hdrfitsextractor.sh  $sourceRadio
 EOF

BAORadio/AmasNancay/trunk/submit2bqs-onoffmaker.sh

@@ -40 +40 @@
 jobLogName="${jobBatchName}.log.$$"
 
-qsub -l u_sps_baoradio,u_irods,T=120000,M=1000MB,scratch=1000MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
+qsub -l u_sps_baoradio,u_irods,u_irods_baoradio,T=120000,M=1000MB,scratch=1000MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
 /afs/in2p3.fr/home/c/campagne/private/work/AmasNancay/onoffmaker.sh  -src ${sourceRadio} ${dateSelected} ${freqBAOCalib} ${simulationMode}
 EOF

BAORadio/AmasNancay/trunk/submit2bqs-procspecmfib.sh

@@ -122 +122 @@
 cpu=`expr ${nFiles} \* 60 \* 50`
 
-qsub -l u_sps_baoradio,u_irods,T=${cpu},M=1000MB,scratch=${scratchSize}MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
+qsub -l u_sps_baoradio,u_irods,u_irods_baoradio,T=${cpu},M=1000MB,scratch=${scratchSize}MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
 /afs/in2p3.fr/home/c/campagne/private/work/AmasNancay/proc_specmfib.sh ${action} -src ${sourceRadio} ${dateSelected} ${typeofproc} ${firstCycle} ${lastCycle} ${simulationMode}
 EOF

BAORadio/AmasNancay/trunk/submit2bqs-scaextractor.sh

@@ -19 +19 @@
 #Process cmd line args: the -src option is mandatory (source name as Abell85)
 sourceRadio=
+force=
 while [ $# -gt 0 ]
 do
   case "$1" in
       -src)  sourceRadio=$2; shift;;
+      -force) force="Yes";;
         -h)
             echo >&2 \
@@ -52 +54 @@
     $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
 
@@ -66 +59 @@
 jobLogName="${jobBatchName}.log.$$"
 
-qsub -l u_sps_baoradio,u_irods,T=100000,M=256MB,scratch=700MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
-/afs/in2p3.fr/home/c/campagne/private/work/AmasNancay/scaextractor.sh  $sourceRadio
+qsub -l u_sps_baoradio,u_irods,u_irods_baoradio,T=100000,M=256MB,scratch=700MB,platform=LINUX -eo -o $jobLogName -N $jobBatchName -mb -me -mu ${LOGNAME}@lal.in2p3.fr <<EOF
+/afs/in2p3.fr/home/c/campagne/private/work/AmasNancay/scaextractor.sh  ${sourceRadio} ${force}
 EOF