Changeset 5381 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

11/11/04 10:32:21 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MPedCalcFromLoGain.cc (modified) (2 diffs)
• MPedCalcFromLoGain.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -576 +576 @@
 //
 //  The following resources are available:
-//    FirstCheckWindowSlice: 0
-//    LastCheckWindowSlice: 29
-//    ExtractWindowFirst:   15
-//    ExtractWindowSize:     6
-//    NumEventsDump:
+//    FirstCheckWindowSlice:  0
+//    LastCheckWindowSlice:  29
+//    ExtractWindowFirst:    15
+//    ExtractWindowSize:      6
+//    NumEventsDump:        500
+//    MaxSignalVar:          40
+//    PedestalUpdate:       yes
 //
 Int_t MPedCalcFromLoGain::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    if (MExtractor::ReadEnv(env, prefix, print)==kERROR)
-        return kERROR;
-
     Bool_t rc=kFALSE;
 
@@ -653 +652 @@
     *fLog << "Max allowed signal variation: " << fMaxSignalVar << endl;
     *fLog << "Pedestal Update is " << (fPedestalUpdate?"on":"off") << endl;
-    MExtractor::Print(o);
-}
+}

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.h

@@ -2 +2 @@
 #define MARS_MPedCalcFromLoGain
 
-#ifndef MARS_MExtractor
-#include "MExtractor.h"
+#ifndef MARS_MTask
+#include "MTask.h"
 #endif
 
@@ -15 +15 @@
 
 class MGeomCam;
-class MBadPixelsCam;
+class MPedestalCam;
+class MRawEvtData;
 class MRawEvtPixelIter;
+class MRawRunHeader;
 
-class MPedCalcFromLoGain : public MExtractor
+class MPedCalcFromLoGain : public MTask
 {
     static const UShort_t fgCheckWinFirst;    // First FADC slice to check for signal (currently set to: 0)
@@ -26 +28 @@
     static const UShort_t fgMaxSignalVar;     // The maximum difference between the highest and lowest slice
 
-    MGeomCam *fGeom;                          // Camera geometry
+    MGeomCam      *fGeom;        //! Camera geometry
+    MPedestalCam  *fPedestals;   //! Pedestals of all pixels in the camera
+    MRawEvtData   *fRawEvt;      //! Raw event data (time slices)
+    MRawRunHeader *fRunHeader;   //! RunHeader information
 
-    UInt_t   fNumEventsDump;                  // Number of event after which MPedestalCam gets updated
+    UInt_t   fNumEventsDump;     // Number of event after which MPedestalCam gets updated
 
     UShort_t fMaxSignalVar;
     UShort_t fCheckWinFirst;
     UShort_t fCheckWinLast;
-    UShort_t fExtractWinSize;                 // Number of slices to calculate the pedestal from
+    UShort_t fExtractWinSize;    // Number of slices to calculate the pedestal from
     UShort_t fExtractWinFirst;
     UShort_t fExtractWinLast;