Changeset 1227 for trunk/MagicSoft

Timestamp:

02/28/02 16:36:54 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/HistLinkDef.h (modified) (2 diffs)
• mhist/MHAlphaEnergyTheta.cc (modified) (1 diff)
• mhist/MHAlphaEnergyTime.cc (modified) (1 diff)
• mhist/MHEffOnTimeTheta.cc (modified) (1 diff)
• mhist/MHEffOnTimeTime.cc (modified) (1 diff)
• mhist/MHEnergyTheta.cc (modified) (1 diff)
• mhist/MHEnergyTime.cc (modified) (1 diff)
• mhist/MHMcCollectionArea.cc (modified) (4 diffs)
• mhist/MHMcCollectionArea.h (modified) (2 diffs)
• mhist/MHMcEfficiency.cc (added)
• mhist/MHMcEfficiency.h (added)
• mhist/MHMcEnergyImpact.cc (added)
• mhist/MHMcEnergyImpact.h (added)
• mhist/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/02/28: Thomas Bretz
+
+   * mhist/MHMcEnergyImpact.[h,cc], mhist/MHMcEfficiency.[h,cc]:
+     - added
+     
+   * mhist/Makefile, mhist/HistLinkDef.h:
+     - added MHMcEnergyImpact and MHMcEfficiency
+
+   * mhist/*.cc:
+     - repaced some *&-> casts by &.
+
+   * mhist/MHMcCollectionArea.[h,cc]:
+     - changed to be able to use new MHMcEfficiency.
+
+
 
  2002/02/21: Abelardo Moralejo

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -15 +15 @@
 #pragma link C++ class MHEnergyTime+;
 #pragma link C++ class MHEnergyTheta+;
-#pragma link C++ class MHMcEnergy+;
-#pragma link C++ class MHMcCollectionArea+;
 #pragma link C++ class MHAlphaEnergyTime;
 #pragma link C++ class MHAlphaEnergyTheta;
@@ -27 +25 @@
 
 #pragma link C++ class MHMcRate+;
+#pragma link C++ class MHMcEfficiency+;
+#pragma link C++ class MHMcEnergy+;
+#pragma link C++ class MHMcEnergyImpact+;
+#pragma link C++ class MHMcCollectionArea+;
 
 #endif

trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.cc

@@ -165 +165 @@
 
     c->cd(4);
-    ((TH3*)(&fHist))->DrawCopy(opt);
+    ((TH3&)fHist).DrawCopy(opt);
 
     c->Modified();

trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc

@@ -169 +169 @@
 
     c->cd(4);
-    ((TH3D*)(&fHist))->DrawCopy(opt);
+    ((TH3D&)fHist).DrawCopy(opt);
 
     c->Modified();

trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.cc

@@ -139 +139 @@
     gROOT->SetSelectedPad(NULL);
 
-    ((TH2*)(&fHist))->DrawCopy(opt);
+    ((TH2&)fHist).DrawCopy(opt);
 
     c->Modified();

trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.cc

@@ -78 +78 @@
     gROOT->SetSelectedPad(NULL);
 
-    ((TH2*)(&fHist))->DrawCopy(opt);
+    ((TH2&)fHist).DrawCopy(opt);
 
     c->Modified();

trunk/MagicSoft/Mars/mhist/MHEnergyTheta.cc

@@ -133 +133 @@
     gROOT->SetSelectedPad(NULL);
 
-    ((TH2D*)&fHist)->DrawCopy(option);
+    ((TH2D&)fHist).DrawCopy(option);
     gPad->SetLogy();
 

trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc

@@ -141 +141 @@
     gROOT->SetSelectedPad(NULL);
 
-    ((TH2D*)&fHist)->DrawCopy(option);
+    ((TH2D&)fHist).DrawCopy(option);
     gPad->SetLogy();
 

trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc

@@ -30 +30 @@
 
 #include "MH.h"
+#include "MHMcEfficiency.h"
 
 ClassImp(MHMcCollectionArea);
@@ -192 +193 @@
 }
 
+void MHMcCollectionArea::Calc(MHMcEfficiency *heff)
+{
+    //
+    //  now calculate the Collection area for different
+    //  energies
+    //
+    TH2D &h = (TH2D&)*heff->GetHist();
+
+    const Int_t nbinx = h.GetXaxis()->GetNbins();
+    const Int_t nbiny = h.GetYaxis()->GetNbins();
+
+    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 = h.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 = h.GetCellContent(ix, iy);
+            const Double_t err = h.GetCellError(ix, iy);
+
+            colA += eff*A;
+            errA += A*A * err*err;
+        }
+
+        fHistCol->SetBinContent(ix, colA);
+        fHistCol->SetBinError(ix, sqrt(errA));
+    }
+}
+
 // --------------------------------------------------------------------------
 //
@@ -201 +239 @@
     // Description!
 
+    /*
     //
     //  first of all calculate the efficency
@@ -258 +297 @@
         fHistCol->SetBinContent(ix, colA);
         fHistCol->SetBinError(ix, sqrt(errA));
-    }
+        }
+        */
+    MHMcEfficiency heff;
+    heff.Calc(fHistSel, fHistAll);
+
+    Calc(&heff);
 
     SetReadyToSave();

trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.h

@@ -8 +8 @@
 class TH1D;
 class TH2D;
+
+class MHMcEfficiency;
 
 class MHMcCollectionArea : public MParContainer
@@ -33 +35 @@
     void CalcEfficiency();
 
+    void Calc(MHMcEfficiency *eff);
+
     ClassDef(MHMcCollectionArea, 1)  // Data Container to calculate Collection Area
 };

trunk/MagicSoft/Mars/mhist/Makefile

@@ -46 +46 @@
            MHTimeDiffTheta.cc \
            MHMcEnergy.cc \
+           MHMcEfficiency.cc \
+           MHMcEnergyImpact.cc \
            MHMcRate.cc