Changeset 2026 for trunk/MagicSoft/Mars/mimage/MHHillas.cc

Timestamp:

04/28/03 15:39:40 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mimage/MHHillas.cc (modified) (11 diffs)

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -70 +70 @@
     fDistC   = new TH1F("DistC",   "Distance from center of camera",  100,   0, 445);
     fDelta   = new TH1F("Delta",   "Angle (Main axis - x-axis)",      101, -90,  90);
-    fUsedPix = new TH1F("UsedPix", "Number of used pixels",           150,   0, 150);
-    fCorePix = new TH1F("CorePix", "Number of core pixels",           150,   0, 150);
 
     fLength->SetLineColor(kBlue);
-    fCorePix->SetLineColor(kRed);
-    fUsedPix->SetLineColor(kGreen);
 
     fLength->SetDirectory(NULL);
@@ -81 +77 @@
     fDistC->SetDirectory(NULL);
     fDelta->SetDirectory(NULL);
-    fUsedPix->SetDirectory(NULL);
-    fCorePix->SetDirectory(NULL);
 
     fLength->SetXTitle("Length [mm]");
@@ -88 +82 @@
     fDistC->SetXTitle("Distance [mm]");
     fDelta->SetXTitle("Delta [\\circ]");
-    fUsedPix->SetXTitle("Number of Pixels");
-    fCorePix->SetXTitle("Number of Pixels");
 
     fLength->SetYTitle("Counts");
@@ -95 +87 @@
     fDistC->SetYTitle("Counts");
     fDelta->SetYTitle("Counts");
-    fUsedPix->SetYTitle("Counts");
-    fCorePix->SetYTitle("Counts");
 
     MBinning bins;
@@ -134 +124 @@
     delete fSize;
     delete fCenter;
-
-    delete fUsedPix;
-    delete fCorePix;
 }
 
@@ -165 +152 @@
     ApplyBinning(*plist, "Delta",  fDelta);
     ApplyBinning(*plist, "Size",   fSize);
-    ApplyBinning(*plist, "Pixels", fUsedPix);
-    ApplyBinning(*plist, "Pixels", fCorePix);
 
     const MBinning *bins = (MBinning*)plist->FindObject("BinningCamera");
@@ -262 +247 @@
     const Double_t scale = fUseMmScale ? 1 : fMm2Deg;
 
-    fLength ->Fill(scale*h.GetLength());
-    fWidth  ->Fill(scale*h.GetWidth());
-    fDistC  ->Fill(scale*d);
-    fCenter ->Fill(scale*h.GetMeanX(), scale*h.GetMeanY());
-    fDelta  ->Fill(kRad2Deg*h.GetDelta());
-    fSize   ->Fill(h.GetSize());
-    fUsedPix->Fill(h.GetNumUsedPixels());
-    fCorePix->Fill(h.GetNumCorePixels());
+    fLength ->Fill(scale*h.GetLength(), w);
+    fWidth  ->Fill(scale*h.GetWidth(), w);
+    fDistC  ->Fill(scale*d, w);
+    fCenter ->Fill(scale*h.GetMeanX(), scale*h.GetMeanY(), w);
+    fDelta  ->Fill(kRad2Deg*h.GetDelta(), w);
+    fSize   ->Fill(h.GetSize(), w);
 
     return kTRUE;
@@ -289 +272 @@
 // --------------------------------------------------------------------------
 //
-// Draw clones of four histograms. So that the object can be deleted
-// and the histograms are still visible in the canvas.
-// The cloned object are deleted together with the canvas if the canvas is
-// destroyed. If you want to handle dostroying the canvas you can get a
-// pointer to it from this function
-//
-TObject *MHHillas::DrawClone(Option_t *opt) const
-{
-    return MH::DrawClone(opt, 720, 810);
-}
-
-// --------------------------------------------------------------------------
-//
 // Creates a new canvas and draws the four histograms into it.
 // Be careful: The histograms belongs to this object and won't get deleted
@@ -308 +278 @@
 void MHHillas::Draw(Option_t *)
 {
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this, 720, 810);
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
@@ -320 +290 @@
 
     pad->cd(2);
+    gPad->SetBorderMode(0);
+    fDistC->Draw();
+
+    pad->cd(3);
     gPad->SetBorderMode(0);
     gPad->SetLogx();
     fSize->Draw();
 
-    pad->cd(3);
-    gPad->SetBorderMode(0);
-    MH::Draw(*fCorePix, *fUsedPix, "Number of core/used Pixels");
-
     pad->cd(4);
     gPad->SetBorderMode(0);
-    fDelta->Draw();
-
-    pad->cd(5);
-    gPad->SetBorderMode(0);
-    fDistC->Draw();
-
-    pad->cd(6);
-    gPad->SetBorderMode(0);
+    gPad->SetPad(0.51, 0.01, 0.99, 0.65);
     SetColors();
     fCenter->Draw("colz");
+
+    pad->cd(5);
+    gPad->SetBorderMode(0);
+    fDelta->Draw();
+
+    pad->cd(6);
+    delete gPad;
 
     pad->Modified();
@@ -353 +323 @@
     if (name.Contains("Size", TString::kIgnoreCase))
         return fSize;
-    if (name.Contains("Core", TString::kIgnoreCase))
-        return fCorePix;
-    if (name.Contains("Used", TString::kIgnoreCase))
-        return fUsedPix;
     if (name.Contains("Delta", TString::kIgnoreCase))
         return fDelta;