Changeset 1489 for trunk/MagicSoft/Mars/mhist/MHHillas.cc

Timestamp:

08/08/02 11:58:59 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHHillas.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -67 +67 @@
     fTitle = title ? title : "Source independent image parameters";
 
-    fLength = new TH1F("Length", "Length of Ellipse",               100,   0, 296.7);
-    fWidth  = new TH1F("Width",  "Width of Ellipse",                100,   0, 296.7);
-    fDistC  = new TH1F("DistC",  "Distance from center of camera",  100,   0, 445);
-    fDelta  = new TH1F("Delta",  "Angle (Main axis - x-axis)",      101, -90,  90);
+    fLength  = new TH1F("Length",  "Length of Ellipse",               100,   0, 296.7);
+    fWidth   = new TH1F("Width",   "Width of Ellipse",                100,   0, 296.7);
+    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->SetDirectory(NULL);
@@ -76 +78 @@
     fDistC->SetDirectory(NULL);
     fDelta->SetDirectory(NULL);
+    fUsedPix->SetDirectory(NULL);
+    fCorePix->SetDirectory(NULL);
 
     fLength->SetXTitle("Length [mm]");
@@ -81 +85 @@
     fDistC->SetXTitle("Distance [mm]");
     fDelta->SetXTitle("Delta [\\circ]");
+    fUsedPix->SetXTitle("Number of Pixels");
+    fCorePix->SetXTitle("Number of Pixels");
 
     fLength->SetYTitle("Counts");
@@ -86 +92 @@
     fDistC->SetYTitle("Counts");
     fDelta->SetYTitle("Counts");
+    fUsedPix->SetYTitle("Counts");
+    fCorePix->SetYTitle("Counts");
 
     MBinning bins;
@@ -122 +130 @@
     delete fSize;
     delete fCenter;
+
+    delete fUsedPix;
+    delete fCorePix;
 }
 
@@ -150 +161 @@
     ApplyBinning(*plist, "Delta",  fDelta);
     ApplyBinning(*plist, "Size",   fSize);
+    ApplyBinning(*plist, "Pixels", fUsedPix);
+    ApplyBinning(*plist, "Pixels", fCorePix);
 
     const MBinning *bins = (MBinning*)plist->FindObject("BinningCamera");
@@ -235 +248 @@
     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());
+    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());
 
     return kTRUE;
@@ -269 +284 @@
 TObject *MHHillas::DrawClone(Option_t *opt) const
 {
-    TCanvas *c = MakeDefCanvas("Hillas", fTitle, 720, 810);
+    TCanvas *c = MakeDefCanvas(this, 720, 810);
     c->Divide(2,3);
 
@@ -275 +290 @@
 
     c->cd(1);
-    fLength->DrawCopy();
+    fWidth->DrawCopy();
+    fLength->SetLineColor(kBlue);
+    fLength->DrawCopy("same");
 
     c->cd(2);
-    fWidth->DrawCopy();
-
-    c->cd(3);
     gPad->SetLogx();
     fSize->DrawCopy();
+
+    c->cd(3);
+    fCorePix->SetLineColor(kRed);
+    fCorePix->DrawCopy();
+    fUsedPix->SetLineColor(kGreen);
+    fUsedPix->DrawCopy("same");
 
     c->cd(4);
@@ -309 +329 @@
 {
     if (!gPad)
-        MakeDefCanvas("Hillas", fTitle, 720, 810);
+        MakeDefCanvas(this, 720, 810);
 
     gPad->Divide(2,3);
 
     gPad->cd(1);
-    fLength->Draw();
+    fWidth->Draw();
+    fLength->SetLineColor(kBlue);
+    fLength->Draw("same");
 
     gPad->cd(2);
-    fWidth->Draw();
-
-    gPad->cd(3);
     gPad->SetLogx();
     fSize->Draw();
+
+    gPad->cd(3);
+    fCorePix->SetLineColor(kRed);
+    fCorePix->Draw();
+    fUsedPix->SetLineColor(kGreen);
+    fUsedPix->Draw("same");
 
     gPad->cd(4);