Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5692)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5693)
@@ -32,2 +32,55 @@
      mhft/Makefile:
      - added
+
+   * Makefile:
+     - mhft added
+
+   * mbase/MParContainer.cc, mbase/MLog.cc:
+     - added a pre-compiler option for destructor debugging
+
+   * mbase/MTaskList.[h,cc]:
+     - added new function Replace
+
+   * mdata/MDataChain.cc, mfbase/MF.cc:
+     - shortened some output
+
+   * mdata/MDataArray.[h,cc]:
+     - added new function FindRule
+
+   * mfileio/MReadTree.[h,cc]:
+     - enhanced functionality to be able to read a TTree stored in memory
+       instead of a file. Therefor introduced fTree which is now the pointer
+       used and replaced fChain where TTree and TChain have common behaviour.
+       Where they behave uncommon new code for the new case has been added.
+
+   * mfileio/MWriteRootFile.[h,cc]:
+     - enhanced functionality to be able to write a TTree into memory
+       instead of a file. This were maily bugfixes for the case fOut==0, which
+       must be handled correctly. Becarefull a tree filles without a file
+       is not deleted automatically!
+    
+   * mhbase/MBinning.h:
+     - added copy constructor
+     - fixed buggy SetEdges(MBinning&) which didn't work
+
+   * mhbase/MHMatrix.cc:
+     - when adding a new rule check first if the same rule already exists
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - added new functionality to support on-off analysis
+     - didn't touch existing code
+
+   * mhflux/MHAlpha.[h,cc]:
+     - added new functionality to support on-off analysis
+     - replaced Fit() calls by newer function calls
+     - added DrawAll - PRELIMINARY
+     - fixed a bug when projecting - may be the reson for some strange
+       crashes
+
+   * mcalib/MCalibColorSet.cc:
+     - fixed a stupid bug introduced last year, which caused MCalibColorSet
+       in some circumstances to stop the eventloop when it shouldn't
+
+   * mjobs/MSequence.cc:
+     - expand path names
+ 
Index: trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc	(revision 5692)
+++ trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc	(revision 5693)
@@ -420,5 +420,10 @@
               return kTRUE;
           }
-
+  }
+  else
+      *fLog << inf << "Color and Intensity determined from project-name (" << proj << ")... ";
+
+  if (color == kNONE)
+  {
       *fLog << err;
       *fLog << "Sorry, calibration run " << num << " was taken before the events could be" << endl;
@@ -427,6 +432,4 @@
       return kFALSE;
   }
-
-  *fLog << inf << "Color and Intensity determined from project-name (" << proj << ")... ";
 
   switch (color)