Changeset 7384 for trunk/MagicSoft

Timestamp:

10/10/05 12:26:49 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MMath.cc (modified) (1 diff)
• mbase/MMath.h (modified) (1 diff)
• mbase/MTime.cc (modified) (1 diff)
• mbase/MTime.h (modified) (1 diff)
• mcalib/MCalibCalcFromPast.cc (modified) (1 diff)
• mhcalib/MHCalibrationCam.cc (modified) (1 diff)
• mhflux/MAlphaFitter.cc (modified) (4 diffs)
• mhflux/MAlphaFitter.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/10/10 Thomas Bretz
+
+   * mbase/MMath.[h,cc]:
+     - added new function SignificanceLiMaExc
+
+   * mbase/MTime.[h,cc]:
+     - added new Setter SetAxisTime
+
+   * mcalib/MCalibCalcFromPast.cc:
+     - fixed some format in output
+
+   * mhcalib/MHCalibrationCam.cc:
+     - fixed a typo
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - added new data member fSiginificanceExc
+
+
+
  2005/10/01 Thomas Bretz
 
@@ -30 +49 @@
 
    * ganymed.cc:
-     - implemented twonew options --ind and --ins
+     - implemented two new options --ind and --ins
 
    * datacenter/scripts/runganymed:

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -133 +133 @@
 // --------------------------------------------------------------------------
 //
+// Return Li/Ma (5) for the error of the excess, under the assumption that
+// the existance of a signal is already known.
+//
+Double_t MMath::SignificanceLiMaExc(Double_t s, Double_t b, Double_t alpha)
+{
+    Double_t Ns = s - alpha*b;
+    Double_t sN = s - alpha*alpha*b;
+
+    return Ns<0 || sN<0 ? 0 : Ns/TMath::Sqrt(sN);
+}
+
+// --------------------------------------------------------------------------
+//
 // Returns: 2/(sigma*sqrt(2))*integral[0,x](exp(-(x-mu)^2/(2*sigma^2)))
 //

trunk/MagicSoft/Mars/mbase/MMath.h

@@ -22 +22 @@
     Double_t SignificanceLiMa(Double_t s, Double_t b, Double_t alpha=1);
     Double_t SignificanceLiMaSigned(Double_t s, Double_t b, Double_t alpha=1);
+    Double_t SignificanceLiMaExc(Double_t s, Double_t b, Double_t alpha=1);
 
     void ReducePrecision(Float_t &val);

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -230 +230 @@
 {
     return (GetMjd()-49718)*kDay/1000;
+}
+
+// --------------------------------------------------------------------------
+//
+// Counterpart of GetAxisTime
+//
+void MTime::SetAxisTime(Double_t time)
+{
+    SetMjd(time*1000/kDay+49718);
 }
 

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -87 +87 @@
     Bool_t   SetMjd(UInt_t mjd, ULong_t ms, UInt_t ns=0);
     void     SetMjd(Double_t m);
+    void     SetAxisTime(Double_t time);
 
     // Getter functions

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -438 +438 @@
     *fLog << inf << endl;
     *fLog << GetDescriptor() << " execution statistics:" << endl;
-    *fLog << " " << setw(7) << fNumFails << " (" << Form("%5.1f", 100.*fNumFails/fNumCam) << "%) updates failed." << endl;
+    *fLog << " " << setfill(' ') << setw(7) << fNumFails << " (" << Form("%5.1f", 100.*fNumFails/fNumCam) << "%) updates failed." << endl;
     *fLog << endl;
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -967 +967 @@
     return kTRUE;
 
-  *fLog << inf << GetDescriptor() << ": Number of event used to fill histograms == " << fCurrentNumEvts << endl;
+  *fLog << inf << GetDescriptor() << ": Number of events used to fill histograms == " << fCurrentNumEvts << endl;
 
   if (fHiGainArray->GetSize() == 0 && fLoGainArray->GetSize() == 0)

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -60 +60 @@
 {
     fSignificance=0;
+    fSignificanceExc=0;
     fEventsExcess=0;
     fEventsSignal=0;
@@ -216 +217 @@
     fEventsExcess     = fEventsSignal-fEventsBackground;
     fSignificance     = MMath::SignificanceLiMaSigned(fEventsSignal, fEventsBackground);
+    fSignificanceExc  = MMath::SignificanceLiMaExc(fEventsSignal, fEventsBackground);
 
     if (TMath::IsNaN(fSignificance))
@@ -250 +252 @@
     fScaleFactor      = alpha;
     fSignificance     = MMath::SignificanceLiMaSigned(fEventsSignal, fEventsBackground/alpha, alpha);
+    fSignificanceExc  = MMath::SignificanceLiMaExc(fEventsSignal, fEventsBackground/alpha, alpha);
 
     if (TMath::IsNaN(fSignificance))
@@ -304 +307 @@
     // Result
     f.fSignificance     = fSignificance;
+    f.fSignificanceExc  = fSignificanceExc;
     f.fEventsExcess     = fEventsExcess;
     f.fEventsSignal     = fEventsSignal;

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -54 +54 @@
     // Result
     Double_t fSignificance;     // significance of signal
+    Double_t fSignificanceExc;  // significance of excess
     Double_t fEventsExcess;     // calculated number of excess events (signal-bg)
     Double_t fEventsSignal;     // calculated number of signal events
@@ -154 +155 @@
 
     Double_t GetSignificance() const       { return fSignificance; }
+    Double_t GetSignificanceExc() const    { return fSignificanceExc; }
     Double_t GetChiSqSignal() const        { return fChiSqSignal; }
     Double_t GetChiSqBg() const            { return fChiSqBg; }