Changeset 3638 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/03/04 17:50:04 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MGeomApply.cc (modified) (3 diffs)
• MMcCalibrationUpdate.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -72 +72 @@
 #include "MPedestalCam.h"
 #include "MCalibrationChargeCam.h"
+#include "MCalibrationRelTimeCam.h"
 #include "MCalibrationQECam.h"
 #include "MPedPhotCam.h"
@@ -134 +135 @@
         ped->InitSize(cam->GetNumPixels());
 
-    MCalibrationChargeCam *cal = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
+    MCalibrationChargeCam *cal = 
+      (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
     if (cal)
       {
-        cal->InitSize(cam->GetNumPixels());
-        cal->InitAverageAreas(cam->GetNumAreas());
-        cal->InitAverageSectors(cam->GetNumSectors());
+        cal->InitSize          ( cam->GetNumPixels()  );
+        cal->InitAverageAreas  ( cam->GetNumAreas()   );
+        cal->InitAverageSectors( cam->GetNumSectors() );
+      }
+
+    MCalibrationRelTimeCam *cat = 
+      (MCalibrationRelTimeCam*)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"));
+    MCalibrationQECam *qe = 
+      (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
     if (qe)
         qe->InitSize(cam->GetNumPixels());
@@ -151 +162 @@
         pedphot->InitSize(cam->GetNumPixels());
 
+
     MExtractedSignalCam *ext = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
     if (ext)
         ext->InitSize(cam->GetNumPixels());
 
+
     MBlindPixels *bnd = (MBlindPixels*)pList->FindObject(AddSerialNumber("MBlindPixels"));
     if (bnd)

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -239 +239 @@
     for (int i=0; i<num; i++)
     {
-        MCalibrationChargePix &calpix = (*fCalCam)[i];
+        MCalibrationChargePix &calpix = (MCalibrationChargePix&)(*fCalCam)[i];
 
         calpix.SetBlindPixelMethodValid();
@@ -305 +305 @@
         MPedPhotPix &pedpix = (*fPedPhotCam)[i];
 
-        MCalibrationChargePix &calpix = (*fCalCam)[i];
+        MCalibrationChargePix &calpix = (MCalibrationChargePix&)(*fCalCam)[i];
         Float_t adc2phot = calpix.GetMeanConversionBlindPixelMethod();
         Float_t hi2lo    = calpix.GetConversionHiLo();