Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 8380)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 8381)
@@ -19,4 +19,16 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/03/21 Stefan Ruegamer
+
+   * datacenter/scripts/runcallisto:
+     - removed entries for callisto_MarApr05.rc (outdated)
+     
+   * datacenter/scripts/makecallistolinks:
+     - updated reason1 because the old reason has been removed in the
+       Mars Version 1.0, resulting in no more calibration with spline
+       if DF fails
+
+
+
  2007/03/20 Daniel Hoehne
 
Index: /trunk/MagicSoft/Mars/datacenter/scripts/makecallistolinks
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/scripts/makecallistolinks	(revision 8380)
+++ /trunk/MagicSoft/Mars/datacenter/scripts/makecallistolinks	(revision 8381)
@@ -51,5 +51,7 @@
 callistorcnew=callisto_Dec04Jan05.rc
 # reason why calibration with standard callisto.rc fails
-reason1="Pulse is too much to the right, cannot go beyond logain limits!"
+#reason1="Pulse is too much to the right, cannot go beyond logain limits!"
+#.* == hi or lo
+reason1="Pulse is too much to the right, out of .*-gain range"
 echo "reason1: "$reason1 >> $scriptlog 2>&1
 
Index: /trunk/MagicSoft/Mars/datacenter/scripts/runcallisto
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 8380)
+++ /trunk/MagicSoft/Mars/datacenter/scripts/runcallisto	(revision 8381)
@@ -70,5 +70,4 @@
 # define callisto.rc files
 callistorcnew=$setuppath/$program/callisto.rc
-callistorcmarapr05=$setuppath/$program/callisto_MarApr05.rc
 # find callisto.rc file
 if [ -e $outpath/callisto.rc ]
@@ -78,10 +77,5 @@
 else
    echo "no $program.rc found in $outpath -> making link " >> $scriptlog 2>&1
-   if [ 49735 -lt $sequence ] && [ $sequence -lt 53516 ]
-   then 
-      ln -vs $callistorcmarapr05 $outpath/callisto.rc >> $scriptlog 2>&1
-   else
-      ln -vs $callistorcnew $outpath/callisto.rc >> $scriptlog 2>&1
-   fi
+   ln -vs $callistorcnew $outpath/callisto.rc >> $scriptlog 2>&1
    callistorcseq=$outpath/callisto.rc
 fi