Changeset 9473 for trunk

Timestamp:

07/02/09 10:31:39 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MGeomApply.cc (modified) (1 diff)
• melectronics/ElectronicsLinkDef.h (modified) (1 diff)
• melectronics/Makefile (modified) (1 diff)
• mhbase/MHMatrix.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- 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

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -204 +204 @@
     }
 
-    // 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.

trunk/MagicSoft/Mars/melectronics/ElectronicsLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class APD+;
-#pragma link C++ class MPulseShape+;
 #pragma link C++ class MAnalogSignal+;
 #pragma link C++ class MDigitalSignal+;

trunk/MagicSoft/Mars/melectronics/Makefile

@@ -24 +24 @@
            MAnalogSignal.cc \
            MAnalogChannels.cc \
-           MDigitalSignal.cc  \
-           MPulseShape.cc
+           MDigitalSignal.cc
 
 ############################################################

trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

@@ -255 +255 @@
     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)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -725 +725 @@
     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");

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1401 +1401 @@
     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;