Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 9373)
+++ trunk/MagicSoft/Mars/Changelog	(revision 9374)
@@ -31,4 +31,25 @@
      msimreflector/MMirrorSquare.[h,cc], msimreflector/MReflector.[h,cc]:
      - added GetA member function
+
+   * manalysis/MCameraData.cc, mbadpixels/MBadPixelsCalc.cc,
+     mbadpixels/MBadPixelsCam.cc, mbadpixels/MBadPixelsTreat.cc,
+     mcalib/MCalibrationCam.cc, mcalib/MCalibrationChargeCalc.cc,
+     mcalib/MCalibrationChargeCam.cc, mcalib/MCalibrationPulseTimeCam.cc,
+     mcalib/MCalibrationRelTimeCalc.cc, mcalib/MCalibrationRelTimeCam.cc,
+     mcalib/MCalibrationTestCalc.cc, mcalib/MCalibrationTestCam.cc,
+     mcorsika/MCorsikaEvtHeader.cc, mfilter/MFSoftwareTrigger.cc,
+     mgeom/MGeomCam.cc, mhcalib/MHCalibrationCam.cc,
+     mhcalib/MHCalibrationChargeCam.cc, mhcalib/MHCalibrationPulseTimeCam.cc,
+     mhcalib/MHCalibrationRelTimeCam.cc, mhft/MHexagonalFTCalc.cc,
+     mhist/MHCamera.cc, mimage/MHillas.cc, mimage/MNewImagePar.cc,
+     mjobs/MJCut.cc, mjobs/MJSimulation.cc, mpedestal/MExtractPedestal.cc,
+     mpedestal/MPedPhotCam.cc, mpedestal/MPedestalCam.cc,
+     mpointing/MPointingPos.h, msignal/MSignalCam.cc,
+     msimcamera/MSimGeomCam.cc:
+     - replaced MGeomPix by MGeom
+
+   * mjobs/MJStar.cc:
+     - added BinningDist
+     - converted Muon cuts from mm to deg
 
 
Index: trunk/MagicSoft/Mars/manalysis/MCameraData.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCameraData.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/manalysis/MCameraData.cc	(revision 9374)
@@ -43,5 +43,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MPedPhotCam.h"
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 9374)
@@ -67,5 +67,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MPedPhotCam.h"
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 9374)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.53 2009-03-01 21:48:13 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.54 2009-03-02 14:32:49 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -47,5 +47,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 ClassImp(MBadPixelsCam);
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc	(revision 9374)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.42 2009-03-01 21:48:13 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.43 2009-03-02 14:32:49 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -85,5 +85,5 @@
 #include "MParList.h"
 
-#include "MGeomPix.h"
+#include "MGeom.h"
 #include "MGeomCam.h"
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 9374)
@@ -59,5 +59,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MBadPixelsCam.h"
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 9374)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.186 2009-03-01 21:48:13 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.187 2009-03-02 14:32:49 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -221,5 +221,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 #include "MHCamera.h"
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 9374)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.72 2008-06-03 15:26:39 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.73 2009-03-02 14:32:49 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -95,5 +95,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MBadPixelsCam.h"
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPulseTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationPulseTimeCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationPulseTimeCam.cc	(revision 9374)
@@ -82,5 +82,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MCalibrationPix.h"
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc	(revision 9374)
@@ -72,5 +72,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MCalibrationRelTimeCam.h"
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCam.cc	(revision 9374)
@@ -82,5 +82,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MCalibrationRelTimePix.h"
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc	(revision 9374)
@@ -60,5 +60,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 #include "MHCamera.h"
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationTestCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationTestCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationTestCam.cc	(revision 9374)
@@ -42,5 +42,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 ClassImp(MCalibrationTestCam);
Index: trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc
===================================================================
--- trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc	(revision 9374)
@@ -112,5 +112,5 @@
     fStartAltitude          = f[3];
     fFirstTargetNum         = f[4];
-    fFirstInteractionHeight = f[5];
+    fFirstInteractionHeight = f[5]; // FIXME: Could be negative
 
     // Pointing opposite particle direction
Index: trunk/MagicSoft/Mars/mfilter/MFSoftwareTrigger.cc
===================================================================
--- trunk/MagicSoft/Mars/mfilter/MFSoftwareTrigger.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mfilter/MFSoftwareTrigger.cc	(revision 9374)
@@ -72,5 +72,5 @@
 #include "MParList.h"
 
-#include "MGeomPix.h"
+#include "MGeom.h"
 #include "MGeomCam.h"
 
Index: trunk/MagicSoft/Mars/mgeom/MGeomCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mgeom/MGeomCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mgeom/MGeomCam.cc	(revision 9374)
@@ -73,5 +73,5 @@
 #include "MLogManip.h"
 
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 ClassImp(MGeomCam);
@@ -177,5 +177,5 @@
 void MGeomCam::InitOuterRing()
 {
-    fPixels.R__FOR_EACH(MGeomPix, CheckOuterRing)(*this);
+    fPixels.R__FOR_EACH(MGeom, CheckOuterRing)(*this);
 }
 
@@ -518,5 +518,5 @@
 //
 // Return direction of p2 w.r.t. p1. For more details
-// see MGeomPix::GetDirection
+// see MGeom::GetDirection
 //
 Int_t MGeomCam::GetDirection(UInt_t p1, UInt_t p2) const
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 9374)
@@ -85,5 +85,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MParList.h"
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 9374)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.62 2008-06-30 09:36:36 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.63 2009-03-02 14:32:50 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -147,5 +147,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MBadPixelsCam.h"
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc	(revision 9374)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.43 2008-11-12 15:55:32 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.44 2009-03-02 14:32:50 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -133,5 +133,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MBadPixelsCam.h"
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 9374)
@@ -117,5 +117,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MBadPixelsCam.h"
Index: trunk/MagicSoft/Mars/mhft/MHexagonalFTCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mhft/MHexagonalFTCalc.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mhft/MHexagonalFTCalc.cc	(revision 9374)
@@ -58,5 +58,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MSignalCam.h"
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 9374)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.119 2009-03-01 21:48:14 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.120 2009-03-02 14:32:50 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -80,5 +80,5 @@
 #include "MBinning.h"
 
-#include "MGeomPix.h"
+#include "MGeom.h"
 #include "MGeomCam.h"
 
Index: trunk/MagicSoft/Mars/mimage/MHillas.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHillas.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mimage/MHillas.cc	(revision 9374)
@@ -66,5 +66,5 @@
 #include <TVector2.h>
 
-#include "MGeomPix.h"
+#include "MGeom.h"
 #include "MGeomCam.h"
 
Index: trunk/MagicSoft/Mars/mimage/MNewImagePar.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MNewImagePar.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mimage/MNewImagePar.cc	(revision 9374)
@@ -84,5 +84,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MSignalCam.h"
Index: trunk/MagicSoft/Mars/mjobs/MJCut.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCut.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mjobs/MJCut.cc	(revision 9374)
@@ -259,22 +259,36 @@
     if (fNameResult.IsNull() && fStoreResult)
     {
+        // If no special name fNameResult is given but the result should be stored,
+        // search for a file named oname (fNameOutput or ganymed%08d.root)
         file = (TFile*)gROOT->GetListOfFiles()->FindObject(oname);
-        if (file)
-            file->cd();
+        if (!file)
+        {
+            *fLog << err << "ERROR - File " << oname << " expected to be open, but isn't..." << endl;
+            return kFALSE;
+        }
+
+        file->cd();
     }
     else
+    {
+        // If special name fNameResult is given or no storage requested,
+        // open a new file named oname (fNameOutput or ganymed%08d.root)
         file = TFile::Open(oname, fOverwrite?"RECREATE":"NEW", "File created by MJCut", 9);
 
-    if (!file)
-    {
-        *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
-        return kFALSE;
-    }
-
+        if (!file)
+        {
+            *fLog << err << "ERROR - Couldn't open new file " << oname << " for writing..." << endl;
+            return kFALSE;
+        }
+    }
+
+    // Write container to output file
     const Bool_t rc = WriteContainer(cont);
 
+    // If file was newly opened, close it
     if (!(fNameResult.IsNull() && fStoreResult))
         delete file;
 
+    // Return result of writing
     return rc;
 }
@@ -301,6 +315,9 @@
         arr.Add((TObject*)(&halpha->GetAlphaFitter()));
 
-    // Save also the dataset
+    // Save also the dataset, environment and display
     arr.Add(const_cast<MDataSet*>(&set));
+    arr.Add(const_cast<TEnv*>(GetEnv()));
+    if (fDisplay)
+        arr.Add(fDisplay);
 
     const Int_t num = set.GetNumAnalysis();
@@ -317,9 +334,4 @@
         }
     }
-
-    if (fDisplay)
-        arr.Add(fDisplay);
-
-    arr.Add(const_cast<TEnv*>(GetEnv()));
 
     return WriteContainer(arr, fname, "UPDATE");
@@ -995,5 +1007,5 @@
     fillsrc.SetNameTab("SrcPos");
 
-    if (set.IsWobbleMode() && !set.IsMonteCarlo())
+    if (set.IsWobbleMode()/* && !set.IsMonteCarlo()*/)
         tlist2.AddToListBefore(&fillsrc, &hcalc);
 
Index: trunk/MagicSoft/Mars/mjobs/MJSimulation.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJSimulation.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mjobs/MJSimulation.cc	(revision 9374)
@@ -496,5 +496,9 @@
     //  NSB = 0.2*6e-3
 
-    // FIXME: Simulate photons before QE!
+    // MAGIC: 84MHz       / Pixel
+    // DWARF: 14MHz-25Mhz / APD
+
+
+    // FIXME: Simulate photons before cones and QE!
 
     MSimRandomPhotons  simnsb;
@@ -520,5 +524,6 @@
 
     MParameterD pulpos("IntendedPulsePos");
-//    pulpos.SetVal(40);  // [ns]
+    // FIXME: Set a default which could be 1/3 of the digitization window
+    //    pulpos.SetVal(40);  // [ns]
     plist.AddToList(&pulpos);
 
Index: trunk/MagicSoft/Mars/mjobs/MJStar.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 9374)
@@ -174,4 +174,5 @@
     MBinning bins5("BinningMuonWidth");
     MBinning bins6("BinningArcPhi");
+    MBinning binsd("BinningDist");
     plist.AddToList(&bins1);
     plist.AddToList(&bins2);
@@ -180,4 +181,5 @@
     plist.AddToList(&bins5);
     plist.AddToList(&bins6);
+    plist.AddToList(&binsd);
 
 
@@ -434,8 +436,8 @@
     MFDataPhrase fmuon1("MHillas.fSize>150 && MNewImagePar.fConcCOG<0.1", "MuonPreCut");
     // Filter to calculate further muon parameters
-    MFDataPhrase fmuon2("(MMuonSearchPar.fRadius>180) && (MMuonSearchPar.fRadius<400) &&"
-                        "(MMuonSearchPar.fDeviation<45)", "MuonSearchCut");
+    MFDataPhrase fmuon2("(MMuonSearchPar.fRadius*MGeomCam.fConvMm2Deg>0.6) && (MMuonSearchPar.fRadius*MGeomCam.fConvMm2Deg<1.35) &&"
+                        "(MMuonSearchPar.fDeviation*MGeomCam.fConvMm2Deg<0.152)", "MuonSearchCut");
     // Filter to fill the MHMuonPar
-    MFDataPhrase fmuon3("(MMuonCalibPar.fArcPhi>190) && (MMuonSearchPar.fDeviation<35) &&"
+    MFDataPhrase fmuon3("(MMuonCalibPar.fArcPhi>190) && (MMuonSearchPar.fDeviation*MGeomCam.fConvMm2Deg<0.118) &&"
                         "(MMuonCalibPar.fArcWidth<0.20) && (MMuonCalibPar.fArcWidth>0.04) &&"
                         "MMuonCalibPar.fRelTimeSigma<1.5",
Index: trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc	(revision 9374)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.39 2008-11-12 16:04:18 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.40 2009-03-02 14:32:50 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -166,5 +166,5 @@
 #include "MPedestalCam.h"
 
-#include "MGeomPix.h"
+#include "MGeom.h"
 #include "MGeomCam.h"
 
Index: trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc	(revision 9374)
@@ -50,5 +50,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MBadPixelsCam.h"
Index: trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc	(revision 9374)
@@ -58,5 +58,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MBadPixelsCam.h"
Index: trunk/MagicSoft/Mars/mpointing/MPointingPos.h
===================================================================
--- trunk/MagicSoft/Mars/mpointing/MPointingPos.h	(revision 9373)
+++ trunk/MagicSoft/Mars/mpointing/MPointingPos.h	(revision 9374)
@@ -27,4 +27,7 @@
     Double_t fHa;  // [h]   Hour angle
     Double_t fDec; // [deg] Declination
+
+    // Hour angle!
+    // Angle to magnetic field!
 
 public:
Index: trunk/MagicSoft/Mars/msignal/MSignalCam.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MSignalCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/msignal/MSignalCam.cc	(revision 9374)
@@ -45,5 +45,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 ClassImp(MSignalCam);
Index: trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc
===================================================================
--- trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc	(revision 9373)
+++ trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc	(revision 9374)
@@ -54,5 +54,5 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MPhotonEvent.h"