Index: trunk/DataCheck/Transfer/CheckTransfer.sh
===================================================================
--- trunk/DataCheck/Transfer/CheckTransfer.sh	(revision 13154)
+++ trunk/DataCheck/Transfer/CheckTransfer.sh	(revision 13171)
@@ -1,5 +1,5 @@
 #!/bin/bash
 #
-# This script checks whether data can be transferred
+# This script checks whether data can be deleted
 #
 
@@ -14,4 +14,6 @@
         `date +%Y/%m/%d --date="-72hour"` `date +%Y/%m/%d --date="-48hour"` `date +%Y/%m/%d --date="-24hour"` \
         )
+
+dates=( "2012/03/12" )
 
 numdaysok=0
@@ -42,5 +44,5 @@
    lpziprawpath="/loc_data/zipraw/"$date
    localrawpath="/scratch/from_lapalma/raw/"$date
-   localrawpath2="/data00/fact-construction/raw/"$date
+   #localrawpath2="/data00/fact-construction/raw/"$date
    localrawpath3="/fact/raw/"$date
    localfailpath="/archive/fact/fails/raw/"$date
@@ -57,5 +59,5 @@
    zip=( `ssh fact@161.72.93.131 "if [ -d $lpziprawpath ]; then ls $lpziprawpath/* | wc -l; du -s -b --apparent-size $lpziprawpath; else echo '-1 -1 -1'; fi"` )
    dl00=( `if [ -d $localrawpath ]; then ls $localrawpath/* | wc -l; du -s -b --apparent-size $localrawpath; else echo '-1 -1 -1'; fi` )
-   data00=( `if [ -d $localrawpath2 ]; then ls $localrawpath2/* | wc -l; du -s -b --apparent-size $localrawpath2; else echo '-1 -1 -1'; fi` )
+   #data00=( `if [ -d $localrawpath2 ]; then ls $localrawpath2/* | wc -l; du -s -b --apparent-size $localrawpath2; else echo '-1 -1 -1'; fi` )
    archive=( `if [ -d $localrawpath3 ]; then ls $localrawpath3/* | wc -l; du -s -b --apparent-size $localrawpath3; else echo '-1 -1 -1'; fi` )
    fails=( `if [ -d $localfailpath ]; then ls $localfailpath/* | wc -l; du -s -b --apparent-size $localfailpath; else echo '-1 -1 -1'; fi` )
@@ -91,10 +93,10 @@
    echo "  data    "${data[@]}
    echo "  zip     "${zip[@]}
-   if [ $date2 -gt 20120307 ]
-   then 
+   #if [ $date2 -gt 20120307 ]
+   #then 
       echo "  dl00    "${dl00[@]}
-   else
-      echo "  data00  "${data00[@]}
-   fi
+   #else
+   #   echo "  data00  "${data00[@]}
+   #fi
    echo "  arch    "${archive[@]}
    echo "  fail    "${fails[@]}
@@ -105,13 +107,13 @@
    echo "  wue     "$numwue
    
-   # check if file are available in the differen places
+   # check if file are available in the different places
    if [ ${dl00[0]} -eq -1 ] && [ $date2 -lt 20120308 ] 
    then
       echo "INFO data not available on /scratch on dl00 for "$date
    fi
-   if [ ${data00[0]} -eq -1 ] && [ $date2 -gt 20120307 ]
-   then
-      echo "INFO data not available on /data00 for "$date
-   fi
+   #if [ ${data00[0]} -eq -1 ] && [ $date2 -gt 20120307 ]
+   #then
+   #   echo "INFO data not available on /data00 for "$date
+   #fi
    if [ ${archive[0]} -eq -1 ] 
    then
@@ -130,5 +132,5 @@
          if ! [ $sum -eq ${daq[0]} ]
          then
-            echo "ERROR number of files in archive ("$sum") wrong."
+            echo "ERROR number of files in archive ("$sum") is different from number of files in La Palma ("${daq[0]}")."
             numpb=`echo " $numpb + 1 " | bc -l `
             result="1"
@@ -137,4 +139,6 @@
             result="0"
          fi
+      else
+         result="1"
       fi
    else
@@ -162,9 +166,9 @@
       result=$result"0"
    fi
-   # /data00 (to be removed later)
-   if ! [ ${data00[0]} -eq -1 ]  && ! [ ${data00[0]} -eq ${daq[0]} ]
-   then
-      echo "WARN number of files in /data00 (" ${data00[0]}") does not agree with number of files in LP (" ${daq[0]}") for "$date
-   fi
+   ## /data00 (to be removed later)
+   #if ! [ ${data00[0]} -eq -1 ]  && ! [ ${data00[0]} -eq ${daq[0]} ]
+   #then
+   #   echo "WARN number of files in /data00 (" ${data00[0]}") does not agree with number of files in LP (" ${daq[0]}") for "$date
+   #fi
    # wue
    if ! [ ${wue[0]} -eq -1 ]  && ! [ ${wue[0]} -eq ${daq[0]} ]
@@ -209,13 +213,13 @@
       result=$result"0"
    fi
-   # data00 (to be removed later)
-   if ! [ ${zip[1]} -eq ${data00[1]} ] && [ $date2 -lt 20120308 ]
-   then
-      echo "WARN size of data doesn't agree on data ("${zip[1]}") and /data00 ("${data00[1]}") for "$date
-      if ! [ ${data00[1]} -eq -1 ]
-      then 
-         numdiff=`echo " $numdiff + 1 " | bc -l `
-      fi
-   fi
+   ## data00 (to be removed later)
+   #if ! [ ${zip[1]} -eq ${data00[1]} ] && [ $date2 -lt 20120308 ]
+   #then
+   #   echo "WARN size of data doesn't agree on data ("${zip[1]}") and /data00 ("${data00[1]}") for "$date
+   #   if ! [ ${data00[1]} -eq -1 ]
+   #   then 
+   #      numdiff=`echo " $numdiff + 1 " | bc -l `
+   #   fi
+   #fi
    # archive
    if ! [ ${zip[1]} -eq ${archive[1]} ]
@@ -280,5 +284,5 @@
       if ! [ $numruns -eq $numisdc ]
       then
-         echo "WARN number of rsynced in archive ("$numrsynced") not equal to number of runs ("$numruns")"
+         echo "WARN number of ingested files in archive ("$numisdc") not equal to number of runs ("$numruns")"
          numpb=`echo " $numpb + 1 " | bc -l `
          result=$result"1"
@@ -305,5 +309,5 @@
    then
       query="SELECT fRunID FROM RunInfo WHERE fNight="$date2
-      runs=`sendquery`
+      runs=( `sendquery` )
       archivediffcounter=0
       archiveokcounter=0
@@ -314,4 +318,5 @@
       datadiffcounter=0
       dataokcounter=0
+      echo "INFO found "${#runs[@]}" rawfiles in DB."
       for run in ${runs[@]}
       do 
@@ -327,11 +332,15 @@
             sizedl00=( `ls -l $localrawpath/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
          fi
-         if ! [ ${data00[1]} -eq -1 ]
-         then
-            sizedata00=( `ls -l $localrawpath2/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
-         fi
+         #if ! [ ${data00[1]} -eq -1 ]
+         #then
+         #   sizedata00=( `ls -l $localrawpath2/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
+         #fi
          if ! [ ${archive[1]} -eq -1 ]
          then
             sizearchive=( `ls -l $localrawpath3/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
+         fi
+         if ! [ ${fails[1]} -eq -1 ]
+         then
+            sizefails=( `ls -l $localfailpath/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
          fi
          if ! [ ${wue[1]} -eq -1 ]
@@ -357,17 +366,31 @@
             dl00okcounter=`echo " $dl00okcounter + 1 " | bc -l `
          fi
-         # data00
-         if ! [ "$sizezip" = "$sizedata00" ] && ! [ ${data00[1]} -eq -1 ]
-         then
-            echo "  "$rawfile2" data("$sizezip") data00("$sizedata00")"
-         fi
+         ## data00
+         #if ! [ "$sizezip" = "$sizedata00" ] && ! [ ${data00[1]} -eq -1 ]
+         #then
+         #   echo "  "$rawfile2" data("$sizezip") data00("$sizedata00")"
+         #fi
          # archive
-         if ! [ "$sizezip" = "$sizearchive" ] && ! [ ${archive[1]} -eq -1 ]
-         then
-            echo "  "$rawfile2" data("$sizezip") archive("$sizearchive")"
-            archivediffcounter=`echo " $archivediffcounter + 1 " | bc -l `
+         if [  "$sizezip" != "$sizearchive"  -a  ${archive[1]} -ne -1 ] || [  "$sizezip" != "$sizefails" -a ${fails[1]} -ne -1  ]
+         #if ! [ "$sizezip" = "$sizearchive" ] && ! [ ${archive[1]} -eq -1 ]
+         then
+            #echo "  --"$rawfile2" data("$sizezip") archive("$sizearchive"/"$sizefails")"
+            #if ! [ "$sizezip" = "$sizefails" ] && ! [ ${fails[1]} -eq -1 ]
+            #then
+               echo "  "$rawfile2" data("$sizezip") archive("$sizearchive"/"$sizefails")"
+               archivediffcounter=`echo " $archivediffcounter + 1 " | bc -l `
+            #else
+            #   archiveokcounter=`echo " $archiveokcounter + 1 " | bc -l `
+            #fi
          else
             archiveokcounter=`echo " $archiveokcounter + 1 " | bc -l `
          fi
+         #if ! [ "$sizezip" = "" ] && ! [ "$sizearchive" = "" ] && ! [ ${archive[1]} -eq -1 ]
+         #then
+         #   if [ $sizezip -gt $sizearchive ] 
+         #   then
+         #      echo "ERROR "$rawfile" smaller in archive ("$sizearchive") than on data ("$sizezip")"
+         #   fi
+         #fi
          # wue
          if ! [ "$sizezip" = "$sizewue" ] && ! [ ${wue[1]} -eq -1 ]
@@ -380,5 +403,6 @@
       done
       query="SELECT fRunID FROM RunInfo WHERE fNight="$date2" AND fHasDrsFile=1"
-      drsruns=`sendquery`
+      drsruns=( `sendquery` )
+      echo "INFO found "${#drsruns[@]}" drsfiles in DB."
       for drsrun in ${drsruns[@]}
       do 
@@ -393,11 +417,15 @@
             sizedl00=( `ls -l $localrawpath/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
          fi
-         if ! [ ${data00[1]} -eq -1 ]
-         then
-            sizedata00=( `ls -l $localrawpath2/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
-         fi
+         #if ! [ ${data00[1]} -eq -1 ]
+         #then
+         #   sizedata00=( `ls -l $localrawpath2/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
+         #fi
          if ! [ ${archive[1]} -eq -1 ]
          then
             sizearchive=( `ls -l $localrawpath3/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
+         fi
+         if ! [ ${fails[1]} -eq -1 ]
+         then
+            sizefails=( `ls -l $localfailpath/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
          fi
          if ! [ ${wue[1]} -eq -1 ]
@@ -423,14 +451,21 @@
             dl00okcounter=`echo " $dl00okcounter + 1 " | bc -l `
          fi
-         # data00
-         if ! [ "$sizezip" = "$sizedata00" ] && ! [ ${data00[1]} -eq -1 ]
-         then
-            echo "  "$rawfile2" data("$sizezip") data00("$sizedata00")"
-         fi
+         ## data00
+         #if ! [ "$sizezip" = "$sizedata00" ] && ! [ ${data00[1]} -eq -1 ]
+         #then
+         #   echo "  "$rawfile2" data("$sizezip") data00("$sizedata00")"
+         #fi
          # archive
-         if ! [ "$sizezip" = "$sizearchive" ] && ! [ ${archive[1]} -eq -1 ]
-         then
-            echo "  "$rawfile2" data("$sizezip") archive("$sizearchive")"
-            archivediffcounter=`echo " $archivediffcounter + 1 " | bc -l `
+         #if [ ! [ "$sizezip" = "$sizearchive" ] && ! [ ${archive[1]} -eq -1 ] ] || [ ! [ "$sizezip" = "$sizefails" ] && ! [ ${fails[1]} -eq -1 ] ]
+         if [  "$sizezip" != "$sizearchive"  -a  ${archive[1]} -ne -1 ] || [  "$sizezip" != "$sizefails" -a ${fails[1]} -ne -1  ]
+         then
+            #echo "  --"$rawfile2" data("$sizezip") archive("$sizearchive"/"$sizefails")"
+            #if
+            #then
+               echo "  "$rawfile2" data("$sizezip") archive("$sizearchive"/"$sizefails")"
+               archivediffcounter=`echo " $archivediffcounter + 1 " | bc -l `
+            #else
+            #   archiveokcounter=`echo " $archiveokcounter + 1 " | bc -l `
+            #fi
          else
             archiveokcounter=`echo " $archiveokcounter + 1 " | bc -l `
@@ -447,52 +482,54 @@
       
       result=$result"-"
-      echo "Wue:  ok: "$wueokcounter" diff: "$wuediffcounter
-      echo "Arch: ok: "$archiveokcounter" diff: "$archivediffcounter
+      #echo "Wue:  ok: "$wueokcounter" diff: "$wuediffcounter
+      #echo "Arch: ok: "$archiveokcounter" diff: "$archivediffcounter
       # raw files
+      echo "INFO "$dataokcounter" files are ok on data (raw)."
+      echo "WARN "$datadiffcounter" files have a different size on data (raw)."
       if [ $dataokcounter -eq ${data[0]} ]
       then
          numok=`echo " $numok + 1 " | bc -l `
          result=$result"0"
-         echo "INFO "$dataokcounter" files are ok on data (raw)."
-      else
-         result=$result"1"
-         numpb=`echo " $numpb + 1 " | bc -l `
-         echo "WARN "$datadiffcounter" files have a different size on data (raw)."
+      else
+         result=$result"1"
+         numpb=`echo " $numpb + 1 " | bc -l `
       fi
       # zipped files
       # dl00
+      echo "INFO "$dl00okcounter" files are ok on dl00."
+      echo "WARN "$dl00diffcounter" files have a different size on dl00."
       if [ $dl00okcounter -eq ${dl00[0]} ]
       then
          result=$result"0"
          numok=`echo " $numok + 1 " | bc -l `
-         echo "INFO "$dl00okcounter" files are ok on dl00."
-      else
-         result=$result"1"
-         numpb=`echo " $numpb + 1 " | bc -l `
-         echo "WARN "$dl00diffcounter" files have a different size on dl00."
+      else
+         result=$result"1"
+         numpb=`echo " $numpb + 1 " | bc -l `
       fi
       # archive
+      echo "INFO "$archiveokcounter" files are ok in the archive."
+      echo "WARN "$archivediffcounter" files have a different size in the archive."
       if [ $archiveokcounter -eq ${daq[0]} ]
       then
          result=$result"0"
          numok=`echo " $numok + 1 " | bc -l `
-         echo "INFO "$archiveokcounter" files are ok in the archive."
-      else
-         result=$result"1"
-         numpb=`echo " $numpb + 1 " | bc -l `
-         echo "WARN "$archivediffcounter" files have a different size in the archive."
+      else
+         result=$result"1"
+         numpb=`echo " $numpb + 1 " | bc -l `
       fi
       # wue
+      echo "INFO "$wueokcounter" files are ok in Wue."
+      echo "WARN "$wuediffcounter" files have a different size in Wue."
       if [ $wueokcounter -eq ${wue[0]} ]
       then
          result=$result"0"
          numok=`echo " $numok + 1 " | bc -l `
-         echo "INFO "$wueokcounter" files are ok in Wue."
-      else
-         result=$result"1"
-         numpb=`echo " $numpb + 1 " | bc -l `
-         echo "WARN "$wuediffcounter" files have a different size in Wue."
-      fi
-   fi
+      else
+         result=$result"1"
+         numpb=`echo " $numpb + 1 " | bc -l `
+      fi
+   fi
+   
+   # list #drs
    
    # print summary: 
@@ -500,7 +537,8 @@
    echo "INFO numok: "$numok
    echo "INFO numpb: "$numpb
-   echo "result: (#files-dudir-db-filesize)"
-   echo "ldaw-ldaw-ldaw-ldaw"
-   echo $result
+   echo "result:"
+   echo "(#files-dudir-db-filesize)"
+   echo " ldaw-ldaw-ldaw-ldaw"
+   echo " "$result
    #if [ $numpb -eq 0 ]
    if [ $numpb -lt 4 ]