Changeset 5136 for trunk

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationQECam.h (modified) (3 diffs)
• msignal/MExtractBlindPixel.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
  2004/09/23: Markus Gaug
  
+   * msignal/MExtractBlindPixel.[h,cc]
+     - added enum DataType_t to set in which MRawEvtData container the 
+       blind pixel is found. The container of the blind pixel has changed 
+       from MRawEvtData to MRawEvtData2
+
    * mcalib/MCalibrationBlindCam.[h,cc]
      - added function SetPulserColor which was only available in 

trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.h

@@ -14 +14 @@
 #endif
 
+class TGraphErrors;
+class TH2D;
 class MCalibrationQECam : public MCalibrationCam
 {
@@ -34 +36 @@
 
   MArrayD fCorningBlues;                   // Corning blues of the pixels (if available) 
-  MArrayD fCorningReds;                    //o Corning reds  of the pixels (if available) 
+  MArrayD fCorningReds;                    // Corning reds  of the pixels (if available) 
 
 public:
@@ -42 +44 @@
   void Clear( Option_t *o=""  );
   void Copy ( TObject& object ) const;
+
+  TGraphErrors *GetGraphQEvsCorningBlues() const;
+  TGraphErrors *GetGraphQEvsCorningReds() const;  
+  
+  TH2D *GetHistQEvsCorningBlues( const Int_t nbins=50, const Axis_t first=6., const Axis_t last=17.) const;
+  TH2D *GetHistQEvsCorningReds( const Int_t nbins=50, const Axis_t first=0., const Axis_t last=25.) const;  
   
   // Others

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
 //