Index: trunk/DataCheck/QuickLook/Step2a.sh
===================================================================
--- trunk/DataCheck/QuickLook/Step2a.sh	(revision 15382)
+++ trunk/DataCheck/QuickLook/Step2a.sh	(revision 15383)
@@ -26,6 +26,6 @@
 for source in ${sources[@]}
 do 
-   # doing first 5min datasets, i.e. one image file per dataset
-   min=5
+   ## doing first 5min datasets, i.e. one image file per dataset
+   #min=5
    # getting all image files for this source and night
    printprocesslog "INFO get file list for source "$source
@@ -37,9 +37,15 @@
    fi
    # write data set file
-   dspath=$anapath/$source/datasets`printf %03d $min`min/$datepath
+   #dspath=$anapath/$source/datasets`printf %03d $min`min/$datepath
+   dspath=$anapath/$source/datasets_run/$datepath
    makedir $dspath
    for (( i=1 ; i<=${#files[@]} ; i++ ))
    do 
-      dsfile=$dspath/dataset$i.txt
+      night=`basename ${files[$i-1]} | cut -d_ -f1`
+      echo "night: "$night
+      run=`basename ${files[$i-1]} | cut -d_ -f2`
+      echo "run: "$run
+      dsfile=$dspath"/dataset"$night"_"$run".txt"
+      echo $dsfile
       printprocesslog "INFO writing dataset file "$dsfile
       # write dataset only if merpp-log is available to make sure that star-file is complete
@@ -58,4 +64,5 @@
       then
          echo $logfile" "${files[$i-1]}
+         echo "`dirname $0`/RunGanymed.sh $source $dsfile"
          `dirname $0`/RunGanymed.sh $source $dsfile
          numganymeds=`echo " $numganymeds + 1 " | bc -l`
@@ -63,68 +70,70 @@
    done 
    
-   # get list of 5min-dataset-files as starting point
-   printprocesslog "INFO get list of dataset files for "$min"min"
-   files=( `find $dspath -type f -name 'dataset*.txt' | sort` )
-   minold=5
-   # loop over data set files
-   # copy always 2 in one new file for double observation time
-   while [ ${#files[@]} -gt 1 ]
-   do
-      # get double observation time and path for datasets
-      min=`echo " $minold + $minold " | bc -l `
-      dspathold=$dspath
-      dspath=$anapath"/"$source"/datasets"`printf %03d $min`"min/"$datepath
-      makedir $dspath
-      # loop over already existing data set files
-      for (( i=0 ; i<=${#files[@]} ; i++ ))
-      do 
-         # number of 1st and 2nd old dataset file
-         num1=`echo " $i + $i + 1" | bc -l `
-         num2=`echo " $i + $i + 2 " | bc -l `
-         # number of new dataset file
-         dsnum=`echo " $i + 1 " | bc -l `
-         # continue only if 2 dataset files are left
-         if ! [ ${files[$num1]} ]
-         then 
-            break
-         fi
-         ds1=$dspathold"/dataset"$num1".txt"
-         ds2=$dspathold"/dataset"$num2".txt"
-         dsfile=$dspath"/dataset"$dsnum".txt"
-         if ! [ -e $ds1 ] || ! [ -e $ds2 ] 
-         then
-            echo $ds1" or "$ds2" is still missing -> continue."
-            continue
-         fi
-         # copy two old into one new dataset file
-         printprocesslog "INFO writing dataset "$dsfile
-         cat $ds1 > $dsfile
-         cat $ds2 >> $dsfile
-         # process only if ganymedlogfiles is not yet there
-         logfile=`echo $dsfile | sed -e 's/datasets/ganymed/' -e 's/dataset//' -e 's/[.]txt/-ganymed[.]log/'`
-         if ! ls $logfile  >/dev/null 2>&1
-         then
-            echo $logfile
-            `dirname $0`/RunGanymed.sh $source $dsfile
-             numganymeds=`echo " $numganymeds + 1 " | bc -l`
-         fi
-      done
-      # get list of new dataset files
-      printprocesslog "INFO get list of dataset files for "$min"min"
-      files=( `find $dspath -type f -name 'dataset*.txt' | sort` )
-      minold=$min
-   done
-   if [ $numganymeds -gt 0 ]
-   then 
-       if ! ps aux | grep Step2b | grep -v grep >/dev/null 2>&1
-       then 
-         `dirname $0`/Step2b.sh &
-       fi
-       if ! ps aux | grep Step3 | grep -v grep >/dev/null 2>&1
-       then 
-         `dirname $0`/Step3.sh min &
-       fi
-      numganymeds=0
-   fi
+#   # get list of 5min-dataset-files as starting point
+#   printprocesslog "INFO get list of dataset files for "$min"min"
+#   files=( `find $dspath -type f -name 'dataset*.txt' | sort` )
+#   minold=5
+#   # loop over data set files
+#   # copy always 2 in one new file for double observation time
+#   while [ ${#files[@]} -gt 1 ]
+#   do
+#      # get double observation time and path for datasets
+#      min=`echo " $minold + $minold " | bc -l `
+#      dspathold=$dspath
+#      dspath=$anapath"/"$source"/datasets"`printf %03d $min`"min/"$datepath
+#      makedir $dspath
+#      # loop over already existing data set files
+#      for (( i=0 ; i<=${#files[@]} ; i++ ))
+#      do
+#         # number of 1st and 2nd old dataset file
+#         num1=`echo " $i + $i + 1" | bc -l `
+#         num2=`echo " $i + $i + 2 " | bc -l `
+#         # number of new dataset file
+#         dsnum=`echo " $i + 1 " | bc -l `
+#         # continue only if 2 dataset files are left
+#         if ! [ ${files[$num1]} ]
+#         then
+#            break
+#         fi
+#         ds1=$dspathold"/dataset"$num1".txt"
+#         ds2=$dspathold"/dataset"$num2".txt"
+#         dsfile=$dspath"/dataset"$dsnum".txt"
+#         if ! [ -e $ds1 ] || ! [ -e $ds2 ]
+#         then
+#            echo $ds1" or "$ds2" is still missing -> continue."
+#            continue
+#         fi
+#         # copy two old into one new dataset file
+#         printprocesslog "INFO writing dataset "$dsfile
+#         cat $ds1 > $dsfile
+#         cat $ds2 >> $dsfile
+#         # process only if ganymedlogfiles is not yet there
+#         logfile=`echo $dsfile | sed -e 's/datasets/ganymed/' -e 's/dataset//' -e 's/[.]txt/-ganymed[.]log/'`
+#         if ! ls $logfile  >/dev/null 2>&1
+#         then
+#            echo $logfile
+#            `dirname $0`/RunGanymed.sh $source $dsfile
+#             numganymeds=`echo " $numganymeds + 1 " | bc -l`
+#         fi
+#      done
+#      # get list of new dataset files
+#      printprocesslog "INFO get list of dataset files for "$min"min"
+#      files=( `find $dspath -type f -name 'dataset*.txt' | sort` )
+#      minold=$min
+#   done
+
+    echo "found "$numganymeds" ganymeds."
+#   if [ $numganymeds -gt 0 ]
+#   then 
+#       if ! ps aux | grep Step2b | grep -v grep >/dev/null 2>&1
+#       then 
+#         `dirname $0`/Step2b.sh &
+#       fi
+#       if ! ps aux | grep Step3 | grep -v grep >/dev/null 2>&1
+#       then 
+#         `dirname $0`/Step3.sh min &
+#       fi
+#      numganymeds=0
+#   fi
 done