Changeset 2533 for trunk/MagicSoft

Timestamp:

11/19/03 20:38:55 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MPedCalcPedRun.cc (modified) (3 diffs)
• manalysis/MPedCalcPedRun.h (modified) (3 diffs)
• mhist/MHCalibrationConfig.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -2 +2 @@
 to   send  a   Changelog   file  to  a  line  printer  directly.  Thanks.
 
+
                                                  -*-*- END OF LINE -*-*-
+ 2003/11/19: Markus Gaug
+
+   * manalysis/MPedCalcPedRun:
+     - implemented function ReInit
+     - implemented pointer fRunheader
+     - fNumHiGainSamples now called from fRunHeader inside ReInit
+     - Now, fNumHiGainSamples gets right number, instead of inf
+
+   * mhist/MHCalibrationConig:
+     - gkStartQlast changed from 5000 to 10000.
+
  2003/11/18: Thomas Bretz
 

trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc

@@ -43 +43 @@
 #include "MLogManip.h"
 
+#include "MRawRunHeader.h"  
 #include "MRawEvtPixelIter.h"
 #include "MRawEvtData.h"
@@ -77 +78 @@
         return kFALSE;
 
-    fNumHiGainSamples = fRawEvt->GetNumHiGainSamples();
+    return kTRUE;
+}
+
+Bool_t MPedCalcPedRun::ReInit(MParList *pList )   
+{
+
+    fRunheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+    if (!fRunheader)
+        {
+        *fLog << warn << dbginf << 
+                "Warning - cannot check file type, MRawRunHeader not found." << endl;
+        }
+    else
+        if (fRunheader->GetRunType() == kRTMonteCarlo)
+        {
+            return kTRUE;
+        }
+
+    fNumHiGainSamples =  fRunheader->GetNumSamplesHiGain();
 
     return kTRUE;
+
 }
 
@@ -102 +122 @@
 
         pix.Set(higainped, higainrms);
-        //pix.SetPedestalRms(higainpederr, higainrmserr);
+        *fLog << dbg << higainped << " " << higainrms << endl; 
+       //pix.SetPedestalRms(higainpederr, higainrmserr);
     }
 

trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.h

@@ -14 +14 @@
 #endif
 
+class MRawRunHeader;
 class MRawEvtData;
 class MPedestalCam;
@@ -21 +22 @@
     Byte_t fNumHiGainSamples;
 
+    MRawRunHeader *fRunheader; // raw event run header
     MRawEvtData  *fRawEvt;     // raw event data (time slices)
     MPedestalCam *fPedestals;  // Pedestals of all pixels in the camera
@@ -28 +30 @@
     //Float_t CalcHiGainMeanErr(Float_t higainrms) const;
     //Float_t CalcHiGainRmsErr(Float_t higainrms) const;
+
+    Bool_t MPedCalcPedRun::ReInit(MParList *pList);
 
     Int_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mhist/MHCalibrationConfig.h

@@ -24 +24 @@
 
 // Starting number for the highest value of the Q-histo:
-const Axis_t gkStartQlast      = 5000.;
+const Axis_t gkStartQlast      = 10000.;
 
 // Square root of 2 pi: