Changeset 8787 for trunk/MagicSoft/Mars/mjobs

Timestamp:

12/13/07 14:19:38 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJPedestal.cc (modified) (5 diffs)
• MJPedestal.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -19 +19 @@
 !   Author(s): Markus Gaug, 4/2004 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -29 +29 @@
 //
 // Resource file entries are case sensitive!
+//
+// We require at least fMinEvents (def=50) to be processed by the
+// ExtractPedestal-task. If not an error is returned.
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -118 +121 @@
     : fExtractor(NULL), fDisplayType(kDisplayDataCheck),
     fExtractType(kUsePedRun), fExtractionType(kFundamental),
-    fIsUseHists(kFALSE), fDeadPixelCheck(kFALSE)
+    fIsUseHists(kFALSE), fDeadPixelCheck(kFALSE), fMinEvents(50)
 {
     fName  = name  ? name  : "MJPedestal";
@@ -761 +764 @@
     SetExtractWinRight(GetEnv("ExtractWinRight", fExtractWinRight));
 
+    SetMinEvents(GetEnv("MinEvents", (Int_t)fMinEvents));
+
     if (!MJCalib::CheckEnvLocal())
         return kFALSE;
@@ -1252 +1257 @@
     }
 
+    if (taskenv.GetNumExecutions()<fMinEvents)
+    {
+        *fLog << err << GetDescriptor() << ": Failed. Less than the required " << fMinEvents << " evts processed." << endl;
+        return kFALSE;
+    }
+
     if (fDeadPixelCheck)
     {

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -51 +51 @@
     Float_t fExtractWinLeft;                 //  Number of FADC slices to extract leftward from mean pulse pos.  
     Float_t fExtractWinRight;                //  Number of FADC slices to extract rightward from mean pulse pos.
-    
+
     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
 
@@ -73 +73 @@
     Bool_t fIsUseHists;                      // Switch on histogramming or not
     Bool_t fDeadPixelCheck;                  // Should the dead pixel check be done?
+
+    UInt_t  fMinEvents;                      // Minimum number of events
 
     MExtractor *ReadCalibration();
@@ -93 +95 @@
 
     Bool_t WriteExtractor() const;
-    
+
 public:
     MJPedestal(const char *name=NULL, const char *title=NULL);
@@ -128 +130 @@
     void SetExtractWinRight( const Float_t f=fgExtractWinRight ) { fExtractWinRight = f; }    
 
+    void SetMinEvents(UInt_t min) { fMinEvents = min; }
+
     MExtractor *GetExtractor() const { return fExtractor; }