Changeset 8577 for trunk/MagicSoft/Mars/mbadpixels

Timestamp:

06/18/07 15:16:18 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbadpixels

Files:

• MBadPixelsTreat.cc (modified) (8 diffs)
• MBadPixelsTreat.h (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.38 2007-03-01 17:42:27 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.39 2007-06-18 14:11:08 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -64 +64 @@
 //   MPedPhotCam
 //   MBadPixelsCam
+//   MRawRunHeader
 //   [MGeomCam]
 //
@@ -97 +98 @@
 #include "MBadPixelsCam.h"
 
+#include "MRawRunHeader.h"
+
 ClassImp(MBadPixelsTreat);
 
@@ -109 +112 @@
 //
 MBadPixelsTreat::MBadPixelsTreat(const char *name, const char *title)
-    : fGeomCam(0), fEvt(0), fBadPixels(0), fPedPhot1(0), fPedPhot2(0),
-    fFlags(0), fNumMinNeighbors(3), fMaxArrivalTimeDiff(0.9)
+    : fGeomCam(0), fEvt(0), fBadPixels(0), fRawRunHeader(0),
+    fPedPhot1(0), fPedPhot2(0),fFlags(0), fNumMinNeighbors(3),
+    fMaxArrivalTimeDiff(3.)
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -146 +150 @@
 Int_t MBadPixelsTreat::PreProcess (MParList *pList)
 {
+    fRawRunHeader = (MRawRunHeader*)pList->FindObject(AddSerialNumber("MRawRunHeader"));
+    if (!fRawRunHeader)
+    {
+        *fLog << err << AddSerialNumber("MRawRunHeader") << " not found... aborting." << endl;
+        return kFALSE;
+    }
+
     fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
     if (!fBadPixels)
@@ -216 +227 @@
 
         if (fPedPhot1 && fPedPhot2)
-            *fLog << "Maximum arrival time difference: " << fMaxArrivalTimeDiff << endl;
+            *fLog << "Maximum arrival time difference: " << fMaxArrivalTimeDiff << "ns" << endl;
 
     }
@@ -434 +445 @@
 void MBadPixelsTreat::InterpolateTimes() const
 {
+    const Double_t maxdiff = fMaxArrivalTimeDiff*fRawRunHeader->GetFreqSampling()/1000.;
+
     const Int_t n = fEvt->GetNumPixels();
     for (int i=0; i<n; i++)
@@ -478 +491 @@
 
             // Calculate mean arrival time of pixel probably inside the shower
-            if (TMath::Abs(tm1 - tm2)<fMaxArrivalTimeDiff)
+            if (TMath::Abs(tm1 - tm2)<maxdiff)
             {
                 sum2 += tm1+tm2;

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h

@@ -10 +10 @@
 class MPedPhotCam;
 class MBadPixelsCam;
+class MRawRunHeader;
 
 class MBadPixelsTreat : public MTask
 {
 private:
-    MGeomCam      *fGeomCam;   //!
-    MSignalCam    *fEvt;       //!
-    MBadPixelsCam *fBadPixels; //!
+    MGeomCam      *fGeomCam;       //! Camera geometry to get the area scaling factors
+    MSignalCam    *fEvt;           //! Signal Event to be interpolated
+    MBadPixelsCam *fBadPixels;     //! Bad Pixels to be interpolated
+    MRawRunHeader *fRawRunHeader;  //! Run header to get the sampling frequency
 
-    MPedPhotCam   *fPedPhot1;  //! Pedestal from extractor used for "no-signal" in InterpolateTimes
-    MPedPhotCam   *fPedPhot2;  //! Pedestal from extractor used for "no-signal" in InterpolateTimes
+    MPedPhotCam   *fPedPhot1;      //! Pedestal from extractor used for "no-signal" in InterpolateTimes
+    MPedPhotCam   *fPedPhot2;      //! Pedestal from extractor used for "no-signal" in InterpolateTimes
 
 
-    TList fPedPhotCams;
+    TList fPedPhotCams;            // List of PedPhotCams to be treated
 
     Byte_t  fFlags;                // flag for the method which is used

trunk/MagicSoft/Mars/mbadpixels/Makefile

@@ -21 +21 @@
 INCLUDES = -I. -I../mbase -I../manalysis -I../mgeom -I../mgui \
            -I../mmc -I../mpedestal -I../msignal -I../mpointing \
-           -I../mhbase -I../mhist
+           -I../mhbase -I../mhist -I../mraw
 # MBadPixelsCalc  (manalysis): MPedPhotCam, MSigmabar
 # MBadPixelsCalc  (mgeom):     MGeomCam