Changeset 967 for trunk/MagicSoft/Mars/mhist

Timestamp:

10/16/01 16:18:29 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MFillH.cc (modified) (1 diff)
• MHMcCollectionArea.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -150 +150 @@
         if (!fParContainer)
         {
-            *fLog << dbginf << fParContainerName << " not found... aborting." << endl;
+            *fLog << dbginf << fParContainerName << " [MParContainer] not found... aborting." << endl;
             return kFALSE;
         }

trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc

@@ -52 +52 @@
 
 
-    fHistAll = new TH2D("All Events", "All showers - Radius vs log(E) distribution",
+    fHistAll = new TH2D("AllEvents", "All showers - Radius vs log(E) distribution",
                         50, 0., 5.,
                         50, 0., 500.);
@@ -60 +60 @@
     fHistAll->SetZTitle("N");
 
-    fHistSel = new TH2D("Selected Events", "Selected showers - Radius vs log(E) distribution",
+    fHistSel = new TH2D("SelectedEvents", "Selected showers - Radius vs log(E) distribution",
                         50, 0., 5.,
                         50, 0., 500.);
@@ -68 +68 @@
     fHistSel->SetYTitle("N");
 
-    fHistCol = new TH1D("Area", "Collection Area vs. log(E)",
+    fHistCol = new TH1D("CollectionArea", "Collection Area vs. log(E)",
                         50, 0., 5.);
 
     fHistCol->SetXTitle("log(E/GeV)");
-    fHistCol->SetYTitle("A/m^2");
+    fHistCol->SetYTitle("A/m^{2}");
 }
 
@@ -204 +204 @@
         for (Int_t iy=1; iy<=nbiny; iy++)
         {
-            const Float_t Ns = fHistSel->GetCellContent(ix, iy);
             const Float_t Na = fHistAll->GetCellContent(ix, iy);
 
@@ -210 +209 @@
                 continue;
 
+            const Float_t Ns = fHistSel->GetCellContent(ix, iy);
+
             const Double_t eff = Ns/Na;
-            const Double_t err = sqrt(Na + Na*Ns - Ns*Ns - Ns) / (Na*Na);
+            const Double_t err = sqrt((1.-eff)*Ns)/Na;
+
+            // old calculation from Harald:
+            //  const Double_t eff = Ns/Na;
+            //  const Double_t err = sqrt(Na + Na*Ns - Ns*Ns - Ns) / (Na*Na);
 
             fHistSel->SetCellContent(ix, iy, eff);
@@ -229 +234 @@
         for (Int_t iy=1; iy<=nbiny; iy++)
         {
-            const Double_t r1  = fHistSel->GetYaxis()->GetBinLowEdge(iy);
-            const Double_t r2  = fHistSel->GetYaxis()->GetBinLowEdge(iy+1);
+            TAxis *yaxis = fHistSel->GetYaxis();
+
+            const Double_t r1  = yaxis->GetBinLowEdge(iy);
+            const Double_t r2  = yaxis->GetBinLowEdge(iy+1);
 
             const Double_t A   = TMath::Pi() * (r2*r2 - r1*r1);