Changeset 17596 for trunk

Timestamp:

03/02/14 12:50:49 (11 years ago)

Author:

Daniela Dorner

Message:

give warning about missing files only when rawdata available

Location:

trunk/DataCheck/Processing

Files:

• FillAuxCurrents.sh (modified) (5 diffs)
• FillAuxThresholds.sh (modified) (3 diffs)
• FillEffectiveOn.sh (modified) (2 diffs)
• FillRatescans.sh (modified) (2 diffs)

trunk/DataCheck/Processing/FillAuxCurrents.sh

@@ -51 +51 @@
    #   continue
    #fi
-
+   
    # check if aux files are available from that night
    if ! [ -d $auxdir ]
@@ -60 +60 @@
       printprocesslog "INFO processing files in "$auxdir
    fi
-   
+
+   rawdir=$rawdata/$date
+   # check if raw files are available from that night
+   if ! [ -d $rawdir ]
+   then
+      logtext="INFO"
+   else
+      logtext="WARN"
+   fi
+
    biasvoltagefile=$auxdir/$runnumber.BIAS_CONTROL_VOLTAGE.fits
    if ! [ -e $biasvoltagefile ]
    then 
-      printprocesslog "WARN "$biasvoltagefile" not found."
+      printprocesslog $logtext" "$biasvoltagefile" not found."
       continue
    else
@@ -77 +86 @@
    if ! [ -e $biascurrentfile ]
    then 
-      printprocesslog "WARN "$biascurrentfile" not found."
+      printprocesslog $logtext" "$biascurrentfile" not found."
       continue
    else
@@ -91 +100 @@
    if ! [ -e $feedbackcalfile ]
    then 
-      printprocesslog "WARN "$feedbackcalfile" not found."
+      printprocesslog $logtext" "$feedbackcalfile" not found."
       continue
    else
@@ -118 +127 @@
    if ! [ -e $calcurrentsfile ]
    then 
-      printprocesslog "WARN "$calcurrentsfile" not found."
+      printprocesslog $logtext" "$calcurrentsfile" not found."
       continue
    else

trunk/DataCheck/Processing/FillAuxThresholds.sh

@@ -59 +59 @@
    fi
    
+   rawdir=$rawdata/$date
+   # check if raw files are available from that night
+   if ! [ -d $rawdir ]
+   then
+      logtext="INFO"
+   else
+      logtext="WARN"
+   fi
+
    thresholdfile=$auxdir/$runnumber.RATE_CONTROL_THRESHOLD.fits
    printprocesslog "INFO processing "$thresholdfile
@@ -64 +73 @@
    if ! [ -e $thresholdfile ]
    then 
-      printprocesslog "WARN "$thresholdfile" not found."
+      printprocesslog $logtext" "$thresholdfile" not found."
       continue
    else
@@ -78 +87 @@
    if ! [ -e $thresholdfile2 ]
    then 
-      printprocesslog "WARN "$thresholdfile2" not found."
+      printprocesslog $logtext" "$thresholdfile2" not found."
       continue
    else

trunk/DataCheck/Processing/FillEffectiveOn.sh

@@ -47 +47 @@
    auxdir=$auxdata/$date
    runnumber=`echo $date | sed -e 's/\///g'`
-   
-#   if [ $runnumber -lt 20130301 ]
-#   then
-#      continue
-#   fi
 #   echo $auxdir" @ "`date` 
 
@@ -63 +58 @@
    fi
    
+   rawdir=$rawdata/$date
+   # check if raw files are available from that night
+   if ! [ -d $rawdir ]
+   then
+      logtext="INFO"
+   else
+      logtext="WARN"
+   fi
+
    ftmcontrolfile=$auxdir/$runnumber.FTM_CONTROL_TRIGGER_RATES.fits
    if ! [ -e $ftmcontrolfile ]
    then 
-      printprocesslog "WARN "$ftmcontrolfile" not found."
+      printprocesslog $logtext" "$ftmcontrolfile" not found."
       continue
    else

trunk/DataCheck/Processing/FillRatescans.sh

@@ -44 +44 @@
    fi
    
+   rawdir=$rawdata/$date
+   # check if raw files are available from that night
+   if ! [ -d $rawdir ]
+   then
+      logtext="INFO"
+   else
+      logtext="WARN"
+   fi
+
    ratescanfile=$auxdir/$runnumber.RATE_SCAN_DATA.fits
    printprocesslog "INFO processing "$ratescanfile
@@ -49 +58 @@
    if ! [ -e $ratescanfile ]
    then 
-      printprocesslog "WARN "$ratescanfile" not found."
+      printprocesslog $logtext" "$ratescanfile" not found."
       continue
    else