Changeset 6302 for trunk/MagicSoft

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mjobs/MJPedestal.cc (modified) (10 diffs)
• mjobs/MJPedestal.h (modified) (8 diffs)
• mjobs/badpixels_0_559.rc (added)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/02/09 Markus Gaug 
+
+   * mjobs/MJPedestal.[h,cc]
+   * mjobs/badpixels_0_559.rc
+     - allow exclusion of bad pixels from the beginning (default is 
+       Pixel 0 and 559).
+
+
  2005/02/08 Markus Gaug 
  
@@ -26 +34 @@
    * mcalib/MCalibrationChargeCalc.cc
      - replaced GetNumExecutions()==0 condition by GetNumExecution() < 1 
+
 
  2005/02/08 Thomas Bretz

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -45 +45 @@
 #include <TPad.h>
 #include <TEnv.h>
+#include <TH2F.h>
 
 // mars core
@@ -85 +86 @@
 #include "MPedCalcFromLoGain.h"
 
+#include <fstream>
+
 ClassImp(MJPedestal);
 
@@ -90 +93 @@
 
 const TString  MJPedestal::fgReferenceFile = "mjobs/pedestalref.rc";
+const TString  MJPedestal::fgBadPixelsFile = "mjobs/badpixels_0_559.rc";
 // --------------------------------------------------------------------------
 //
@@ -111 +115 @@
     SetPathIn("");
     SetReferenceFile();
+    SetBadPixelsFile();
 
     //
@@ -149 +154 @@
 const char* MJPedestal::GetOutputFileName() const
 {
-    if (fSequence.IsValid())
-        return Form("pedest%08d.root", fSequence.GetSequence());
-
-    if (!fRuns)
-        return "";
-
-    return Form("%s-F0.root", (const char*)fRuns->GetRunsAsFileName());
+
+  if (fSequence.IsValid())
+    return Form("pedest%08d.root", fSequence.GetSequence());
+  
+  if (!fRuns)
+    return "";
+  
+  return Form("%s-F0.root", (const char*)fRuns->GetRunsAsFileName());
 }
 
@@ -815 +821 @@
     SetExtractor((MExtractor*)tenv.GetTask());
 
-    fReferenceFile = GetEnv("ReferenceFile", fReferenceFile.Data());
+    fBadPixelsFile = GetEnv("BadPixelsFile",fBadPixelsFile.Data());
+    fReferenceFile = GetEnv("ReferenceFile",fReferenceFile.Data());
     ReadReferenceFile();
 
@@ -934 +941 @@
     plist.AddToList(&fBadPixels);
     
+    //
+    // Read bad pixels from outside
+    // 
+    if (!fBadPixelsFile.IsNull())
+      {
+        *fLog << err << "Excluding: " << fBadPixelsFile << endl;
+        ifstream f(fBadPixelsFile.Data());
+        fBadPixels.AsciiRead((istream&)f);  
+        f.close();
+      }
+
     MGeomApply geomapl;
     MBadPixelsMerge merge(&fBadPixels);
@@ -943 +961 @@
     pedlogain.SetPedestalUpdate(kFALSE);
 
-    MHPedestalCam hpedcam;
-    hpedcam.SetRenorm(kTRUE);
+    fPedestalHist.SetRenorm(kTRUE);
     
-    MFillH fillped(&hpedcam, "MExtractedSignalCam", "FillPedestalCam");
+    MFillH fillped(&fPedestalHist, "MExtractedSignalCam", "FillPedestalCam");
     fillped.SetBit(MFillH::kDoNotDisplay);
 
@@ -967 +984 @@
     sel.SetNumSelectEvts(0);
 
-    if (fExtractionType!=kFundamental)
+    if (fExtractionType!=kFundamental && fExtractType!=kUseHists)
       {
         fExtractor->SetFilter(&sel);
@@ -1002 +1019 @@
         }
 
+        fExtractor->SetPedestals(&fPedestalCamIn);
+        plist.AddToList(&fPedestalHist);
         tlist.AddToList(fExtractor);
         tlist.AddToList(&fillped);

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