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

shorter functino

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-25 17:56:20 +02:00
parent b853bd92c8
commit b76d123df1
2 changed files with 52 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/include/slsDetector.h
View File

@ -296,7 +296,7 @@ class slsDetector : public virtual slsDetectorDefs{
template <typename Arg, typename Ret>
typename std::enable_if<
!(std::is_pointer<Arg>::value & std::is_pointer<Ret>::value), int>::type
!(std::is_pointer<Arg>::value | std::is_pointer<Ret>::value), int>::type
sendToDetector(int fnum, const Arg &args, Ret &retval);
int sendToDetectorStop(int fnum, const void *args, size_t args_size,
void *retval, size_t retval_size);
@ -1116,7 +1116,7 @@ class slsDetector : public virtual slsDetectorDefs{
* @param i is -1 to get, 0 to reset and any other value to set the counter bit
* @returns the counter bit in detector
*/
int setCounterBit(int i = -1);
int setCounterBit(int cb = -1);
/**
* send ROI to processor (moench only)