Index: trunk/DataCheck/Processing/FillAuxCamHum.sh =================================================================== --- trunk/DataCheck/Processing/FillAuxCamHum.sh (revision 18320) +++ trunk/DataCheck/Processing/FillAuxCamHum.sh (revision 18321) @@ -28,10 +28,4 @@ if [ "$certaindate" != "" ] then - checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'` - if [ "$checkstring" = "" ] - then - echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)" - finish - fi getdates $certaindate else @@ -46,6 +40,4 @@ echo `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1 -#echo ${dates[@]} - cd $mars @@ -59,5 +51,4 @@ continue fi - #echo $auxdir" @ "`date` # check if aux files are available from that night @@ -90,5 +81,4 @@ then printprocesslog "WARN "$fschumfile" not found." - #echo "WARN "$fschumfile" not found." else humnumerrors=`fverify $fschumfile 2>/dev/null | grep -o '[0-9][ ]error(s)' | grep -E -o '[0-9]'` @@ -130,9 +120,4 @@ fi # assuming that at least TSTARTI and TSTOPI are consistent - #echo $rawfile - #echo $tstarti - #echo $tstopi - #echo $tstartf - #echo $tstopf if [ $tstarti -gt 30000 ] then @@ -169,5 +154,4 @@ query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum - #echo $query # send query to DB sendquery >/dev/null Index: trunk/DataCheck/Processing/FillAuxContTemp.sh =================================================================== --- trunk/DataCheck/Processing/FillAuxContTemp.sh (revision 18320) +++ trunk/DataCheck/Processing/FillAuxContTemp.sh (revision 18321) @@ -28,10 +28,4 @@ if [ "$certaindate" != "" ] then - checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'` - if [ "$checkstring" = "" ] - then - echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)" - finish - fi getdates $certaindate else @@ -122,9 +116,4 @@ fi # assuming that at least TSTARTI and TSTOPI are consistent - #echo $rawfile - #echo $tstarti - #echo $tstopi - #echo $tstartf - #echo $tstopf if [ $tstarti -gt 30000 ] then @@ -148,5 +137,4 @@ then conttemps=( `root -q -b -l fact/processing/contemp.C\("\"$conttempfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` ) - #echo " "${conttemps[@]} if [ "${conttemps[0]}" == "" ] then Index: trunk/DataCheck/Processing/FillAuxCtrDev.sh =================================================================== --- trunk/DataCheck/Processing/FillAuxCtrDev.sh (revision 18320) +++ trunk/DataCheck/Processing/FillAuxCtrDev.sh (revision 18321) @@ -28,10 +28,4 @@ if [ "$certaindate" != "" ] then - checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'` - if [ "$checkstring" = "" ] - then - echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)" - finish - fi getdates $certaindate else @@ -121,9 +115,4 @@ fi # assuming that at least TSTARTI and TSTOPI are consistent - #echo $rawfile - #echo $tstarti - #echo $tstopi - #echo $tstartf - #echo $tstopf if [ $tstarti -gt 30000 ] then Index: trunk/DataCheck/Processing/FillAuxCurrents.sh =================================================================== --- trunk/DataCheck/Processing/FillAuxCurrents.sh (revision 18320) +++ trunk/DataCheck/Processing/FillAuxCurrents.sh (revision 18321) @@ -28,10 +28,4 @@ if [ "$certaindate" != "" ] then - checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'` - if [ "$checkstring" = "" ] - then - echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)" - finish - fi getdates $certaindate else @@ -174,9 +168,4 @@ fi # assuming that at least TSTARTI and TSTOPI are consistent - #echo $rawfile - #echo $tstarti - #echo $tstopi - #echo $tstartf - #echo $tstopf if [ $tstarti -gt 30000 ] then @@ -198,6 +187,4 @@ if [ -e $calcurrentsfile ] && [ $calnumerrors -eq 0 ] then - #root -q -b -l fact/curavg.C\("\"$calcurrentsfile\""\,$tstart\,$tstop\) # | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*' - #currents=( `root -q -b -l fact/curavg.C\("\"$calcurrentsfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` ) currents=( `root -q -b -l fact/processing/currents.C\("\"$calcurrentsfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[-]?[0-9]+[.]?[0-9]*'` ) if [ "${currents[0]}" == "" ] @@ -277,5 +264,4 @@ query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum - #echo $query # send query to DB sendquery >/dev/null Index: trunk/DataCheck/Processing/FillAuxData.sh =================================================================== --- trunk/DataCheck/Processing/FillAuxData.sh (revision 18320) +++ trunk/DataCheck/Processing/FillAuxData.sh (revision 18321) @@ -2,4 +2,5 @@ # new version of the script to run on newdaq +# but can be also used at ISDC # option whether to fill all row or only those where information is missing @@ -28,10 +29,4 @@ if [ "$certaindate" != "" ] then - checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'` - if [ "$checkstring" = "" ] - then - echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)" - finish - fi getdates $certaindate else @@ -80,7 +75,5 @@ then printprocesslog "WARN empty evaluation of statistic ("$@") for run "$date" "$file - #echo " ---> "$@ - fi - #echo "ev: "$evaluation + fi min=`echo $evaluation | grep -E -o 'Min:\ [-]?[0-9]+[.]?[0-9]*' | sed -e 's/Min:\ //'` max=`echo $evaluation | grep -E -o 'Max:\ [-]?[0-9]+[.]?[0-9]*' | sed -e 's/Max:\ //'` @@ -88,5 +81,4 @@ mean=`echo $evaluation | grep -E -o 'Avg:\ [-]?[0-9]+[.]?[0-9]*' | sed -e 's/Avg:\ //'` rms=`echo $evaluation | grep -E -o 'Rms:\ [-]?[0-9]+[.]?[0-9]*[e]?[-]?[0-9]+' | sed -e 's/Rms:\ //'` - #echo "eval: "$min" "$max" "$med" "$mean" "$rms } @@ -105,5 +97,4 @@ else printprocesslog "INFO processing files in "$auxdir - #echo "INFO processing files in "$auxdir fi @@ -179,5 +170,5 @@ printprocesslog "INFO processing file number "$runnumber"_"`printf %03d $filenum` echo `date`": processing file number "$runnumber"_"`printf %03d $filenum` >> $logfile 2>&1 - echo `date`": processing file number "$runnumber"_"`printf %03d $filenum` + #echo `date`": processing file number "$runnumber"_"`printf %03d $filenum` # get information from rawfile @@ -200,11 +191,5 @@ continue fi - echo $runtype # assuming that at least TSTARTI and TSTOPI are consistent - #echo $rawfile - #echo $tstarti - #echo $tstopi - #echo $tstartf - #echo $tstopf if [ $tstarti -gt 30000 ] then @@ -219,6 +204,5 @@ tstop=`echo " $tstopi + $tstopf " | bc -l` fi - #echo $tstart - #echo $tstop + # code for very old data #if [ $runnumber -eq 20111123 ] #then @@ -317,5 +301,4 @@ fi fi - echo $runstart $runstop #numevents=`$factpath/fitsdump -h -t Events $rawfile 2>/dev/null | grep Events | grep -E -o '[0-9]+'` numevents=`$factpath/fitsdump -h $rawfile 2>/dev/null | grep Events | grep -E -o '[0-9]+'` @@ -420,5 +403,4 @@ # RA evaluatestatistics "Ra" $trackingstats - #echo $min"_"$max"_"$ if [ "$evaluation" != "" ] then @@ -623,5 +605,4 @@ # add where condition query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum - echo $query # send query to DB Index: trunk/DataCheck/Processing/FillAuxTemp.sh =================================================================== --- trunk/DataCheck/Processing/FillAuxTemp.sh (revision 18320) +++ trunk/DataCheck/Processing/FillAuxTemp.sh (revision 18321) @@ -28,10 +28,4 @@ if [ "$certaindate" != "" ] then - checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'` - if [ "$checkstring" = "" ] - then - echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)" - finish - fi getdates $certaindate else @@ -86,5 +80,4 @@ then printprocesslog "WARN "$magicweatherfile" not found." - #echo "WARN "$magicweatherfile" not found." else weathernumerrors=`fverify $magicweatherfile 2>/dev/null | grep -o '[0-9][ ]error(s)' | grep -E -o '[0-9]'` @@ -99,5 +92,4 @@ then printprocesslog "WARN "$fsctempfile" not found." - #echo "WARN "$fsctempfile" not found." else tempnumerrors=`fverify $fsctempfile 2>/dev/null | grep -o '[0-9][ ]error(s)' | grep -E -o '[0-9]'` @@ -139,9 +131,4 @@ fi # assuming that at least TSTARTI and TSTOPI are consistent - #echo $rawfile - #echo $tstarti - #echo $tstopi - #echo $tstartf - #echo $tstopf if [ $tstarti -gt 30000 ] then @@ -156,5 +143,4 @@ tstop=`echo " $tstopi + $tstopf " | bc -l` fi - #echo $rawfile" "$tstart" "$tstop # build query to update runinfo in DB Index: trunk/DataCheck/Processing/FillAuxThresholds.sh =================================================================== --- trunk/DataCheck/Processing/FillAuxThresholds.sh (revision 18320) +++ trunk/DataCheck/Processing/FillAuxThresholds.sh (revision 18321) @@ -29,10 +29,4 @@ if [ "$certaindate" != "" ] then - checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'` - if [ "$checkstring" = "" ] - then - echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)" - finish - fi getdates $certaindate else @@ -46,6 +40,4 @@ echo `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1 -#echo ${dates[@]} - cd $mars @@ -97,5 +89,4 @@ thresholdfile2=$auxdir/$runnumber.FTM_CONTROL_STATIC_DATA.fits - #ls $thresholdfile2 if ! [ -e $thresholdfile2 ] then @@ -134,9 +125,4 @@ fi # assuming that at least TSTARTI and TSTOPI are consistent - #echo $rawfile - #echo $tstarti - #echo $tstopi - #echo $tstartf - #echo $tstopf if [ $tstarti -gt 30000 ] then @@ -159,6 +145,4 @@ then thresholds1=( `root -q -b -l fact/processing/threshold.C\("\"$thresholdfile2\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` ) - #root -q -b -l fact/threshold.C\("\"$thresholdfile2\""\,$tstart\,$tstop\) | grep "result" - #echo ${thresholds1[@]} if [ "${thresholds1[0]}" == "" ] then @@ -196,6 +180,4 @@ then thresholds2=( `root -q -b -l fact/processing/lastth.C\("\"$thresholdfile\""\,$tstart\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` ) - #root -q -b -l fact/lastth.C\("\"$thresholdfile\""\,$tstart\) | grep "result" - #echo ${thresholds2[@]} if [ "${thresholds2[0]}" == "" ] then @@ -218,5 +200,4 @@ query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum - #echo $query # send query to DB sendquery >/dev/null Index: trunk/DataCheck/Processing/FillDrsTemp.sh =================================================================== --- trunk/DataCheck/Processing/FillDrsTemp.sh (revision 18320) +++ trunk/DataCheck/Processing/FillDrsTemp.sh (revision 18321) @@ -28,10 +28,4 @@ if [ "$certaindate" != "" ] then - checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'` - if [ "$checkstring" = "" ] - then - echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)" - finish - fi getdates $certaindate else @@ -46,6 +40,4 @@ echo `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1 -#echo ${dates[@]} - cd $mars @@ -59,5 +51,4 @@ continue fi - #echo $auxdir" @ "`date` # check if aux files are available from that night @@ -130,9 +121,4 @@ fi # assuming that at least TSTARTI and TSTOPI are consistent - #echo $rawfile - #echo $tstarti - #echo $tstopi - #echo $tstartf - #echo $tstopf if [ $tstarti -gt 30000 ] then @@ -190,5 +176,4 @@ query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum - #echo $query # send query to DB sendquery >/dev/null Index: trunk/DataCheck/Processing/FillEffectiveOn.sh =================================================================== --- trunk/DataCheck/Processing/FillEffectiveOn.sh (revision 18320) +++ trunk/DataCheck/Processing/FillEffectiveOn.sh (revision 18321) @@ -28,10 +28,4 @@ if [ "$certaindate" != "" ] then - checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'` - if [ "$checkstring" = "" ] - then - echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)" - finish - fi getdates $certaindate else @@ -53,5 +47,4 @@ auxdir=$auxdata/$date runnumber=`echo $date | sed -e 's/\///g'` -# echo $auxdir" @ "`date` # get file numbers from DB @@ -117,9 +110,4 @@ fi # assuming that at least TSTARTI and TSTOPI are consistent - #echo $rawfile - #echo $tstarti - #echo $tstopi - #echo $tstartf - #echo $tstopf if [ $tstarti -gt 30000 ] then