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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-07 12:32:59 +02:00
parent dd6a95d041
commit 615835f03d
3 changed files with 79 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
slsDetectorSoftware/include/Detector.h
View File

@ -36,13 +36,13 @@ class Detector {
/**
* Get the acquiring flag. When true the detector blocks
* any attempt to start a new acquisition.
* any attempt to start a new acquisition.
*/
bool getAcquiringFlag() const;
/**
* Set the acquiring flag. This might have to done manually
* after an acquisition was aborted.
* Set the acquiring flag. This might have to done manually
* after an acquisition was aborted.
*/
void setAcquiringFlag(bool value);
@ -66,7 +66,7 @@ class Detector {
// Bits and registers
/**
* Clears (sets to 0) bit number bitnr in register at addr.
* Clears (sets to 0) bit number bitnr in register at addr.
* @param addr address of the register
* @param bitnr bit number to clear
* @param pos detector position
@ -124,14 +124,52 @@ class Detector {
void setPeriod(ns t, Positions pos = {});
// dhanya
/**
* Check version compatibility with detector software
* (if hostname/rx_hostname has been set/ sockets created)
* @param p port type control port or receiver port
* @param detPos -1 for all detectors in list or specific detector position
* @param pos detector position
*/
void checkDetectorVersionCompatibility(Positions pos = {});
void checkDetectorVersionCompatibility(Positions pos = {}) const;
/**
* Check version compatibility with receiver software
* @param pos detector position
*/
void checkReceiverVersionCompatibility(Positions pos = {}) const;
/**
* Get detector firmware version
* @param pos detector position
* @returns detector firmware version
*/
int64_t getDetectorFirmwareVersion(Positions pos = {}) const;
/**
* Get detector server version
* @param pos detector position
* @returns detector server version
*/
int64_t getDetectorServerVersion(Positions pos = {}) const;
/**
* Get detector serial number
* @param pos detector position
* @returns detector serial number
*/
int64_t getDetectorSerialNumber(Positions pos = {}) const;
/**
* Get Client Software version
* @returns client software version
*/
int64_t getClientSoftwareVersion() const;
/**
* Get Receiver software version
* @param pos detector position
* @return receiver software version
*/
int64_t getReceiverSoftwareVersion(Positions pos = {}) const;
};
} // namespace sls

12
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -294,7 +294,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param p port type control port or receiver port
* @param detPos -1 for all detectors in list or specific detector position
*/
void checkReceiverVersionCompatibility(int detPos = -1);
void checkReceiverVersionCompatibility(int detPos = -1);//
/**
* Get ID or version numbers
@ -302,27 +302,27 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns Id or version number of that type
*/
int64_t getId(idMode mode, int detPos = -1);
int64_t getId(idMode mode, int detPos = -1);//not needed anymore (later remove this_software_version from enum)
int getMultiId()const{return multiId;}
int getMultiId()const{return multiId;} //public but part of multi
/**
* Get Client Software version
* @returns client software version
*/
int64_t getClientSoftwareVersion() const;
int64_t getClientSoftwareVersion() const;//
/**
* Get Receiver software version
* @return receiver software version
*/
int64_t getReceiverSoftwareVersion(int detPos = -1);
int64_t getReceiverSoftwareVersion(int detPos = -1);//
/**
* Get Detector Number
* @returns vector of detector number
*/
std::vector<int64_t> getDetectorNumber();
std::vector<int64_t> getDetectorNumber(); // renamed to getDetectorSerialNumber
/**
* Free shared memory from the command line
* avoiding creating the constructor classes and mapping