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

first one

Browse Source
This commit is contained in:
maliakal_d 2019-08-07 12:02:59 +02:00
parent cff4d162c1
commit dd6a95d041
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/include/Detector.h
View File

@ -124,7 +124,13 @@ class Detector {
void setPeriod(ns t, Positions pos = {}); void setPeriod(ns t, Positions pos = {});
// dhanya // 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
*/
void checkDetectorVersionCompatibility(Positions pos = {});
}; };

8
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -210,7 +210,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* one * one
* @param update true to update last user pid, date etc * @param update true to update last user pid, date etc
*/ */
void setupMultiDetector(bool verify = true, bool update = true); void setupMultiDetector(bool verify = true, bool update = true); // private
/** /**
* Loop through the detectors serially and return the result as a vector * Loop through the detectors serially and return the result as a vector
@ -260,7 +260,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param channelY channel number from detector offset in x direction * @param channelY channel number from detector offset in x direction
* @returns detector id or -1 if channel number out of range * @returns detector id or -1 if channel number out of range
*/ */
int decodeNChannel(int offsetX, int offsetY, int &channelX, int &channelY); int decodeNChannel(int offsetX, int offsetY, int &channelX, int &channelY);// private
/** /**
* Set acquiring flag in shared memory * Set acquiring flag in shared memory
@ -278,7 +278,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* Check if acquiring flag is set, set error if set * Check if acquiring flag is set, set error if set
* @returns FAIL if not ready, OK if ready * @returns FAIL if not ready, OK if ready
*/ */
bool isAcquireReady(); bool isAcquireReady(); // private
/** /**
* Check version compatibility with detector software * Check version compatibility with detector software
@ -286,7 +286,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param p port type control port or receiver port * @param p port type control port or receiver port
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
*/ */
void checkDetectorVersionCompatibility(int detPos = -1); void checkDetectorVersionCompatibility(int detPos = -1);//
/** /**
* Check version compatibility with receiver software * Check version compatibility with receiver software

5
slsDetectorSoftware/src/Detector.cpp
View File

@ -126,7 +126,12 @@ Result<bool> Detector::getFileOverWrite(Positions pos) const {
return pimpl->Parallel(&slsDetector::getFileOverWrite, pos); return pimpl->Parallel(&slsDetector::getFileOverWrite, pos);
} }
// dhanya // dhanya
Result<bool> Detector::checkDetectorVersionCompatibility(Positions pos) const {
return pimpl->Parallel(&slsDetector::checkDetectorVersionCompatibility, pos);
}
} // namespace sls } // namespace sls