Index: trunk/MagicSoft/Mars/datacenter/scripts/fillganymed
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillganymed	(revision 7460)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillganymed	(revision 7465)
@@ -37,4 +37,5 @@
 
 user=`whoami`
+program=fillganymed
 source /home/$user/Mars/datacenter/scripts/sourcefile
 
@@ -48,10 +49,10 @@
 
 todofile=$listpath/ToDo-$table-$column.txt
-getstatuslogpath=$logpath/getstatus/fillganymws/$year
-getstatuslog=$getstatuslogpath/getstatus-fillganymed-$datetime.log
+getstatuslogpath=$logpath/getstatus/$program/$year
+getstatuslog=$getstatuslogpath/getstatus-$program-$datetime.log
 
-scriptlogpath=$logpath/run/fillganymed/`date +%Y/%m/%d`
+scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
 makedir $scriptlogpath
-scriptlog=$scriptlogpath/runfillganymed-$datetime.log
+scriptlog=$scriptlogpath/run$program-$datetime.log
 
 date >> $scriptlog 2>&1
@@ -67,5 +68,5 @@
     0)   echo "checklock0=$checklock0 -> continue " >> $scriptlog 2>&1;;
     1)   echo "checklock0=$checklock0 -> file exists " >> $scriptlog 2>&1
-         echo "-> fillganymed is running -> exit" >> $scriptlog 2>&1
+         echo "-> $program is running -> exit" >> $scriptlog 2>&1
          date  >> $scriptlog 2>&1
          exit;;
@@ -78,5 +79,5 @@
 
 case $check0 in 
-    1)   echo "check0=$check0 -> everything ok -> run fillganymed" >> $scriptlog 2>&1;;
+    1)   echo "check0=$check0 -> everything ok -> run $program" >> $scriptlog 2>&1;;
     *)   echo "check0=$check0 -> ERROR -> could not get list -> exit" >> $scriptlog 2>&1
          rm -v $todofile >> $scriptlog 2>&1
@@ -105,23 +106,21 @@
    path="$datapath/ganymed/$no/$no2"
    ganymedfile=$path/ganymed$no2.root
-   fillganymedlogpath=$logpath/fillganymed/$no
-   echo "fillganymedlogpath: "$fillganymedlogpath >> $scriptlog 2>&1
+   fillganymedlogpath=$logpath/$program/$no
+   echo "$programlogpath: "$fillganymedlogpath >> $scriptlog 2>&1
    makedir $fillganymedlogpath >> $scriptlog 2>&1
-   fillganymedlog=$fillganymedlogpath/fillganymed-$dataset.log
+   fillganymedlog=$fillganymedlogpath/$program-$dataset.log
 
-   echo "run fillganymed for dataset $dataset" >> $scriptlog 2>&1
+   echo "run $program for dataset $dataset" >> $scriptlog 2>&1
    check2=`root -q -b $macrospath/fillganymed.C+\("\"$ganymedfile\""\,kFALSE\) | tee $fillganymedlog | grep int | sed -e 's/(int)//'`
    case $check2 in
       1)   echo "check2=$check2 -> everything ok " >> $scriptlog 2>&1
-           echo "-> inserting the status for fillganymed for dataset $dataset into the db" >> $scriptlog 2>&1
-           setstatuslogpath=$logpath/setstatus/fillganymed/$no
-           makedir $setstatuslogpath >> $scriptlog 2>&1
-           setstatuslog=$setstatuslogpath/setstatus-fillganymed-$no2.log
-
-           check4=`root -q -b $macrospath/setstatus.C+\("\"$dataset\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog | grep int | sed -e 's/(int)//'`
-           case $check4 in
-   	     1)   echo "check4=$check4 -> everything ok, status has been set" >> $scriptlog 2>&1;;
-   	     *)   echo "check4=$check4 -> ERROR -> step could not be set" >> $scriptlog 2>&1;;
-           esac
+           echo "-> inserting the status for $program for dataset $dataset into the db" >> $scriptlog 2>&1
+           statustime="Now()"
+           failed="NULL"
+           starttime="NULL"
+           failedtime="NULL"
+           var1=$no
+           var2=$no2
+           setstatus
    	  ;;
       *)  echo "check2=$check2 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1;;