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

Merge branch '3.0-rc' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-17 14:17:05 +02:00
commit 3a887eb604
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -954,12 +954,21 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
/* trim/cal directories */
/*! \page settings Detector settings commands
Commands to setup the settings of the detector
- \ref settingsdir "Settings, trim & cal Directories": commands to setup settings/trim/cal directories
- \ref settingssett "Settings and Threshold": commands to configure settings and threshold of detector
- \ref settingsdacs "DACs": commands to configure DACs of detector
- \ref settingsadcs "ADCs": commands to readout ADCs of detector
*/
/* trim/cal directories */
/*! \page settings
\section settingsdir Settings, trim & cal Directories
commands to setup settings/trim/cal directories
*/
/*! \page settings
- <b>settingsdir [dir]</b> Sets/gets the directory where the settings files are located (string)
*/
@ -988,6 +997,10 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
i++;
/* settings, threshold */
/*! \page settings
\section settingssett Settings and Threshold
commands to configure settings and threshold of detector
*/
/*! \page settings
- <b>settings [s]</b> sets/gets the settings of the detector. Options: \c standard, \c fast, \c highgain, \c dynamicgain, \c lowgain, \c mediumgain, \c veryhighgain,
@ -1043,6 +1056,11 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
/* pots */
/*! \page settings
\section settingsdacs DACs
commands to configure DACs of detector
*/
/*! \page settings
- <b>vthreshold [i] [mv]</b> Sets/gets detector threshold voltage for single photon counters. Normally in DAC units unless \c mv is specified at the end of the command line (int)
*/
@ -1399,6 +1417,10 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
i++;
/* r/w timers */
/*! \page settings
\section settingsadcs ADCs
commands to readout ADCs of detector
*/
/*! \page settings
- <b>temp_adc</b> Gets the ADC temperature (int)