Changeset 1283 for trunk/MagicSoft/Mars/mhist

Timestamp:

04/22/02 11:28:38 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• HistLinkDef.h (modified) (1 diff)
• MFillH.cc (modified) (2 diffs)
• MH.cc (modified) (2 diffs)
• MH.h (modified) (1 diff)
• MH3.cc (added)
• MH3.h (added)
• MHHillas.cc (modified) (5 diffs)
• MHHillas.h (modified) (3 diffs)
• MHHillasExt.cc (added)
• MHHillasExt.h (added)
• MHStarMap.cc (modified) (5 diffs)
• MHStarMap.h (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -8 +8 @@
 
 #pragma link C++ class MH+;
+#pragma link C++ class MH3+;
 #pragma link C++ class MHFadcCam+;
 #pragma link C++ class MHFadcPix+;
 #pragma link C++ class MHHillas+;
 #pragma link C++ class MHHillasSrc+;
+#pragma link C++ class MHHillasExt+;
 #pragma link C++ class MHStarMap+;
 #pragma link C++ class MHEnergyTime+;

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -238 +238 @@
         const TString name = ExtractName(fHName);
 
-        TObject *obj = pList->FindCreateObj(cls, name);
+        TObject *obj=NULL;
+        if (cls==name)
+            obj = pList->FindObject(fHName);
+
+        if (!obj)
+            obj = pList->FindCreateObj(cls, name);
+
         if (!obj)
             return kFALSE;
@@ -277 +283 @@
     // list. If it could not be found we cannot proceed.
     //
+    if (fParContainerName.IsNull())
+    {
+        fParContainer = pList;
+        return kTRUE;
+    }
+
     fParContainer = (MParContainer*)pList->FindObject(fParContainerName);
     if (fParContainer)
         return kTRUE;
 
-    *fLog << err << dbginf << fParContainerName << " [MParContainer] not found... aborting." << endl;
+    *fLog << err << dbginf << "'" << fParContainerName << "' [MParContainer] not found... aborting." << endl;
     return kFALSE;
 }

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -66 +66 @@
     //   set the name and title of this object
     //
-    fName  = name  ? name  : "MH" ;
-    fTitle = title ? title : "Base class for Mars histograms" ;
+    fName  = name  ? name  : "MH";
+    fTitle = title ? title : "Base class for Mars histograms";
 }
 
@@ -83 +83 @@
 // number of all existing canvases plus one)
 //
-TCanvas *MH::MakeDefCanvas(const char *name, const char *title,
+TCanvas *MH::MakeDefCanvas(TString name, const char *title,
                            const UInt_t w, const UInt_t h)
 {
     const TList *list = (TList*)gROOT->GetListOfCanvases();
 
-    const char *def = name ? name : gROOT->GetDefCanvasName();
-
-    TCanvas *c;
-    if (list->FindObject(def))
-    {
-        const char *n = StrDup(Form("%s <%d>", def, list->GetSize()+1));
-        c = new TCanvas(n, title, w, h);
-        delete [] n;
-    }
-    else
-        c = new TCanvas(def, title, w, h);
-
-    return c;
+    if (name.IsNull())
+        name = gROOT->GetDefCanvasName();
+
+    if (list->FindObject(name))
+        name += Form(" <%d>", list->GetSize()+1);
+
+    return new TCanvas(name, title, w, h);
 }
 

trunk/MagicSoft/Mars/mhist/MH.h

@@ -22 +22 @@
     virtual Bool_t Fill(const MParContainer *par) = 0;
 
-    static TCanvas *MakeDefCanvas(const char *name=NULL, const char *title="",
+    static TCanvas *MakeDefCanvas(TString name="", const char *title="",
                                   const UInt_t w=700, const UInt_t h=500);
     static TCanvas *MakeDefCanvas(const TObject *obj,

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -53 +53 @@
 //
 MHHillas::MHHillas(const char *name, const char *title)
-    : fMm2Deg(-1), fUseMmScale(kFALSE)
+    : fMm2Deg(-1), fUseMmScale(kTRUE)
 {
     //
@@ -72 +72 @@
     fWidth->SetDirectory(NULL);
 
-    fLength->GetXaxis()->SetTitle("Length [mm]");
-    fWidth->GetXaxis()->SetTitle("Width [mm]");
-
-    fLength->GetYaxis()->SetTitle("Counts");
-    fWidth->GetYaxis()->SetTitle("Counts");
+    fLength->SetXTitle("Length [mm]");
+    fWidth->SetXTitle("Width [mm]");
+
+    fLength->SetYTitle("Counts");
+    fWidth->SetYTitle("Counts");
 }
 
@@ -119 +119 @@
     }
 
-    fLength->GetXaxis()->SetTitle("Length [\\circ]");
-    fWidth->GetXaxis()->SetTitle("Width [\\circ]");
-
-    fMm2Deg = geom->GetConvMm2Deg();
+    fLength->SetXTitle("Length [\\circ]");
+    fWidth->SetXTitle("Width [\\circ]");
+
+    fMm2Deg     = geom->GetConvMm2Deg();
+    fUseMmScale = kFALSE;
 
     return kTRUE;
@@ -189 +190 @@
     if (fUseMmScale)
     {
-        fLength->GetXaxis()->SetTitle("Length [mm]");
-        fWidth->GetXaxis()->SetTitle("Width [mm]");
+        fLength->SetXTitle("Length [mm]");
+        fWidth->SetXTitle("Width [mm]");
 
         fLength->Scale(1./fMm2Deg);
@@ -197 +198 @@
     else
     {
-        fLength->GetXaxis()->SetTitle("Length [\\circ]");
-        fWidth->GetXaxis()->SetTitle("Width [\\circ]");
+        fLength->SetXTitle("Length [\\circ]");
+        fWidth->SetXTitle("Width [\\circ]");
 
         fLength->Scale(fMm2Deg);

trunk/MagicSoft/Mars/mhist/MHHillas.h

@@ -7 +7 @@
 
 class TH1F;
-class MHillas;
 
 class MHHillas : public MH
@@ -15 +14 @@
     TH1F *fLength;
 
+protected:
     Float_t fMm2Deg;
 
@@ -24 +24 @@
 
     void SetMmScale(Bool_t mmscale=kTRUE);
-    void SetMm2Deg(Float_t mmdeg);
+    virtual void SetMm2Deg(Float_t mmdeg);
 
     Bool_t SetupFill(const MParList *pList);

trunk/MagicSoft/Mars/mhist/MHStarMap.cc

@@ -39 +39 @@
 #include <TCanvas.h>  // TCanvas
 
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MParList.h"
+
+#include "MGeomCam.h"
 #include "MHillas.h"
+#include "MBinning.h"
 
 ClassImp(MHStarMap);
@@ -48 +55 @@
 //
 MHStarMap::MHStarMap(const char *name, const char *title)
+    : fMm2Deg(-1), fUseMmScale(kTRUE)
 {
     //
@@ -57 +65 @@
     //   set the name and title of this object
     //
-    
     fName  = name  ? name  : "MHStarMap" ;
     fTitle = title ? title : "Container for a Star Map" ;
@@ -88 +95 @@
 // --------------------------------------------------------------------------
 //
+// Setup the Binning for the histograms automatically if the correct
+// instances of MBinning (with the names 'BinningWidth' and 'BinningLength')
+// are found in the parameter list
+// Use this function if you want to set the conversion factor which
+// is used to convert the mm-scale in the camera plain into the deg-scale
+// used for histogram presentations. The conversion factor is part of
+// the camera geometry. Please create a corresponding MGeomCam container.
+//
+Bool_t MHStarMap::SetupFill(const MParList *plist)
+{
+    const MGeomCam *geom = (MGeomCam*)plist->FindObject("MGeomCam");
+    if (geom)
+    {
+        fMm2Deg = geom->GetConvMm2Deg();
+        fUseMmScale = kFALSE;
+
+        fStarMap->SetXTitle("x [\\circ]");
+        fStarMap->SetYTitle("y [\\circ]");
+    }
+
+    const MBinning *bins = (MBinning*)plist->FindObject("BinningStarMap");
+    if (!bins)
+    {
+        float r = geom ? geom->GetMaxRadius() : 600;
+        r *= 2./3;
+        if (!fUseMmScale)
+            r *= fMm2Deg;
+
+        MBinning b;
+        b.SetEdges(100, -r, r);
+        SetBinning(fStarMap, &b, &b);
+    }
+    else
+        SetBinning(fStarMap, bins, bins);
+
+    if (!geom)
+    {
+        *fLog << warn << dbginf << "No Camera Geometry available. Using mm-scale for histograms." << endl;
+        return kTRUE;
+    }
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
 // Fill the four histograms with data from a MHillas-Container.
 // Be careful: Only call this with an object of type MHillas
@@ -98 +151 @@
 
     const float m = tan(delta);
-    const float t = h.GetMeanY() - m*h.GetMeanX();
+
+    float t = h.GetMeanY() - m*h.GetMeanX();
+
+    if (!fUseMmScale)
+        t *= fMm2Deg;
 
     if (m>-1 && m<1)
-        for (int x=-298; x<298; x+=4)
+    {
+        TAxis &axe = *fStarMap->GetXaxis();
+
+        const int N = axe.GetXbins()->GetSize();
+        for (int i=0; i<N; i++)
         {
+            const float x = axe.GetBinCenter(i);
             const float y = m*x+t;
 
             fStarMap->Fill(x, y);
         }
+    }
     else
-        for (int y=-298; y<298; y+=4)
+    {
+        TAxis &axe = *fStarMap->GetYaxis();
+
+        const int N = axe.GetXbins()->GetSize();
+        for (int i=0; i<N; i++)
         {
+            const float y = axe.GetBinCenter(i);
             const float x = (y-t)/m;
 
             fStarMap->Fill(x, y);
         }
+    }
 
     return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Use this function to setup your own conversion factor between degrees
+// and millimeters. The conversion factor should be the one calculated in
+// MGeomCam. Use this function with Caution: You could create wrong values
+// by setting up your own scale factor.
+//
+void MHStarMap::SetMm2Deg(Float_t mmdeg)
+{
+    if (mmdeg<0)
+    {
+        *fLog << warn << dbginf << "Warning - Conversion factor < 0 - nonsense. Ignored." << endl;
+        return;
+    }
+
+    if (fMm2Deg>=0)
+        *fLog << warn << dbginf << "Warning - Conversion factor already set. Overwriting" << endl;
+
+    fMm2Deg = mmdeg;
+}
+
+// --------------------------------------------------------------------------
+//
+// With this function you can convert the histogram ('on the fly') between
+// degrees and millimeters.
+//
+void MHStarMap::SetMmScale(Bool_t mmscale)
+{
+    if (fUseMmScale == mmscale)
+        return;
+
+    if (fMm2Deg<0)
+    {
+        *fLog << warn << dbginf << "Warning - Sorry, no conversion factor for conversion available." << endl;
+        return;
+    }
+
+    if (fUseMmScale)
+    {
+        fStarMap->SetXTitle("x [mm]");
+        fStarMap->SetYTitle("y [mm]");
+
+        fStarMap->Scale(1./fMm2Deg);
+    }
+    else
+    {
+        fStarMap->SetXTitle("x [\\circ]");
+        fStarMap->SetYTitle("y [\\circ]");
+
+        fStarMap->Scale(1./fMm2Deg);
+    }
+
+    fUseMmScale = mmscale;
 }
 

trunk/MagicSoft/Mars/mhist/MHStarMap.h

@@ -17 +17 @@
     TH2F *fStarMap;
 
+    Float_t fMm2Deg;
+
+    Bool_t fUseMmScale;
+
     void PrepareDrawing() const;
 
@@ -23 +27 @@
     ~MHStarMap();
 
+    void SetMmScale(Bool_t mmscale=kTRUE);
+    void SetMm2Deg(Float_t mmdeg);
+
+    Bool_t SetupFill(const MParList *pList);
     Bool_t Fill(const MParContainer *par);
 

trunk/MagicSoft/Mars/mhist/Makefile

@@ -31 +31 @@
            MBinning.cc \
            MH.cc \
+           MH3.cc \
            MHFadcPix.cc \
            MHFadcCam.cc \
            MHHillas.cc \
            MHHillasSrc.cc \
+           MHHillasExt.cc \
            MHStarMap.cc \
            MHEnergyTime.cc \