Changeset 1216 for trunk/MagicSoft/Mars/mhist/MHHillasSrc.cc

Timestamp:

02/13/02 16:40:37 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHHillasSrc.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mhist/MHHillasSrc.cc

@@ -38 +38 @@
 #include <TCanvas.h>
 
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MGeomCam.h"
+
 #include "MParList.h"
 
@@ -62 +67 @@
     // connect all the histogram with the container fHist
     //
-    fAlpha = new TH1F("Alpha [deg]", "Alpha of Hillas",   90, 0,  90);
-    fDist  = new TH1F("Dist [mm]",   "Dist of Hillas",   100, 0, 600);
+    fAlpha = new TH1F("Alpha", "Alpha of Ellipse",   90, 0,  90);
+    fDist  = new TH1F("Dist",  "Dist of Ellipse",   100, 0, 600);
 
     fAlpha->SetDirectory(NULL);
@@ -90 +95 @@
 // instances of MBinning (with the names 'BinningAlpha' and 'BinningDist')
 // 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 MHHillasSrc::SetupFill(const MParList *plist)
@@ -95 +104 @@
     const MBinning* binsa = (MBinning*)plist->FindObject("BinningAlpha");
     const MBinning* binsd = (MBinning*)plist->FindObject("BinningDist");
-
-    if (binsa)
-        SetBinning(fAlpha, binsa);
-
-    if (binsd)
-        SetBinning(fDist, binsd);
+    if (!binsa || !binsd)
+    {
+        *fLog << err << dbginf << "At least one MBinning not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    SetBinning(fAlpha, binsa);
+    SetBinning(fDist,  binsd);
+
+    const MGeomCam *geom = (MGeomCam*)plist->FindObject("MGeomCam");
+    if (!geom)
+    {
+        *fLog << warn << dbginf << "No Camera Geometry available. Using mm-scale for histograms." << endl;
+        return kTRUE;
+    }
+
+    fDist->GetXaxis()->SetTitle("Dist [\\circ]");
+
+    fMm2Deg = geom->GetConvMm2Deg();
 
     return kTRUE;
@@ -115 +137 @@
 
     fAlpha->Fill(fabs(h.GetAlpha()));
-    fDist ->Fill(h.GetDist());
+    fDist ->Fill(fUseMmScale ? h.GetDist() : fMm2Deg*h.GetDist());
 
     return kTRUE;