Changeset 19563 for trunk/DataCheck

Timestamp:

07/19/19 18:53:55 (5 years ago)

Author:

Daniela Dorner

Message:

allow for # in source names

File:

• trunk/DataCheck/Processing/FillAuxData.sh (modified) (4 diffs)

trunk/DataCheck/Processing/FillAuxData.sh

@@ -75 +75 @@
    if [ "$evaluation" = "" ]
    then
-      if [ $runtypekey -eq 1 ] || [ $runtypekey -eq 18 ] #|| [ $sourcekey -gt 0 ] #doesn't work as sourcekey can be empty
-      then
-         printprocesslog "WARN empty evaluation of statistic ("$@") for run "$date" file "$rawfile
-      else
-         printprocesslog "DEBUG empty evaluation of statistic ("$@") for run "$date" file "$rawfile
-      fi
+      printprocesslog "DEBUG empty evaluation of statistic ("$@") for run "$date" file "$rawfile
+#      if [ $runtypekey -eq 1 ] || [ $runtypekey -eq 18 ] #|| [ $sourcekey -gt 0 ] #doesn't work as sourcekey can be empty
+#      then
+#         printprocesslog "WARN empty evaluation of statistic ("$@") for run "$date" file "$rawfile
+#      else
+#         printprocesslog "DEBUG empty evaluation of statistic ("$@") for run "$date" file "$rawfile
+#      fi
    fi
    min=`echo $evaluation | grep -E -o 'Min:\ [-]?[0-9]+[.]?[0-9]*' | sed -e 's/Min:\ //'`
@@ -121 +122 @@
    if [ "$doupdate" = "no" ]
    then
-      query=$query" AND ISNULL(fRightAscension) "
+      query=$query" AND (ISNULL(fRightAscension) OR (ISNULL(fSourceKey) AND fRunTypeKey=1)) "
    fi
    printprocesslog "DEBUG get filenumbers from DB: QUERY: "$query
@@ -162 +163 @@
       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`
- 
+      if [ "$certaindate" != "" ]
+      then
+         echo  `date`": processing file number "$runnumber"_"`printf %03d $filenum`
+      fi
+      
       # get information from rawfile
       rawfile=`ls $rawdir/$runnumber"_"\`printf %03d $filenum\`.fits* 2>/dev/null`
@@ -224 +228 @@
       if [ -e $sourceposfile ] 
       then 
-         sourcename=`$factpath/fitsdump ${sourceposfile} -c Time -c Name --filter='[1]<'${tstop}' && [1]>'${sourceposfiletstart}  2>/dev/null | tail -1 2>&1 | grep -o -E "['][a-zA-Z0-9\ \.\+\-]+[']" | sed -e "s/'//g"`
+         sourcename=`$factpath/fitsdump ${sourceposfile} -c Time -c Name --filter='[1]<'${tstop}' && [1]>'${sourceposfiletstart}  2>/dev/null | tail -1 2>&1 | grep -o -E "['][a-zA-Z0-9\#\_\ \.\+\-]+[']" | sed -e "s/'//g"`
+         printprocesslog "DEBUG $factpath/fitsdump ${sourceposfile} -c Time -c Name --filter='[1]<'${tstop}' && [1]>'${sourceposfiletstart}  2>/dev/null | tail -1 2>&1 | grep -o -E \"['][a-zA-Z0-9\#\_\ \.\+\-]+[']\" | sed -e \"s/'//g\" "
          if [ "$sourcename" == "" ]
          then