Changeset 18321


Ignore:
Timestamp:
08/31/15 01:31:37 (9 years ago)
Author:
Daniela Dorner
Message:
removed check of certaindate-variable (now done in getdate())
Location:
trunk/DataCheck/Processing
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/DataCheck/Processing/FillAuxCamHum.sh

    r18253 r18321  
    2828if [ "$certaindate" != "" ]
    2929then
    30    checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'`
    31    if [ "$checkstring" = "" ]
    32    then
    33       echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)"
    34       finish
    35    fi
    3630   getdates $certaindate
    3731else
    … …  
    4640echo  `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1
    4741
    48 #echo ${dates[@]}
    49 
    5042cd $mars
    5143
    … …  
    5951      continue
    6052   fi
    61    #echo $auxdir" @ "`date`
    6253
    6354   # check if aux files are available from that night
    … …  
    9081   then
    9182      printprocesslog "WARN "$fschumfile" not found."
    92       #echo "WARN "$fschumfile" not found."
    9383   else
    9484      humnumerrors=`fverify $fschumfile 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
    … …  
    130120      fi
    131121      # assuming that at least TSTARTI and TSTOPI are consistent
    132       #echo $rawfile
    133       #echo $tstarti
    134       #echo $tstopi
    135       #echo $tstartf
    136       #echo $tstopf
    137122      if [ $tstarti -gt 30000 ]
    138123      then
    … …  
    169154      query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum
    170155     
    171       #echo $query
    172156      # send query to DB
    173157      sendquery >/dev/null

  • trunk/DataCheck/Processing/FillAuxContTemp.sh

    r17907 r18321  
    2828if [ "$certaindate" != "" ]
    2929then
    30    checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'`
    31    if [ "$checkstring" = "" ]
    32    then
    33       echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)"
    34       finish
    35    fi
    3630   getdates $certaindate
    3731else
    … …  
    122116      fi
    123117      # assuming that at least TSTARTI and TSTOPI are consistent
    124       #echo $rawfile
    125       #echo $tstarti
    126       #echo $tstopi
    127       #echo $tstartf
    128       #echo $tstopf
    129118      if [ $tstarti -gt 30000 ]
    130119      then
    … …  
    148137      then
    149138         conttemps=( `root -q -b -l fact/processing/contemp.C\("\"$conttempfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
    150          #echo " "${conttemps[@]}
    151139         if [ "${conttemps[0]}" == "" ]
    152140         then

  • trunk/DataCheck/Processing/FillAuxCtrDev.sh

    r18253 r18321  
    2828if [ "$certaindate" != "" ]
    2929then
    30    checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'`
    31    if [ "$checkstring" = "" ]
    32    then
    33       echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)"
    34       finish
    35    fi
    3630   getdates $certaindate
    3731else
    … …  
    121115      fi
    122116      # assuming that at least TSTARTI and TSTOPI are consistent
    123       #echo $rawfile
    124       #echo $tstarti
    125       #echo $tstopi
    126       #echo $tstartf
    127       #echo $tstopf
    128117      if [ $tstarti -gt 30000 ]
    129118      then

  • trunk/DataCheck/Processing/FillAuxCurrents.sh

    r17907 r18321  
    2828if [ "$certaindate" != "" ]
    2929then
    30    checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'`
    31    if [ "$checkstring" = "" ]
    32    then
    33       echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)"
    34       finish
    35    fi
    3630   getdates $certaindate
    3731else
    … …  
    174168      fi
    175169      # assuming that at least TSTARTI and TSTOPI are consistent
    176       #echo $rawfile
    177       #echo $tstarti
    178       #echo $tstopi
    179       #echo $tstartf
    180       #echo $tstopf
    181170      if [ $tstarti -gt 30000 ]
    182171      then
    … …  
    198187      if [ -e $calcurrentsfile ] && [ $calnumerrors -eq 0 ]
    199188      then
    200          #root -q -b -l fact/curavg.C\("\"$calcurrentsfile\""\,$tstart\,$tstop\) # | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'
    201          #currents=( `root -q -b -l fact/curavg.C\("\"$calcurrentsfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
    202189         currents=( `root -q -b -l fact/processing/currents.C\("\"$calcurrentsfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[-]?[0-9]+[.]?[0-9]*'` )
    203190         if [ "${currents[0]}" == "" ]
    … …  
    277264      query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum
    278265     
    279       #echo $query
    280266      # send query to DB
    281267      sendquery >/dev/null

  • trunk/DataCheck/Processing/FillAuxData.sh

    r18135 r18321  
    22
    33# new version of the script to run on newdaq
     4#   but can be also used at ISDC
    45
    56# option whether to fill all row or only those where information is missing
    … …  
    2829if [ "$certaindate" != "" ]
    2930then
    30    checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'`
    31    if [ "$checkstring" = "" ]
    32    then
    33       echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)"
    34       finish
    35    fi
    3631   getdates $certaindate
    3732else
    … …  
    8075   then
    8176      printprocesslog "WARN empty evaluation of statistic ("$@") for run "$date" "$file
    82       #echo "   ---> "$@
    83    fi
    84    #echo "ev: "$evaluation
     77   fi
    8578   min=`echo $evaluation | grep -E -o 'Min:\ [-]?[0-9]+[.]?[0-9]*' | sed -e 's/Min:\ //'`
    8679   max=`echo $evaluation | grep -E -o 'Max:\ [-]?[0-9]+[.]?[0-9]*' | sed -e 's/Max:\ //'`
    … …  
    8881   mean=`echo $evaluation | grep -E -o 'Avg:\ [-]?[0-9]+[.]?[0-9]*' | sed -e 's/Avg:\ //'`
    8982   rms=`echo $evaluation | grep -E -o 'Rms:\ [-]?[0-9]+[.]?[0-9]*[e]?[-]?[0-9]+' | sed -e 's/Rms:\ //'`
    90    #echo "eval: "$min" "$max" "$med" "$mean" "$rms
    9183}
    9284
    … …  
    10597   else
    10698      printprocesslog "INFO processing files in "$auxdir
    107       #echo "INFO processing files in "$auxdir
    10899   fi
    109100
    … …  
    179170      printprocesslog "INFO processing file number "$runnumber"_"`printf %03d $filenum`
    180171      echo  `date`": processing file number "$runnumber"_"`printf %03d $filenum` >> $logfile 2>&1
    181       echo  `date`": processing file number "$runnumber"_"`printf %03d $filenum`
     172      #echo  `date`": processing file number "$runnumber"_"`printf %03d $filenum`
    182173 
    183174      # get information from rawfile
    … …  
    200191         continue
    201192      fi
    202       echo $runtype
    203193      # assuming that at least TSTARTI and TSTOPI are consistent
    204       #echo $rawfile
    205       #echo $tstarti
    206       #echo $tstopi
    207       #echo $tstartf
    208       #echo $tstopf
    209194      if [ $tstarti -gt 30000 ]
    210195      then
    … …  
    219204         tstop=`echo " $tstopi + $tstopf " | bc -l`
    220205      fi
    221       #echo $tstart
    222       #echo $tstop
     206      # code for very old data
    223207      #if [ $runnumber -eq 20111123 ]
    224208      #then
    … …  
    317301            fi
    318302         fi
    319          echo $runstart $runstop
    320303         #numevents=`$factpath/fitsdump -h -t Events $rawfile  2>/dev/null | grep Events | grep -E -o '[0-9]+'`
    321304         numevents=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep Events | grep -E -o '[0-9]+'`
    … …  
    420403         # RA
    421404         evaluatestatistics "Ra" $trackingstats
    422          #echo $min"_"$max"_"$
    423405         if [ "$evaluation" != "" ]
    424406         then
    … …  
    623605      # add where condition
    624606      query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum
    625       echo $query
    626607
    627608      # send query to DB

  • trunk/DataCheck/Processing/FillAuxTemp.sh

    r18253 r18321  
    2828if [ "$certaindate" != "" ]
    2929then
    30    checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'`
    31    if [ "$checkstring" = "" ]
    32    then
    33       echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)"
    34       finish
    35    fi
    3630   getdates $certaindate
    3731else
    … …  
    8680   then
    8781      printprocesslog "WARN "$magicweatherfile" not found."
    88       #echo "WARN "$magicweatherfile" not found."
    8982   else
    9083      weathernumerrors=`fverify $magicweatherfile 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
    … …  
    9992   then
    10093      printprocesslog "WARN "$fsctempfile" not found."
    101       #echo "WARN "$fsctempfile" not found."
    10294   else
    10395      tempnumerrors=`fverify $fsctempfile 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
    … …  
    139131      fi
    140132      # assuming that at least TSTARTI and TSTOPI are consistent
    141       #echo $rawfile
    142       #echo $tstarti
    143       #echo $tstopi
    144       #echo $tstartf
    145       #echo $tstopf
    146133      if [ $tstarti -gt 30000 ]
    147134      then
    … …  
    156143         tstop=`echo " $tstopi + $tstopf " | bc -l`
    157144      fi
    158       #echo $rawfile" "$tstart" "$tstop
    159145
    160146      # build query to update runinfo in DB

  • trunk/DataCheck/Processing/FillAuxThresholds.sh

    r17907 r18321  
    2929if [ "$certaindate" != "" ]
    3030then
    31    checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'`
    32    if [ "$checkstring" = "" ]
    33    then
    34       echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)"
    35       finish
    36    fi
    3731   getdates $certaindate
    3832else
    … …  
    4640echo  `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1
    4741
    48 #echo ${dates[@]}
    49 
    5042cd $mars
    5143
    … …  
    9789
    9890   thresholdfile2=$auxdir/$runnumber.FTM_CONTROL_STATIC_DATA.fits
    99    #ls $thresholdfile2
    10091   if ! [ -e $thresholdfile2 ]
    10192   then
    … …  
    134125      fi
    135126      # assuming that at least TSTARTI and TSTOPI are consistent
    136       #echo $rawfile
    137       #echo $tstarti
    138       #echo $tstopi
    139       #echo $tstartf
    140       #echo $tstopf
    141127      if [ $tstarti -gt 30000 ]
    142128      then
    … …  
    159145      then
    160146         thresholds1=( `root -q -b -l fact/processing/threshold.C\("\"$thresholdfile2\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
    161          #root -q -b -l fact/threshold.C\("\"$thresholdfile2\""\,$tstart\,$tstop\) | grep "result"
    162          #echo ${thresholds1[@]}
    163147         if [ "${thresholds1[0]}" == "" ]
    164148         then
    … …  
    196180      then
    197181         thresholds2=( `root -q -b -l fact/processing/lastth.C\("\"$thresholdfile\""\,$tstart\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
    198          #root -q -b -l fact/lastth.C\("\"$thresholdfile\""\,$tstart\) | grep "result"
    199          #echo ${thresholds2[@]}
    200182         if [ "${thresholds2[0]}" == "" ]
    201183         then
    … …  
    218200      query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum
    219201     
    220       #echo $query
    221202      # send query to DB
    222203      sendquery >/dev/null

  • trunk/DataCheck/Processing/FillDrsTemp.sh

    r18253 r18321  
    2828if [ "$certaindate" != "" ]
    2929then
    30    checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'`
    31    if [ "$checkstring" = "" ]
    32    then
    33       echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)"
    34       finish
    35    fi
    3630   getdates $certaindate
    3731else
    … …  
    4640echo  `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1
    4741
    48 #echo ${dates[@]}
    49 
    5042cd $mars
    5143
    … …  
    5951      continue
    6052   fi
    61    #echo $auxdir" @ "`date`
    6253
    6354   # check if aux files are available from that night
    … …  
    130121      fi
    131122      # assuming that at least TSTARTI and TSTOPI are consistent
    132       #echo $rawfile
    133       #echo $tstarti
    134       #echo $tstopi
    135       #echo $tstartf
    136       #echo $tstopf
    137123      if [ $tstarti -gt 30000 ]
    138124      then
    … …  
    190176      query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum
    191177     
    192       #echo $query
    193178      # send query to DB
    194179      sendquery >/dev/null

  • trunk/DataCheck/Processing/FillEffectiveOn.sh

    r17907 r18321  
    2828if [ "$certaindate" != "" ]
    2929then
    30    checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'`
    31    if [ "$checkstring" = "" ]
    32    then
    33       echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)"
    34       finish
    35    fi
    3630   getdates $certaindate
    3731else
    … …  
    5347   auxdir=$auxdata/$date
    5448   runnumber=`echo $date | sed -e 's/\///g'`
    55 #   echo $auxdir" @ "`date`
    5649
    5750   # get file numbers from DB
    … …  
    117110      fi
    118111      # assuming that at least TSTARTI and TSTOPI are consistent
    119       #echo $rawfile
    120       #echo $tstarti
    121       #echo $tstopi
    122       #echo $tstartf
    123       #echo $tstopf
    124112      if [ $tstarti -gt 30000 ]
    125113      then
Note: See TracChangeset for help on using the changeset viewer.