Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 9472)
+++ trunk/MagicSoft/Mars/Changelog	(revision 9473)
@@ -18,4 +18,24 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2009/07/02 Thomas Bretz
+
+   * manalysis/MGeomApply.cc:
+     - cosmetics to a comment
+
+   * melectronics/ElectronicsLinkDef.h, melectronics/Makefile:
+     - removed MPulseShape
+
+   * mhbase/MHMatrix.cc:
+     - improved memeory managment when matrix size is growing
+
+   * mjobs/MJCalibrateSignal.cc:
+     - added MCorsikaRunHeader and MCorsikaEvtHeader to output
+       for completeness
+
+   * mjobs/MJCalibration.cc:
+     - improved the filter for the trigger pattern
+
+
 
  2009/07/01 Thomas Bretz
Index: trunk/MagicSoft/Mars/manalysis/MGeomApply.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MGeomApply.cc	(revision 9472)
+++ trunk/MagicSoft/Mars/manalysis/MGeomApply.cc	(revision 9473)
@@ -204,5 +204,5 @@
     }
 
-    // FIXME, workaround: this call to CalcPixRatio is here just to allow
+    // FIXME (workaround): this call to CalcPixRatio is here just to allow
     // the use of some MC camera files from the 0.7 beta version in which the 
     // array containing pixel ratios is not initialized.
Index: trunk/MagicSoft/Mars/melectronics/ElectronicsLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/melectronics/ElectronicsLinkDef.h	(revision 9472)
+++ trunk/MagicSoft/Mars/melectronics/ElectronicsLinkDef.h	(revision 9473)
@@ -6,5 +6,4 @@
 
 #pragma link C++ class APD+;
-#pragma link C++ class MPulseShape+;
 #pragma link C++ class MAnalogSignal+;
 #pragma link C++ class MDigitalSignal+;
Index: trunk/MagicSoft/Mars/melectronics/Makefile
===================================================================
--- trunk/MagicSoft/Mars/melectronics/Makefile	(revision 9472)
+++ trunk/MagicSoft/Mars/melectronics/Makefile	(revision 9473)
@@ -24,6 +24,5 @@
            MAnalogSignal.cc \
            MAnalogChannels.cc \
-	   MDigitalSignal.cc  \
-	   MPulseShape.cc
+	   MDigitalSignal.cc
 
 ############################################################
Index: trunk/MagicSoft/Mars/mhbase/MHMatrix.cc
===================================================================
--- trunk/MagicSoft/Mars/mhbase/MHMatrix.cc	(revision 9472)
+++ trunk/MagicSoft/Mars/mhbase/MHMatrix.cc	(revision 9473)
@@ -255,5 +255,8 @@
     TMatrix m(fM);
 #endif
-    fM.ResizeTo(fM.GetNrows()*2, fData->GetNumEntries());
+
+    // If we exceed ~50MB of memory we start growing slower
+    const Int_t n = fM.GetNrows()>10000000/fM.GetNcols() ? TMath::Nint(fM.GetNrows()*1.2) : fM.GetNrows()*2;
+    fM.ResizeTo(n, fData->GetNumEntries());
 
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,05,07)
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 9472)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 9473)
@@ -725,7 +725,9 @@
     write.AddContainer("MMcConfigRunHeader",        "RunHeaders", kFALSE);
     write.AddContainer("MMcCorsikaRunHeader",       "RunHeaders", kFALSE);
+    write.AddContainer("MCorsikaRunHeader",         "RunHeaders", kFALSE);
     // Monte Carlo
     write.AddContainer("MMcEvt",                    "Events",     kFALSE);
     write.AddContainer("MMcTrig",                   "Events",     kFALSE);
+    write.AddContainer("MCorsikaEvtHeader",         "Events",     kFALSE);
     // Data tree
     write.AddContainer("MSignalCam",                "Events");
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 9472)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 9473)
@@ -1401,9 +1401,17 @@
     MFTriggerPattern          fcalib("CalibFilter");
     fcalib.SetDefault(kFALSE);
-    fcalib.DenyCalibration(MFTriggerPattern::kPrescaled);
-    fcalib.DenyAll();
-    fcalib.AllowCalibration();
-
-    MContinue                 ccalib(&fcalib,"ContTrigPattern");
+    fcalib.AllowAll(MFTriggerPattern::kPrescaled);
+    fcalib.AllowAll(MFTriggerPattern::kUnPrescaled);
+    fcalib.DenyTriggerLvl1(MFTriggerPattern::kUnPrescaled);
+    fcalib.DenyTriggerLvl1(MFTriggerPattern::kPrescaled);
+    fcalib.DenyTriggerLvl2(MFTriggerPattern::kUnPrescaled);
+    fcalib.DenyTriggerLvl2(MFTriggerPattern::kPrescaled);
+    fcalib.DenySumTrigger(MFTriggerPattern::kUnPrescaled);
+    fcalib.DenySumTrigger(MFTriggerPattern::kPrescaled);
+    fcalib.RequireCalibration(MFTriggerPattern::kPrescaled);
+    fcalib.RequireCalibration(MFTriggerPattern::kUnPrescaled);
+
+    MContinue                 ccalib(&fcalib, "ContTrigPattern");
+    ccalib.SetInverted();
 
     MCalibrationPatternDecode decode;