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

sendToDetectorStop

Browse Source
This commit is contained in:
Erik Frojdh 2019-04-26 15:15:56 +02:00
parent d7eadd5782
commit c4aa5ef7bb
4 changed files with 157 additions and 515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -234,7 +234,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* Get Receiver software version * Get Receiver software version
* @return receiver software version * @return receiver software version
*/ */
int64_t getReceiverSoftwareVersion(int detPos = -1) const; int64_t getReceiverSoftwareVersion(int detPos = -1);
std::vector<int64_t> getDetectorNumber(); std::vector<int64_t> getDetectorNumber();
/** /**

21
slsDetectorSoftware/include/slsDetector.h
View File

@ -300,23 +300,34 @@ class slsDetector : public virtual slsDetectorDefs{
int sendToDetector(int fnum, const Arg &args, std::nullptr_t); int sendToDetector(int fnum, const Arg &args, std::nullptr_t);
template<typename Ret> template<typename Ret>
int sendToDetector(int fnum, std::nullptr_t, Ret & retval); int sendToDetector(int fnum, std::nullptr_t, Ret & retval);
int sendToDetector(int fnum);
int sendToDetectorStop(int fnum, const void *args, size_t args_size, int sendToDetectorStop(int fnum, const void *args, size_t args_size,
void *retval, size_t retval_size); void *retval, size_t retval_size);
int sendToDetector(int fnum);
template <typename Arg, typename Ret>
int sendToDetectorStop(int fnum, const Arg &args, Ret &retval);
template<typename Arg>
int sendToDetectorStop(int fnum, const Arg &args, std::nullptr_t);
template<typename Ret>
int sendToDetectorStop(int fnum, std::nullptr_t, Ret & retval);
int sendToDetectorStop(int fnum);
int sendToReceiver(int fnum, const void *args, size_t args_size, int sendToReceiver(int fnum, const void *args, size_t args_size,
void *retval, size_t retval_size); void *retval, size_t retval_size);
template<typename Arg, typename Ret> template<typename Arg, typename Ret>
int sendToReceiver(int fnum, const Arg& args, Ret& retval); int sendToReceiver(int fnum, const Arg& args, Ret& retval);
template<typename Arg> template<typename Arg>
int sendToReceiver(int fnum, const Arg& args, std::nullptr_t); int sendToReceiver(int fnum, const Arg& args, std::nullptr_t);
template<typename Ret> template<typename Ret>
int sendToReceiver(int fnum, std::nullptr_t, Ret& retval); int sendToReceiver(int fnum, std::nullptr_t, Ret& retval);
int sendToReceiver(int fnum); int sendToReceiver(int fnum);
int64_t getReceiverSoftwareVersion() const; int64_t getReceiverSoftwareVersion();
/** /**
* Free shared memory without creating objects * Free shared memory without creating objects
@ -1487,7 +1498,7 @@ class slsDetector : public virtual slsDetectorDefs{
* @param f max frames per file * @param f max frames per file
* @returns max frames per file in receiver * @returns max frames per file in receiver
*/ */
int setFramesPerFile(int frames); int setFramesPerFile(int n_frames);
int getFramesPerFile() const; int getFramesPerFile() const;

2
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -200,7 +200,7 @@ int64_t multiSlsDetector::getClientSoftwareVersion() const {
return APILIB; return APILIB;
} }
int64_t multiSlsDetector::getReceiverSoftwareVersion(int detPos) const { int64_t multiSlsDetector::getReceiverSoftwareVersion(int detPos){
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->getReceiverSoftwareVersion(); return detectors[detPos]->getReceiverSoftwareVersion();
} }

645
slsDetectorSoftware/src/slsDetector.cpp
View File

File diff suppressed because it is too large Load Diff