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

users bug fix:getting id(version) for single/multi detector

Browse Source
This commit is contained in:
maliakal_d 2018-11-30 16:00:27 +01:00
parent 262bf1b307
commit f120f9c3dd
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -343,11 +343,11 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
\returns id \returns id
*/ */
virtual int64_t getId(idMode mode, int imod=0)=0; virtual int64_t getId(idMode mode, int imod=0)=0;
int64_t getModuleFirmwareVersion(){return getId(MODULE_FIRMWARE_VERSION,-1);}; int64_t getModuleFirmwareVersion(int imod=-1){return getId(MODULE_FIRMWARE_VERSION,imod);};
int64_t getModuleSerialNumber(int imod=-1){return getId(MODULE_SERIAL_NUMBER,imod);}; int64_t getModuleSerialNumber(int imod=-1){return getId(MODULE_SERIAL_NUMBER,imod);};
int64_t getDetectorFirmwareVersion(){return getId(DETECTOR_FIRMWARE_VERSION,-1);}; int64_t getDetectorFirmwareVersion(int imod=-1){return getId(DETECTOR_FIRMWARE_VERSION,imod);};
int64_t getDetectorSerialNumber(){return getId(DETECTOR_SERIAL_NUMBER,-1);}; int64_t getDetectorSerialNumber(int imod=-1){return getId(DETECTOR_SERIAL_NUMBER,imod);};
int64_t getDetectorSoftwareVersion(){return getId(DETECTOR_SOFTWARE_VERSION,-1);}; int64_t getDetectorSoftwareVersion(int imod=-1){return getId(DETECTOR_SOFTWARE_VERSION,imod);};
int64_t getThisSoftwareVersion(){return getId(THIS_SOFTWARE_VERSION,-1);}; int64_t getThisSoftwareVersion(){return getId(THIS_SOFTWARE_VERSION,-1);};
/** /**

16
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -267,24 +267,24 @@ string slsDetectorUsers::setClientDataStreamingInIP(string ip){
return myDetector->setClientDataStreamingInIP(ip); return myDetector->setClientDataStreamingInIP(ip);
} }
int64_t slsDetectorUsers::getModuleFirmwareVersion(){ int64_t slsDetectorUsers::getModuleFirmwareVersion(int imod){
return myDetector->getModuleFirmwareVersion(); return myDetector->getModuleFirmwareVersion(imod);
} }
int64_t slsDetectorUsers::getModuleSerialNumber(int imod){ int64_t slsDetectorUsers::getModuleSerialNumber(int imod){
return myDetector->getModuleSerialNumber(imod); return myDetector->getModuleSerialNumber(imod);
} }
int64_t slsDetectorUsers::getDetectorFirmwareVersion(){ int64_t slsDetectorUsers::getDetectorFirmwareVersion(int imod){
return myDetector->getDetectorFirmwareVersion(); return myDetector->getDetectorFirmwareVersion(imod);
} }
int64_t slsDetectorUsers::getDetectorSerialNumber(){ int64_t slsDetectorUsers::getDetectorSerialNumber(int imod){
return myDetector->getDetectorSerialNumber(); return myDetector->getDetectorSerialNumber(imod);
} }
int64_t slsDetectorUsers::getDetectorSoftwareVersion(){ int64_t slsDetectorUsers::getDetectorSoftwareVersion(int imod){
return myDetector->getDetectorSoftwareVersion(); return myDetector->getDetectorSoftwareVersion(imod);
} }
int64_t slsDetectorUsers::getThisSoftwareVersion(){ int64_t slsDetectorUsers::getThisSoftwareVersion(){

14
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -505,12 +505,13 @@ class slsDetectorUsers
/** /**
get get Module Firmware Version get get Module Firmware Version
@param imod module number
\returns id \returns id
*/ */
int64_t getModuleFirmwareVersion(); int64_t getModuleFirmwareVersion(int imod=-1);
/** /**
get get Module Serial Number get get Module Serial Number (only mythen)
@param imod module number @param imod module number
\returns id \returns id
*/ */
@ -518,21 +519,24 @@ class slsDetectorUsers
/** /**
get get Detector Firmware Version get get Detector Firmware Version
@param imod module number
\returns id \returns id
*/ */
int64_t getDetectorFirmwareVersion(); int64_t getDetectorFirmwareVersion(int imod=-1);
/** /**
get get Detector Serial Number get get Detector Serial Number
@param imod module number
\returns id \returns id
*/ */
int64_t getDetectorSerialNumber(); int64_t getDetectorSerialNumber(int imod=-1);
/** /**
get get Detector Software Version get get Detector Software Version
@param imod module number
\returns id \returns id
*/ */
int64_t getDetectorSoftwareVersion(); int64_t getDetectorSoftwareVersion(int imod=-1);
/** /**
get this Software Version get this Software Version