Changeset 3667 for trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

Timestamp:

04/06/04 13:58:05 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MGeomApply.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -75 +75 @@
 #include "MGeomCam.h"
 #include "MPedestalCam.h"
-#include "MCalibrationChargeCam.h"
-#include "MCalibrationRelTimeCam.h"
-#include "MCalibrationQECam.h"
-#include "MCalibrationPedCam.h"
+#include "MCalibrationCam.h"
 #include "MPedPhotCam.h"
 #include "MExtractedSignalCam.h"
@@ -140 +137 @@
         ped->InitSize(cam->GetNumPixels());
 
-    MCalibrationChargeCam *cal = 
-      (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
+    MCalibrationCam *cal = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
     if (cal)
-      {
-        cal->InitSize          ( cam->GetNumPixels()  );
-        cal->InitAverageAreas  ( cam->GetNumAreas()   );
-        cal->InitAverageSectors( cam->GetNumSectors() );
-      }
+        cal->Init(*cam);
 
-    MCalibrationRelTimeCam *cat = 
-      (MCalibrationRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
+    MCalibrationCam *cat = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
     if (cat)
-      {
-        cat->InitSize          ( cam->GetNumPixels()  );
-        cat->InitAverageAreas  ( cam->GetNumAreas()   );
-        cat->InitAverageSectors( cam->GetNumSectors() );
-      }
-    
-    MCalibrationQECam *qe = 
-      (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
+        cat->Init(*cam);
+
+    MCalibrationCam *qe = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
     if (qe)
-      {
-        qe->InitSize           ( cam->GetNumPixels()  );
-        qe->InitAverageAreas   ( cam->GetNumAreas()   );
-        qe->InitAverageSectors ( cam->GetNumSectors() );
-      }
-    
-    MCalibrationPedCam *pcam = 
-      (MCalibrationPedCam*)pList->FindObject(AddSerialNumber("MCalibrationPedCam"));
+        qe->Init(*cam);
+
+    MCalibrationCam *pcam = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationPedCam"));
     if (pcam)
-      {
-        pcam->InitSize           ( cam->GetNumPixels()  );
-        pcam->InitAverageAreas   ( cam->GetNumAreas()   );
-        pcam->InitAverageSectors ( cam->GetNumSectors() );
-      }
-    
+        pcam->Init(*cam);
+
     MPedPhotCam *pedphot = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
     if (pedphot)
         pedphot->InitSize(cam->GetNumPixels());
 
-
     MExtractedSignalCam *ext = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
     if (ext)
         ext->InitSize(cam->GetNumPixels());
-
 
     MBlindPixels *bnd = (MBlindPixels*)pList->FindObject(AddSerialNumber("MBlindPixels"));