Changeset 584 for BAORadio

Timestamp:

Oct 21, 2011, 3:40:27 PM (13 years ago)

Author:

campagne

Message:

correct bug: threshold to detect 1st level of DAB (jec)

Location:

BAORadio/AmasNancay/trunk

Files:

• anacalibmaker.sh (modified) (4 diffs)
• analyse.cc (modified) (2 diffs)
• submit2bqs-anacalibmaker.sh (modified) (1 diff)

BAORadio/AmasNancay/trunk/anacalibmaker.sh

@@ -260 +260 @@
   $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
+#  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"
@@ -288 +288 @@
   $ECHO "DEBUG (${scriptName}): execute the analysis... should not take long. `date`"
   if [ ${simulationMode} = "On" ]; then
-      $ECHO "SIMUL: ${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}"
+      $ECHO "SIMUL: ${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}"
       cat > ${logFile} <<EOF
       Ok calibration finished
@@ -294 +294 @@
 #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  -debug 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 10 -freqBAOCalib ${freqBAOCalib} -bwBAOCalib ${bwBAOCalib} >& ${logFile}
   fi
 #
@@ -317 +317 @@
   else
       $LS -lrth
-      $FIND . -name "calib_*" -print | $XARGS -i  iput -f  -v -K {} ${i}
+#      $FIND . -name "calib_*" -print | $XARGS -i  iput -f  -v -K {} ${i}
+      $FIND . -name "calib_*" -print | $XARGS -i  cp {} /sps/baoradio/AmasNancay/JEC/tmp
   fi
 #save analysis logfile

BAORadio/AmasNancay/trunk/analyse.cc

@@ -321 +321 @@
   int ka=1;
   while (ka<(narg-1)) {
+    cout << "Debug arglist: <" << arg[ka] <<">" << endl;
     if (strcmp(arg[ka],"-debug")==0) {
       debuglev=arg[ka+1];
@@ -1446 +1447 @@
   const r_4 twin2 =  6.;
   const r_4 twin3 =  8;
-  const r_4 thresholdFactor = 0.80; //80% of the diff. Max-Min intensity
+  const r_4 thresholdFactor = 0.20; //80% of the diff. Max-Min intensity
 
   sa_size_t inModeIdx = powerEvolution.ColumnIndex("mode");

BAORadio/AmasNancay/trunk/submit2bqs-anacalibmaker.sh

@@ -37 +37 @@
 
 
-jobBatchName="anacalibs-${sourceRadio}${dateJob}"
+jobBatchName="anacalibs-${sourceRadio}${dateJob}-test"
 
 jobLogName="${jobBatchName}.log.$$"