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

slsDetector implicit conversion

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-16 09:15:17 +02:00
parent d31446ce07
commit 0527880747
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -1299,7 +1299,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns return value (mostly -1 as it can't read adc register)
*/
int writeAdcRegister(int addr, int val, int detPos = -1);
int writeAdcRegister(uint32_t addr, uint32_t val, int detPos = -1);
/**
* Activates/Deactivates the detector (Eiger only)

2
slsDetectorSoftware/include/slsDetector.h
View File

@ -1160,7 +1160,7 @@ class slsDetector : public virtual slsDetectorDefs{
* @param val value
* @returns return value (mostly -1 as it can't read adc register)
*/
int writeAdcRegister(int addr, int val);
int writeAdcRegister(uint32_t addr, uint32_t val);
/**
* Activates/Deactivates the detector (Eiger only)