Changeset 10962

Timestamp:

06/09/11 19:56:48 (13 years ago)

Author:

tbretz

Message:

Fixed ThresholdDisableOthers

Location:

trunk/FACT++/gui

Files:

• FactGui.h (modified) (4 diffs)
• MainWindow.cc (modified) (1 diff)
• MainWindow.h (modified) (2 diffs)

trunk/FACT++/gui/FactGui.h

@@ -1166 +1166 @@
         // fPatch converts from software id to software patch id
         for (int i=0; i<1440; i++)
-            dat[i] = sdata.fRatePatch[fPatch[i]];
+        {
+            const int isw = fPatch[i];
+            const int ihw = fPatchMapHW[isw];
+            dat[i] = sdata.fRatePatch[ihw];
+        }
 
         c = fRatesCanv->GetCanvas();
@@ -1925 +1929 @@
 
             ostringstream str;
-            str << "  HW=" << ihw << "  Patch=" << idx << "  (Crate=" << crate << " Board=" << board << " Patch=" << patch << ")";
+            str << " (hw=" << ihw << ")  Patch=" << idx << "  (hw=" << fPatchMapHW[idx] << "; Crate=" << crate << " Board=" << board << " Patch=" << patch << ")";
 
             tipText += str.str().c_str();
@@ -1974 +1978 @@
         fPatchRate->setValue(cam.GetData(isw));
 
+        // Loop over the software idx of all pixels
         for (unsigned int i=0; i<fPatch.size(); i++)
             if (fPatch[i]==isw)
@@ -2064 +2069 @@
 
         Dim::SendCommand("FTM_CONTROL/DISABLE_ALL_PIXELS_EXCEPT", ihw);
+    }
+
+    void on_fThresholdDisableOthers_clicked()
+    {
+        const uint16_t isw = fThresholdIdx->value();
+        const uint16_t ihw = fPatchMapHW[isw];
+
+        Dim::SendCommand("FTM_CONTROL/DISABLE_ALL_PATCHES_EXCEPT", ihw);
     }
 

trunk/FACT++/gui/MainWindow.cc

@@ -245 +245 @@
 }
 
-void MainWindow::on_fThresholdDisableOthers_clicked()
-{
-    Dim::SendCommand("FTM_CONTROL/DISABLE_ALL_PATCHES_EXCEPT",
-                     uint16_t(fThresholdIdx->value()));
-}
-
 void MainWindow::on_fEnableTrigger_stateChanged(int b)
 {

trunk/FACT++/gui/MainWindow.h

@@ -85 +85 @@
 
     // Tab: Rates
-    void on_fPixelEnable_stateChanged(int);
-    void on_fThresholdVal_valueChanged(int);
+    virtual void on_fPixelEnable_stateChanged(int) { }
+    virtual void on_fThresholdVal_valueChanged(int) { }
     virtual void on_fThresholdIdx_valueChanged(int) { }
     virtual void on_fThresholdCrate_valueChanged(int) { }
@@ -93 +93 @@
     virtual void on_fPixelIdx_valueChanged(int) { }
 
-    void on_fPixelDisableOthers_clicked();
-    virtual void on_fThresholdDisableOthers_clicked();
+    void on_fPixelEnableAll_clicked();
+    void on_fPixelDisableAll_clicked();
+
+    virtual void on_fPixelDisableOthers_clicked() { }
+    virtual void on_fThresholdDisableOthers_clicked() { }
 
     virtual void on_fRatePatch1_valueChanged(int) { }