Changeset 5136 for trunk/MagicSoft/Mars/msignal

Timestamp:

09/25/04 13:56:33 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -94 +94 @@
     : fHiGainSignal(NULL),
       fHiGainFirstDeriv(NULL), 
-      fHiGainSecondDeriv(NULL)
+      fHiGainSecondDeriv(NULL),
+      fDataType(0)
 {
   
@@ -213 +214 @@
     return kFALSE;
 
-  
+  if (IsDataType(kRawEvt2))
+    fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData2"));
+  else
+    fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData"));
+
+  if (!fRawEvt)
+    {
+      *fLog << err << "MRawEvtData2 or MRawEvtData not found... aborting." << endl;
+      return kFALSE;
+    }
   return kTRUE;
 }
@@ -718 +728 @@
 // ------------------------------------------------------------------------------------
 //
+// Returns true if the Data type. Available are: kAmplitude, kIntegral and kFilter
+// The flags kIntegral and kFilter may be set both. 
+//
+Bool_t MExtractBlindPixel::IsDataType( const DataType_t typ )
+{
+  
+  return TESTBIT( fDataType, typ );
+
+}
+
+// ------------------------------------------------------------------------------------
+//
 // Returns true if the extraction type. Available are: kAmplitude, kIntegral and kFilter
 // The flags kIntegral and kFilter may be set both. 
@@ -730 +752 @@
 // --------------------------------------------------------------------------
 //
+// Sets the Data type. Available are: kAmplitude and kIntegral
+//
+void MExtractBlindPixel::SetDataType( const DataType_t typ )
+{
+  SETBIT( fDataType, typ );
+}
+
+// --------------------------------------------------------------------------
+//
 // Sets the extraction type. Available are: kAmplitude and kIntegral
 //