Changeset 2533 for trunk/MagicSoft/Mars/manalysis

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MPedCalcPedRun.cc (modified) (3 diffs)
• MPedCalcPedRun.h (modified) (3 diffs)

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);