Changeset 6855 for trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

Timestamp:

03/18/05 17:21:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -34 +34 @@
 //   This task takes the integrated charge from MExtractedSignal and applies
 //   the calibration constants from MCalibrationCam to convert the summed FADC 
-//   slices into photons. The number of photons obtained is stored in MCerPhotEvt. 
+//   slices into photons. The number of photons obtained is stored in MSignalCam. 
 //   Optionally, the calibration of pedestals from an MPedestalCam container into 
 //   an MPedPhotCam container can be chosen with the member functions 
@@ -89 +89 @@
 //   Output Containers:
 //    [MPedPhotCam]
-//    [MCerPhotEvt]
+//    [MSignalCam]
 //
 // See also: MJCalibration, MJPedestal, MJExtractSignal, MJExtractCalibTest
@@ -129 +129 @@
 #include "MBadPixelsPix.h"
 
-#include "MCerPhotEvt.h"
+#include "MSignalCam.h"
 
 ClassImp(MCalibrateData);
@@ -194 +194 @@
 //
 //  - MPedPhotCam
-//  - MCerPhotEvt
+//  - MSignalCam
 //
 Int_t MCalibrateData::PreProcess(MParList *pList)
@@ -218 +218 @@
         }
 
-        fCerPhotEvt = (MCerPhotEvt*)pList->FindCreateObj(AddSerialNumber("MCerPhotEvt"));
+        fCerPhotEvt = (MSignalCam*)pList->FindCreateObj(AddSerialNumber("MSignalCam"));
         if (!fCerPhotEvt)
             return kFALSE;
@@ -657 +657 @@
     const Float_t sqrtslices = TMath::Sqrt(slices);
 
+    Int_t numsatlo=0;
+    Int_t numsathi=0;
+
     for (UInt_t pixidx=0; pixidx<npix; pixidx++)
     {
@@ -699 +702 @@
             const Float_t nphotErr = TMath::Sqrt(TMath::Abs(nphot)) * fCalibFFactors[pixidx];
             
-            MCerPhotPix *cpix = fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr);
+            fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr);
 
             if (sig.GetNumHiGainSaturated() > 0)
-                cpix->SetPixelHGSaturated();
+                numsathi++;
 
             if (sig.GetNumLoGainSaturated() > 0)
-              cpix->SetPixelSaturated();
+                numsatlo++;
         } /* if (data) */
       
@@ -735 +738 @@
     if (data)
     {
-        fCerPhotEvt->FixSize();
+        fCerPhotEvt->SetNumPixelsSaturated(numsathi, numsatlo);
         fCerPhotEvt->SetReadyToSave();
     }