detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

wip

Browse Source
This commit is contained in:
maliakal_d 2021-08-05 13:39:55 +02:00
parent c5d6dd0dd4
commit dd12c7c2f5
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE.txt
View File

@ -64,6 +64,7 @@ This document describes the differences between 5.2.0 and 5.1.0 releases.
getAutoCompDisable->getAutoComparatorDisable getAutoCompDisable->getAutoComparatorDisable
setBottom->setFlippedDataAcrossXAxis setBottom->setFlippedDataAcrossXAxis
filter->filterResistor
3. Firmware Requirements 3. Firmware Requirements
======================== ========================

14
slsDetectorSoftware/include/sls/Detector.h
View File

@ -477,6 +477,14 @@ class Detector {
* [Mythen3] If exposure time is too short, acquisition will return with an * [Mythen3] If exposure time is too short, acquisition will return with an
* ERROR and take fewer frames than expected */ * ERROR and take fewer frames than expected */
void setParallelMode(bool value, Positions pos = {}); void setParallelMode(bool value, Positions pos = {});
/** [Gotthard2][Jungfrau] */
Result<int> getFilterResistor(Positions pos = {}) const;
/** [Gotthard2] Options: 0-3. Default: 0
* [Jungfrau] 0-1. Default: 1 */
void setFilterResistor(int value, Positions pos = {});
///@{ ///@{
/** @name Acquisition */ /** @name Acquisition */
@ -1282,12 +1290,6 @@ class Detector {
/** default disabled */ /** default disabled */
void setCDSGain(bool value, Positions pos = {}); void setCDSGain(bool value, Positions pos = {});
/** [Gotthard2] */
Result<int> getFilter(Positions pos = {}) const;
/** [Gotthard2] Set filter resister. Options: 0-3. Default: 0 */
void setFilter(int value, Positions pos = {});
/** [Gotthard2] */ /** [Gotthard2] */
Result<bool> getCurrentSource(Positions pos = {}) const; Result<bool> getCurrentSource(Positions pos = {}) const;

12
slsDetectorSoftware/src/CmdProxy.h
View File

@ -591,6 +591,7 @@ class CmdProxy {
{"clkdivider", "speed"}, {"clkdivider", "speed"},
{"vhighvoltage", "highvoltage"}, {"vhighvoltage", "highvoltage"},
{"digitest", "imagetest"}, {"digitest", "imagetest"},
{"filter", "filterresistor"},
/** temperature */ /** temperature */
@ -800,6 +801,7 @@ class CmdProxy {
{"imagetest", &CmdProxy::imagetest}, {"imagetest", &CmdProxy::imagetest},
{"extsig", &CmdProxy::ExternalSignal}, {"extsig", &CmdProxy::ExternalSignal},
{"parallel", &CmdProxy::parallel}, {"parallel", &CmdProxy::parallel},
{"filterresistor", &CmdProxy::filterresistor},
/** temperature */ /** temperature */
{"templist", &CmdProxy::templist}, {"templist", &CmdProxy::templist},
@ -947,7 +949,6 @@ class CmdProxy {
{"vetofile", &CmdProxy::VetoFile}, {"vetofile", &CmdProxy::VetoFile},
{"burstmode", &CmdProxy::BurstMode}, {"burstmode", &CmdProxy::BurstMode},
{"cdsgain", &CmdProxy::cdsgain}, {"cdsgain", &CmdProxy::cdsgain},
{"filter", &CmdProxy::filter},
{"currentsource", &CmdProxy::currentsource}, {"currentsource", &CmdProxy::currentsource},
{"timingsource", &CmdProxy::timingsource}, {"timingsource", &CmdProxy::timingsource},
{"veto", &CmdProxy::veto}, {"veto", &CmdProxy::veto},
@ -1348,6 +1349,11 @@ class CmdProxy {
"acquisition will return ERROR status and take fewer " "acquisition will return ERROR status and take fewer "
"frames than expected."); "frames than expected.");
INTEGER_COMMAND_VEC_ID(
filterresistor, getFilterResistor, setFilterResistor, StringTo<int>,
"[0|1|2|3] [Gotthard2] Set filter resistor. Default is 0.\n[0|1] "
"[Jungfrau] Set filter resistor. Default is 1.");
/** temperature */ /** temperature */
GET_COMMAND_NOID( GET_COMMAND_NOID(
templist, getTemperatureList, templist, getTemperatureList,
@ -1911,10 +1917,6 @@ class CmdProxy {
"[0, 1]\n\t[Gotthard2] Enable or disable CDS gain. Default " "[0, 1]\n\t[Gotthard2] Enable or disable CDS gain. Default "
"is disabled."); "is disabled.");
INTEGER_COMMAND_VEC_ID(
filter, getFilter, setFilter, StringTo<int>,
"[0|1|2|3]\n\t[Gotthard2] Set filter resistor. Default is 0.");
INTEGER_COMMAND_VEC_ID( INTEGER_COMMAND_VEC_ID(
currentsource, getCurrentSource, setCurrentSource, StringTo<int>, currentsource, getCurrentSource, setCurrentSource, StringTo<int>,
"[0, 1]\n\t[Gotthard2] Enable or disable current source. " "[0, 1]\n\t[Gotthard2] Enable or disable current source. "