Changeset 7778 for trunk/MagicSoft

Timestamp:

07/05/06 12:39:47 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mhflux/MHAlpha.cc (modified) (7 diffs)
• mhflux/MHAlpha.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
      datacenter/macros/setupdb.C:
      - make sure that 'res' is correctly deleted
-     
+
    * datacenter/macros/doexclusions.C:
      - fixed some variable name overrides
@@ -36 +36 @@
    * mhflux/MAlphaFitter.[h,cc]:
      - added the possibility to DrawResult()
+
+   * mhflux/MHAlpha.[h,cc]:
+     - added new output container (Bin) which contains the number
+       of the bin the event was assigned to
+     - fixed drawing the significance in DrawAll
 
 

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -54 +54 @@
 #include <TStopwatch.h>
 
-#include "MGeomCam.h"
 #include "MSrcPosCam.h"
 #include "MHillasSrc.h"
@@ -82 +81 @@
 MHAlpha::MHAlpha(const char *name, const char *title)
     : fNameParameter("MHillasSrc"), fParameter(0),
-    fOffData(0), fResult(0), /*fExcess(0),*/ fEnergy(0),
+    fOffData(0), fResult(0), fEnergy(0), fBin(0),
     fPointPos(0), fTimeEffOn(0), fTime(0), fNumTimeBins(10),
     fHillas(0), fMatrix(0), fSkipHistTime(kFALSE), fSkipHistTheta(kFALSE),
@@ -295 +294 @@
     if (!fSigma)
         return kFALSE;
+    fBin = (MParameterI*)const_cast<MParList*>(pl)->FindCreateObj("MParameterI", "Bin");
+    if (!fBin)
+        return kFALSE;
 
     //fExcess = (MParameterD*)const_cast<MParList*>(pl)->FindCreateObj("MParameterD", "MExcess");
@@ -440 +442 @@
 }
 
+void MHAlpha::SetBin(Int_t ibin)
+{
+    // Is this necessary?
+    // Could be speed up up searching for it only once.
+    const Float_t max     = fFit.GetSignalIntegralMax();
+    const Int_t bin0      = fHist.GetZaxis()->FindFixBin(max);
+
+    const Int_t nbinsx    = fHist.GetNbinsX();
+    const Int_t nbinsy    = fHist.GetNbinsY();
+    const Int_t nxy       = (nbinsx+2)*(nbinsy+2);
+
+    const Int_t binz      = ibin/nxy;
+
+    const Bool_t issignal = binz>0 && binz<bin0;
+
+    fBin->SetVal(issignal ? binz : -binz);
+}
+
 // --------------------------------------------------------------------------
 //
@@ -479 +499 @@
 
     // Fill histograms
-    fHist.Fill(theta, energy, TMath::Abs(alpha), w);
+    const Int_t ibin = fHist.Fill(theta, energy, TMath::Abs(alpha), w);
+    SetBin(ibin);
 
     if (!fSkipHistTime)
@@ -769 +790 @@
 void MHAlpha::DrawAll(Bool_t newc)
 {
-    if (newc && !fDisplay)
+    if (!newc && !fDisplay)
         return;
 
@@ -843 +864 @@
         {
             *fLog << dbg << "Bin " << i << ": sigmaexc=" << fit.GetSignificanceExc() << " omega=" << fit.GetGausSigma() << " events=" << fit.GetEventsExcess() << " scale=" << fit.GetScaleFactor() << endl;
-            fit.PaintResult();
+            fit.DrawResult();
         }
         /*

trunk/MagicSoft/Mars/mhflux/MHAlpha.h

@@ -20 +20 @@
 class MParList;
 class MParameterD;
+class MParameterI;
 class MHillas;
 class MHMatrix;
@@ -46 +47 @@
     MParameterD   *fSigma;      //!
     MParameterD   *fEnergy;     //!
+    MParameterI   *fBin;        //!
     MPointingPos  *fPointPos;   //!
 
@@ -73 +75 @@
     void InitAlphaTime(const MTime &t);
     void FinalAlphaTime(MBinning &bins);
+
+    void SetBin(Int_t bin);
 
     void PaintText(Double_t val, Double_t error) const;