Index: trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc	(revision 2275)
+++ trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc	(revision 2377)
@@ -38,4 +38,5 @@
 #include "MTaskList.h"           // MTaskList::AddToList
 #include "MHCamera.h"            // MHCamera
+#include "MGeomApply.h"          // MGeomApply
 #include "MHillasCalc.h"         // MHillasCalc
 #include "MHillasSrcCalc.h"      // MHillasSrcCalc
@@ -43,10 +44,10 @@
 #include "MPedestalCam.h"        // MPedestalCam
 #include "MCerPhotEvt.h"         // MCerPhotEvt::GetPixById
-#include "MCerPhotCalc.h"       // MCerPhotCalc
+#include "MCerPhotCalc.h"        // MCerPhotCalc
 #include "MMcPedestalCopy.h"     // MMcPedestalCopy
 #include "MMcPedestalNSBAdd.h"   // MMcPedestalNSBAdd
 #include "MBlindPixelCalc.h"     // MBlindPixelCalc
 #include "MImgCleanStd.h"        // MImgCleanStd
-#include "MGeomCamMagic.h"       // MGeomMagicCam
+//#include "MGeomCamMagic.h"       // MGeomMagicCam
 #include "MRawEvtData.h"         // MRawEvtData
 
@@ -116,9 +117,10 @@
 //  preprocess tasks and read in first event (process)
 //
-MGeomCam *MGCamDisplay::SetupTaskList()
+void /*MGeomCam */MGCamDisplay::SetupTaskList()
 {
     MTaskList *tlist = GetTaskList();
     MParList  *plist = GetParList();
 
+    MGeomApply        *apply = new MGeomApply;
     MMcPedestalCopy   *pcopy = new MMcPedestalCopy;
     MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
@@ -130,4 +132,5 @@
     MHillasSrcCalc    *scalc = new MHillasSrcCalc;
 
+    tlist->AddToList(apply);
     tlist->AddToList(pcopy);
     tlist->AddToList(pdnsb);
@@ -139,13 +142,13 @@
     tlist->AddToList(scalc);
 
-    MGeomCamMagic *geom   = new MGeomCamMagic;
+    // MGeomCamMagic *geom   = new MGeomCamMagic;
     MPedestalCam  *pedest = new MPedestalCam;
     MRawEvtData   *event  = new MRawEvtData;
 
-    plist->AddToList(geom);
+    // plist->AddToList(geom);
     plist->AddToList(pedest);
     plist->AddToList(event);
 
-    return geom;
+    // return NULL;
 }
 
@@ -161,5 +164,5 @@
     // Setup Task list for hillas calculation
     //
-    MGeomCam *geom = SetupTaskList();
+    /*MGeomCam *geom = */SetupTaskList();
 
     //
@@ -181,5 +184,5 @@
     {
         fCanvas2[i]->cd();
-        fDisplay[i] = new MHCamera(*geom);
+        fDisplay[i] = new MHCamera;//(*geom);
         fDisplay[i]->Draw();
         fDisplay[i]->AddNotify(*(MCamEvent*)GetParList()->FindObject("MRawEvtData"));
@@ -221,4 +224,5 @@
 //  together with the hillas ellipse or not.
 //
+#include <iostream.h>
 void MGCamDisplay::UpdateDisplay()
 {
@@ -227,4 +231,14 @@
 
     const MParList *plist = fEvtLoop->GetParList();
+
+    if (!fDisplay[0]->GetGeometry())
+    {
+        MGeomCam *cam = (MGeomCam*)plist->FindObject("MGeomCam");
+        for (int i=0; i<5; i++)
+        {
+            fDisplay[i]->SetGeometry(*cam);
+            cout << "---> Setting geometry for: " << fDisplay[i]->GetName() << endl;
+        }
+    }
 
     //
@@ -257,8 +271,10 @@
     const MPedestalCam *ped   = (MPedestalCam*)plist->FindObject("MPedestalCam");
 
+    const Int_t n = ped->GetSize();
+
     // FIXME: Make this publicly available
-    TArrayD val(577);
-    TArrayC use(577);
-    for (int i=0; i<577;i++)
+    TArrayD val(n);
+    TArrayC use(n);
+    for (int i=0; i<n;i++)
     {
         // FIXME: photon event first!
Index: trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h
===================================================================
--- trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h	(revision 2275)
+++ trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h	(revision 2377)
@@ -25,5 +25,5 @@
     void UpdateDisplay();
 
-    MGeomCam *SetupTaskList();
+    void /*MGeomCam */SetupTaskList();
 
 public:
Index: trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc	(revision 2275)
+++ trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc	(revision 2377)
@@ -278,4 +278,5 @@
 
     AddTab("Geometry");
+
     MGeomCamMagic geom;
     MHCamera *display = new MHCamera(geom);