Changeset 7043 for trunk/MagicSoft/Mars/mfilter

Timestamp:

05/17/05 12:08:31 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MFCosmics.cc (modified) (9 diffs)
• MFCosmics.h (modified) (4 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mfilter/MFCosmics.cc

@@ -17 +17 @@
 !
 !   Author(s): Markus Gaug  02/2004 <mailto:markus@ifae.es>
-!
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Author(s): Thomas Bretz <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2005
 !
 !
@@ -33 +34 @@
 //   the outer pixels have some defect).
 //
+//   In the PostProcess we...
+//    a) check the ratio of events which were accepted against
+//       fMinAcceptedFraction.
+//    b) check the ratio of events which were rejected against
+//       fMaxExcludedFraction.
+//
 //  Input Containers:
 //   MRawEvtData
 //   MPedestalCam
+//   MBadPixelsCam
 //   MExtractedSignalCam
 //
@@ -55 +63 @@
 #include "MPedestalPix.h"
 
+#include "MBadPixelsCam.h"
+#include "MBadPixelsPix.h"
+
 #include "MExtractedSignalCam.h"
 #include "MExtractedSignalPix.h"
@@ -69 +80 @@
 //
 MFCosmics::MFCosmics(const char *name, const char *title)
-    : fPedestals(NULL), fSignals(NULL), fRawEvt(NULL),
-    fNamePedestalCam(fgNamePedestalCam), fMaxEmptyPixels(0.2)
+    : fPedestals(NULL), fSignals(NULL), fBadPixels(NULL), fRawEvt(NULL),
+    fNamePedestalCam(fgNamePedestalCam), fMaxEmptyPixels(0.2),
+    fMinAcceptedFraction(0), fMaxExcludedFraction(1)
 {
     fName  = name  ? name  : "MFCosmics";
@@ -99 +111 @@
     }
 
+    fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam");
+    if (!fBadPixels)
+    {
+        *fLog << err << "MBadPixelsCam not found... aborting." << endl;
+        return kFALSE;
+    }
+
     fSignals = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
     if (!fSignals)
@@ -133 +152 @@
 {
     fResult = CosmicsRejection();
-
     fCut[fResult ? 0 : 1]++;
+
     return kTRUE;
 }
@@ -163 +182 @@
         const UInt_t idx = pixel.GetPixelId();
 
-        MExtractedSignalPix &sig =  (*fSignals)[idx];
-        MPedestalPix        &ped =  (*fPedestals)[idx];
+        if ((*fBadPixels)[idx].IsUnsuitable())
+            continue;
+
+        const MExtractedSignalPix &sig =  (*fSignals)[idx];
+        const MPedestalPix        &ped =  (*fPedestals)[idx];
 
         const Float_t pedrms = ped.GetPedestalRms()*fSqrtHiGainSamples;
@@ -186 +208 @@
 }
 
+// ---------------------------------------------------------
+//
+//   In the PostProcess we...
+//    a) check the ratio of events which were accepted against
+//       fMinAcceptedFraction.
+//    b) check the ratio of events which were rejected against
+//       fMaxExcludedFraction.
+//
+//   return failure (kFALSE) if condition is not fullfilled.
+//
 Int_t MFCosmics::PostProcess()
 {
-    if (GetNumExecutions()==0)
+    const UInt_t n = GetNumExecutions();
+    if (n==0)
         return kTRUE;
 
@@ -196 +229 @@
 
     *fLog << " " << setw(7) << fCut[0] << " (" << setw(3) ;
-    *fLog << (int)(fCut[0]*100/GetNumExecutions()) ;
+    *fLog << (int)(fCut[0]*100/n);
     *fLog << "%) Detected cosmics " ;
     *fLog << " (with fMaxEmptyPixels = " << fMaxEmptyPixels*100 << "%)" << endl;
 
     *fLog << " " << setw(7) << fCut[1] << " (" << setw(3) ;
-    *fLog << (int)(fCut[1]*100/GetNumExecutions()) ;
+    *fLog << (int)(fCut[1]*100/n);
     *fLog << "%) No cosmics!" << endl;
     *fLog << endl;
 
-    return kTRUE;
-}
-
+    const Float_t min = fMinAcceptedFraction*n;
+    const Float_t max = fMaxExcludedFraction*n;
+    if (fCut[0]<min)
+    {
+        *fLog << err << "ERROR - Fraction of accepted events " << min*100;
+        *fLog << "% underrun " << fMinAcceptedFraction*100 << "%... abort." << endl;
+        return kFALSE;
+    }
+    if (fCut[1]>max)
+    {
+        *fLog << err << "ERROR - Fraction of excluded events " << max*100;
+        *fLog << "% exceeded " << fMaxExcludedFraction*100 << "%... abort." << endl;
+        return kFALSE;
+    }
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Read the setup from a TEnv, eg:
+//   MFCosmics.MaxEmptyPixels:    0.2
+//   MFCosmics.MaxExcludedFraction: 1
+//   MFCosmics.MinAcceptedFraction: 0
+//
+Int_t MFCosmics::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "MaxEmptyPixels", print))
+    {
+        rc = kTRUE;
+        SetMaxEmptyPixels(GetEnvValue(env, prefix, "MaxEmptyPixels", fMaxEmptyPixels));
+    }
+    if (IsEnvDefined(env, prefix, "MaxExcludedFraction", print))
+    {
+        rc = kTRUE;
+        SetMaxExcludedFraction(GetEnvValue(env, prefix, "MaxExcludedFraction", fMaxExcludedFraction));
+    }
+    if (IsEnvDefined(env, prefix, "MinAcceptedFraction", print))
+    {
+        rc = kTRUE;
+        fMinAcceptedFraction = GetEnvValue(env, prefix, "MinAcceptedFraction", fMinAcceptedFraction);
+    }
+    return rc;
+}

trunk/MagicSoft/Mars/mfilter/MFCosmics.h

@@ -9 +9 @@
 
 class MPedestalCam;
+class MBadPixelsCam;
 class MExtractedSignalCam;
 
@@ -18 +19 @@
     MPedestalCam        *fPedestals; // Pedestals of all pixels in the camera
     MExtractedSignalCam *fSignals;   // Calibration events of all pixels in the camera
+    MBadPixelsCam       *fBadPixels; // Bad pixel used for exclusions
 
     MRawEvtData         *fRawEvt;    // raw event data (time slices)
@@ -29 +31 @@
     Float_t fSqrtHiGainSamples;      // Square root of the number of used Hi-Gain Samples
 
+    Float_t fMinAcceptedFraction;      // return error if exceeded
+    Float_t fMaxExcludedFraction;      // return error if exceeded
+
+    // MFCosmics
+    Bool_t CosmicsRejection() const;
+
+    // MTask
     Bool_t ReInit(MParList *pList);
     Int_t  PreProcess(MParList *pList);
     Int_t  Process();
     Int_t  PostProcess();
+    Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
 
-    Bool_t CosmicsRejection() const;
-
+    // MFilter
     Bool_t IsExpressionTrue() const { return fResult; }
   
@@ -44 +53 @@
     Float_t GetMaxEmptyPixels() const          { return fMaxEmptyPixels; }
 
-    void SetNamePedestalCam(const char *name) { fNamePedestalCam = name; }
+    void    SetMaxExcludedFraction(const Float_t n) { fMaxExcludedFraction = n;    }
+    void    SetMinAcceptedFraction(const Float_t n) { fMinAcceptedFraction = n;    }
+
+    void    SetNamePedestalCam(const char *name) { fNamePedestalCam = name; }
 
     ClassDef(MFCosmics, 0)   // Filter to perform a cosmics rejection

trunk/MagicSoft/Mars/mfilter/Makefile

@@ -11 +11 @@
 #------------------------------------------------------------------------------
 
-INCLUDES = -I. -I../mbase -I../mfbase -I../mraw -I../mmc -I../mdata \
-           -I../manalysis -I../mfileio  -I../mgeom -I../mimage      \
-           -I../mhbase -I../mmain -I../mgui -I../msignal -I../mpointing  \
-           -I../mpedestal
+INCLUDES = -I. -I../mbase -I../mfbase -I../mraw -I../mdata \
+           -I../mfileio  -I../mgeom -I../mimage -I../mgui  \
+           -I../mhbase -I../msignal -I../mpedestal -I../mbadpixels
 
 CINT     = Filter