Changeset 18092 for trunk/DataCheck

Timestamp:

01/11/15 18:37:04 (10 years ago)

Author:

Daniela Dorner

Message:

fixed bug: runs with timestamp as runnumber are ignored now

Location:

trunk/DataCheck

Files:

• Processing/CheckRawData.sh (modified) (1 diff)
• QuickLook/Step1.sh (modified) (5 diffs)

trunk/DataCheck/Processing/CheckRawData.sh

@@ -78 +78 @@
    printprocesslog "INFO finding files to be checked in $rawdir..."
    #fitsfiles=`ls $rawdir/*.fits 2>/dev/null | sort `
-   fitsfiles=`find $rawdir -type f -regex '.*[.]fits[.]?[g]?[f]?[z]?' 2>/dev/null | sort `
+   fitsfiles=( `find $rawdir -type f -regex '.*20[0-9][0-9][01][0-9][0-3][0-9][_][0-9][0-9][0-9][.]fits[.]?[g]?[f]?[z]?' 2>/dev/null | sort ` )
 
    # loop to check files

trunk/DataCheck/QuickLook/Step1.sh

@@ -96 +96 @@
 
 printprocesslog "INFO get lists of raw files on newdaq and daq"
-files=( `find $rawpathnewdaq -type f -regex '.*[.]fits[.]?[g]?[f]?[z]?' 2>/dev/null | sort` )
+files=( `find $rawpathnewdaq -type f -regex '.*20[0-9][0-9][01][0-9][0-3][0-9][_][0-9][0-9][0-9][.]fits[.]?[g]?[f]?[z]?' 2>/dev/null | sort` )
 # to treat links use:
-#files=( `find -L $rawpathnewdaq -regex '.*[.]fits[.]?[g]?[f]?[z]?' 2>/dev/null | sort` )
+#files=( `find -L $rawpathnewdaq -regex '.*20[0-9][0-9][01][0-9][0-3][0-9][_][0-9][0-9][0-9][.]fits[.]?[g]?[f]?[z]?' 2>/dev/null | sort` )
 
 if [ ${#files[@]} -eq 0 ]
@@ -105 +105 @@
    finish
 fi
-fileslocal=( `find -L $rawpath -type f -regex '.*[.]fits[.]?[g]?[f]?[z]?' 2>/dev/null| sort` )
+fileslocal=( `find -L $rawpath -type f -regex '.*20[0-9][0-9][01][0-9][0-3][0-9][_][0-9][0-9][0-9][.]fits[.]?[g]?[f]?[z]?' 2>/dev/null| sort` )
 callistofiles=( `find $calpath -type f -name $date*-calibration.log 2>/dev/null| sort` )
 # get number of dataruns from DB
@@ -147 +147 @@
 
       source `dirname $0`/../Sourcefile.sh
+
       # check if file is already transferred
       if ! ls $localfile >/dev/null 2>&1 
@@ -359 +360 @@
    # get new file lists
    printprocesslog "INFO get new file lists for "$datepath
-   files=( `find $rawpathnewdaq -type f -regex '.*[.]fits[.]?[g]?[f]?[z]?' | sort` )
-   fileslocal=( `find -L $rawpath -type f -regex '.*[.]fits[.]?[g]?[f]?[z]?' | sort` )
+   files=( `find $rawpathnewdaq -type f -regex '.*20[0-9][0-9][01][0-9][0-3][0-9][_][0-9][0-9][0-9][.]fits[.]?[g]?[f]?[z]?' | sort` )
+   fileslocal=( `find -L $rawpath -type f -regex '.*20[0-9][0-9][01][0-9][0-3][0-9][_][0-9][0-9][0-9][.]fits[.]?[g]?[f]?[z]?' | sort` )
    callistofiles=( `find $calpath -type f -name $date*-calibration.log | sort` )
    #echo "INFO #files-daq:"${#fileslocal[@]}" #files-newdaq:"${#files[@]}" #callisto-logs:"${#callistofiles[@]}" #runs:"$numcalibrated
@@ -372 +373 @@
       sleep 60
       printprocesslog "INFO get new file lists for "$datepath
-      files=( `find $rawpathnewdaq -type f -regex '.*[.]fits[.]?[g]?[f]?[z]?' | sort` )
-      fileslocal=( `find -L $rawpath -type f -regex '.*[.]fits[.]?[g]?[f]?[z]?' | sort` )
+      files=( `find $rawpathnewdaq -type f -regex '.*20[0-9][0-9][01][0-9][0-3][0-9][_][0-9][0-9][0-9][.]fits[.]?[g]?[f]?[z]?' | sort` )
+      fileslocal=( `find -L $rawpath -type f -regex '.*20[0-9][0-9][01][0-9][0-3][0-9][_][0-9][0-9][0-9][.]fits[.]?[g]?[f]?[z]?' | sort` )
       callistofiles=( `find $calpath -type f -name $date*-calibration.log | sort` )
    fi