Changeset 1203 for trunk/MagicSoft/Mars/mhist

Timestamp:

01/21/02 20:52:12 (23 years ago)

Author:

rkb

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• HistLinkDef.h (modified) (1 diff)
• MHHillas.cc (modified) (7 diffs)
• MHHillas.h (modified) (2 diffs)
• MHHillasSrc.cc (added)
• MHHillasSrc.h (added)
• MHStarMap.cc (modified) (4 diffs)
• MHStarMap.h (modified) (2 diffs)
• Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -11 +11 @@
 #pragma link C++ class MHFadcPix+;
 #pragma link C++ class MHHillas+;
+#pragma link C++ class MHHillasSrc+;
 #pragma link C++ class MHStarMap+;
 #pragma link C++ class MHMcEnergy+;

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -45 +45 @@
 // --------------------------------------------------------------------------
 //
-// Setup four histograms for Alpha, Width, Length and Dist
+// Setup four histograms for Width, Length
 //
 MHHillas::MHHillas (const char *name, const char *title)
@@ -60 +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");
 }
@@ -87 +79 @@
 MHHillas::~MHHillas()
 {
-    delete fAlpha;
     delete fWidth;
     delete fLength;
-    delete fDist;
 }
 
@@ -102 +92 @@
     const MHillas &h = *(MHillas*)par;
 
-    fAlpha ->Fill(fabs(h.GetAlpha()));
     fWidth ->Fill(h.GetWidth());
     fLength->Fill(h.GetLength());
-    fDist  ->Fill(h.GetDist());
 }
 
@@ -118 +106 @@
 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);
@@ -127 +116 @@
     //
     c->cd(1);
-    fAlpha->DrawCopy();
+    fLength->DrawCopy();
 
     c->cd(2);
-    fLength->DrawCopy();
-
-    c->cd(3);
-    fDist->DrawCopy();
-
-    c->cd(4);
     fWidth->DrawCopy();
 
@@ -153 +136 @@
 {
     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

@@ -12 +12 @@
 {
 private:
-    TH1F *fAlpha;
     TH1F *fWidth;
     TH1F *fLength;
-    TH1F *fDist;
 
 public:
-     MHHillas(const char *name=NULL, const char *title=NULL);
+    MHHillas(const char *name=NULL, const char *title=NULL);
     ~MHHillas();
 
     void Fill(const MParContainer *par);
 
-    TH1F *GetHistAlpha()  { return fAlpha; }
     TH1F *GetHistWidth()  { return fWidth; }
     TH1F *GetHistLength() { return fLength; }
-    TH1F *GetHistDist()   { return fDist; }
 
     void Draw(Option_t *opt=NULL);
@@ -35 +31 @@
 
 #endif
-

trunk/MagicSoft/Mars/mhist/MHStarMap.cc

@@ -47 +47 @@
 // Create the star map histogram
 //
-MHStarMap::MHStarMap (const char *name, const char *title)
+MHStarMap::MHStarMap(const char *name, const char *title)
 {
     //
@@ -72 +72 @@
     fStarMap->SetDirectory(NULL);
 
-    fStarMap->SetXTitle("x/mm");
-    fStarMap->SetYTitle("y/mm");
+    fStarMap->SetXTitle("x [mm]");
+    fStarMap->SetYTitle("y [mm]");
     fStarMap->SetZTitle("Counts");
 }
@@ -95 +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)
@@ -211 +209 @@
     gPad->Update();
 }
-

trunk/MagicSoft/Mars/mhist/MHStarMap.h

@@ -20 +20 @@
 
 public:
-     MHStarMap(const char *name=NULL, const char *title=NULL);
+    MHStarMap(const char *name=NULL, const char *title=NULL);
     ~MHStarMap();
 
@@ -34 +34 @@
 
 #endif
-

trunk/MagicSoft/Mars/mhist/Makefile

@@ -30 +30 @@
 SRCFILES = MFillH.cc \
            MH.cc \
-           MHFadcPix.cc \
+        MHFadcPix.cc \
            MHFadcCam.cc \
            MHHillas.cc \
+           MHHillasSrc.cc \
            MHStarMap.cc \
            MHMcCollectionArea.cc \
@@ -53 +54 @@
 
 # @endcode
-