Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6969)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6970)
@@ -21,4 +21,17 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/04/21 Daniela Dorner
+
+    * datacenter/scripts/runcallisto: 
+      - fixed choice of todofile
+      
+    * datacenter/scripts/copyscript:
+      - adapted some paths
+      
+    * datacenter/macros/filldotrun.C:
+      - added 6 new arehucas versions
+
+
 
  2005/04/21 Thomas Bretz
Index: trunk/MagicSoft/Mars/datacenter/macros/filldotrun.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/filldotrun.C	(revision 6969)
+++ trunk/MagicSoft/Mars/datacenter/macros/filldotrun.C	(revision 6970)
@@ -37,4 +37,5 @@
 //   040518-0, 040727-0,
 //   041113-0, 041209-0, 041221-0
+//   050224-0, 050317-0, 050322-0, 050401-0, 050413-0, 050415-0
 //
 // Usage:
@@ -178,5 +179,6 @@
         && version!=200407270 && version!=200411130 &&
         version!=200412090 && version!=200412210 &&
-        version!=200503220 && version!=200504010)
+        version!=200502240 && version!=200503170 && version!=200503220 &&
+        version!=200504010 && version!=200504130 && version!=200504150)
     {
         cout << filename << ": File Version unknown - please update the macro!" << endl;
@@ -444,5 +446,6 @@
         Int_t calibrationscriptkey=1;
         if (version==200411130 || version==200412090 || version==200412210
-            || version==200503220 || version==200504010)
+            || version==200502240 || version==200503170 || version==200503220
+            || version==200504010 || version==200504130 || version==200504150)
         {
             // ========== Col 19-35: DC and HV-values, mjd =========
Index: trunk/MagicSoft/Mars/datacenter/scripts/copyscript
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/copyscript	(revision 6969)
+++ trunk/MagicSoft/Mars/datacenter/scripts/copyscript	(revision 6970)
@@ -174,5 +174,5 @@
       if grep "$filename: OK" $transdir/.check  >> $scriptlog 2>&1 
       then
-         newfile=`echo $file | sed -e 's/datacenter\/transfer/subsystemdata/' -e 's/ccdata/cc/' -e 's/drivelogs/drive/' -e 's/_/\//1' -e 's/_/\//1' `
+         newfile=`echo $file | sed -e 's/datacenter\/transfer/subsystemdata/' -e 's/ccdata/cc/' -e 's/cacodata/caco/' -e 's/drivelogs/drive/' -e 's/_/\//1' -e 's/_/\//1' `
          echo "file (new path): "$newfile >> $scriptlog 2>&1 
          newpath=`dirname $newfile`
@@ -194,5 +194,5 @@
          then
             echo "found rbk-file $filename"  >> $scriptlog 2>&1 
-            checkfillrbk=`root -q -b $macrospath/filldotrbk.C+\("\"$file\""\,kFALSE\) | tee $copylogpath/filldotrbk-$date-log.txt | grep int | sed -e 's/(int)//'`
+            checkfillrbk=`root -q -b $macrospath/filldotrbk.C+\("\"$file\""\,kFALSE\) | tee $copylogpath/filldotrbk-$filename-log.txt | grep int | sed -e 's/(int)//'`
             case $checkfillrbk in
                1) echo "checkfillrbk=$checkfillrbk -> everything ok " >> $scriptlog 2>&1 
@@ -205,5 +205,5 @@
          then
             echo "found run-file $filename" >> $scriptlog 2>&1 
-            checkfillrun=`root -q -b $macrospath/filldotrun.C+\("\"$file\""\,kFALSE\) | tee $copylogpath/filldotrun-$date-log.txt  | grep int | sed -e 's/(int)//'`
+            checkfillrun=`root -q -b $macrospath/filldotrun.C+\("\"$file\""\,kFALSE\) | tee $copylogpath/filldotrun-$filename-log.txt  | grep int | sed -e 's/(int)//'`
             case $checkfillrun in
                1) echo "checkfillrun=$checkfillrun -> everything ok " >> $scriptlog 2>&1 
@@ -247,4 +247,5 @@
 rm -v $transdir/.check >> $scriptlog 2>&1 
 
+#rsync -av $transdir/ $extern >> $scriptlog 2>&1 
 rsync -av --delete $transdir/ $extern >> $scriptlog 2>&1 
 
Index: trunk/MagicSoft/Mars/datacenter/scripts/runcallisto
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 6969)
+++ trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 6970)
@@ -92,5 +92,5 @@
 
 echo "checking if other todo-files are there" >> $scriptlog 2>&1
-if  ls $todofile-[1-9].txt >> $scriptlog 2>&1
+if  ls $todofile-[1-9]*.txt >> $scriptlog 2>&1
 then 
    echo "other file(s) on disk " >> $scriptlog 2>&1