Added getters for various Control values (detectorTotalGain(),
mcaChannels(), pileUpRejection(), thermoelectricCooler(),
fastThreshold(), slowThreshold(), peakingTime(),
fastChannelPeakingTime()
Added function prototype and stub for getNotes() to
SGMXASScanActionController class
-Updated SGMXASScanActionController.buildNotes() to include:
X, Y, Z, Theta manipulator values
Exit and Entrance Slit values
Grating Description
All Scaler Channels with connected SR570 (name, value, units)
All AMPTek Detectors (Gain, Temperature, Pile-Upon Rejection, Peaking
Time, Fast Threshold, Slow Threshold)
-Added Call to setNotes(buildNotes()) in SGMXASScanActionController
constructor
-Added $notes field in SGMAppController.setupSGMExporterOptions()
Made formatting changes to the notes QString returned by
SGMXASScanActionController.buildNotes()
Updates to CLSAmptekSDD123DetectorNew:
-Added amptekLowROIEv() to get ROI value in eV
-Added amptekHighROIEv() to get ROI value in eV
-Added setAmptekROIbyEv() to set ROI high and low by eV
-Added convertBinToEv() to convert a given bin to eV value
-Added convertEvToBin() to convert an eV value to a bin
Updated CLSAmptekSDD123DetailedDetectorView:
-Added boolean flag to indicate if view is editing in eV or bin mode
-Added header widgets to display current mode and detector's eV/bin
-Added slot to update eV/Bin label when detector's eV/bin is changed.
-Added slot to update text values and mode when the combo box is changed
from eV to bin mode (onDetectorEvPerBinChanged)
Updated, but commented out until fully tested:
-Updated slots (onLowIndexValueChanged, onHighIndexValueChanged) to
update LineEdits based on current mode
-Updated function roiEditingFinishedHelper to update detector ROI based
on current mode
Set tooltips for ROI window on invalid input (eV still not fully
functional)
Changed structure of Edit ROIs window:
-Removed Combobox to select edit mode
-Added tab structure (tab for eV editing, tab for bin)
-Changed the eVs to edit using double spin boxes (with step value set to
evPerBin)
Merge branch 'Issue588' into Issue496ToMergeWithSGMReleaseToMergeWithNewXRFDetector
Merge branch 'Issue587' into Issue496ToMergeWithSGMReleaseToMergeWithNewXRFDetector