Changeset 1442 for trunk/MagicSoft

Timestamp:

07/25/02 14:18:34 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHHillasSrc.cc (modified) (7 diffs)
• mhist/MHHillasSrc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/07/25: Wolfgang Wittek, Thomas Bretz
+
+   * mhist/MHHillas.[h,cc], mhist/MHHillasSrc.[h,cc]:
+     - added some more histograms showing the new parameters.
+
+   * mhist/MH.[h,cc]:
+     - added ScaleAxis member functions
+
 
 

trunk/MagicSoft/Mars/mhist/MHHillasSrc.cc

@@ -68 +68 @@
     // connect all the histogram with the container fHist
     //
-    fAlpha = new TH1F("Alpha", "Alpha of Ellipse",   90, 0,  90);
-    fDist  = new TH1F("Dist",  "Dist of Ellipse",   100, 0, 600);
+    fAlpha    = new TH1F("Alpha",    "Alpha of Ellipse",             90,  0,  90);
+    fDist     = new TH1F("Dist",     "Dist of Ellipse",             100,  0, 600);
+    fHeadTail = new TH1F("HeadTail", "HeadTail of Ellipse",          45,  0,  90);
+    fCosDA    = new TH1F("CosDA",    "cos(Delta,Alpha) of Ellipse", 100, -1,   1);
 
     fAlpha->SetDirectory(NULL);
     fDist->SetDirectory(NULL);
-
-    fAlpha->SetXTitle("\\alpha [mm]");
+    fHeadTail->SetDirectory(NULL);
+    fCosDA->SetDirectory(NULL);
+
+    fAlpha->SetXTitle("\\alpha [\\circ]");
     fDist->SetXTitle("Dist [mm]");
+    fHeadTail->SetXTitle("Head-Tail [\\circ]");
+    fCosDA->SetXTitle("cos(\\delta,\\alpha) [mm]");
 
     fAlpha->SetYTitle("Counts");
     fDist->SetYTitle("Counts");
+    fHeadTail->SetYTitle("Counts");
+    fCosDA->SetYTitle("Counts");
 }
 
@@ -89 +97 @@
     delete fAlpha;
     delete fDist;
+    delete fHeadTail;
+    delete fCosDA;
 }
 
@@ -138 +148 @@
     const MHillasSrc &h = *(MHillasSrc*)par;
 
-    fAlpha->Fill(fabs(h.GetAlpha()));
-    fDist ->Fill(fUseMmScale ? h.GetDist() : fMm2Deg*h.GetDist());
+    fAlpha   ->Fill(fabs(h.GetAlpha()));
+    fDist    ->Fill(fUseMmScale ? h.GetDist() : fMm2Deg*h.GetDist());
+    fHeadTail->Fill(h.GetHeadTail());
+    fCosDA   ->Fill(h.GetCosDeltaAlpha());
 
     return kTRUE;
@@ -154 +166 @@
 TObject *MHHillasSrc::DrawClone(Option_t *opt) const
 {
-    TCanvas *c = MakeDefCanvas("Hillas", "Histograms of Source dependant Parameters",
-                               350, 500);
-    c->Divide(1, 2);
+    TCanvas *c = MakeDefCanvas("HillasSrc", "Histograms of Source dependant Parameters",
+                               700, 500);
+    c->Divide(2, 2);
 
     // FIXME: Display Source position
@@ -170 +182 @@
     c->cd(2);
     fDist->DrawCopy();
+
+    c->cd(3);
+    fHeadTail->DrawCopy();
+
+    c->cd(4);
+    fCosDA->DrawCopy();
 
     c->Modified();
@@ -186 +204 @@
 {
     if (!gPad)
-        MakeDefCanvas("Hillas", "Histograms of Src dependant Parameters", 350, 500);
+        MakeDefCanvas("HillasSrc", "Histograms of Src dependant Parameters",
+                      700, 500);
 
     // FIXME: Display Source position
 
-    gPad->Divide(1, 2);
+    gPad->Divide(2, 2);
 
     gPad->cd(1);
@@ -198 +217 @@
     fDist->Draw();
 
+    gPad->cd(1);
+    fHeadTail->Draw();
+
+    gPad->cd(2);
+    fCosDA->Draw();
+
     gPad->Modified();
     gPad->Update();

trunk/MagicSoft/Mars/mhist/MHHillasSrc.h

@@ -14 +14 @@
     TH1F *fAlpha;
     TH1F *fDist;
+    TH1F *fHeadTail;     
+    TH1F *fCosDA;
 
     Float_t fMm2Deg;
@@ -27 +29 @@
     Bool_t Fill(const MParContainer *par);
 
-    TH1F *GetHistAlpha()  { return fAlpha; }
-    TH1F *GetHistDist()   { return fDist; }
+    TH1F *GetHistAlpha()         { return fAlpha; }
+    TH1F *GetHistDist()          { return fDist; }
+    TH1F *GetHistHeadTail()      { return fHeadTail; }
+    TH1F *GetHistCosDeltaAlpha() { return fCosDA; }
 
     void Draw(Option_t *opt=NULL);