Changeset 12094 for trunk

Timestamp:

09/13/11 19:05:48 (13 years ago)

Author:

tbretz

Message:

Fixed the feedback units.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -2526 +2526 @@
             const PixelMapEntry &entry = fPixelMap.index(i);
 
-            dev[i] = 1000*ptr[entry.hv()];
+            dev[i] = /*1000*/ptr[entry.hv()];
             cmd[i] = 1000*ptr[entry.hv()+416];
 
@@ -3627 +3627 @@
         fDimFadRuns            ("FAD_CONTROL/RUNS",               (void*)NULL, 0, this),
         fDimFadEvents          ("FAD_CONTROL/EVENTS",             (void*)NULL, 0, this),
-        fDimFadRawData         ("FAD_CONTROL/RAWX_DATA",           (void*)NULL, 0, this),
+        fDimFadRawData         ("FAD_CONTROL/RAW_DATA",           (void*)NULL, 0, this),
         fDimFadEventData       ("FAD_CONTROL/EVENT_DATA",         (void*)NULL, 0, this),
         fDimFadConnections     ("FAD_CONTROL/CONNECTIONS",        (void*)NULL, 0, this),
@@ -3944 +3944 @@
         fFeedbackDevCam->assignPixelMap(fPixelMap);
         fFeedbackDevCam->assignTriggerPatchesMap(fPatchHW);
-        fFeedbackDevCam->setAutoscaleLowerLimit((fFeedbackDevMin->minimum()+0.5*fFeedbackDevMin->singleStep())*0.001);
-        fFeedbackDevCam->SetMin(fFeedbackDevMin->value()*0.001);
-        fFeedbackDevCam->SetMax(fFeedbackDevMax->value()*0.001);
+        fFeedbackDevCam->setAutoscaleLowerLimit((fFeedbackDevMin->minimum()+0.5*fFeedbackDevMin->singleStep()));
+        fFeedbackDevCam->SetMin(fFeedbackDevMin->value());
+        fFeedbackDevCam->SetMax(fFeedbackDevMax->value());
         fFeedbackDevCam->updateCamera();
 
         fFeedbackCmdCam->assignPixelMap(fPixelMap);
         fFeedbackCmdCam->assignTriggerPatchesMap(fPatchHW);
-        fFeedbackCmdCam->setAutoscaleLowerLimit((fFeedbackCmdMin->minimum()+0.5*fFeedbackCmdMin->singleStep())*0.001);
-        fFeedbackCmdCam->SetMin(fFeedbackCmdMin->value()*0.001);
-        fFeedbackCmdCam->SetMax(fFeedbackCmdMax->value()*0.001);
+        fFeedbackCmdCam->setAutoscaleLowerLimit((fFeedbackCmdMin->minimum()+0.5*fFeedbackCmdMin->singleStep()));
+        fFeedbackCmdCam->SetMin(fFeedbackCmdMin->value());
+        fFeedbackCmdCam->SetMax(fFeedbackCmdMax->value());
         fFeedbackCmdCam->updateCamera();
 
@@ -3960 +3960 @@
         fBiasCamV->assignPixelMap(fPixelMap);
         fBiasCamV->assignTriggerPatchesMap(fPatchHW);
-        fBiasCamV->setAutoscaleLowerLimit((fBiasVoltMin->minimum()+0.5*fBiasVoltMin->singleStep())*0.001);
+        fBiasCamV->setAutoscaleLowerLimit((fBiasVoltMin->minimum()+0.5*fBiasVoltMin->singleStep()));
         fBiasCamV->SetMin(fBiasVoltMin->value());
         fBiasCamV->SetMax(fBiasVoltMax->value());
@@ -3966 +3966 @@
 
         fBiasCamA->assignPixelMap(fPixelMap);
-        fBiasCamA->setAutoscaleLowerLimit((fBiasCurrentMin->minimum()+0.5*fBiasCurrentMin->singleStep())*0.001);
+        fBiasCamA->setAutoscaleLowerLimit((fBiasCurrentMin->minimum()+0.5*fBiasCurrentMin->singleStep()));
         fBiasCamA->SetMin(fBiasCurrentMin->value());
         fBiasCamA->SetMax(fBiasCurrentMax->value());