Changeset 2540 for trunk/MagicSoft/Mars

Timestamp:

11/20/03 00:39:37 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCalibrationCalc.cc (modified) (4 diffs)
• manalysis/MCalibrationCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -12 +12 @@
    * manalysis/MCalibrationCam.cc:
      - function GetPixelContent enlarged
+
+   * manalysis/MCalibrationCalc:
+     - function ReInit added like in MPedCalcPedRun
 
 

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc

@@ -123 +123 @@
 //
 // The PreProcess searches for the following input containers:
-//  - MRawRunHeader
 //  - MRawEvtData
 //  - MPedestalCam
@@ -139 +138 @@
     fOverFlow = 0;
     fNrEvents = 0;
-
-    fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-    if (!fRunHeader)
-    {
-        *fLog << dbginf << "MRawRunHeader not found... aborting." << endl;
-        return kFALSE;
-    }
 
     fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
@@ -211 +203 @@
 }
 
+
+// --------------------------------------------------------------------------
+//
+// The ReInit searches for the following input containers:
+//  - MRawRunHeader
+//
+Bool_t MCalibrationCalc::ReInit(MParList *pList )
+{
+ 
+    fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+    if (!fRunHeader)
+    {
+        *fLog << dbginf << "MRawRunHeader not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fNumHiGainSamples =  fRunHeader->GetNumSamplesHiGain();
+    fNumLoGainSamples =  fRunHeader->GetNumSamplesLoGain();
+ 
+    return kTRUE;
+ 
+}
+
+
 // --------------------------------------------------------------------------
 //
@@ -282 +298 @@
         // Assume pedestals per time slice ==> multiply with number of slices
         //
-        pedes *= (sat ? fRawEvt->GetNumLoGainSamples() : fRawEvt->GetNumHiGainSamples() );
+        pedes *= (sat ? fNumLoGainSamples : fNumHiGainSamples );
 
         Float_t rsum      = (float)sum - pedes;

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.h

@@ -38 +38 @@
   Int_t fOverFlow;                         // Number of events with saturated Low Gain
 
+  Byte_t fNumHiGainSamples; 
+  Byte_t fNumLoGainSamples; 
+
   Byte_t fFlags;                           // Flag for the fits used
-  
+   
+
   enum
     {
@@ -55 +59 @@
   PulserColor_t  fColor;
   
+  Bool_t ReInit(MParList *pList); 
   Int_t PreProcess(MParList *pList);
   Int_t Process();