Changeset 2036 for trunk/MagicSoft/Mars/mhistmc

Timestamp:

04/29/03 09:18:03 (22 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhistmc

Files:

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

trunk/MagicSoft/Mars/mhistmc/MHMcCollectionArea.cc

@@ -40 +40 @@
 #include "MHMcEnergyImpact.h"
 
+#include "MLog.h"
+#include "MLogManip.h"
+
 ClassImp(MHMcCollectionArea);
 
@@ -223 +226 @@
 //  flag
 //
-void MHMcCollectionArea::CalcEfficiency(UInt_t numevts, Float_t angle)
+void MHMcCollectionArea::CalcEfficiency(UInt_t numevts, Float_t emin, Float_t emax, Float_t index)
 {
     // Here we estimate the total number of showers in each energy bin
@@ -238 +241 @@
     MH::SetBinning(fHistCol, &xaxis);
 
-    // TO BE FIXED! In forthcoming camera versions emin, emax and index
-    // will be available in a run header, and should be read from it.
-
-    const Float_t emin  = 10.;
-    const Float_t emax  = 30000.;  // Energies in GeV.
-    const Float_t index = 2.6;     // Differential spectral Index.
-
-    const Float_t expo = 1.-index;
+    const Float_t expo = 1+index;
 
     const Float_t k = (Float_t)numevts / (pow(emax,expo) - pow(emin,expo));
@@ -267 +263 @@
 
     // -----------------------------------------------------------
-
-    // Impact parameter range:
+    //
+    // Impact parameter range:  TO BE FIXED! Impact parameter shoud be
+    // read from run header, but it is not yet in!!
+    //
     const Float_t r1 = 0;
-    const Float_t r2 = 400;
-
-    const Float_t dr = TMath::Pi() * (r2*r2 - r1*r1);
-
-    angle *= TMath::Pi()/180;
+    const Float_t r2 = 300;
+
+    *fLog << warn << endl << dbginf << "WARNING! I will assume a maximum impact parameter of 300 meters for the MC events. Check that this is the true one!" <<endl<<endl;
+    const Float_t area = TMath::Pi() * (r2*r2 - r1*r1);
 
     for (Int_t ix=1; ix<=nbinx; ix++)
@@ -294 +291 @@
         const Double_t eff = Ns/Na;
 
-        const Double_t err = sqrt((1.-eff)*Ns)/Na;
-
-        const Float_t area = dr * cos(angle);
+        const Double_t efferr = sqrt((1.-eff)*Ns)/Na;
 
         fHistCol->SetBinContent(ix, eff*area);
-        fHistCol->SetBinError(ix, err*area);
+        fHistCol->SetBinError(ix, efferr*area);
     }
 
@@ -340 +335 @@
 
             const Double_t eff = h.GetCellContent(ix, iy);
-            const Double_t err = h.GetCellError(ix, iy);
+            const Double_t efferr = h.GetCellError(ix, iy);
 
             colA += eff*A;
-            errA += A*A * err*err;
+            errA += A*A * efferr*efferr;
         }
 

trunk/MagicSoft/Mars/mhistmc/MHMcCollectionArea.h

@@ -38 +38 @@
 
     void CalcEfficiency();
-    void CalcEfficiency(UInt_t allevts, Float_t theta);
+    void CalcEfficiency(UInt_t allevts, Float_t emin, Float_t emax, Float_t index);
 
     void Calc(const MHMcEnergyImpact &mcsel, const MHMcEnergyImpact &mcall);