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

data types and format

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-21 14:43:24 +01:00
parent a4fec1e750
commit b200138730
4 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -11,6 +11,7 @@
#include "versionAPI.h"
#include <arpa/inet.h>
#include <array>
#include <bitset>
#include <cmath>
#include <cstdlib>
@ -5258,18 +5259,18 @@ int slsDetector::setCTBPatLoops(int level, int &start, int &stop, int &n) {
return ret;
}
int slsDetector::setCTBPatWaitAddr(int level, int addr) {
uint64_t slsDetector::setCTBPatWaitAddr(uint64_t level, uint64_t addr) {
int fnum = F_SET_CTB_PATTERN;
int ret = FAIL;
int mode = 2; // sets loop
uint64_t args[3] = {(uint64_t)mode, (uint64_t)level, (uint64_t)addr};
uint64_t retval = -1;
uint64_t mode = 2; // sets loop
uint64_t retval = -1;
std::array<uint64_t, 3> args{mode, level, addr};
FILE_LOG(logDEBUG1) << "Setting CTB Wait Addr, "
"level: "
<< level << ", addr: 0x" << std::hex << addr << std::dec;
if (thisDetector->onlineFlag == ONLINE_FLAG && connectControl() == OK) {
ret = thisDetectorControl->Client_Send(fnum, args, sizeof(args), &retval, sizeof(retval));
ret = thisDetectorControl->Client_Send(fnum, args.data(), sizeof(args), &retval, sizeof(retval));
disconnectControl();
// handle ret
@ -5285,16 +5286,16 @@ int slsDetector::setCTBPatWaitAddr(int level, int addr) {
return retval;
}
int slsDetector::setCTBPatWaitTime(int level, uint64_t t) {
uint64_t slsDetector::setCTBPatWaitTime(uint64_t level, uint64_t t) {
int fnum = F_SET_CTB_PATTERN;
int ret = FAIL;
int mode = 3; // sets loop
uint64_t args[3] = {(uint64_t)mode, (uint64_t)level, t};
uint64_t retval = -1;
uint64_t mode = 3; // sets loop
uint64_t retval = -1; //TODO! is this what we want?
std::array<uint64_t,3> args{mode, level, t};
FILE_LOG(logDEBUG1) << "Setting CTB Wait Time, level: " << level << ", t: " << t;
if (thisDetector->onlineFlag == ONLINE_FLAG && connectControl() == OK) {
ret = thisDetectorControl->Client_Send(fnum, args, sizeof(args), &retval, sizeof(retval));
ret = thisDetectorControl->Client_Send(fnum, args.data(), sizeof(args), &retval, sizeof(retval));
disconnectControl();
// handle ret

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1612,7 +1612,7 @@ public:
* @param addr wait address, -1 gets
* @returns actual value
*/
int setCTBPatWaitAddr(int level, int addr=-1);
uint64_t setCTBPatWaitAddr(uint64_t level, uint64_t addr=-1);
/**
* Sets the wait time in the CTB
@ -1620,7 +1620,7 @@ public:
* @param t wait time, -1 gets
* @returns actual value
*/
int setCTBPatWaitTime(int level, uint64_t t=-1);
uint64_t setCTBPatWaitTime(uint64_t level, uint64_t t=-1);
private: