Changeset 11926

Timestamp:

08/31/11 16:53:42 (13 years ago)

Author:

tbretz

Message:

Adapted Bias control stuff to the changes in the GUI; mainly added the didplay of voltages.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -2479 +2479 @@
     void handleBiasVolt(const DimData &d)
     {
-        if (!CheckSize(d, 416*sizeof(int16_t)))
+        if (!CheckSize(d, 2*416*sizeof(int16_t)))
             return;
 
         const int16_t *ptr = d.ptr<int16_t>();
 
-        fVecBiasVolt.assign(ptr, ptr+416);
-
+        fVecBiasVolt.assign(ptr, ptr+2*416);
+
+        on_fBiasDispRefVolt_stateChanged();
         UpdateBiasValues();
     }
@@ -2508 +2509 @@
             dat[i] = abs(ptr[entry.hv()])*5000./4096;
 
-            fBiasCam->SetEnable(i, uint16_t(ptr[entry.hv()])!=0x8000);
-        }
-
-        fBiasCam->SetData(dat);
+            fBiasCamA->SetEnable(i, uint16_t(ptr[entry.hv()])!=0x8000);
+            fBiasCamA->highlightPixel(i, ptr[entry.hv()]<0);
+        }
+
+        fBiasCamA->SetData(dat);
 
         UpdateBiasValues();
@@ -3278 +3280 @@
         {
             fBiasVoltDac->setValue(fVecBiasVolt[ihw]);
-            fBiasVolt->setValue(fVecBiasVolt[ihw]*90./4096);
+            //fBiasVolt->setValue(fVecBiasVolt[ihw]*90./4096);
+
+            fBiasVoltCur->setValue(fVecBiasVolt[ihw]*90./4096);
+            fBiasVoltRef->setValue(fVecBiasVolt[ihw+416]*90./4096);
+
+            SetLedColor(fBiasNominalLed,
+                        fVecBiasCurrent[ihw]==fVecBiasVolt[ihw+416]?kLedGreen:kLedRed, Time());
         }
 
@@ -3301 +3309 @@
     }
 
+    void BiasHvChannelChanged()
+    {
+        if (fInChooseBiasHv)
+            return;
+
+        const int b  = fBiasHvBoard->value();
+        const int ch = fBiasHvChannel->value();
+
+        // FIXME: Mark corresponding patch in camera
+        const PixelMapEntry &entry = fPixelMap.hv(b, ch);
+        fBiasCamV->SetWhite(entry.index);
+        fBiasCamA->SetWhite(entry.index);
+        fBiasCamV->updateGL();
+        fBiasCamA->updateGL();
+
+        UpdateBiasCam(entry);
+        UpdateBiasValues();
+    }
+
     void UpdateBiasHv(const PixelMapEntry &entry)
     {
@@ -3309 +3336 @@
 
         fInChooseBiasHv = false;
-    }
-
-    void BiasHvChannelChanged()
-    {
-        if (fInChooseBiasHv)
-            return;
-
-        const int b  = fBiasHvBoard->value();
-        const int ch = fBiasHvChannel->value();
-
-        const PixelMapEntry &entry = fPixelMap.hv(b, ch);
-        fBiasCam->SetWhite(entry.index);
-        fBiasCam->updateGL();
-        // FIXME: mark patch in camera
-        UpdateBiasCam(entry);
-        UpdateBiasValues();
     }
 
@@ -3337 +3348 @@
         const int pixel = fBiasCamPixel->value();
 
+        // FIXME: Display corresponding patches
         const PixelMapEntry &entry = fPixelMap.cbpx(crate, board, patch, pixel);
-        fBiasCam->SetWhite(entry.index);
-        fBiasCam->updateGL();
-        // FIXME: mark patch in camera
+        fBiasCamV->SetWhite(entry.index);
+        fBiasCamA->SetWhite(entry.index);
+        fBiasCamV->updateGL();
+        fBiasCamA->updateGL();
+
         UpdateBiasHv(entry);
         UpdateBiasValues();
@@ -3352 +3366 @@
         UpdateBiasCam(entry);
         UpdateBiasValues();
+    }
+
+    void on_fBiasDispRefVolt_stateChanged(int = 0)
+    {
+        // FIXME: Display patches for which ref==cur
+
+        valarray<double> dat(0., 1440);
+
+        int offset = 0;
+        if (!fBiasDispRefVolt->isChecked())
+            fBiasCamV->setTitle("Applied BIAS voltage");
+        else
+        {
+            fBiasCamV->setTitle("Reference BIAS voltage");
+            offset = 416;
+        }
+
+        if (fVecBiasVolt.size()>0)
+        {
+            for (int i=0; i<1440; i++)
+            {
+                const PixelMapEntry &entry = fPixelMap.index(i);
+                dat[i] = fVecBiasVolt[entry.hv()+offset]*90./4096;
+
+                // FIXME: Highglight HV patch instead!
+                fBiasCamV->highlightPixel(i, fVecBiasVolt[entry.hv()]==fVecBiasVolt[entry.hv()+416]);
+            }
+
+            fBiasCamV->SetData(dat);
+        }
+
+        fBiasCamV->updateGL();
     }
 
@@ -3746 +3792 @@
         // --------------------------------------------------------------------------
 
-        fBiasCam->SetMin(fBiasMin->value());
-        fBiasCam->SetMax(fBiasMax->value());
-        fBiasCam->updateGL();
+        fBiasCamV->SetMin(fBiasVoltMin->value());
+        fBiasCamV->SetMax(fBiasVoltMax->value());
+        fBiasCamV->updateGL();
+
+        fBiasCamA->SetMin(fBiasCurrentMin->value());
+        fBiasCamA->SetMax(fBiasCurrentMax->value());
+        fBiasCamA->updateGL();
 
         // --------------------------------------------------------------------------
@@ -3775 +3825 @@
         fRatesCanv->setUnits("Hz");
 
-        fBiasCam->setTitle("BIAS current");
-        fBiasCam->setUnits("uA");
+        fBiasCamA->setTitle("BIAS current");
+        fBiasCamA->setUnits("uA");
+
+        fBiasCamV->setTitle("Applied BIAS voltage");
+        fBiasCamV->setUnits("V");
 
         fEventCanv1->setTitle("Average (all slices)");
@@ -3818 +3871 @@
         connect(fRatesCanv, SIGNAL(signalCurrentPixel(int)),
                 this, SLOT(slot_ChoosePixelThreshold(int)));
-        connect(fBiasCam, SIGNAL(signalCurrentPixel(int)),
+        connect(fBiasCamV, SIGNAL(signalCurrentPixel(int)),
+                this, SLOT(slot_ChooseBiasChannel(int)));
+        connect(fBiasCamA, SIGNAL(signalCurrentPixel(int)),
                 this, SLOT(slot_ChooseBiasChannel(int)));
         connect(fFtmRateCanv, SIGNAL(     RootEventProcessed(TObject*, unsigned int, TCanvas*)),