Changeset 2812 for trunk/MagicSoft/Mars/mhist/MHCamera.cc

Timestamp:

01/15/04 13:58:31 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHCamera.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -95 +95 @@
 //  Default Constructor. To be used by the root system ONLY.
 //
-MHCamera::MHCamera() : TH1D(), fGeomCam(NULL), fColors(kItemsLegend), fYProj(NULL)
+MHCamera::MHCamera() : TH1D(), fGeomCam(NULL), fColors(kItemsLegend)
 {
     Init();
@@ -474 +474 @@
 TH1D *MHCamera::Projection(const char *name) const
 {
+
+    Int_t nbins = 50;
+
     // Create the projection histogram
     TString pname(name);
@@ -495 +498 @@
         Int_t newbins=0;
 
-        THLimitsFinder::OptimizeLimits(50, newbins, min, max, kFALSE);
-
-        h1 = new TH1D(pname, GetTitle(), 50, min, max);
+        THLimitsFinder::OptimizeLimits(nbins, newbins, min, max, kFALSE);
+
+        h1 = new TH1D(pname, GetTitle(), nbins, min, max);
 
         h1->SetXTitle(GetYaxis()->GetTitle());
@@ -516 +519 @@
 
     return h1;
-}
-
-// ------------------------------------------------------------------------
-// Will be removed in the future
-void MHCamera::CreateProjection()
-{
-    Int_t nbins = 50;
-
-    // Create the projection histogram
-    TString ytitle(GetYaxis()->GetTitle());
-    fYProj = new TH1D(ytitle.Data(),GetTitle(),nbins,GetMinimum()-0.1,GetMaximum()+0.1);
-    fYProj->SetXTitle(ytitle.Data());
-    fYProj->SetYTitle("Nr. of pixels");
-    fYProj->Sumw2();
-    fYProj->SetDirectory(NULL);
-
-    // Fill the projected histogram
-    Double_t cont;
-    for (Int_t binx =0;binx<=GetNbinsX()+1;binx++) {
-        cont  = GetBinContent(binx);
-        if (cont)
-            fYProj->Fill(cont);
-    }
 }
 
@@ -689 +669 @@
     if (opt.Contains("proj"))
     {
-        CreateProjection();
-        opt.ReplaceAll("proj", "");
-        Float_t he = gStyle->GetStatH();
-        Float_t wi = gStyle->GetStatH();
-        gStyle->SetStatH(0.4);
-        gStyle->SetStatW(0.25);
-        fYProj->Paint(opt);
-        gStyle->SetStatH(he);
-        gStyle->SetStatW(wi);
-        return;
+      opt.ReplaceAll("proj", "");
+      Projection(GetName())->Paint(opt);
+      return;
     }