Changeset 1207 for trunk/MagicSoft/Mars/mhist

Timestamp:

01/21/02 22:09:45 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MH.cc (modified) (1 diff)
• MH.h (modified) (2 diffs)
• MHHillas.cc (modified) (10 diffs)
• MHHillas.h (modified) (1 diff)
• MHStarMap.cc (modified) (5 diffs)
• MHStarMap.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -222 +222 @@
 }
 
+void MH::SetBinning(TH1 *h, TH1 *x)
+{
+    SetBinning(h, x->GetXaxis(), x->GetYaxis(), x->GetZaxis());
+}

trunk/MagicSoft/Mars/mhist/MH.h

@@ -7 +7 @@
 
 class TH1;
+class TAxis;
+class TArrayD;
+class TCanvas;
+
 class MBinning;
 class MParList;
-class TArrayD;
-class TAxis;
-
-class TCanvas;
 
 class MH : public MParContainer
@@ -39 +39 @@
     static void SetBinning(TH1 *h, const TAxis *binsx, const TAxis *binsy, const TAxis *binsz);
 
+    static void SetBinning(TH1 *h, TH1 *x);
+
     ClassDef(MH, 1) //A histogram base class for Mars histograms
 };

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -1 @@
-<<<<<<< MHHillas.cc
 /* ======================================================================== *\
 !
@@ -19 +18 @@
 !   Author(s): Thomas Bretz  2001 <mailto:tbretz@uni-sw.gwdg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Copyright: MAGIC Software Development, 2000-2002
 !
 !
 \* ======================================================================== */
 
-///////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 //
 // MHHillas
@@ -30 +29 @@
 // This class contains histograms for every Hillas parameter
 //
-///////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
 #include "MHHillas.h"
@@ -46 +45 @@
 // --------------------------------------------------------------------------
 //
-// Setup four histograms for Alpha, Width, Length and Dist
+// Setup four histograms for Width, Length
 //
 MHHillas::MHHillas (const char *name, const char *title)
@@ -61 +60 @@
     // connect all the histogram with the container fHist
     //
-    fAlpha  = new TH1F("Alpha [deg]", "Alpha of Hillas",   90, 0,  90);
     fWidth  = new TH1F("Width [mm]",  "Width of Hillas",  100, 0, 300);
     fLength = new TH1F("Length [mm]", "Length of Hillas", 100, 0, 300);
-    fDist   = new TH1F("Dist [mm]",   "Dist of Hillas",   100, 0, 300);
 
-    fAlpha->SetDirectory(NULL);
     fLength->SetDirectory(NULL);
-    fDist->SetDirectory(NULL);
     fWidth->SetDirectory(NULL);
 
-    fAlpha->GetXaxis()->SetTitle("\\alpha [\\circ]");
     fLength->GetXaxis()->SetTitle("Length [mm]");
-    fDist->GetXaxis()->SetTitle("Dist [mm]");
     fWidth->GetXaxis()->SetTitle("Width [mm]");
 
-    fAlpha->GetYaxis()->SetTitle("Counts");
     fLength->GetYaxis()->SetTitle("Counts");
-    fDist->GetYaxis()->SetTitle("Counts");
     fWidth->GetYaxis()->SetTitle("Counts");
 }
@@ -88 +79 @@
 MHHillas::~MHHillas()
 {
-    delete fAlpha;
     delete fWidth;
     delete fLength;
-    delete fDist;
 }
 
@@ -103 +92 @@
     const MHillas &h = *(MHillas*)par;
 
-    fAlpha ->Fill(fabs(h.GetAlpha()));
     fWidth ->Fill(h.GetWidth());
     fLength->Fill(h.GetLength());
-    fDist  ->Fill(h.GetDist());
 
     return kTRUE;
@@ -121 +108 @@
 TObject *MHHillas::DrawClone(Option_t *opt) const
 {
-    TCanvas *c = MakeDefCanvas("Hillas", "Histograms of Hillas Parameters");
-    c->Divide(2, 2);
+    TCanvas *c = MakeDefCanvas("Hillas", "Histograms of Hillas Parameters",
+                               350, 500);
+    c->Divide(1, 2);
 
     gROOT->SetSelectedPad(NULL);
@@ -130 +118 @@
     //
     c->cd(1);
-    fAlpha->DrawCopy();
+    fLength->DrawCopy();
 
     c->cd(2);
-    fLength->DrawCopy();
-
-    c->cd(3);
-    fDist->DrawCopy();
-
-    c->cd(4);
     fWidth->DrawCopy();
 
@@ -156 +138 @@
 {
     if (!gPad)
-        MakeDefCanvas("Hillas", "Histograms of Hillas Parameters");
+        MakeDefCanvas("Hillas", "Histograms of Hillas Parameters", 350, 500);
 
-    gPad->Divide(2,2);
+    gPad->Divide(1, 2);
 
     gPad->cd(1);
-    fAlpha->Draw();
+    fLength->Draw();
 
     gPad->cd(2);
-    fLength->Draw();
-
-    gPad->cd(3);
-    fDist->Draw();
-
-    gPad->cd(4);
     fWidth->Draw();
 

trunk/MagicSoft/Mars/mhist/MHHillas.h

@@ -19 +19 @@
     ~MHHillas();
 
-    void Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par);
 
     TH1F *GetHistWidth()  { return fWidth; }

trunk/MagicSoft/Mars/mhist/MHStarMap.cc

@@ -1 @@
-<<<<<<< MHStarMap.cc
 /* ======================================================================== *\
 !
@@ -48 +47 @@
 // Create the star map histogram
 //
-MHStarMap::MHStarMap (const char *name, const char *title)
+MHStarMap::MHStarMap(const char *name, const char *title)
 {
     //
@@ -73 +72 @@
     fStarMap->SetDirectory(NULL);
 
-    fStarMap->SetXTitle("x/mm");
-    fStarMap->SetYTitle("y/mm");
+    fStarMap->SetXTitle("x [mm]");
+    fStarMap->SetYTitle("y [mm]");
     fStarMap->SetZTitle("Counts");
 }
@@ -96 +95 @@
     const MHillas &h = *(MHillas*)par;
 
-    const float dist  = h.GetDist();
-    const float theta = h.GetTheta();
-    const float alpha = h.GetAlpha()/kRad2Deg;
-
-    const float m = tan(theta+alpha-kPI);
-    const float t = dist*(sin(theta)-cos(theta)*m);
+    const float delta = h.GetDelta();
+
+    const float m = tan(delta);
+    const float t = m*h.GetMeanX()-h.GetMeanY();
 
     if (m>-1 && m<1)
@@ -214 +211 @@
     gPad->Update();
 }
-

trunk/MagicSoft/Mars/mhist/MHStarMap.h

@@ -23 +23 @@
     ~MHStarMap();
 
-    void Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par);
 
     TH2F *GetHist() { return fStarMap; }