Changeset 597 for BAORadio

Timestamp:

Nov 10, 2011, 10:03:19 AM (13 years ago)

Author:

torrento

Message:

Increase expected number of files per cycle

Location:

BAORadio/AmasNancay/trunk

Files:

• etude_gain.pic (modified) (3 diffs)
• proc_specmfib.sh (modified) (2 diffs)
• submit2ge-procspecmfib.sh (modified) (2 diffs)

BAORadio/AmasNancay/trunk/etude_gain.pic

@@ -1 +1 @@
 set user "AST"
 set toppath "/sps/baoradio/AmasNancay/${user}"
-set source "Abell85"
-set srclower "abell85"
-set date   "20110812"
+set source "Abell1205"
+set srclower "abell1205"
+set date   "20110924"
 set saveplot "1"
 
@@ -22 +22 @@
 if ( $saveplot == "1" ) then
   echo "saving plot"
-  w2eps ${toppath}/${source}/eps/gain/gain_${date}_${srclower}.eps
+#  w2eps ${toppath}/${source}/eps/gain/gain_${date}_${srclower}.eps
 endif
 
@@ -42 +42 @@
 settitle "Gain monitor $source ${date} Ch 0 (blue) Ch 1 (red)"
 if ( $saveplot == "1" ) then
-#  w2eps ${toppath}/${source}/eps/gain/gain_monitor_${date}_${srclower}.eps
+  w2eps ${toppath}/${source}/eps/gain/gain_monitor_${date}_${srclower}.eps
 endif
 

BAORadio/AmasNancay/trunk/proc_specmfib.sh

@@ -407 +407 @@
 $ECHO "DEBUG (${scriptName}): END cat ${OUT}"
 #
-$ECHO "DEBUG (${scriptName}): START filling cylceArrayBis timeArray"
+$ECHO "DEBUG (${scriptName}): START filling cycleArrayBis timeArray"
 #
 declare -a cycleArrayBis
@@ -567 +567 @@
 
 #save results to Irods (use option -f ONLY to force override)
-    iput -v -K -r -f ${curDir}/${dirName} /baoradio/data/AmasNancay/${localpath}
+    emptydir=`$FIND ${curDir}/${dirName} -maxdepth 1 -type f | $WC -l`
+    if [ "<${emptydir}>" != "<>" ]; then
+      iput -v -K -r -f ${curDir}/${dirName} /baoradio/data/AmasNancay/${localpath}
+    else
+      $ECHO "DEBUG (${scriptName}): directory ${curDir}/${dirName} is empty"
+    fi
 #
 #clean the signal files which can at the end of the day fill completly the scratch directory of the batch work/AmasNancayer

BAORadio/AmasNancay/trunk/submit2ge-procspecmfib.sh

@@ -99 +99 @@
 fi
 
-#assume 20 files/cycles cf. 30sec/cycle et 3sec par signal et fact 2 margin 
+#assume 2*10 files/cycles cf. 30sec/cycle et 3sec par signal et fact 2 margin
+# Test: assume for Abell1205, aout2011, 2*20 files
+guessFiles=40
 if [ "<${firstCycle}>" != "<>" -a "<${lastCycle}>" != "<>" ]; then
     jobBatchName="procspecmfib-${sourceRadio}${dateJob}${type}-${fcycle}-${lcycle}"
     nFiles=`expr ${lcycle} - ${fcycle} + 1`
-    nFiles=`expr ${nFiles} \* 20`
+    nFiles=`expr ${nFiles} \* ${guessFiles}`
 else
     jobBatchName="procspecmfib-${sourceRadio}${dateJob}${type}-All"
     #assume 30 cycles maxi!
-    nFiles=`expr 20 \* 30`
+    nFiles=`expr ${guessFiles} \* 30`
 
 fi
@@ -116 +118 @@
 tspwin="5120"
 #calcul du scratch sachant que l'on nettoie apres chaque cycle
-nSpectra=`expr 20 \* 25600 /  ${tspwin}`
-scratchSize=`expr  20 \* 500 + ${nSpectra} \* 200 / 1000 + 5`
+nSpectra=`expr ${guessFiles} \* 25600 /  ${tspwin}`
+scratchSize=`expr  ${guessFiles} \* 500 + ${nSpectra} \* 200 / 1000 + 5`
 
 #le cpu total tient compte de l'emsemble des ficheirs a traiter