Changeset 3299

Timestamp:

02/25/04 12:29:24 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrateData.cc (modified) (5 diffs)
• MCalibrateData.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -100 +100 @@
 Int_t MCalibrateData::PreProcess(MParList *pList)
 {
+
+    MGeomCam *fCam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
+    if (!fCam)
+    {
+        *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
+        return kFALSE;
+    }
+
     fPedestal = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     if (!fPedestal)
@@ -106 +114 @@
         return kFALSE;
     }
+
 
     fSignals = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
@@ -127 +136 @@
     if (!fPedPhot)
         return kFALSE;
+    fPedPhot->InitSize(fCam->GetNumPixels());
 
     fCerPhotEvt = (MCerPhotEvt*)pList->FindCreateObj(AddSerialNumber("MCerPhotEvt"));
@@ -166 +176 @@
 
   // is pixid equal to pixidx ?
-  if (fPedestal->GetSize() != fSignals->GetSize())
+  if (    (Int_t)(fPedestal->GetSize()) != fSignals->GetSize())
   {
     *fLog << err << "MCalibrateData::ReInit(); sizes of MPedestalCam and MCalibrationCam are different" 
@@ -178 +188 @@
   *fLog << all << "     pixid, calibrationConversionFactor, ped, pedRMS, pedphot, pedphotRMS :"
         << endl;
-  for (Int_t pixid=0; pixid<fPedestal->GetSize(); pixid++)
+  for (UInt_t pixid=0; pixid<fPedestal->GetSize(); pixid++)
   {
     const MPedestalPix    &ped = (*fPedestal)[pixid];

trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

@@ -33 +33 @@
 {
 private:
-    MPedestalCam          *fPedestal;     // Pedestals/slice [ADC counts]
-    MCalibrationChargeCam *fCalibrations; // Calibration constants 
-    MExtractedSignalCam   *fSignals;      // Integrated charge in FADCs counts
+    MGeomCam            *fCam;
+    MPedestalCam        *fPedestal;     // Pedestals/slice [ADC counts]
+    MCalibrationCam     *fCalibrations; // Calibration constants 
+    MExtractedSignalCam *fSignals;      // Integrated charge in FADCs counts
 
     MPedPhotCam         *fPedPhot;      // Pedestals/(used slices) [photons]
@@ -68 +69 @@
 
 #endif
+
+
+
+
+
+
+
+
+