Changeset 1228 for trunk

Timestamp:

03/01/02 15:40:22 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/HistLinkDef.h (modified) (1 diff)
• mhist/MHMcCollectionArea.cc (modified) (7 diffs)
• mhist/MHMcCollectionArea.h (modified) (3 diffs)
• mhist/MHMcDifRate.cc (added)
• mhist/MHMcDifRate.h (added)
• mhist/MHMcEfficiency.cc (modified) (3 diffs)
• mhist/MHMcEfficiency.h (modified) (2 diffs)
• mhist/MHMcEfficiencyEnergy.cc (added)
• mhist/MHMcEfficiencyEnergy.h (added)
• mhist/MHMcEfficiencyImpact.cc (added)
• mhist/MHMcEfficiencyImpact.h (added)
• mhist/MHMcIntRate.cc (added)
• mhist/MHMcIntRate.h (added)
• mhist/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/03/01: Thomas Bretz
+
+   * mhist/MHMcEfficiencyEnergy.[h,cc], mhist/MHMcEfficiencyImpact.[h,cc],
+     mhist/MHMcDifRate.[h,cc], mhist/MHMcIntRate.[h,cc]:
+     - added
+     
+   * mhist/Makefile, mhist/HistLinkDef.h:
+     - added MHMcEfficiencyEnergy and MHMcEfficiencyImpact
+     - added MHMcDifRate and MHMcIntRate
+
+   * mhist/MHMcCollectionArea.[h,cc]:
+     - changed instantiation of collection area histogram
+     - added settings for the binning
+     - replaced division by root function
+     - added Calc-functions
+     - added GetHist
+
+   * mhist/MHMcEfficiency.[h,cc]:
+     - changed pointers in Calc functions to references
+
+
 
  2002/02/28: Thomas Bretz

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -25 +25 @@
 
 #pragma link C++ class MHMcRate+;
+#pragma link C++ class MHMcDifRate+;
+#pragma link C++ class MHMcIntRate+;
 #pragma link C++ class MHMcEfficiency+;
+#pragma link C++ class MHMcEfficiencyImpact+;
+#pragma link C++ class MHMcEfficiencyEnergy+;
 #pragma link C++ class MHMcEnergy+;
 #pragma link C++ class MHMcEnergyImpact+;

trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc

@@ -31 +31 @@
 #include "MH.h"
 #include "MHMcEfficiency.h"
+#include "MHMcEnergyImpact.h"
 
 ClassImp(MHMcCollectionArea);
@@ -52 +53 @@
   
     fName  = name  ? name  : "MHMcCollectionArea";
-    fTitle = title ? title : "Data to Calculate Collection Area";
+    fTitle = title ? title : "Collection Area vs. Energy";
 
     const Int_t  nbins = 50;
@@ -70 +71 @@
     fHistSel = new TH2D("SelectedEvents", "Selected showers - Radius vs Energy distribution",
                         nbins, binsx, nbins, binsy);
-    fHistCol = new TH1D("CollectionArea", "Collection Area vs. Energy",
-                        nbins, binsx);
 
     delete binsx;
     delete binsy;
+
+    fHistCol = new TH1D;
+    fHistCol->SetName(fName);
+    fHistCol->SetTitle(fTitle);
 
     fHistAll->SetDirectory(NULL);
@@ -193 +196 @@
 }
 
-void MHMcCollectionArea::Calc(MHMcEfficiency *heff)
+void MHMcCollectionArea::Calc(const MHMcEfficiency &heff)
 {
     //
@@ -199 +202 @@
     //  energies
     //
-    TH2D &h = (TH2D&)*heff->GetHist();
+    TH2D &h = (TH2D&)*heff.GetHist();
+
+    MH::SetBinning(fHistCol, h.GetXaxis());
 
     const Int_t nbinx = h.GetXaxis()->GetNbins();
@@ -228 +233 @@
         fHistCol->SetBinError(ix, sqrt(errA));
     }
+
+    SetReadyToSave();
 }
 
@@ -237 +244 @@
 void MHMcCollectionArea::CalcEfficiency()
 {
-    // Description!
-
-    /*
-    //
-    //  first of all calculate the efficency
-    //  do it here by hand to get the right error of efficency
-    //
-    const Int_t nbinx = fHistSel->GetXaxis()->GetNbins();
-    const Int_t nbiny = fHistSel->GetYaxis()->GetNbins();
-
-    for (Int_t ix=1; ix<=nbinx; ix++)
-    {
-        for (Int_t iy=1; iy<=nbiny; iy++)
-        {
-            const Float_t Na = fHistAll->GetCellContent(ix, iy);
-
-            if (Na <= 0)
-                continue;
-
-            const Float_t Ns = fHistSel->GetCellContent(ix, iy);
-
-            const Double_t eff = Ns/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);
-            fHistSel->SetCellError(ix, iy, err);
-        }
-    }
-
-    //
-    //  now calculate the Collection area for different
-    //  energies
-    //
-    for (Int_t ix=1; ix<=nbinx; ix++)
-    {
-        Double_t errA = 0;
-        Double_t colA = 0;
-
-        for (Int_t iy=1; iy<=nbiny; iy++)
-        {
-            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);
-
-            const Double_t eff = fHistSel->GetCellContent(ix, iy);
-            const Double_t err = fHistSel->GetCellError(ix, iy);
-
-            colA += eff*A;
-            errA += A*A * err*err;
-        }
-
-        fHistCol->SetBinContent(ix, colA);
-        fHistCol->SetBinError(ix, sqrt(errA));
-        }
-        */
     MHMcEfficiency heff;
-    heff.Calc(fHistSel, fHistAll);
-
-    Calc(&heff);
-
-    SetReadyToSave();
-}
+    heff.Calc(*fHistSel, *fHistAll);
+
+    Calc(heff);
+}
+
+void MHMcCollectionArea::Calc(const MHMcEnergyImpact &mcsel, const MHMcEnergyImpact &mcall)
+{
+    MHMcEfficiency heff;
+    heff.Calc(*mcsel.GetHist(), *mcall.GetHist());
+
+    Calc(heff);
+}

trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.h

@@ -10 +10 @@
 
 class MHMcEfficiency;
+class MHMcEnergyImpact;
 
 class MHMcCollectionArea : public MParContainer
@@ -30 +31 @@
     void DrawSel(Option_t *option="");
 
+    const TH1D *GetHist()       { return fHistCol; }
+    const TH1D *GetHist() const { return fHistCol; }
+
     void Draw(Option_t *option="");
     TObject *DrawClone(Option_t *option="") const;
@@ -35 +39 @@
     void CalcEfficiency();
 
-    void Calc(MHMcEfficiency *eff);
+    void Calc(const MHMcEnergyImpact &mcsel, const MHMcEnergyImpact &mcall);
+    void Calc(const MHMcEfficiency &heff);
 
     ClassDef(MHMcCollectionArea, 1)  // Data Container to calculate Collection Area

trunk/MagicSoft/Mars/mhist/MHMcEfficiency.cc

@@ -41 +41 @@
 #include "MH.h"
 #include "MBinning.h"
+
+#include "MHMcEnergyImpact.h"
 
 ClassImp(MHMcEfficiency);
@@ -133 +135 @@
 }
 
-
-// --------------------------------------------------------------------------
-//
-//  Calculate the Efficiency and set the 'ReadyToSave' flag.
-//  The Efficiency is calculated as the number of selected showers
-//  (eg. triggered ones) divided by the number of all showers.
-//  For error calculation Binomial errors are computed.
-//
-void MHMcEfficiency::Calc(TH2D *hsel, TH2D *hall)
+void MHMcEfficiency::Calc(const TH2D &hsel, const TH2D &hall)
 {
     //
     // Set the binning from the two axis of one of the two histograms
     //
-    MH::SetBinning(&fHist, hsel->GetXaxis(), hsel->GetYaxis());
+    MH::SetBinning(&fHist, ((TH2D&)hsel).GetXaxis(), ((TH2D&)hsel).GetYaxis());
 
     //
@@ -161 +155 @@
     // calculation we assume a binomial error calculation.
     //
-    fHist.Divide(hsel, hall, 1, 1, "B");
+    fHist.Divide((TH2D*)&hsel, (TH2D*)&hall, 1, 1, "B");
 
     SetReadyToSave();
 }
+
+// --------------------------------------------------------------------------
+//
+//  Calculate the Efficiency and set the 'ReadyToSave' flag.
+//  The Efficiency is calculated as the number of selected showers
+//  (eg. triggered ones) divided by the number of all showers.
+//  For error calculation Binomial errors are computed.
+//
+void MHMcEfficiency::Calc(const MHMcEnergyImpact &mcsel, const MHMcEnergyImpact &mcall)
+{
+    Calc(*mcsel.GetHist(), *mcall.GetHist());
+
+}

trunk/MagicSoft/Mars/mhist/MHMcEfficiency.h

@@ -10 +10 @@
 
 class MMcEvt;
+class MHMcEnergyImpact;
 
 class MHMcEfficiency : public MParContainer
@@ -32 +33 @@
     TObject *DrawClone(Option_t* option = "") const;
 
-    void Calc(TH2D *hsel, TH2D *hall);
+    void Calc(const TH2D &hsel, const TH2D &hall);
+    void Calc(const MHMcEnergyImpact &mcsel, const MHMcEnergyImpact &mcall);
 
     ClassDef(MHMcEfficiency, 1)  // Histogram container for montecarlo energy threshold

trunk/MagicSoft/Mars/mhist/Makefile

@@ -47 +47 @@
            MHMcEnergy.cc \
            MHMcEfficiency.cc \
+           MHMcEfficiencyImpact.cc \
+           MHMcEfficiencyEnergy.cc \
            MHMcEnergyImpact.cc \
-           MHMcRate.cc
+           MHMcRate.cc \
+           MHMcIntRate.cc \
+           MHMcDifRate.cc 
 
 SRCS    = $(SRCFILES)