Changeset 4577 for trunk/MagicSoft/Mars/manalysis

Timestamp:

08/11/04 12:01:44 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -118 +118 @@
 Bool_t MGeomApply::ReInit(MParList *pList)
 {
-    MGeomCam *cam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
-    if (!cam)
+    MGeomCam *geom = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
+    if (!geom)
     {
        *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
@@ -128 +128 @@
     // the use of some camera files from the 0.7 beta version in which the 
     // array containing pixel ratios is not initialized.
-    cam->CalcPixRatio();
-
+    geom->CalcPixRatio();
+
+    TIter Next(*pList);
+    TObject *o = 0;
+
+    while ((o=Next()))
+    {
+        MCamEvent *cam = dynamic_cast<MCamEvent*>(o);
+        if (cam)
+            cam->Init(*geom);
+    }
+/*
     MPedestalCam *ped = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     if (ped)
-        ped->Init(*cam);
+        ped->Init(*geom);
 
     MCalibrationCam *cal = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
     if (cal)
-        cal->Init(*cam);
+        cal->Init(*geom);
 
     MCalibrationCam *cat = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
     if (cat)
-        cat->Init(*cam);
+        cat->Init(*geom);
 
     MCalibrationCam *qe = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
     if (qe)
-        qe->Init(*cam);
+        qe->Init(*geom);
 
     MCalibrationCam *pcam = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationPedCam"));
     if (pcam)
-        pcam->Init(*cam);
+        pcam->Init(*geom);
 
     MPedPhotCam *pedphot = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
     if (pedphot)
-        pedphot->Init(*cam);
+        pedphot->Init(*geom);
 
     MExtractedSignalCam *ext = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
     if (ext)
-        ext->InitSize(cam->GetNumPixels());
+        ext->Init(*cam);
 
     MArrivalTimeCam *tme = (MArrivalTimeCam*)pList->FindObject(AddSerialNumber("MArrivalTimeCam"));
@@ -168 +178 @@
     MBadPixelsCam *bad = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
     if (bad)
-      bad->InitSize(cam->GetNumPixels());
+        bad->InitSize(cam->GetNumPixels());
+    */
 
     return kTRUE;