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

Timestamp:

03/20/06 12:48:14 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mhflux/MHDisp.cc

@@ -32 +32 @@
 // in the tasklist. Switching of the M3L cut in MFMagicCuts is recommended.
 //
+// Class Version 3:
+// ----------------
+//  + Double_t fScaleMin;    // [deg] Minimum circle for integration of off-data for scaling
+//  + Double_t fScaleMax;    // [deg] Maximum circle for integration of off-data for scaling
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MHDisp.h"
@@ -65 +70 @@
 //
 MHDisp::MHDisp(const char *name, const char *title)
-    : fDisp(0), fDeviation(0), fSmearing(-1), fWobble(kFALSE)
+    : fDisp(0), fDeviation(0), fSmearing(-1), fWobble(kFALSE),
+    fScaleMin(0.325), fScaleMax(0.475)
 {
     //
@@ -165 +171 @@
         if (!fHistOff)
         {
-            if (delta>165)
+            if (delta>180-25)
                 return kTRUE;
 
@@ -175 +181 @@
             // increased uncertainty
             // FIXME: The delta stuff could be replaced by a 2*antitheta cut...
-            w0 = delta>15 ? 1 : 2;
+            w0 = delta>25 ? 1 : 2;
         }
 
@@ -331 +337 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Make sure that if the scale is changed by the context menu all subpads
+// are redrawn.
+//
+void MHDisp::Update()
+{
+    TVirtualPad *pad = gPad;
+    for (int i=1; i<=6; i++)
+    {
+        if (pad->GetPad(i))
+            pad->GetPad(i)->Modified();
+    }
+}
 
 // --------------------------------------------------------------------------
@@ -348 +368 @@
         {
             const Double_t d = TMath::Hypot(axex.GetBinCenter(x+1), axey.GetBinCenter(y+1));
-            if (d>0.325 && d<0.475)
+            if (d>fScaleMin && d<fScaleMax)
             {
                 sum += h.GetBinContent(x+1,y+1);
@@ -354 +374 @@
             }
         }
+
     return sum/cnt;
 }
@@ -611 +632 @@
     // ----- Pad number 4 -----
     TString name = Form("%s_4", pad->GetName());
-    TPad *p = new TPad(name,name, 0.5025, 0.3355, 0.995, 0.995, col, 0, 0);
+    TPad *p = new TPad(name,name, 0.525/*0.5025*/, 0.3355, 0.995, 0.995, col, 0, 0);
     p->SetNumber(4);
     p->Draw();
@@ -631 +652 @@
     pad->cd();
     name = Form("%s_1", pad->GetName());
-    p = new TPad(name,name, 0.005, 0.3355, 0.4975, 0.995, col, 0, 0);
+    p = new TPad(name,name, 0.005, 0.3355, 0.475/*0.4975*/, 0.995, col, 0, 0);
     p->SetNumber(1);
     p->Draw();
@@ -733 +754 @@
         SetWobble(GetEnvValue(env, prefix, "Wobble", fWobble));
     }
+    if (IsEnvDefined(env, prefix, "ScaleMin", print))
+    {
+        rc = kTRUE;
+        SetScaleMin(GetEnvValue(env, prefix, "ScaleMin", fScaleMin));
+    }
+    if (IsEnvDefined(env, prefix, "ScaleMax", print))
+    {
+        rc = kTRUE;
+        SetScaleMax(GetEnvValue(env, prefix, "ScaleMax", fScaleMax));
+    }
 
     return rc;