Changeset 7251

Timestamp:

08/02/05 10:04:19 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• NEWS (modified) (3 diffs)
• callisto.rc (modified) (1 diff)
• callisto_Dec04Jan05.rc (modified) (1 diff)
• callisto_MarApr05.rc (added)
• mbase/MMath.h (modified) (2 diffs)
• mhflux/MHPhi.cc (modified) (11 diffs)
• mhflux/MHPhi.h (modified) (1 diff)
• mjobs/MJCut.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 @@
-
- 
 Please  do  not write behind the end of line tag so that it is  possible
 to   send  a   Changelog   file  to  a  line  printer  directly.  Thanks.
@@ -20 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/08/02 Thomas Bretz
+
+   * callisto.rc, callisto_Dec04Jan05.rc:
+     - new ScaleFactor (1% difference)
+
+   * callisto_MarApr05.rc:
+     - new file, identical to callisto.rc but scale factor 5% different
+
+   * mhflux/MHPhi.[h,cc]:
+     - some small improvements
+     - commented code for further improvement
+
+   * mjobs/MJCut.cc:
+     - implemented MHPhi for wobble mode
+
+   * mjobs/MJStar.cc:
+     - repleced maximum deviation (45) in first muon cut by 35
+       it is done anyhow in a later step and doesn't change in between
+
+
 
  2005/07/31 Daniela Dorner

trunk/MagicSoft/Mars/NEWS

@@ -54 +54 @@
        - 1.40 (MExtractTimeAndChargeDigitalFilter)
      This is important mainly for timing studies.
-
-   - callisto: added new plot (MHPhi) as described in
-     http://www.astro.uni-wuerzburg.de/results/ringmethod/
 
    - callisto: Changed limits in MHCalibrationChargeCalc from
@@ -72 +69 @@
      for Monte Carlo calibrations.
 
+   - callisto: Updated Muon scale with latest results (1% difference
+     for most data, 5% for Mar/Apr'05)
+
    - callisto: use a new criterium to exclude bad pixels: If the high-gain
      was saturated and the blackout-events in the low-gain exceed the 
@@ -134 +134 @@
            plot was a histogram instead of a profile the resulting psf
            became pedestal rms dependant
+
+   - ganymed: added new plot (MHPhi) for wobble mode as described in
+     http://www.astro.uni-wuerzburg.de/results/ringmethod/
 
    - ganymed: corrects now (correctly?) for the misspointing in 

trunk/MagicSoft/Mars/callisto.rc

@@ -399 +399 @@
 #MJCalibrateSignal.MCalibColorSet.ExpicitColor: green,blue,uv,ct1
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
-MJCalibrateSignal.MCalibrateData.ScaleFactor: 0.956937799
+MJCalibrateSignal.MCalibrateData.ScaleFactor: 0.9633911368
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
 #MJCalibrateSignal.MCalibrateData.CalibConvMinLimit: 0.01

trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

@@ -410 +410 @@
 #MJCalibrateSignal.MCalibColorSet.ExpicitColor: green,blue,uv,ct1
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
-MJCalibrateSignal.MCalibrateData.ScaleFactor: 0.904159132
+MJCalibrateSignal.MCalibrateData.ScaleFactor: 0.919117647
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
 #MJCalibrateSignal.MCalibrateData.CalibConvMinLimit: 0.01

trunk/MagicSoft/Mars/mbase/MMath.h

@@ -10 +10 @@
 namespace MMath
 {
+    inline Double_t DegToHor() { return 1./15; }
+    inline Double_t HorToDeg() { return 15;    }
+
+    inline Double_t RadToHor() { return TMath::RadToDeg()/15; }
+    inline Double_t HorToRad() { return 15/TMath::RadToDeg(); }
+
     Double_t GaussProb(Double_t x, Double_t sigma, Double_t mean=0);
 
@@ -24 +30 @@
     Double_t InterpolParabCos(const TVector3 &vx, const TVector3 &vy, Double_t x);
 
-    Double_t Sgn(Double_t d);
+    inline Double_t Sgn(Double_t d) { return d<0 ? -1 : 1; }
 }
 
-inline Double_t MMath::Sgn(Double_t d) { return d<0 ? -1 : 1; }
-
 #endif

trunk/MagicSoft/Mars/mhflux/MHPhi.cc

@@ -30 +30 @@
 // the source position.
 //
+// More detail can be found at:
+// http://www.astro.uni-wuerzburg.de/results/ringmethod/
+//
 ////////////////////////////////////////////////////////////////////////////
 #include "MHPhi.h"
@@ -60 +63 @@
 //
 MHPhi::MHPhi(const char *name, const char *title)
-: fHillas(0), fSrcPos(0), fDisp(0)
+: fHillas(0), fSrcPos(0), fDisp(0)//, fOnOffMode(kTRUE), fIsOffLoop(kFALSE)
 {
     fName  = name  ? name  : "MHPhi";
@@ -66 +69 @@
 
     // Init Graphs
-    fHPhi.SetNameTitle("Phi", "Distribution of \\Delta\\Phi");
+    fHPhi.SetNameTitle("Phi", "\\Delta\\Phi-Distribution");
 
     fHPhi.SetXTitle("\\Delta\\Phi [\\circ]");
@@ -78 +81 @@
 
     fHPhi.GetYaxis()->SetTitleOffset(1.2);
-}
+
+    /*
+    fNameParameter = "Disp";
+
+    fHist.SetNameTitle("Phi", "\\Delta\\Phi-Distribution");
+    fHist.SetZTitle("\\Delta\\Phi [\\circ]");
+    fHist.SetDirectory(NULL);
+
+    // Main histogram
+    fHistTime.SetName("Phi");
+    fHistTime.SetXTitle("\\Delta\\Phi [\\circ]");
+    fHistTime.SetDirectory(NULL);
+
+    MBinning binsa, binse, binst;
+    //binsa.SetEdges(75, 0, 1.5);
+    //binsa.SetEdges(arr);
+    binse.SetEdgesLog(15, 10, 100000);
+    binst.SetEdgesASin(67, -0.005, 0.665);
+    //binsa.Apply(fHistTime);
+
+    MH::SetBinning(&fHist, &binst, &binse, &binsa);
+     */
+}
+
+/*
+Double_t MHPhi::GetVal() const
+{
+    const Dopuble_t disp = static_cast<const MParameterD*>(fParameter)->GetVal();
+
+    const TVector2 pos = fHillas->GetMean()*fConvMm2Deg + fHillas->GetNormAxis()*disp;
+    const TVector2 src = fSrcPos->GetXY()*fConvMm2Deg;
+
+    // Calculate radial distance.
+    const Double_t d = pos.Mod() - src.Mod();
+
+    if (d<-fThetaCut*0.913 || d>fThetaCut)
+        return kTRUE;
+
+    const Double_t delta = src.DeltaPhi(pos)*TMath::RadToDeg();
+    const Double_t absd  = TMath::Abs(delta)
+
+    return fHistOff ? absd : 180-absd;
+}
+*/
 
 // --------------------------------------------------------------------------
@@ -118 +164 @@
     fThetaCut      = 0.21/1.2;
     fDistSrc       = 0.4;
+    //fIsOffLoop = !fIsOffLoop;
 
     const Double_t w  = TMath::ATan(fThetaCut/fDistSrc);
@@ -124 +171 @@
 
     MBinning(n, 0, n*sz).Apply(fHPhi);
-
+    /*
+
+    // Get Histogram binnings
+    MBinning binst, binse;
+    binst.SetEdges(fHist, 'x');
+    binse.SetEdges(fHist, 'y');
+
+    MBinning binsa(n, 0, n*sz);
+
+    // Apply binning
+    binsa.Apply(fHistTime);
+    MH::SetBinning(&fHist, &binst, &binse, &binsa);
+
+    // Remark: Binnings might be overwritten in MHAlpha::SetupFill
+    return MHAlpha::SetupFill(pl);
+     */
     return kTRUE;
 }
@@ -135 +197 @@
 Bool_t MHPhi::Fill(const MParContainer *par, const Stat_t weight)
 {
-    const TVector2 pos = fHillas->GetMean()*fConvMm2Deg - fHillas->GetNormAxis()*fDisp->GetVal();
+    const TVector2 pos = fHillas->GetMean()*fConvMm2Deg + fHillas->GetNormAxis()*fDisp->GetVal();
     const TVector2 src = fSrcPos->GetXY()*fConvMm2Deg;
 
+    // Calculate radial distance.
     const Double_t d = pos.Mod() - src.Mod();
 
@@ -146 +209 @@
 
     fHPhi.Fill(TMath::Abs(delta), weight);
+
+    // const Double_t absd = TMath::Abs(delta)
+    // fHPhi.Fill(fHistOff ? absd : 180-absd, weight);
 
     return kTRUE;
@@ -161 +227 @@
     pad->SetBorderMode(0);
 
+    AppendPad("combine");
+
     fHPhi.Draw();
 
-    AppendPad();
+    AppendPad(opt);
 }
 
 void MHPhi::Paint(Option_t *o)
 {
-    const Double_t sig = fHPhi.Integral(1, fNumBinsSignal);
-    const Double_t bg  = fHPhi.Integral(1+fNumBinsSignal, fHPhi.GetNbinsX());
-
-    const Double_t cut = fHPhi.GetBinLowEdge(fNumBinsSignal+1);
-
-    const Double_t f   = cut/(180-cut);
-
-    const Double_t S0  = MMath::SignificanceLiMaSigned(sig, bg*f);
-    const Double_t S   = MMath::SignificanceLiMaSigned(sig, bg, f);
-
-    const TString  fmt = Form("\\sigma_{L/M}=%.1f (\\sigma_{0}=%.1f)  \\Delta\\Phi<%.1f\\circ  E=%.0f  B=%.0f  f=%.2f",
-                              S, S0, cut, sig-bg*f, bg*f, f);
+    //TString opt(o);
+    //opt.ToLower();
+
+    // if (opt=="combine" && fHistOff)
+    // {
+    //    fHPhi.Add(fHist, fHistOff);
+    //    return;
+    // }
+
+    const Bool_t wobble = TString(o).Contains("anticut", TString::kIgnoreCase);
+
+    const Double_t cut  = fHPhi.GetBinLowEdge(fNumBinsSignal+1);
+
+    const Int_t maxbin  = wobble ? fHPhi.GetXaxis()->FindFixBin(180-cut)-1 : fHPhi.GetNbinsX();
+    const Double_t cut2 = wobble ? fHPhi.GetBinLowEdge(maxbin+1) : 180;
+
+    const Double_t sig  = fHPhi.Integral(1, fNumBinsSignal);
+    const Double_t bg   = fHPhi.Integral(1+fNumBinsSignal, maxbin);
+
+    const Double_t f    = cut/(cut2-cut);
+
+    const Double_t S0   = MMath::SignificanceLiMaSigned(sig, bg*f);
+    const Double_t S    = MMath::SignificanceLiMaSigned(sig, bg, f);
+
+    const TString  fmt  = Form("\\sigma_{L/M}=%.1f (\\sigma_{0}=%.1f)  \\Delta\\Phi_{on}<%.1f\\circ  \\Delta\\Phi_{off}<%.1f\\circ  E=%.0f  B=%.0f  f=%.2f",
+                               S, S0, cut, cut2, sig-bg*f, bg*f, f);
 
     const Double_t b = bg             *f/fNumBinsSignal;
     const Double_t e = TMath::Sqrt(bg)*f/fNumBinsSignal;
 
-    TLatex text(0.33, 0.94, fmt);
+    TLatex text(0.27, 0.94, fmt);
     text.SetBit(TLatex::kTextNDC);
     text.SetTextSize(0.035);
@@ -192 +274 @@
     line.SetLineColor(14);
     line.PaintLine(cut, gPad->GetUymin(), cut, gPad->GetUymax());
+    if (maxbin<fHPhi.GetNbinsX())
+        line.PaintLine(cut2, gPad->GetUymin(), cut2, gPad->GetUymax());
     line.SetLineColor(kBlue);
     line.PaintLine(0, b, cut, b);
@@ -202 +286 @@
     m.SetMarkerStyle(kFullDotMedium);
     m.PaintMarker(cut/2, b);
-
-}
+}

trunk/MagicSoft/Mars/mhflux/MHPhi.h

@@ -27 +27 @@
     Float_t fThetaCut;
     Float_t fDistSrc;
+    //Bool_t  fOnOffMode;
+
+    //Bool_t  fIsOffLoop; //! 
 
 public:

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -727 +727 @@
     MH *hfs=CreateNewHistFS(plist);
     MFillH ffs2(hfs, "MHillas", "FillFS");
+    MFillH fillphi("MHPhi", "", "FillPhi");
+    fillphi.SetDrawOption("anticut");
 
     tlist.Replace(&readon);
@@ -751 +753 @@
         if (!fIsWobble || !fNameHist.IsNull())
             tlist2.Replace(&ffs2);
-        if (fIsWobble && !fNameHist.IsNull())
-            tlist2.RemoveFromList(&ffs);
+        if (fIsWobble)
+        {
+            tlist2.AddToListAfter(&fillphi, &falpha2);
+            if (!fNameHist.IsNull())
+                tlist2.RemoveFromList(&ffs);
+        }
 
         if (!fIsMonteCarlo)