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

users bug fix:getting id(version) for single/multi detector, added resetframescaught in users

Browse Source
This commit is contained in:
maliakal_d 2018-11-30 14:39:01 +01:00
parent 6d04c14bd6
commit 512e1a3136
4 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4501,7 +4501,16 @@ int64_t multiSlsDetector::getId(idMode mode, int imod) {
} }
} }
return -1; ret = -100; int64_t ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
if (detectors[idet]){
ret1=detectors[idet]->getId(mode, imod);
if(ret==-100)
ret=ret1;
else if (ret!=ret1)
ret=-1;
}
return ret;
} }

8
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -345,11 +345,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);};
/** /**

20
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -258,24 +258,24 @@ int slsDetectorUsers::setClientDataStreamingInPort(int i){
return myDetector->setClientDataStreamingInPort(i); return myDetector->setClientDataStreamingInPort(i);
} }
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(){
@ -389,3 +389,7 @@ int slsDetectorUsers::setReceiverSilentMode(int i) {
int slsDetectorUsers::setHighVoltage(int i) { int slsDetectorUsers::setHighVoltage(int i) {
return myDetector->setHighVoltage(i); return myDetector->setHighVoltage(i);
} }
int slsDetectorUsers::resetFramesCaughtInReceiver() {
return myDetector->resetFramesCaught();
}

22
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -483,12 +483,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 (mythen only)
@param imod module number @param imod module number
\returns id \returns id
*/ */
@ -496,21 +497,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
@ -659,6 +663,13 @@ class slsDetectorUsers
*/ */
int setHighVoltage(int i); int setHighVoltage(int i);
/**
* reset frames caught in receiver
* should be called before startReceiver()
* @returns OK or FAIL
*/
int resetFramesCaughtInReceiver();
/************************************************************************ /************************************************************************
STATIC FUNCTIONS STATIC FUNCTIONS
@ -677,6 +688,7 @@ class slsDetectorUsers
case 3: return string("finished"); \ case 3: return string("finished"); \
case 4: return string("data"); \ case 4: return string("data"); \
case 5: return string("running"); \ case 5: return string("running"); \
case 6: return string("stopped"); \
default: return string("unknown"); \ default: return string("unknown"); \
}}; }};