Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3376)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3377)
@@ -4,4 +4,11 @@
 
                                                  -*-*- 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
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 3376)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 3377)
@@ -434,5 +434,5 @@
     MCerPhotPix *pix;
     while ((pix = (MCerPhotPix*)TObjArrayIter::Next()))
-        if (!fUsedOnly || (fUsedOnly && pix->IsPixelUsed()))
+        if (!fUsedOnly || pix->IsPixelUsed())
             return pix;
     return pix;
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 3376)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 3377)
@@ -100,12 +100,4 @@
 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,18 +115,17 @@
     }
 
-   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"));