Changeset 11086 for trunk/FACT++

Timestamp:

06/21/11 10:17:40 (13 years ago)

Author:

tbretz

Message:

Make sure that gPad is always set correctly; replaces gPad by canv where possible in slot_RootEventProcess; do only AbsPixelToX/Y; added warning output if the mapping files are not well read.

File:

• trunk/FACT++/gui/FactGui.h (modified) (13 diffs)

trunk/FACT++/gui/FactGui.h

@@ -187 +187 @@
         gStyle->SetPalette(fPalette.size(), fPalette.data());
 
-
         const double r   = double(gPad->GetWw())/gPad->GetWh();
         const double max = 20.5; // 20.5 rings in x and y
@@ -196 +195 @@
             gPad->Range(-max, -max/r, max, max/r);
 
+        Double_t x1, x2, y1, y2;
+        gPad->GetRange(x1, x2, y1, y2);
+
         double dmin = fData[0];
         double dmax = fData[0];
@@ -212 +214 @@
         const double min   = dmin;
         const double scale = dmax==dmin ? 1 : dmax-dmin;
-
-//        const double min   = fData.min();
-//        const double scale = fData.max()==fData.min() ? 1 : fData.max()-fData.min();
 
         TAttFill fill(0, 1001);
@@ -314 +313 @@
         static string       str;
 
-        const float x = gPad->PadtoX(gPad->AbsPixeltoX(px));
-        const float y = gPad->PadtoY(gPad->AbsPixeltoY(py));
+        const float x = gPad->AbsPixeltoX(px);
+        const float y = gPad->AbsPixeltoY(py);
 
         const int idx = GetIdx(x, y);
@@ -331 +330 @@
     Int_t DistancetoPrimitive(Int_t px, Int_t py)
     {
-        const float x = gPad->PadtoX(gPad->AbsPixeltoX(px));
-        const float y = gPad->PadtoY(gPad->AbsPixeltoY(py));
+        const float x = gPad->AbsPixeltoX(px);
+        const float y = gPad->AbsPixeltoY(py);
 
         return GetIdx(x, y)>=0 ? 0 : 99999;
@@ -1860 +1859 @@
 
 #ifdef HAVE_ROOT
-    void slot_RootEventProcessed(TObject *obj, unsigned int evt, TCanvas *)
+    void slot_RootEventProcessed(TObject *obj, unsigned int evt, TCanvas *canv)
     {
         // kMousePressEvent       // TCanvas processed QEvent mousePressEvent
@@ -1878 +1877 @@
             if (dynamic_cast<Camera*>(obj))
             {
-                const float xx = gPad->PadtoX(gPad->AbsPixeltoX(tipped->GetEventX()));
-                const float yy = gPad->PadtoY(gPad->AbsPixeltoY(tipped->GetEventY()));
+                const float xx = canv->AbsPixeltoX(tipped->GetEventX());
+                const float yy = canv->AbsPixeltoY(tipped->GetEventY());
 
                 Camera *cam = static_cast<Camera*>(obj);
@@ -1894 +1893 @@
             if (dynamic_cast<Camera*>(obj))
             {
-                const float xx = gPad->PadtoX(gPad->AbsPixeltoX(tipped->GetEventX()));
-                const float yy = gPad->PadtoY(gPad->AbsPixeltoY(tipped->GetEventY()));
+                const float xx = canv->AbsPixeltoX(tipped->GetEventX());
+                const float yy = canv->AbsPixeltoY(tipped->GetEventY());
 
                 Camera *cam = static_cast<Camera*>(obj);
@@ -1920 +1919 @@
         // our own GetObjectInfo which make everything a bit more
         // complicated.
+        canv->cd();
 #if ROOT_VERSION_CODE > ROOT_VERSION(5,22,00)
         const char *objectInfo =
@@ -1937 +1937 @@
         if (dynamic_cast<Camera*>(obj))
         {
-            const float xx = gPad->PadtoX(gPad->AbsPixeltoX(tipped->GetEventX()));
-            const float yy = gPad->PadtoY(gPad->AbsPixeltoY(tipped->GetEventY()));
+            const float xx = canv->AbsPixeltoX(tipped->GetEventX());
+            const float yy = canv->AbsPixeltoY(tipped->GetEventY());
 
             Camera *cam = static_cast<Camera*>(obj);
@@ -2221 +2221 @@
         }
 
+        if (l!=160)
+            cerr << "WARNING - Problems reading Trigger-Patches.txt" << endl;
+
         // --------------------------------------------------------------------------
 
@@ -2249 +2252 @@
         }
 
+        if (l!=1440)
+            cerr << "WARNING - Problems reading MasterList-v3.txt" << endl;
+
         // --------------------------------------------------------------------------
 
@@ -2275 +2281 @@
             l++;
         }
+
+        if (l!=160)
+            cerr << "WARNING - Problems reading PatchList.txt" << endl;
 
         // --------------------------------------------------------------------------