Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 9412)
+++ trunk/MagicSoft/Mars/Changelog	(revision 9413)
@@ -18,4 +18,18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2009/03/30 Thomas Bretz
+
+   * manalysis/MMcCalibrationUpdate.cc:
+     - fixed a conditional which prevented the display from
+       correctly process raw data
+
+   * mgeom/MGeomCamSquare.cc:
+     - shifted pixels to be centered around 0
+
+   * msimcamera/MSimCamera.cc:
+     - added an additional sanity check
+
+
+
  2009/03/27 Stefan Ruegamer
 
@@ -27,5 +41,5 @@
  2009/03/24 Stefan Ruegamer
 
-   * mhflux/MHalpha.cc
+   * mhflux/MHAlpha.cc
      - changed in DrawAll the line color of on-off to blue
 
@@ -45,4 +59,9 @@
    * mhbase/MH.cc:
      - included TProfile2D for newer root versions
+
+   * mjobs/MJCalibrateSignal.cc:
+     - made the copy of "OriginalMC" optional. Now it also works
+       for non-ceres (original MMCS) files again which don't 
+       have this tree.
 
 
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 9412)
+++ trunk/MagicSoft/Mars/NEWS	(revision 9413)
@@ -8,4 +8,9 @@
      canvases) found in the file are drawn. Note that this may result
      in empty tabs.
+
+ ;callisto:
+
+   * Fixed a bug which prevented MAGIC Monte Carlo file from being
+     calibrated (ceres files worked)
 
  ;ganymed:
Index: trunk/MagicSoft/Mars/msimcamera/MSimCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/msimcamera/MSimCamera.cc	(revision 9412)
+++ trunk/MagicSoft/Mars/msimcamera/MSimCamera.cc	(revision 9413)
@@ -210,4 +210,12 @@
     const UInt_t npix = fStat->GetMaxIndex()+1;
 
+    if (npix>(UInt_t)fElectronicNoise->GetSize())
+    {
+        *fLog << err << "ERROR - More indices (" << npix << ") ";
+        *fLog << "assigned than existing in camera (";
+        *fLog << fElectronicNoise->GetSize() << ")!" << endl;
+        return kERROR;
+    }
+
     const Double_t pl = fSpline->GetXmin()*freq;
     const Double_t pr = fSpline->GetXmax()*freq;