Changeset 3377 for trunk

Timestamp:

03/02/04 09:21:05 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCerPhotEvt.cc (modified) (1 diff)
• mcalib/MCalibrateData.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/03/02: Thomas Bretz
+
+   * mcalib/MCalibrateData.cc:
+     - removed usage of MGeomCam (you have MGeomApply for this!)
+
+
 
  2004/03/01: Nadia Tonello

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -434 +434 @@
     MCerPhotPix *pix;
     while ((pix = (MCerPhotPix*)TObjArrayIter::Next()))
-        if (!fUsedOnly || (fUsedOnly && pix->IsPixelUsed()))
+        if (!fUsedOnly || pix->IsPixelUsed())
             return pix;
     return pix;

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)
@@ -123 +115 @@
     }
 
-   if(fCalibrationMode>kNone)
-      {
-        fCalibrations = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
-        if (!fCalibrations)
-          {
-            *fLog << err << AddSerialNumber("MCalibrationChargeCam") << " not found ... aborting." << endl;
-            return kFALSE;
-          }
-      }
+    if (fCalibrationMode>kNone)
+    {
+        fCalibrations = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
+        if (!fCalibrations)
+        {
+            *fLog << err << AddSerialNumber("MCalibrationChargeCam") << " not found ... aborting." << endl;
+            return kFALSE;
+        }
+    }
 
     fPedPhot = (MPedPhotCam*)pList->FindCreateObj(AddSerialNumber("MPedPhotCam"));
     if (!fPedPhot)
         return kFALSE;
-    fPedPhot->InitSize(fCam->GetNumPixels());
 
     fCerPhotEvt = (MCerPhotEvt*)pList->FindCreateObj(AddSerialNumber("MCerPhotEvt"));