Changeset 19399

Timestamp:

11/15/18 13:24:06 (6 years ago)

Author:

Daniela Dorner

Message:

improved logging, added ignore-option for filling events

Location:

trunk/DataCheck/Processing

Files:

• CalcSource.sh (modified) (1 diff)
• FillEvents.sh (modified) (1 diff)

trunk/DataCheck/Processing/CalcSource.sh

@@ -65 +65 @@
    then
       printprocesslog "INFO "$numchanged" rows were changed in DB => "$night"_"$runid" is already processed => continue."
-      echo "continue"
       continue
    fi
 
+   # get file-id 
    query="SELECT FileID FROM CalcSourceStatus WHERE fNight="$night" AND fRunID="$runid
    fileid=`sendquery`
-   echo "INFO calculating source position for "$fileid
+   #echo "INFO calculating source position for "$fileid
    printprocesslog "INFO calculating source position for "$fileid
    echo "INFO filling star events for "$fileid >> $logfile

trunk/DataCheck/Processing/FillEvents.sh

@@ -66 +66 @@
    then
       printprocesslog "INFO "$numchanged" rows were changed in DB => "$night"_"$runid" is already processed => continue."
-      echo "continue"
       continue
    fi
-
    
-   echo "INFO filling star events for "$night"_"$runid
+   # get file id and star-file name
+   #echo "INFO filling star events for "$night"_"$runid
    printprocesslog "INFO filling star events for "$night"_"$runid
    echo "INFO filling star events for "$night"_"$runid >> $logfile
    night2=`echo $night | cut -c 1-4`/`echo $night | cut -c 5-6`/`echo $night | cut -c 7-8`
    starfile=$datapath/star/$night2/$night"_"`printf %03d $runid`"_I.root"
+
+   # some runs have problems, e.g. double event numbers
+   #  these have an ignore-errors flag set in the DB
+   ignoreoption=""
+   query="SELECT fIgnoreErrors FROM StarEventsFilledStatus WHERE fNight="$night" AND fRunID="$runid
+   ignore=`sendquery`
+   if [ $ignore -eq 1 ]
+   then 
+      ignoreoption="--ignore-errors"
+   fi
    
    # fill star files to DB
    printprocesslog  "INFO /swdev_nfs/FACT++.r19188-bin/root2sql -C $starrc $starfile"
-   /swdev_nfs/FACT++.r19188-bin/root2sql -C $starrc $starfile >> $logfile 2>&1
+   /swdev_nfs/FACT++.r19188-bin/root2sql -C $starrc $ignoreoption $starfile >> $logfile 2>&1
    check1=$?
    case $check1 in