Changeset 7618 for trunk

Timestamp:

03/20/06 18:05:27 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -34 +34 @@
    * ganymed.rc, ganymed_onoff.rc, ganymed_wobble.rc:
      - added example how to change the new scale parameters in MHDisp
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - implemented the strategy for optimization which is suggested
+       by the Berlin people for weak sources "weaksource"
+
+   * mhflux/MHPhi.[h,cc]:
+     - moved the AppendPad for the text-paint into all sub-pads which
+       need it. Otherwise they are not always properly updated.
 
 

trunk/MagicSoft/Mars/NEWS

@@ -23 +23 @@
      remove events triggered by car-light (rate changing on a short
      time-scale) are missing.
+
+   - macros: optimonoff.C, optimwobble.C: implemented a new strategy
+     for optimization (kWeakSource) which is suggested by the Berlin
+     people for weak sources.
 
    - ganymed: In the second loop the MHNewImagePar histograms disapeared.

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -36 +36 @@
 // Version 2:
 // ----------
-//  +Double_t fSignificanceExc;  // significance of excess
+//  + Double_t fSignificanceExc;  // significance of a known excess
 //
 //
@@ -276 +276 @@
     f.SetMuStep(0.05);
     f.SetMuMax(100);
+    f.SetMuMin(0);
+    f.SetCL(90);
+
     return f.CalculateUpperLimit(fEventsSignal, fEventsBackground);
 }
@@ -587 +590 @@
     case kGaussSigma:
         return GetGausSigma();
+    case kWeakSource:
+        return GetEventsBackground()<1 ? -GetEventsExcess() : -GetEventsExcess()/TMath::Sqrt(GetEventsBackground());
     }
     return 0;
@@ -649 +654 @@
         if (txt==(TString)"gausssigma" || txt==(TString)"gaussigma")
             fStrategy = kGaussSigma;
+        if (txt==(TString)"weaksource")
+            fStrategy = kWeakSource;
         rc = kTRUE;
     }

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -35 +35 @@
         kSignificanceExcess,
         kExcess,
-        kGaussSigma
+        kGaussSigma,
+        kWeakSource
     };
     enum SignalFunc_t {

trunk/MagicSoft/Mars/mhflux/MHPhi.cc

@@ -297 +297 @@
     h1->Draw("same");
 
+    AppendPad("result1");
+
     // --------------------------
 
@@ -341 +343 @@
     h1->Draw("same");
 
+    AppendPad("result4");
+
     // --------------------------
-
-    pad->cd();
-    AppendPad("result");
 }
 
@@ -454 +455 @@
 }
 
-void MHPhi::PaintResult() const
-{
-    TVirtualPad *pad = gPad;
-
-    pad->cd(1);
-    PaintText(fHPhi);
-
-    pad->cd(4);
-    TH1D *res = gPad ? dynamic_cast<TH1D*>(gPad->FindObject("Result")) : NULL;
-    if (res)
-        PaintText(*res);
-}
-
 void MHPhi::Paint(Option_t *o)
 {
@@ -472 +460 @@
     if (opt=="update")
         PaintUpdate();
-    if (opt=="result")
-        PaintResult();
+    if (opt=="result1")
+        PaintText(fHPhi);
+    if (opt=="result4")
+    {
+        TH1D *res = gPad ? dynamic_cast<TH1D*>(gPad->FindObject("Result")) : NULL;
+        if (res)
+            PaintText(*res);
+    }
 }
 

trunk/MagicSoft/Mars/mhflux/MHPhi.h

@@ -37 +37 @@
     // Paint
     void PaintUpdate() const;
-    void PaintResult() const;
     void PaintText(const TH1D &res) const;