Changeset 8891 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

05/15/08 19:37:27 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationPulseTimeCam.cc (modified) (4 diffs)
• MHCalibrationPulseTimeCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.41 2007-06-19 09:25:38 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.42 2008-05-15 18:37:26 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -175 +175 @@
 //
 MHCalibrationPulseTimeCam::MHCalibrationPulseTimeCam(const char *name, const char *title)
-    : fBadPixels(NULL)
+    : fSignalCam(NULL), fBadPixels(NULL)
 {
 
@@ -277 +277 @@
 Bool_t MHCalibrationPulseTimeCam::ReInitHists(MParList *pList)
 {
-
-  MExtractedSignalCam *signal = 
-    (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
-  if (!signal)
+  fSignalCam = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
+  if (!fSignalCam)
   {
       *fLog << err << "MExtractedSignalCam not found... abort." << endl;
@@ -397 +395 @@
             continue;
 
-        // Get position of maximum (FIXME: Extraction range?)
+        // Get position of maximum
         Float_t max;
-        const Int_t pos = evt->GetMaxPos(idx, max);
+        const Int_t pos = evt->GetMax(idx, fSignalCam->GetFirstUsedSliceHiGain(),
+                                      fSignalCam->GetLastUsedSliceHiGain(), max);
 
         // check if maximum is high enough

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.h

@@ -8 +8 @@
 class TH1F;
 class MRawEvtData;
+class MExtractedSignalCam;
 class MHCalibrationChargePix;
 
@@ -39 +40 @@
   Float_t fOuterRefTime;                       // The reference mean arrival time outer pixels
 
-  MBadPixelsCam *fBadPixels;                   //!  Bad Pixels
+  MExtractedSignalCam *fSignalCam;             //! Signal cam for extraction range
+  MBadPixelsCam *fBadPixels;                   //! Bad Pixels
   
   void   InitHiGainArrays( const Int_t npix, const Int_t nareas, const Int_t nsectors );