Changeset 7386 for trunk/MagicSoft

Timestamp:

10/11/05 14:34:04 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mbase/MMath.cc (modified) (1 diff)
• mhflux/MAlphaFitter.cc (modified) (1 diff)
• mhflux/MAlphaFitter.h (modified) (1 diff)
• mhflux/MHAlpha.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
- 2005/09/29 Daniela Dorner
+ 2005/10/11 Thomas Bretz
+
+   * mbase/MMath.cc:
+     - fixed a typo in SignificanceLiMaExc
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - added a comment 
+     - increased ClassDef
+
+   * mhflux/MHAlpha.cc:
+     - correctly use SignificanceExc for bins instead of Significance
+
+
+
+ 2005/10/11 Daniela Dorner
 
    * datacenter/macros/setupdb.C:

trunk/MagicSoft/Mars/NEWS

@@ -8 +8 @@
      and where to search for the image data
        --ind=/magic/data/star
+
+   - ganymed/sponde: Calculation of the error of single size-/energy-
+     bins now uses Li/Ma (5) instead of LiMa (17)
 
 

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -139 +139 @@
 {
     Double_t Ns = s - alpha*b;
-    Double_t sN = s - alpha*alpha*b;
+    Double_t sN = s + alpha*alpha*b;
 
     return Ns<0 || sN<0 ? 0 : Ns/TMath::Sqrt(sN);

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -34 +34 @@
 // container in the parlisrt
 //
-// PRELIMINARY!
+// Version 2:
+// ----------
+//  +Double_t fSignificanceExc;  // significance of excess
+//
 //
 //////////////////////////////////////////////////////////////////////////////

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -220 +220 @@
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
 
-    ClassDef(MAlphaFitter, 1)
+    ClassDef(MAlphaFitter, 2)
 };
 

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -163 +163 @@
         {
             fHEnergy.SetBinContent(i, fit.GetEventsExcess());
-            if (fit.GetSignificance()>1)
-                fHEnergy.SetBinError(i, fit.GetEventsExcess()/fit.GetSignificance());
+            if (fit.GetSignificanceExc()>1)
+                fHEnergy.SetBinError(i, fit.GetEventsExcess()/fit.GetSignificanceExc());
             else
                 fHEnergy.SetBinError(i, fit.GetEventsExcess());
 
-            if (fit.GetSignificance()>1)
+            if (fit.GetSignificanceExc()>1)
             {
-                mean += fit.GetSignificance();
+                mean += fit.GetSignificanceExc()*fit.GetSignificanceExc();
                 num++;
             }
         }
     }
-    return mean/num;
+    return TMath::Sqrt(mean)/num;
 }
 
@@ -192 +192 @@
         {
             fHTheta.SetBinContent(i, fit.GetEventsExcess());
-            if (fit.GetSignificance()>1)
-                fHTheta.SetBinError(i, fit.GetEventsExcess()/fit.GetSignificance());
+            if (fit.GetSignificanceExc()>1)
+                fHTheta.SetBinError(i, fit.GetEventsExcess()/fit.GetSignificanceExc());
             else
                 fHTheta.SetBinError(i, fit.GetEventsExcess());
@@ -430 +430 @@
     //
     fHTime.SetBinContent(n+1, fit.GetEventsExcess());
-    if (fit.GetSignificance()>1)
-        fHTime.SetBinError(n+1, fit.GetEventsExcess()/fit.GetSignificance());
+    if (fit.GetSignificanceExc()>1)
+        fHTime.SetBinError(n+1, fit.GetEventsExcess()/fit.GetSignificanceExc());
     else
         fHTime.SetBinError(n+1, fit.GetEventsExcess());
@@ -810 +810 @@
         if (hof ? fit.Fit(*hon, *hof, alpha) : fit.Fit(*hon))
         {
-            *fLog << dbg << "Bin " << i << ": sigma=" << fit.GetSignificance() << " omega=" << fit.GetGausSigma() << " events=" << fit.GetEventsExcess() << " scale=" << fit.GetScaleFactor() << endl;
+            *fLog << dbg << "Bin " << i << ": sigmaexc=" << fit.GetSignificanceExc() << " omega=" << fit.GetGausSigma() << " events=" << fit.GetEventsExcess() << " scale=" << fit.GetScaleFactor() << endl;
             fit.PaintResult();
         }