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

Timestamp:

12/20/03 13:46:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -56 +56 @@
 // Default constructor. 
 //
-MExtractSignal::MExtractSignal(const Byte_t first, const Byte_t last, const Byte_t logainshift, 
+MExtractSignal::MExtractSignal(/*const Byte_t first, const Byte_t last, const Byte_t logainshift,*/
                     const char *name, const char *title)
-  : fNumHiGainSamples(last-first+1), fNumLoGainSamples(last-first+1),
+  : /*fNumHiGainSamples(last-first+1), fNumLoGainSamples(last-first+1),*/
     fSaturationLimit(254)
 {
@@ -67 +67 @@
     AddToBranchList("MRawEvtData.*");
 
+    SetRange();
+    /*
+     fFirst       = first;
+     fLoGainFirst = first+logainshift;
+
+     fSqrtHiGainSamples = TMath::Sqrt((Float_t)fNumHiGainSamples);
+     fSqrtLoGainSamples = TMath::Sqrt((Float_t)fNumLoGainSamples);
+     */
+}
+
+void MExtractSignal::SetRange(Byte_t first, Byte_t last, Byte_t logainshift)
+{
+    fNumHiGainSamples = last-first+1;
+    fNumLoGainSamples = last-first+1;
+
     fFirst       = first;
     fLoGainFirst = first+logainshift;
 
-    fSqrtHiGainSamples = TMath::Sqrt((Float_t)fNumHiGainSamples); 
-    fSqrtLoGainSamples = TMath::Sqrt((Float_t)fNumLoGainSamples); 
+    fSqrtHiGainSamples = TMath::Sqrt((Float_t)fNumHiGainSamples);
+    fSqrtLoGainSamples = TMath::Sqrt((Float_t)fNumLoGainSamples);
 }
 
@@ -87 +102 @@
 Int_t MExtractSignal::PreProcess(MParList *pList)
 {
-
     fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
     if (!fRawEvt)
     {
-        *fLog << dbginf << "MRawEvtData not found... aborting." << endl;
+        *fLog << err << "MRawEvtData not found... aborting." << endl;
         return kFALSE;
     }
@@ -103 +117 @@
     if (!fPedestals)
       {
-        *fLog << err << dbginf << "Cannot find MPedestalCam ... aborting" << endl;
+        *fLog << err << "MPedestalCam not found... aborting" << endl;
         return kFALSE;
       }
@@ -118 +132 @@
 Bool_t MExtractSignal::ReInit(MParList *pList )
 {
- 
-
     MGeomCam *cam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
     if (!cam)
@@ -127 +139 @@
     }
 
+    // FIXME: This solution may change in the future, MExtractedSignal
+    //        must be similar to MCerPhotEvt not to MPedestalCam
+    //        (Have to think about the mean size of both solutions)
     fSignals->InitSize(cam->GetNumPixels());    
 
-
-    fSignals->SetNumUsedFADCSlices(fNumHiGainSamples,fFirst,fFirst+fNumHiGainSamples-1,
-                                   fNumLoGainSamples,fFirst,fFirst+fNumLoGainSamples-1);
+    fSignals->SetNumUsedFADCSlices(fNumHiGainSamples, fFirst, fFirst+fNumHiGainSamples-1,
+                                   fNumLoGainSamples, fFirst, fFirst+fNumLoGainSamples-1);
 
     return kTRUE;
@@ -144 +158 @@
 Int_t MExtractSignal::Process()
 {
-
     MRawEvtPixelIter pixel(fRawEvt);
     fSignals->Clear();
 
     while (pixel.Next())
-      {
-
+    {
         UShort_t satHi = 0;
         UShort_t satLo = 0;
@@ -219 +231 @@
                                );
 
-        pix.SetGainSaturation((satHi),satHi,satLo);
-
+        pix.SetGainSaturation(satHi, satHi, satLo);
+
+        // FIXME: Arrival time has to be stored in MArrivalTime!
         if (satHi)
           pix.SetArrivalTimes((Float_t)(midlo+fFirst),0.,0.);
@@ -233 +246 @@
     return kTRUE;
 }
-
-Int_t MExtractSignal::PostProcess()
-{
-
-  return kTRUE;
-
-}