Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7053)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7054)
@@ -21,4 +21,27 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/05/18 Thomas Bretz
+
+   * mcalib/MCalibCalcFromPast.cc:
+     - added missing fIntensQE to list of initialization in
+       constructor
+
+   * mcalib/MCalibrateData.cc:
+     - fixed a bug which caused kNo to be ignored
+     - removed a second check for the size of the badpixelcam
+
+   * mjobs/MJCalibrateSignal.cc:
+     - removed the obsolete second adding of filhil and filpul to
+       the tasklist
+
+   * mjobs/MJCalibration.cc:
+     - do not display result or statistics if no execution has taken
+       place
+
+   * mjobs/MJStar.cc:
+     - moved processing of CC-branch to the beginning of the tasklist
+
+
+
  2005/05/17 Thomas Bretz
  
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 7053)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 7054)
@@ -1976,5 +1976,5 @@
         SetUsePINDiode(kFALSE);
 
-    const Int_t numexec = IsUseRawData() ? rawread.GetNuMExecutions() : read.GetNuMExecutions();
+    const Int_t numexec = IsUseRawData() ? rawread.GetNumExecutions() : read.GetNumExecutions();
     if (numexec>0)
     {
Index: /trunk/MagicSoft/Mars/mjobs/MJStar.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 7053)
+++ /trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 7054)
@@ -433,7 +433,7 @@
     tlist.AddToList(ismc ? (MTask*)&readmc : (MTask*)&readreal);
     tlist.AddToList(&pcalc,  ismc ? "Events" : "Drive");
-    tlist.AddToList(&tlist2, "Events");
     if (!ismc)
         tlist.AddToList(&fillw,  "CC");
+    tlist.AddToList(&tlist2, "Events");
     tlist.AddToList(&write);