Changeset 7202 for trunk/MagicSoft/Mars/mhflux/MHDisp.cc

Timestamp:

07/21/05 11:44:05 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhflux/MHDisp.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhflux/MHDisp.cc

@@ -213 +213 @@
     }
 
-    if (fSmearing<=0)
-    {
-        fHist.Fill(pos1.X(), pos1.Y(), 0.0, w*w0);
-        return kTRUE;
-    }
-
     // -------------------------------------------------
     //  The following algorithm may look complicated...
@@ -241 +235 @@
     const Int_t    bz     = fHist.GetZaxis()->FindFixBin(0);
 
-    TH1 &bg = fHalf ? fHistBg1 : fHistBg2;
+    TH2 &bg = fHalf ? fHistBg1 : fHistBg2;
+
+    const Bool_t smear = fSmearing>0;
+    if (!smear)
+    {
+        if (!fHistOff)
+            bg.Fill(pos1.X(), pos1.Y(), w*w0);
+        else
+            fHist.Fill(pos1.X(), pos1.Y(), 0.0, w*w0);
+    }
 
     // To calculate significance map smear with 2*theta-cut and
@@ -254 +257 @@
             const Double_t cy = axey.GetBinCenter(y);
             const Double_t sp = Sq(px, cy-pos1.Y());
-            const Double_t dp = sp/psf;
-
-            // Values below 1e-3 (>3.5sigma) are not filled into the histogram
-            if (dp<4)
+            if (smear)
             {
-                const Double_t rc = TMath::Exp(-dp)/normg;
-                if (!fHistOff)
-                    bg.AddBinContent(bg.GetBin(x, y), rc);
-                else
-                    fHist.AddBinContent(fHist.GetBin(x, y, bz), rc);
+                const Double_t dp = sp/psf;
+
+                // Values below 1e-3 (>3.5sigma) are not filled into the histogram
+                if (dp<4)
+                {
+                    const Double_t rc = TMath::Exp(-dp)/normg;
+                    if (!fHistOff)
+                        bg.AddBinContent(bg.GetBin(x, y), rc);
+                    else
+                        fHist.AddBinContent(fHist.GetBin(x, y, bz), rc);
+                }
             }
 
@@ -285 +291 @@
         }
     }
-    fHist.SetEntries(fHist.GetEntries()+1);
+
+    if (fHistOff)
+        fHistBg.SetEntries(fHistBg.GetEntries()+1);
+
+    if (!smear)
+        return kTRUE;
 
     if (!fHistOff)
-        bg.SetEntries(fHistBg1.GetEntries()+1);
+        bg.SetEntries(bg.GetEntries()+1);
+    else
+        fHist.SetEntries(fHist.GetEntries()+1);
 
     return kTRUE;