Changeset 2666 for trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

Timestamp:

12/12/03 14:27:05 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -37 +37 @@
 #include "MPedestalPix.h"
 
+#include "MGeomCam.h"
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -56 +58 @@
 // Default constructor. 
 //
-MExtractSignal::MExtractSignal(const char *name, const char *title)
-  : fNumHiGainSamples(0), fNumLoGainSamples(0),
-    fSqrtHiGainSamples(0), fSqrtLoGainSamples(0),
-    fBefore(2), fAfter(4), 
+MExtractSignal::MExtractSignal(const Byte_t first, const Byte_t last, const char *name, const char *title)
+  : fNumHiGainSamples(last-first+1), fNumLoGainSamples(last-first+1),
     fSaturationLimit(254), fConversionHiLo(10.)
 {
@@ -67 +67 @@
 
     AddToBranchList("MRawEvtData.*");
+
+    fFirst = first;
+
+    fSqrtHiGainSamples = TMath::Sqrt((Float_t)fNumHiGainSamples); 
+    fSqrtLoGainSamples = TMath::Sqrt((Float_t)fNumLoGainSamples); 
 }
 
@@ -125 +130 @@
     }
 
-    //fNumHiGainSamples =  fRunHeader->GetNumSamplesHiGain();
-    //fNumLoGainSamples =  fRunHeader->GetNumSamplesLoGain();
-    fNumHiGainSamples =  6;
-    fNumLoGainSamples =  6;
-
-    fSqrtHiGainSamples = TMath::Sqrt((float)fNumHiGainSamples); 
-    fSqrtLoGainSamples = TMath::Sqrt((float)fNumLoGainSamples); 
-
-    //
-    // FIXME: The next statement simply does not work: 
-    //        fRawEvt->GetNumPixels() returns always 0
-    //
-
-    fSignals->InitSize(577);    
-    // fExtractedSignals->InitSize(fRawEvt->GetNumPixels());
+
+    MGeomCam *cam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
+    if (!cam)
+    {
+        *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fSignals->InitSize(cam->GetNumPixels());    
 
     return kTRUE;
@@ -163 +162 @@
 
         Byte_t *ptr   = pixel.GetHiGainSamples();
-        Byte_t *first = ptr + 3;
-        Byte_t *last  = ptr + 9;
+        Byte_t *first = ptr + fFirst;
+        Byte_t *last  = ptr + fFirst + fNumHiGainSamples;
 
         UInt_t  sumHi   = 0;
@@ -196 +195 @@
 
         ptr   = pixel.GetLoGainSamples();
-        first = ptr + 3;
-        last  = ptr + 9;
+        first = ptr + fFirst;
+        last  = ptr + fFirst + fNumLoGainSamples;
         Byte_t maxlo  = 0;
         Byte_t midlo  = 0;
@@ -230 +229 @@
 
         if (satHi)
-          pix.SetArrivalTimes((Float_t)(midlo+3),0.,0.);
+          pix.SetArrivalTimes((Float_t)(midlo+fFirst),0.,0.);
         else
-          pix.SetArrivalTimes((Float_t)(midhi+3),0.,0.);
+          pix.SetArrivalTimes((Float_t)(midhi+fFirst),0.,0.);
 
       } /* while (pixel.Next()) */
 
-    fSignals->SetNumUsedFADCSlices(fNumHiGainSamples,3,8,fNumLoGainSamples,3,8);
+    fSignals->SetNumUsedFADCSlices(fNumHiGainSamples,fFirst,fFirst+fNumHiGainSamples-1,
+                                   fNumLoGainSamples,fFirst,fFirst+fNumLoGainSamples-1);
     fSignals->SetReadyToSave();