Changeset 6302 for trunk/MagicSoft/Mars/mjobs/MJPedestal.h

Timestamp:

02/09/05 10:04:53 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJPedestal.h (modified) (8 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -2 +2 @@
 #define MARS_MJPedestal
 
+#ifndef MARS_MJob
+#include "MJob.h"
+#endif
 #ifndef MARS_MJCalib
 #include "MJCalib.h"
@@ -7 +10 @@
 #ifndef MARS_MPedestalCam
 #include "MPedestalCam.h"
+#endif
+#ifndef MARS_MHPedestalCam
+#include "MHPedestalCam.h"
 #endif
 #ifndef MARS_MBadPixelsCam
@@ -20 +26 @@
 class MEvtLoop;
 
-class MJPedestal : public MJCalib
+class MJPedestal : public MJob, public MJCalib
 {
 private:
 
     static const TString  fgReferenceFile;   //! default for fReferenceFile ("pedestalref.rc")
+    static const TString  fgBadPixelsFile;   //! default for fBadPixelsFile ("badpixels_0_559.rc")
 
     Axis_t fPedestalMin;                     //! Minimum Axis value for pedestal datacheck display
@@ -43 +50 @@
     Float_t fRefPedRmsGalacticOuter;         //! Ref. line ped. RMS for galactic source - outer pixels
 
-    TString     fReferenceFile;              // File name containing the reference values
-
+    TString fReferenceFile;                  // File name containing the reference values
+    TString fBadPixelsFile;                  // File name containing the bad pixels excluded beforehand 
+    
     MExtractor *fExtractor;                  // Signal extractor, used to find the nr. of used FADC slices
 
@@ -50 +58 @@
     MPedestalCam  fPedestalCamOut;           // Created pedestal results
     MBadPixelsCam fBadPixels;                // Bad Pixels
-
+    MHPedestalCam fPedestalHist;             // Histogramming pedestal Camera
+    
     enum Display_t { kDisplayNone, kDisplayNormal, kDisplayDataCheck }; // Possible Display types
     Display_t fDisplayType;                  // Chosen Display type
@@ -76 +85 @@
 
     Bool_t CheckEnvLocal();
-    void ReadReferenceFile();
 
     const char*  GetOutputFileName() const;
@@ -89 +97 @@
     const char*  GetOutputFile() const;
 
+    MHPedestalCam &GetPedestalHist()   { return fPedestalHist;  }
+    
     const Bool_t IsUseData() const { return fExtractType == kUseData; }
 
@@ -108 +118 @@
     void SetExtractionWithExtractor()     { fExtractionType=kWithExtractor;     /*fPedestalCamOut.SetName("MPedestalExtractor");*/     }
 
-    void SetReferenceFile( const TString ref=fgReferenceFile) { fReferenceFile = ref; } // Only usefull to overwrite CheckEnvLocal-default
+    void SetReferenceFile( const TString ref=fgReferenceFile ) { fReferenceFile = ref; }
+    void SetBadPixelsFile( const TString ref=fgBadPixelsFile ) { fBadPixelsFile = ref; }
 
     MExtractor *GetExtractor() const { return fExtractor; }