Index: trunk/MagicSoft/Mars/mimage/MHHillas.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillas.cc	(revision 6961)
+++ trunk/MagicSoft/Mars/mimage/MHHillas.cc	(revision 6977)
@@ -386,5 +386,5 @@
 }
 
-TH1 *MHHillas::GetHistByName(const TString name)
+TH1 *MHHillas::GetHistByName(const TString name) const
 {
     if (name.Contains("Width", TString::kIgnoreCase))
Index: trunk/MagicSoft/Mars/mimage/MHHillas.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillas.h	(revision 6961)
+++ trunk/MagicSoft/Mars/mimage/MHHillas.h	(revision 6977)
@@ -43,5 +43,10 @@
     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
 
-    TH1 *GetHistByName(const TString name);
+    TH1 *GetHistByName(const TString name) const;
+    TObject *FindObject(const TObject *obj) const { return 0; }
+    TObject *FindObject(const char *name) const
+    {
+        return (TObject*)GetHistByName(name);
+    }
 
     TH1F *GetHistLength() { return fLength; }
Index: trunk/MagicSoft/Mars/mimage/MHHillasExt.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillasExt.cc	(revision 6961)
+++ trunk/MagicSoft/Mars/mimage/MHHillasExt.cc	(revision 6977)
@@ -294,14 +294,14 @@
 }
 
-TH1 *MHHillasExt::GetHistByName(const TString name)
+TH1 *MHHillasExt::GetHistByName(const TString name) const
 {
     if (name.Contains("Asym", TString::kIgnoreCase))
-        return &fHAsym;
-    if (name.Contains("M3Long", TString::kIgnoreCase))
-        return &fHM3Long;
-    if (name.Contains("M3Trans", TString::kIgnoreCase))
-        return &fHM3Trans;
+        return const_cast<TH1F*>(&fHAsym);
+    if (name.Contains("M3L", TString::kIgnoreCase))
+        return const_cast<TH1F*>(&fHM3Long);
+    if (name.Contains("M3T", TString::kIgnoreCase))
+        return const_cast<TH1F*>(&fHM3Trans);
     if (name.Contains("MaxDist", TString::kIgnoreCase))
-        return &fHMaxDist;
+        return const_cast<TH1F*>(&fHMaxDist);
 
     return NULL;
Index: trunk/MagicSoft/Mars/mimage/MHHillasExt.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillasExt.h	(revision 6961)
+++ trunk/MagicSoft/Mars/mimage/MHHillasExt.h	(revision 6977)
@@ -37,5 +37,10 @@
     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
 
-    TH1 *GetHistByName(const TString name);
+    TH1 *GetHistByName(const TString name) const;
+    TObject *FindObject(const TObject *obj) const { return 0; }
+    TObject *FindObject(const char *name) const
+    {
+        return (TObject*)GetHistByName(name);
+    }
 
     void Draw(Option_t *opt=NULL);
Index: trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc	(revision 6961)
+++ trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc	(revision 6977)
@@ -293,5 +293,5 @@
 }
 
-TH1 *MHHillasSrc::GetHistByName(const TString name)
+TH1 *MHHillasSrc::GetHistByName(const TString name) const
 {
     if (name.Contains("Alpha", TString::kIgnoreCase))
Index: trunk/MagicSoft/Mars/mimage/MHHillasSrc.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillasSrc.h	(revision 6961)
+++ trunk/MagicSoft/Mars/mimage/MHHillasSrc.h	(revision 6977)
@@ -32,5 +32,10 @@
     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
 
-    TH1 *GetHistByName(const TString name);
+    TH1 *GetHistByName(const TString name) const;
+    TObject *FindObject(const TObject *obj) const { return 0; }
+    TObject *FindObject(const char *name) const
+    {
+        return (TObject*)GetHistByName(name);
+    }
 
     TH1F *GetHistAlpha()         { return fAlpha; }
Index: trunk/MagicSoft/Mars/mimage/MHImagePar.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHImagePar.cc	(revision 6961)
+++ trunk/MagicSoft/Mars/mimage/MHImagePar.cc	(revision 6977)
@@ -297,12 +297,12 @@
 }
 
-TH1 *MHImagePar::GetHistByName(const TString name)
+TH1 *MHImagePar::GetHistByName(const TString name) const
 {
     if (name.Contains("SatHi", TString::kIgnoreCase))
-        return &fHistSatHi;
+        return const_cast<TH1F*>(&fHistSatHi);
     if (name.Contains("SatLo", TString::kIgnoreCase))
-        return &fHistSatLo;
+        return const_cast<TH1F*>(&fHistSatLo);
     if (name.Contains("Islands", TString::kIgnoreCase))
-        return &fHistIslands;
+        return const_cast<TH1F*>(&fHistIslands);
 
     return NULL;
Index: trunk/MagicSoft/Mars/mimage/MHImagePar.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHImagePar.h	(revision 6961)
+++ trunk/MagicSoft/Mars/mimage/MHImagePar.h	(revision 6977)
@@ -33,5 +33,10 @@
     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
 
-    TH1 *GetHistByName(const TString name);
+    TH1 *GetHistByName(const TString name) const;
+    TObject *FindObject(const TObject *obj) const { return 0; }
+    TObject *FindObject(const char *name) const
+    {
+        return (TObject*)GetHistByName(name);
+    }
 
     TH1F &GetHistSatHi()   { return fHistSatHi; }
Index: trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc	(revision 6961)
+++ trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc	(revision 6977)
@@ -367,22 +367,22 @@
 }
 
-TH1 *MHNewImagePar::GetHistByName(const TString name)
+TH1 *MHNewImagePar::GetHistByName(const TString name) const
 {
     if (name.Contains("Leakage1", TString::kIgnoreCase))
-        return &fHistLeakage1;
+        return const_cast<TH1F*>(&fHistLeakage1);
     if (name.Contains("Leakage2", TString::kIgnoreCase))
-        return &fHistLeakage2;
+        return const_cast<TH1F*>(&fHistLeakage2);
+    if (name.Contains("Conc1", TString::kIgnoreCase)) // must be first!
+        return const_cast<TH1F*>(&fHistConc1);
     if (name.Contains("Conc", TString::kIgnoreCase))
-        return &fHistConc;
-    if (name.Contains("Conc1", TString::kIgnoreCase))
-        return &fHistConc1;
+        return const_cast<TH1F*>(&fHistConc);
     if (name.Contains("UsedPix", TString::kIgnoreCase))
-        return &fHistUsedPix;
+        return const_cast<TH1F*>(&fHistUsedPix);
     if (name.Contains("CorePix", TString::kIgnoreCase))
-        return &fHistCorePix;
+        return const_cast<TH1F*>(&fHistCorePix);
     if (name.Contains("UsedArea", TString::kIgnoreCase))
-        return &fHistUsedArea;
+        return const_cast<TH1F*>(&fHistUsedArea);
     if (name.Contains("CoreArea", TString::kIgnoreCase))
-        return &fHistCoreArea;
+        return const_cast<TH1F*>(&fHistCoreArea);
 
     return NULL;
Index: trunk/MagicSoft/Mars/mimage/MHNewImagePar.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHNewImagePar.h	(revision 6961)
+++ trunk/MagicSoft/Mars/mimage/MHNewImagePar.h	(revision 6977)
@@ -35,5 +35,10 @@
     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
 
-    TH1 *GetHistByName(const TString name);
+    TH1 *GetHistByName(const TString name) const;
+    TObject *FindObject(const TObject *obj) const { return 0; }
+    TObject *FindObject(const char *name) const
+    {
+        return (TObject*)GetHistByName(name);
+    }
 
     TH1F &GetHistLeakage1()  { return fHistLeakage1; }