Changeset 6977 for trunk/MagicSoft/Mars/mimage

Timestamp:

04/25/05 15:30:46 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MHHillas.cc (modified) (1 diff)
• MHHillas.h (modified) (1 diff)
• MHHillasExt.cc (modified) (1 diff)
• MHHillasExt.h (modified) (1 diff)
• MHHillasSrc.cc (modified) (1 diff)
• MHHillasSrc.h (modified) (1 diff)
• MHImagePar.cc (modified) (1 diff)
• MHImagePar.h (modified) (1 diff)
• MHNewImagePar.cc (modified) (1 diff)
• MHNewImagePar.h (modified) (1 diff)

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -386 +386 @@
 }
 
-TH1 *MHHillas::GetHistByName(const TString name)
+TH1 *MHHillas::GetHistByName(const TString name) const
 {
     if (name.Contains("Width", TString::kIgnoreCase))

trunk/MagicSoft/Mars/mimage/MHHillas.h

@@ -43 +43 @@
     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; }

trunk/MagicSoft/Mars/mimage/MHHillasExt.cc

@@ -294 +294 @@
 }
 
-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;

trunk/MagicSoft/Mars/mimage/MHHillasExt.h

@@ -37 +37 @@
     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);

trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc

@@ -293 +293 @@
 }
 
-TH1 *MHHillasSrc::GetHistByName(const TString name)
+TH1 *MHHillasSrc::GetHistByName(const TString name) const
 {
     if (name.Contains("Alpha", TString::kIgnoreCase))

trunk/MagicSoft/Mars/mimage/MHHillasSrc.h

@@ -32 +32 @@
     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; }

trunk/MagicSoft/Mars/mimage/MHImagePar.cc

@@ -297 +297 @@
 }
 
-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;

trunk/MagicSoft/Mars/mimage/MHImagePar.h

@@ -33 +33 @@
     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; }

trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc

@@ -367 +367 @@
 }
 
-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;

trunk/MagicSoft/Mars/mimage/MHNewImagePar.h

@@ -35 +35 @@
     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; }