Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4754)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4755)
@@ -19,4 +19,17 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/08/27: 
+
+   * mjobs/MJCalibration.h
+     - re-added function SetInput which had been removed recently 
+       (probably by accident)
+
+   * mjobs/MJCalibration.cc
+     - return kTRUE in function FindColor() if the colour has already 
+       been set (e.g. by the macro).
+
+   
+
+
  2004/08/27: Thomas Bretz
 
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 4754)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 4755)
@@ -1119,4 +1119,7 @@
 Bool_t MJCalibration::FindColor() 
 {
+    if (fColor != MCalibrationCam::kNONE)
+      return kTRUE;
+
     if (fSequence.IsValid())
     {