Changeset 4261 for trunk

Timestamp:

06/01/04 23:35:51 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -144 +144 @@
 // pixel in the MArrivalTimeCam container.
 // Calculate the integral of the FADC time slices and store them as a new
-// pixel in the MExtractedSignalCam container.
+// pixel in the MExtractedSignalCam container. 
+// The functions FindTimeAndChargeHiGain() and FindTimeAndChargeLoGain are 
+// supposed to extract the signal themselves.
 //
 Int_t MExtractTimeAndCharge::Process()
@@ -182 +184 @@
       MArrivalTimePix     &tix = (*fArrTime)[pixid];      
 
-      const Float_t pedes  = ped.GetPedestal();
-      const Float_t pedrms = ped.GetPedestalRms();
-      
-      pix.SetExtractedSignal(sumhi - pedes*fNumHiGainSamples, pedrms*fSqrtHiGainSamples,
-                             sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);
-      
+      pix.SetExtractedSignal(sumhi, deltasumhi,sumlo, deltasumlo);
       pix.SetGainSaturation(sathi, sathi, satlo);