Index: trunk/DataCheck/Transfer/CheckTransfer.sh
===================================================================
--- trunk/DataCheck/Transfer/CheckTransfer.sh	(revision 13802)
+++ trunk/DataCheck/Transfer/CheckTransfer.sh	(revision 13862)
@@ -24,5 +24,5 @@
 numdaysoklimit=3
 sumdata=0
-checklimit=2000
+checklimit=2500
 for date in ${dates[@]}
 do 
@@ -52,5 +52,4 @@
    lpziprawpath="/loc_data/zipraw/"$date
    localrawpath="/scratch/from_lapalma/raw/"$date
-   #localrawpath2="/data00/fact-construction/raw/"$date
    localrawpath3="/fact/raw/"$date
    localfailpath="/archive/fact/fails/raw/"$date
@@ -67,5 +66,4 @@
    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` )
    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` )
@@ -101,13 +99,9 @@
    echo "  data    "${data[@]}
    echo "  zip     "${zip[@]}
-   #if [ $date2 -gt 20120307 ]
-   #then 
-      echo "  dl00    "${dl00[@]}
-   #else
-   #   echo "  data00  "${data00[@]}
-   #fi
+   echo "  dl00    "${dl00[@]}
+   echo "  wue     "${wue[@]}
    echo "  arch    "${archive[@]}
    echo "  fail    "${fails[@]}
-   echo "  wue     "${wue[@]}
+   echo "db: "
    echo "  runinfo "$numruns
    echo "  rsynced "$numrsynced
@@ -120,8 +114,4 @@
       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 [ ${archive[0]} -eq -1 ] 
    then
@@ -174,9 +164,4 @@
       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
    # wue
    if ! [ ${wue[0]} -eq -1 ]  && ! [ ${wue[0]} -eq ${daq[0]} ]
@@ -221,13 +206,4 @@
       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
    # archive
    if ! [ ${zip[1]} -eq ${archive[1]} ]
@@ -341,8 +317,4 @@
             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 ! [ ${archive[1]} -eq -1 ]
          then
@@ -375,31 +347,12 @@
             dl00okcounter=`echo " $dl00okcounter + 1 " | bc -l `
          fi
-         ## data00
-         #if ! [ "$sizezip" = "$sizedata00" ] && ! [ ${data00[1]} -eq -1 ]
-         #then
-         #   echo "  "$rawfile2" data("$sizezip") data00("$sizedata00")"
-         #fi
          # archive
          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
+         then
+            echo "  "$rawfile2" data("$sizezip") archive("$sizearchive"/"$sizefails")"
+            archivediffcounter=`echo " $archivediffcounter + 1 " | bc -l `
          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 ]
@@ -426,8 +379,4 @@
             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 ! [ ${archive[1]} -eq -1 ]
          then
@@ -460,21 +409,8 @@
             dl00okcounter=`echo " $dl00okcounter + 1 " | bc -l `
          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 ] ] || [ ! [ "$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
+            echo "  "$rawfile2" data("$sizezip") archive("$sizearchive"/"$sizefails")"
+            archivediffcounter=`echo " $archivediffcounter + 1 " | bc -l `
          else
             archiveokcounter=`echo " $archiveokcounter + 1 " | bc -l `
@@ -491,9 +427,5 @@
       
       result=$result"-"
-      #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
@@ -506,39 +438,39 @@
       # zipped files
       # dl00
+      if [ $dl00okcounter -eq ${dl00[0]} ]
+      then
+         result=$result"0"
+         numok=`echo " $numok + 1 " | bc -l `
+      else
+         result=$result"1"
+         numpb=`echo " $numpb + 1 " | bc -l `
+      fi
+      # archive
+      if [ $archiveokcounter -eq ${daq[0]} ]
+      then
+         result=$result"0"
+         numok=`echo " $numok + 1 " | bc -l `
+      else
+         result=$result"1"
+         numpb=`echo " $numpb + 1 " | bc -l `
+      fi
+      # wue
+      if [ $wueokcounter -eq ${wue[0]} ]
+      then
+         result=$result"0"
+         numok=`echo " $numok + 1 " | bc -l `
+      else
+         result=$result"1"
+         numpb=`echo " $numpb + 1 " | bc -l `
+      fi
+      echo "INFO "$dataokcounter" files are ok on data (raw)."
       echo "INFO "$dl00okcounter" files are ok on dl00."
+      echo "INFO "$wueokcounter" files are ok in Wue."
+      echo "INFO "$archiveokcounter" files are ok in the archive."
+      echo "WARN "$datadiffcounter" files have a different size on data (raw)."
       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 `
-      else
-         result=$result"1"
-         numpb=`echo " $numpb + 1 " | bc -l `
-      fi
-      # archive
-      echo "INFO "$archiveokcounter" files are ok in the archive."
+      echo "WARN "$wuediffcounter" files have a different size in Wue."
       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 `
-      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 `
-      else
-         result=$result"1"
-         numpb=`echo " $numpb + 1 " | bc -l `
-      fi
-   fi
-   
-   # list #drs
+   fi
    
    # print summary: 
@@ -553,5 +485,4 @@
    sumdata=`echo " $sumdata + $sumdatanew " | bc -l `
    echo "checked alread "$sumdata" GB."$sumdatanew" "${data[1]}" "${zip[1]}
-   #if [ $numpb -eq 0 ]
    if [ $numpb -lt 4 ]
    then