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

Nextframenumber (#215)

Browse Source
This commit is contained in:
Dhanya Thattil 2020-11-16 17:26:12 +01:00 committed by GitHub
parent 4c4e2ccb6b
commit a6d696a0f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 561 additions and 473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELEASE.txt
View File

@ -156,10 +156,10 @@ SLS Detector Package 5.0.0 released on xx.xx.2020 (Major Release)
can cut out required subimage using callbacks, but this feature
is probably more useful for custom receivers.
6. (Eiger, Jungfrau) Starting Frame number - startframenumber
6. (Eiger, Jungfrau) Next Frame number - nextframenumber
Both now have running frame numbers that is only reset at boot up
and increments continuously through acquisitions. One is able to
set the starting frame number before an acquisition.
set the next frame number now.
7. (Jungfrau) Two 10G data interfaces
Only Jungfrau PCBs with version 2.0 can run at full speed using both

1
docs/src/virtualserver.rst
View File

@ -60,6 +60,7 @@ Client
sls_detector_put virtual 2 1912
Use the same in the config file.
Detector API has a method 'isVirtualDetectorServer' to check if on-board detector server is virtual.
Sample Config file

18
integrationTests/test-integrationDectector.cpp
View File

@ -1,9 +1,9 @@
#include "catch.hpp"
#include "sls/ClientSocket.h"
#include "DetectorImpl.h"
#include "Module.h"
#include "sls/ClientSocket.h"
#include "sls/logger.h"
#include "sls/sls_detector_defs.h"
@ -446,8 +446,8 @@ TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert",
CHECK(m.readRegister(0x7b) == 0x1003E);
}
TEST_CASE("Eiger or Jungfrau startingfnum",
"[.eigerintegration][.jungfrauintegration][startingfnum]") {
TEST_CASE("Eiger or Jungfrau nextframenumber",
"[.eigerintegration][.jungfrauintegration][nextframenumber]") {
SingleDetectorConfig c;
// pick up multi detector from shm id 0
@ -465,8 +465,8 @@ TEST_CASE("Eiger or Jungfrau startingfnum",
// starting fnum
uint64_t val = 8;
m.setStartingFrameNumber(val);
CHECK(m.getStartingFrameNumber() == val);
m.setNextFrameNumber(val);
CHECK(m.getNextFrameNumber() == val);
CHECK(m.acquire() == slsDetectorDefs::OK);
CHECK(m.getReceiverCurrentFrameIndex() == val);
@ -474,18 +474,18 @@ TEST_CASE("Eiger or Jungfrau startingfnum",
CHECK(m.acquire() == slsDetectorDefs::OK);
CHECK(m.getReceiverCurrentFrameIndex() == val);
CHECK_THROWS_AS(m.setStartingFrameNumber(0), sls::RuntimeError);
CHECK_THROWS_AS(m.setNextFrameNumber(0), sls::RuntimeError);
if (m.getDetectorTypeAsString() == "Eiger") {
val = 281474976710655;
} else if (m.getDetectorTypeAsString() == "Jungfrau") {
val = 18446744073709551615;
}
m.setStartingFrameNumber(val);
CHECK(m.getStartingFrameNumber() == val);
m.setNextFrameNumber(val);
CHECK(m.getNextFrameNumber() == val);
CHECK(m.acquire() == slsDetectorDefs::OK);
CHECK(m.getReceiverCurrentFrameIndex() == val);
CHECK(m.getStartingFrameNumber() == (val + 1));
CHECK(m.getNextFrameNumber() == (val + 1));
}
TEST_CASE("Eiger readnlines", "[.eigerintegration][readnlines]") {

12
python/slsdet/detector.py
View File

@ -540,13 +540,13 @@ class Detector(CppDetectorApi):
@property
@element
def startingfnum(self):
"""[Eiger][Jungfrau] Starting frame number for next acquisition. Stopping acquisition might result in different frame numbers for different modules. """
return self.getStartingFrameNumber()
def nextframenumber(self):
"""[Eiger][Jungfrau] Next frame number. Stopping acquisition might result in different frame numbers for different modules. """
return self.getNextFrameNumber()
@startingfnum.setter
def startingfnum(self, value):
ut.set_using_dict(self.setStartingFrameNumber, value)
@nextframenumber.setter
def nextframenumber(self, value):
ut.set_using_dict(self.setNextFrameNumber, value)
@property
@element

8
python/src/detector.cpp
View File

@ -374,13 +374,13 @@ void init_det(py::module &m) {
(Result<std::vector<uint64_t>>(Detector::*)(sls::Positions) const) &
Detector::getNumMissingPackets,
py::arg() = Positions{})
.def("getStartingFrameNumber",
.def("getNextFrameNumber",
(Result<uint64_t>(Detector::*)(sls::Positions) const) &
Detector::getStartingFrameNumber,
Detector::getNextFrameNumber,
py::arg() = Positions{})
.def("setStartingFrameNumber",
.def("setNextFrameNumber",
(void (Detector::*)(uint64_t, sls::Positions)) &
Detector::setStartingFrameNumber,
Detector::setNextFrameNumber,
py::arg(), py::arg() = Positions{})
.def("sendSoftwareTrigger",
(void (Detector::*)(sls::Positions)) &

8
slsDetectorGui/forms/form_tab_measurement.ui
View File

@ -344,7 +344,7 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="spinStartingFrameNumber">
<widget class="QSpinBox" name="spinNextFrameNumber">
<property name="enabled">
<bool>false</bool>
</property>
@ -361,7 +361,7 @@
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The starting frame number of next acquisition.&lt;/p&gt;&lt;p&gt;#startingfnum&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The next frame number&lt;/p&gt;&lt;p&gt;#nextframenumber&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="statusTip">
<string/>
@ -390,12 +390,12 @@
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lblStartingFrameNumber">
<widget class="QLabel" name="lblNextFrameNumber">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The starting frame number of next acquisition.&lt;/p&gt;&lt;p&gt;#startingfnum&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The next frame number&lt;/p&gt;&lt;p&gt;#nextframenumber&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Next Frame Number: </string>

4
slsDetectorGui/include/qTabMeasurement.h
View File

@ -35,7 +35,7 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject {
void SetFileName(bool force = false);
void ForceSetFileName();
void SetRunIndex(int val);
void SetStartingFrameNumber(int val);
void SetNextFrameNumber(int val);
void UpdateProgress();
void StartAcquisition();
void StopAcquisition();
@ -67,7 +67,7 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject {
void GetFileWrite();
void GetFileName();
void GetRunIndex();
void GetStartingFrameNumber();
void GetNextFrameNumber();
void ResetProgress();

40
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -56,13 +56,13 @@ void qTabMeasurement::SetupWidgetWindow() {
break;
case slsDetectorDefs::EIGER:
delayImplemented = false;
lblStartingFrameNumber->setEnabled(true);
spinStartingFrameNumber->setEnabled(true);
lblNextFrameNumber->setEnabled(true);
spinNextFrameNumber->setEnabled(true);
startingFnumImplemented = true;
break;
case slsDetectorDefs::JUNGFRAU:
lblStartingFrameNumber->setEnabled(true);
spinStartingFrameNumber->setEnabled(true);
lblNextFrameNumber->setEnabled(true);
spinNextFrameNumber->setEnabled(true);
startingFnumImplemented = true;
break;
case slsDetectorDefs::GOTTHARD2:
@ -141,8 +141,8 @@ void qTabMeasurement::Initialization() {
SLOT(ForceSetFileName()));
connect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(SetRunIndex(int)));
if (startingFnumImplemented) {
connect(spinStartingFrameNumber, SIGNAL(valueChanged(int)), this,
SLOT(SetStartingFrameNumber(int)));
connect(spinNextFrameNumber, SIGNAL(valueChanged(int)), this,
SLOT(SetNextFrameNumber(int)));
}
connect(progressTimer, SIGNAL(timeout()), this, SLOT(UpdateProgress()));
connect(btnStart, SIGNAL(clicked()), this, SLOT(StartAcquisition()));
@ -825,29 +825,29 @@ void qTabMeasurement::SetRunIndex(int val) {
&qTabMeasurement::GetRunIndex)
}
void qTabMeasurement::GetStartingFrameNumber() {
void qTabMeasurement::GetNextFrameNumber() {
LOG(logDEBUG) << "Getting Starting Frame Number";
disconnect(spinStartingFrameNumber, SIGNAL(valueChanged(int)), this,
SLOT(SetStartingFrameNumber(int)));
disconnect(spinNextFrameNumber, SIGNAL(valueChanged(int)), this,
SLOT(SetNextFrameNumber(int)));
try {
auto retval = det->getStartingFrameNumber().tsquash(
auto retval = det->getNextFrameNumber().tsquash(
"Inconsistent starting frame number for all detectors.");
spinStartingFrameNumber->setValue(retval);
spinNextFrameNumber->setValue(retval);
}
CATCH_DISPLAY("Could not get starting frame number.",
"qTabMeasurement::GetStartingFrameNumber")
connect(spinStartingFrameNumber, SIGNAL(valueChanged(int)), this,
SLOT(SetStartingFrameNumber(int)));
"qTabMeasurement::GetNextFrameNumber")
connect(spinNextFrameNumber, SIGNAL(valueChanged(int)), this,
SLOT(SetNextFrameNumber(int)));
}
void qTabMeasurement::SetStartingFrameNumber(int val) {
void qTabMeasurement::SetNextFrameNumber(int val) {
LOG(logINFO) << "Setting Starting frame number to " << val;
try {
det->setStartingFrameNumber(val);
det->setNextFrameNumber(val);
}
CATCH_HANDLE("Could not set starting frame number.",
"qTabMeasurement::SetStartingFrameNumber", this,
&qTabMeasurement::GetStartingFrameNumber)
"qTabMeasurement::SetNextFrameNumber", this,
&qTabMeasurement::GetNextFrameNumber)
}
void qTabMeasurement::ResetProgress() {
@ -928,7 +928,7 @@ void qTabMeasurement::AcquireFinished() {
UpdateProgress();
GetRunIndex();
if (startingFnumImplemented) {
GetStartingFrameNumber();
GetNextFrameNumber();
}
LOG(logDEBUG) << "Measurement " << currentMeasurement << " finished";
// next measurement if acq is not stopped
@ -995,7 +995,7 @@ void qTabMeasurement::Refresh() {
GetFileName();
GetRunIndex();
if (startingFnumImplemented) {
GetStartingFrameNumber();
GetNextFrameNumber();
}
ResetProgress();
}

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

20
slsDetectorServers/eigerDetectorServer/Beb.c
View File

@ -35,7 +35,7 @@ int Beb_activated = 1;
uint32_t Beb_detid = 0;
int Beb_top = 0;
uint64_t Beb_deactivatedStartFrameNumber = 0;
uint64_t Beb_deactivatedNextFrameNumber = 0;
int Beb_quadEnable = 0;
int Beb_positions[2] = {0, 0};
int Beb_readNLines = MAX_ROWS_PER_READOUT;
@ -1441,22 +1441,22 @@ int Beb_SetDetectorPosition(int pos[]) {
return ret;
}
int Beb_SetStartingFrameNumber(uint64_t value) {
int Beb_SetNextFrameNumber(uint64_t value) {
if (!Beb_activated) {
Beb_deactivatedStartFrameNumber = value;
Beb_deactivatedNextFrameNumber = value;
return OK;
}
LOG(logINFO,
("Setting start frame number: %llu\n", (long long unsigned int)value));
("Setting next frame number: %llu\n", (long long unsigned int)value));
u_int32_t *csp0base = 0;
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_TEST_BASEADDR);
if (fd < 0) {
LOG(logERROR, ("Set Start Frame Number FAIL\n"));
LOG(logERROR, ("Set next Frame Number FAIL\n"));
return FAIL;
}
// since the read is not implemented in firmware yet
Beb_deactivatedStartFrameNumber = value;
Beb_deactivatedNextFrameNumber = value;
// decrement for firmware
uint64_t valueInFirmware = value - 1;
@ -1471,17 +1471,17 @@ int Beb_SetStartingFrameNumber(uint64_t value) {
return OK;
}
int Beb_GetStartingFrameNumber(uint64_t *retval, int tengigaEnable) {
int Beb_GetNextFrameNumber(uint64_t *retval, int tengigaEnable) {
if (!Beb_activated) {
*retval = Beb_deactivatedStartFrameNumber;
*retval = Beb_deactivatedNextFrameNumber;
return OK;
}
LOG(logDEBUG1, ("Getting start frame number\n"));
LOG(logDEBUG1, ("Getting next frame number\n"));
u_int32_t *csp0base = 0;
int fd = Beb_open(&csp0base, XPAR_COUNTER_BASEADDR);
if (fd < 0) {
LOG(logERROR, ("Get Start Frame Number FAIL\n"));
LOG(logERROR, ("Get next Frame Number FAIL\n"));
return FAIL;
}

4
slsDetectorServers/eigerDetectorServer/Beb.h
View File

@ -103,8 +103,8 @@ int Beb_SetQuad(int value);
int Beb_GetQuad();
int *Beb_GetDetectorPosition();
int Beb_SetDetectorPosition(int pos[]);
int Beb_SetStartingFrameNumber(uint64_t value);
int Beb_GetStartingFrameNumber(uint64_t *retval, int tengigaEnable);
int Beb_SetNextFrameNumber(uint64_t value);
int Beb_GetNextFrameNumber(uint64_t *retval, int tengigaEnable);
void Beb_SetReadNLines(int value);

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

26
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -85,7 +85,7 @@ int eiger_virtual_transmission_delay_right = 0;
int eiger_virtual_transmission_delay_frame = 0;
int eiger_virtual_transmission_flowcontrol_10g = 0;
int eiger_virtual_activate = 1;
uint64_t eiger_virtual_startingframenumber = 1;
uint64_t eiger_virtual_nextframenumber = 1;
int eiger_virtual_detPos[2] = {0, 0};
int eiger_virtual_test_mode = 0;
int eiger_virtual_quad_mode = 0;
@ -702,7 +702,7 @@ void setupDetector() {
setClockDivider(RUN_CLK, DEFAULT_CLK_SPEED); // clk_devider,half speed
setIODelay(DEFAULT_IO_DELAY);
setTiming(DEFAULT_TIMING_MODE);
setStartingFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
setNextFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
setReadNLines(MAX_ROWS_PER_READOUT);
// SetPhotonEnergyCalibrationParameters(-5.8381e-5,1.838515,5.09948e-7,-4.32390e-11,1.32527e-15);
eiger_tau_ns = DEFAULT_RATE_CORRECTION;
@ -851,21 +851,21 @@ int getOverFlowMode() { return eiger_overflow32; }
/* parameters - timer */
int setStartingFrameNumber(uint64_t value) {
int setNextFrameNumber(uint64_t value) {
#ifdef VIRTUAL
eiger_virtual_startingframenumber = value;
eiger_virtual_nextframenumber = value;
return OK;
#else
return Beb_SetStartingFrameNumber(value);
return Beb_SetNextFrameNumber(value);
#endif
}
int getStartingFrameNumber(uint64_t *retval) {
int getNextFrameNumber(uint64_t *retval) {
#ifdef VIRTUAL
*retval = eiger_virtual_startingframenumber;
*retval = eiger_virtual_nextframenumber;
return OK;
#else
return Beb_GetStartingFrameNumber(retval, send_to_ten_gig);
return Beb_GetNextFrameNumber(retval, send_to_ten_gig);
#endif
}
@ -2256,7 +2256,7 @@ void *start_timer(void *arg) {
// Send data
{
uint64_t frameNr = 0;
getStartingFrameNumber(&frameNr);
getNextFrameNumber(&frameNr);
// loop over number of frames
for (int iframes = 0; iframes != numFrames; ++iframes) {
@ -2264,7 +2264,7 @@ void *start_timer(void *arg) {
// check if manual stop
if (sharedMemory_getStop() == 1) {
setStartingFrameNumber(frameNr + iframes + 1);
setNextFrameNumber(frameNr + iframes + 1);
break;
}
@ -2357,7 +2357,7 @@ void *start_timer(void *arg) {
}
}
}
setStartingFrameNumber(frameNr + numFrames);
setNextFrameNumber(frameNr + numFrames);
}
closeUDPSocket(0);
@ -2395,8 +2395,8 @@ int stopStateMachine() {
// ensure all have same starting frame numbers
uint64_t retval = 0;
if (Beb_GetStartingFrameNumber(&retval, send_to_ten_gig) == -2) {
Beb_SetStartingFrameNumber(retval + 1);
if (Beb_GetNextFrameNumber(&retval, send_to_ten_gig) == -2) {
Beb_SetNextFrameNumber(retval + 1);
}
return OK;
#endif

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

16
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -446,7 +446,7 @@ void setupDetector() {
/*setClockDivider(RUN_CLK, HALF_SPEED); depends if all the previous stuff
* works*/
setTiming(DEFAULT_TIMING_MODE);
setStartingFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
setNextFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
// temp threshold and reset event
setThresholdTemperature(DEFAULT_TMP_THRSHLD);
@ -533,9 +533,9 @@ int selectStoragecellStart(int pos) {
DAQ_STRG_CELL_SLCT_OFST);
}
int setStartingFrameNumber(uint64_t value) {
LOG(logINFO, ("Setting starting frame number: %llu\n",
(long long unsigned int)value));
int setNextFrameNumber(uint64_t value) {
LOG(logINFO,
("Setting next frame number: %llu\n", (long long unsigned int)value));
#ifdef VIRTUAL
setU64BitReg(value, FRAME_NUMBER_LSB_REG, FRAME_NUMBER_MSB_REG);
#else
@ -547,7 +547,7 @@ int setStartingFrameNumber(uint64_t value) {
return OK;
}
int getStartingFrameNumber(uint64_t *retval) {
int getNextFrameNumber(uint64_t *retval) {
#ifdef VIRTUAL
*retval = getU64BitReg(FRAME_NUMBER_LSB_REG, FRAME_NUMBER_MSB_REG);
#else
@ -1727,14 +1727,14 @@ void *start_timer(void *arg) {
// Send data
{
uint64_t frameNr = 0;
getStartingFrameNumber(&frameNr);
getNextFrameNumber(&frameNr);
for (int iframes = 0; iframes != numFrames; ++iframes) {
usleep(transmissionDelayUs);
// check if manual stop
if (sharedMemory_getStop() == 1) {
setStartingFrameNumber(frameNr + iframes + 1);
setNextFrameNumber(frameNr + iframes + 1);
break;
}
@ -1800,7 +1800,7 @@ void *start_timer(void *arg) {
}
}
}
setStartingFrameNumber(frameNr + numFrames);
setNextFrameNumber(frameNr + numFrames);
}
closeUDPSocket(0);

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

4
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -200,8 +200,8 @@ int getReadoutMode();
int selectStoragecellStart(int pos);
#endif
#if defined(JUNGFRAUD) || defined(EIGERD)
int setStartingFrameNumber(uint64_t value);
int getStartingFrameNumber(uint64_t *value);
int setNextFrameNumber(uint64_t value);
int getNextFrameNumber(uint64_t *value);
#endif
void setNumFrames(int64_t val);
int64_t getNumFrames();

7
slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
View File

@ -140,8 +140,8 @@ int set_adc_invert(int);
int get_adc_invert(int);
int set_external_sampling_source(int);
int set_external_sampling(int);
int set_starting_frame_number(int);
int get_starting_frame_number(int);
int set_next_frame_number(int);
int get_next_frame_number(int);
int set_quad(int);
int get_quad(int);
int set_interrupt_subframe(int);
@ -241,4 +241,5 @@ int reconfigure_udp(int);
int validate_udp_configuration(int);
int get_bursts_left(int);
int start_readout(int);
int set_default_dacs(int);
int set_default_dacs(int);
int is_virtual(int);

130
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -262,8 +262,8 @@ void function_table() {
flist[F_GET_ADC_INVERT] = &get_adc_invert;
flist[F_EXTERNAL_SAMPLING_SOURCE] = &set_external_sampling_source;
flist[F_EXTERNAL_SAMPLING] = &set_external_sampling;
flist[F_SET_STARTING_FRAME_NUMBER] = &set_starting_frame_number;
flist[F_GET_STARTING_FRAME_NUMBER] = &get_starting_frame_number;
flist[F_SET_NEXT_FRAME_NUMBER] = &set_next_frame_number;
flist[F_GET_NEXT_FRAME_NUMBER] = &get_next_frame_number;
flist[F_SET_QUAD] = &set_quad;
flist[F_GET_QUAD] = &get_quad;
flist[F_SET_INTERRUPT_SUBFRAME] = &set_interrupt_subframe;
@ -360,6 +360,7 @@ void function_table() {
flist[F_GET_BURSTS_LEFT] = &get_bursts_left;
flist[F_START_READOUT] = &start_readout;
flist[F_SET_DEFAULT_DACS] = &set_default_dacs;
flist[F_IS_VIRTUAL] = &is_virtual;
// check
if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) {
@ -1755,7 +1756,8 @@ int acquire(int blocking, int file_des) {
strcpy(mess, "Could not start acquisition thread!\n");
LOG(logERROR, (mess));
} else {
if (blocking) {
// only does not wait for non blocking and scan
if (blocking || !scan) {
pthread_join(pthread_tid, NULL);
}
}
@ -4497,14 +4499,14 @@ int set_external_sampling(int file_des) {
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
}
int set_starting_frame_number(int file_des) {
int set_next_frame_number(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
uint64_t arg = 0;
if (receiveData(file_des, &arg, sizeof(arg), INT64) < 0)
return printSocketReadError();
LOG(logINFO, ("Setting starting frame number to %llu\n", arg));
LOG(logINFO, ("Setting next frame number to %llu\n", arg));
#if (!defined(EIGERD)) && (!defined(JUNGFRAUD))
functionNotImplemented();
@ -4513,8 +4515,7 @@ int set_starting_frame_number(int file_des) {
if (Server_VerifyLock() == OK) {
if (arg == 0) {
ret = FAIL;
sprintf(mess,
"Could not set starting frame number. Cannot be 0.\n");
sprintf(mess, "Could not set next frame number. Cannot be 0.\n");
LOG(logERROR, (mess));
}
#ifdef EIGERD
@ -4522,12 +4523,12 @@ int set_starting_frame_number(int file_des) {
ret = FAIL;
#ifdef VIRTUAL
sprintf(mess,
"Could not set starting frame number. Must be less then "
"Could not set next frame number. Must be less then "
"%ld (0x%lx)\n",
UDP_HEADER_MAX_FRAME_VALUE, UDP_HEADER_MAX_FRAME_VALUE);
#else
sprintf(mess,
"Could not set starting frame number. Must be less then "
"Could not set next frame number. Must be less then "
"%lld (0x%llx)\n",
UDP_HEADER_MAX_FRAME_VALUE, UDP_HEADER_MAX_FRAME_VALUE);
#endif
@ -4535,21 +4536,21 @@ int set_starting_frame_number(int file_des) {
}
#endif
else {
ret = setStartingFrameNumber(arg);
ret = setNextFrameNumber(arg);
if (ret == FAIL) {
sprintf(mess, "Could not set starting frame number. Failed to "
sprintf(mess, "Could not set next frame number. Failed to "
"map address.\n");
LOG(logERROR, (mess));
}
if (ret == OK) {
uint64_t retval = 0;
ret = getStartingFrameNumber(&retval);
ret = getNextFrameNumber(&retval);
if (ret == FAIL) {
sprintf(mess, "Could not get starting frame number. Failed "
sprintf(mess, "Could not get next frame number. Failed "
"to map address.\n");
LOG(logERROR, (mess));
} else if (ret == -2) {
sprintf(mess, "Inconsistent starting frame number from "
sprintf(mess, "Inconsistent next frame number from "
"left and right FPGA. Please set it.\n");
LOG(logERROR, (mess));
} else {
@ -4557,12 +4558,12 @@ int set_starting_frame_number(int file_des) {
ret = FAIL;
#ifdef VIRTUAL
sprintf(mess,
"Could not set starting frame number. Set "
"Could not set next frame number. Set "
"0x%lx, but read 0x%lx\n",
arg, retval);
#else
sprintf(mess,
"Could not set starting frame number. Set "
"Could not set next frame number. Set "
"0x%llx, but read 0x%llx\n",
arg, retval);
#endif
@ -4576,28 +4577,28 @@ int set_starting_frame_number(int file_des) {
return Server_SendResult(file_des, INT64, NULL, 0);
}
int get_starting_frame_number(int file_des) {
int get_next_frame_number(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
uint64_t retval = -1;
LOG(logDEBUG1, ("Getting Starting frame number \n"));
LOG(logDEBUG1, ("Getting next frame number \n"));
#if (!defined(EIGERD)) && (!defined(JUNGFRAUD))
functionNotImplemented();
#else
// get
ret = getStartingFrameNumber(&retval);
ret = getNextFrameNumber(&retval);
if (ret == FAIL) {
sprintf(mess, "Could not get starting frame number. Failed to map "
sprintf(mess, "Could not get next frame number. Failed to map "
"address.\n");
LOG(logERROR, (mess));
} else if (ret == -2) {
sprintf(mess, "Inconsistent starting frame number from left and right "
sprintf(mess, "Inconsistent next frame number from left and right "
"FPGA. Please set it.\n");
LOG(logERROR, (mess));
} else {
LOG(logDEBUG1, ("Start frame number retval: %u\n", retval));
LOG(logDEBUG1, ("next frame number retval: %u\n", retval));
}
#endif
return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
@ -6364,13 +6365,19 @@ int set_veto_photon(int file_des) {
const int chipIndex = args[0];
const int numChannels = args[1];
int gainIndices[numChannels];
if (receiveData(file_des, gainIndices, sizeof(gainIndices), INT32) < 0)
int *gainIndices = malloc(sizeof(int) * numChannels);
if (receiveData(file_des, gainIndices, sizeof(int) * numChannels, INT32) <
0) {
free(gainIndices);
return printSocketReadError();
}
int values[numChannels];
if (receiveData(file_des, values, sizeof(values), INT32) < 0)
int *values = malloc(sizeof(int) * numChannels);
if (receiveData(file_des, values, sizeof(int) * numChannels, INT32) < 0) {
free(gainIndices);
free(values);
return printSocketReadError();
}
LOG(logINFO, ("Setting Veto Photon: [chipIndex:%d, nch:%d]\n", chipIndex,
numChannels));
@ -6425,6 +6432,12 @@ int set_veto_photon(int file_des) {
}
}
#endif
if (gainIndices != NULL) {
free(gainIndices);
}
if (values != NULL) {
free(values);
}
return Server_SendResult(file_des, INT32, NULL, 0);
}
@ -6432,10 +6445,8 @@ int get_veto_photon(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int arg = -1;
int retvals[NCHAN];
memset(retvals, 0, sizeof(retvals));
int gainRetvals[NCHAN];
memset(gainRetvals, 0, sizeof(gainRetvals));
int *retvals = NULL;
int *gainRetvals = NULL;
if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
return printSocketReadError();
@ -6444,24 +6455,38 @@ int get_veto_photon(int file_des) {
#ifndef GOTTHARD2D
functionNotImplemented();
#else
// get only
int chipIndex = arg;
if (chipIndex < -1 || chipIndex >= NCHIP) {
retvals = malloc(sizeof(int) * NCHAN);
gainRetvals = malloc(sizeof(int) * NCHAN);
memset(retvals, 0, sizeof(int) * NCHAN);
memset(gainRetvals, 0, sizeof(int) * NCHAN);
if (retvals == NULL || gainRetvals == NULL) {
ret = FAIL;
sprintf(mess, "Could not get veto photon. Invalid chip index %d\n",
chipIndex);
strcpy(
mess,
"Could not get veto photon. Could not allocate memory in server\n");
LOG(logERROR, (mess));
} else {
ret = getVetoPhoton(chipIndex, retvals, gainRetvals);
if (ret == FAIL) {
strcpy(mess,
"Could not get veto photon for chipIndex -1. Not the "
"same for all chips. Select specific chip index instead.\n");
// get only
int chipIndex = arg;
if (chipIndex < -1 || chipIndex >= NCHIP) {
ret = FAIL;
sprintf(mess, "Could not get veto photon. Invalid chip index %d\n",
chipIndex);
LOG(logERROR, (mess));
} else {
for (int i = 0; i < NCHAN; ++i) {
LOG(logDEBUG1,
("%d:[%d, %d]\n", i, retvals[i], gainRetvals[i]));
ret = getVetoPhoton(chipIndex, retvals, gainRetvals);
if (ret == FAIL) {
strcpy(mess,
"Could not get veto photon for chipIndex -1. Not the "
"same for all chips. Select specific chip index "
"instead.\n");
LOG(logERROR, (mess));
} else {
for (int i = 0; i < NCHAN; ++i) {
LOG(logDEBUG1,
("%d:[%d, %d]\n", i, retvals[i], gainRetvals[i]));
}
}
}
}
@ -6473,6 +6498,12 @@ int get_veto_photon(int file_des) {
sendData(file_des, gainRetvals, sizeof(gainRetvals), INT32);
sendData(file_des, retvals, sizeof(retvals), INT32);
}
if (retvals != NULL) {
free(retvals);
}
if (gainRetvals != NULL) {
free(gainRetvals);
}
return ret;
}
@ -8162,4 +8193,15 @@ int set_default_dacs(int file_des) {
}
#endif
return Server_SendResult(file_des, INT32, NULL, 0);
}
}
int is_virtual(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int retval = 0;
#ifdef VIRTUAL
retval = 1;
#endif
LOG(logDEBUG1, ("is virtual retval: %d\n", retval));
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
}

6
slsDetectorSoftware/include/sls/Detector.h
View File

@ -142,6 +142,8 @@ class Detector {
* streaming, receiver file or streaming. Default is disabled.
*/
void setGapPixelsinCallback(const bool enable);
Result<bool> isVirtualDetectorServer(Positions pos = {}) const;
///@{
/** @name Callbacks */
@ -482,11 +484,11 @@ class Detector {
getNumMissingPackets(Positions pos = {}) const;
/** [Eiger][Jungfrau] */
Result<uint64_t> getStartingFrameNumber(Positions pos = {}) const;
Result<uint64_t> getNextFrameNumber(Positions pos = {}) const;
/** [Eiger][Jungfrau] Stopping acquisition might result in different frame
* numbers for different modules.*/
void setStartingFrameNumber(uint64_t value, Positions pos = {});
void setNextFrameNumber(uint64_t value, Positions pos = {});
/** [Eiger][Mythen3] Sends an internal software trigger to the detector */
void sendSoftwareTrigger(Positions pos = {});

15
slsDetectorSoftware/src/CmdProxy.h
View File

@ -687,7 +687,7 @@ class CmdProxy {
{"busy", "clearbusy"},
{"receiver", "rx_status"},
{"framescaught", "rx_framescaught"},
{"startingfnum", "startframenumber"},
{"startingfnum", "nextframenumber"},
/* Network Configuration (Detector<->Receiver) */
{"detectorip", "udp_srcip"},
@ -847,7 +847,7 @@ class CmdProxy {
{"status", &CmdProxy::DetectorStatus},
{"rx_framescaught", &CmdProxy::rx_framescaught},
{"rx_missingpackets", &CmdProxy::rx_missingpackets},
{"startframenumber", &CmdProxy::startframenumber},
{"nextframenumber", &CmdProxy::nextframenumber},
{"trigger", &CmdProxy::trigger},
{"scan", &CmdProxy::Scan},
{"scanerrmsg", &CmdProxy::scanerrmsg},
@ -1460,12 +1460,11 @@ class CmdProxy {
GET_COMMAND(rx_missingpackets, getNumMissingPackets,
"\n\tNumber of missing packets for each port in receiver.");
INTEGER_COMMAND_VEC_ID(
startframenumber, getStartingFrameNumber, setStartingFrameNumber,
StringTo<uint64_t>,
"[n_value]\n\t[Eiger][Jungfrau] Starting frame number for "
"next acquisition. Stopping acquisition might result in "
"different frame numbers for different modules.");
INTEGER_COMMAND_VEC_ID(nextframenumber, getNextFrameNumber,
setNextFrameNumber, StringTo<uint64_t>,
"[n_value]\n\t[Eiger][Jungfrau] Next frame number. "
"Stopping acquisition might result in "
"different frame numbers for different modules.");
EXECUTE_SET_COMMAND(
trigger, sendSoftwareTrigger,

12
slsDetectorSoftware/src/Detector.cpp
View File

@ -206,6 +206,10 @@ void Detector::setGapPixelsinCallback(bool enable) {
pimpl->setGapPixelsinCallback(enable);
}
Result<bool> Detector::isVirtualDetectorServer(Positions pos) const {
return pimpl->Parallel(&Module::isVirtualDetectorServer, pos);
}
// Callback
void Detector::registerAcquisitionFinishedCallback(void (*func)(double, int,
@ -621,12 +625,12 @@ Detector::getNumMissingPackets(Positions pos) const {
return pimpl->Parallel(&Module::getNumMissingPackets, pos);
}
Result<uint64_t> Detector::getStartingFrameNumber(Positions pos) const {
return pimpl->Parallel(&Module::getStartingFrameNumber, pos);
Result<uint64_t> Detector::getNextFrameNumber(Positions pos) const {
return pimpl->Parallel(&Module::getNextFrameNumber, pos);
}
void Detector::setStartingFrameNumber(uint64_t value, Positions pos) {
pimpl->Parallel(&Module::setStartingFrameNumber, pos, value);
void Detector::setNextFrameNumber(uint64_t value, Positions pos) {
pimpl->Parallel(&Module::setNextFrameNumber, pos, value);
}
void Detector::sendSoftwareTrigger(Positions pos) {

12
slsDetectorSoftware/src/Module.cpp
View File

@ -178,6 +178,10 @@ void Module::setAllTrimbits(int val) {
sendToDetector<int>(F_SET_ALL_TRIMBITS, val);
}
bool Module::isVirtualDetectorServer() const {
return sendToDetector<int>(F_IS_VIRTUAL);
}
int64_t Module::getNumberOfFrames() const {
return sendToDetector<int64_t>(F_GET_NUM_FRAMES);
}
@ -484,12 +488,12 @@ std::vector<uint64_t> Module::getNumMissingPackets() const {
throw RuntimeError("No receiver to get missing packets.");
}
uint64_t Module::getStartingFrameNumber() const {
return sendToDetector<uint64_t>(F_GET_STARTING_FRAME_NUMBER);
uint64_t Module::getNextFrameNumber() const {
return sendToDetector<uint64_t>(F_GET_NEXT_FRAME_NUMBER);
}
void Module::setStartingFrameNumber(uint64_t value) {
sendToDetector(F_SET_STARTING_FRAME_NUMBER, value, nullptr);
void Module::setNextFrameNumber(uint64_t value) {
sendToDetector(F_SET_NEXT_FRAME_NUMBER, value, nullptr);
}
void Module::sendSoftwareTrigger() { sendToDetectorStop(F_SOFTWARE_TRIGGER); }

5
slsDetectorSoftware/src/Module.h
View File

@ -103,6 +103,7 @@ class Module : public virtual slsDetectorDefs {
void loadSettingsFile(const std::string &fname);
int getAllTrimbits() const;
void setAllTrimbits(int val);
bool isVirtualDetectorServer() const;
/**************************************************
* *
@ -171,8 +172,8 @@ class Module : public virtual slsDetectorDefs {
double getReceiverProgress() const;
int64_t getFramesCaughtByReceiver() const;
std::vector<uint64_t> getNumMissingPackets() const;
uint64_t getStartingFrameNumber() const;
void setStartingFrameNumber(uint64_t value);
uint64_t getNextFrameNumber() const;
void setNextFrameNumber(uint64_t value);
void sendSoftwareTrigger();
defs::scanParameters getScan() const;
void setScan(const defs::scanParameters t);

76
slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
View File

@ -1,14 +1,14 @@
#include "CmdProxy.h"
#include "sls/Detector.h"
#include "catch.hpp"
#include "sls/Detector.h"
#include "sls/sls_detector_defs.h"
#include <sstream>
#include "sls/Result.h"
#include "sls/ToString.h"
#include "sls/versionAPI.h"
#include "test-CmdProxy-global.h"
#include "tests/globals.h"
#include "sls/versionAPI.h"
using sls::CmdProxy;
using sls::Detector;
@ -17,7 +17,7 @@ using test::PUT;
/* dacs */
TEST_CASE("dac", "[.cmd][.dacs][.new]") {
TEST_CASE("dac", "[.cmd][.dacs]") {
// dac 0 to dac 17
Detector det;
@ -100,7 +100,7 @@ TEST_CASE("dac", "[.cmd][.dacs][.new]") {
}
}
TEST_CASE("adcvpp", "[.cmd][.new]") {
TEST_CASE("adcvpp", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -132,7 +132,7 @@ TEST_CASE("adcvpp", "[.cmd][.new]") {
/* CTB/ Moench Specific */
TEST_CASE("samples", "[.cmd][.new]") {
TEST_CASE("samples", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -179,7 +179,7 @@ TEST_CASE("samples", "[.cmd][.new]") {
}
}
TEST_CASE("asamples", "[.cmd][.new]") {
TEST_CASE("asamples", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -209,7 +209,7 @@ TEST_CASE("asamples", "[.cmd][.new]") {
}
}
TEST_CASE("adcclk", "[.cmd][.new]") {
TEST_CASE("adcclk", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -240,7 +240,7 @@ TEST_CASE("adcclk", "[.cmd][.new]") {
}
}
TEST_CASE("runclk", "[.cmd][.new]") {
TEST_CASE("runclk", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -271,7 +271,7 @@ TEST_CASE("runclk", "[.cmd][.new]") {
}
}
TEST_CASE("syncclk", "[.cmd][.new]") {
TEST_CASE("syncclk", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -283,7 +283,7 @@ TEST_CASE("syncclk", "[.cmd][.new]") {
}
}
TEST_CASE("adcpipeline", "[.cmd][.new]") {
TEST_CASE("adcpipeline", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -318,7 +318,7 @@ TEST_CASE("adcpipeline", "[.cmd][.new]") {
}
}
TEST_CASE("v_limit", "[.cmd][.new]") {
TEST_CASE("v_limit", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -356,7 +356,7 @@ TEST_CASE("v_limit", "[.cmd][.new]") {
}
}
TEST_CASE("adcenable", "[.cmd][.new]") {
TEST_CASE("adcenable", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -386,7 +386,7 @@ TEST_CASE("adcenable", "[.cmd][.new]") {
}
}
TEST_CASE("adcenable10g", "[.cmd][.new]") {
TEST_CASE("adcenable10g", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -418,7 +418,7 @@ TEST_CASE("adcenable10g", "[.cmd][.new]") {
/* CTB Specific */
TEST_CASE("dsamples", "[.cmd][.new]") {
TEST_CASE("dsamples", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -448,7 +448,7 @@ TEST_CASE("dsamples", "[.cmd][.new]") {
}
}
TEST_CASE("romode", "[.cmd][.new]") {
TEST_CASE("romode", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -488,7 +488,7 @@ TEST_CASE("romode", "[.cmd][.new]") {
}
}
TEST_CASE("dbitclk", "[.cmd][.new]") {
TEST_CASE("dbitclk", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -519,7 +519,7 @@ TEST_CASE("dbitclk", "[.cmd][.new]") {
}
}
TEST_CASE("dbitpipeline", "[.cmd][.new]") {
TEST_CASE("dbitpipeline", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -554,7 +554,7 @@ TEST_CASE("dbitpipeline", "[.cmd][.new]") {
}
}
TEST_CASE("v_a", "[.cmd][.new]") {
TEST_CASE("v_a", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -575,7 +575,7 @@ TEST_CASE("v_a", "[.cmd][.new]") {
}
}
TEST_CASE("v_b", "[.cmd][.new]") {
TEST_CASE("v_b", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -596,7 +596,7 @@ TEST_CASE("v_b", "[.cmd][.new]") {
}
}
TEST_CASE("v_c", "[.cmd][.new]") {
TEST_CASE("v_c", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -617,7 +617,7 @@ TEST_CASE("v_c", "[.cmd][.new]") {
}
}
TEST_CASE("v_d", "[.cmd][.new]") {
TEST_CASE("v_d", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -638,7 +638,7 @@ TEST_CASE("v_d", "[.cmd][.new]") {
}
}
TEST_CASE("v_io", "[.cmd][.new]") {
TEST_CASE("v_io", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -650,7 +650,7 @@ TEST_CASE("v_io", "[.cmd][.new]") {
}
}
TEST_CASE("v_chip", "[.cmd][.new]") {
TEST_CASE("v_chip", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -662,7 +662,7 @@ TEST_CASE("v_chip", "[.cmd][.new]") {
}
}
TEST_CASE("vm_a", "[.cmd][.new]") {
TEST_CASE("vm_a", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -673,7 +673,7 @@ TEST_CASE("vm_a", "[.cmd][.new]") {
}
}
TEST_CASE("vm_b", "[.cmd][.new]") {
TEST_CASE("vm_b", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -684,7 +684,7 @@ TEST_CASE("vm_b", "[.cmd][.new]") {
}
}
TEST_CASE("vm_c", "[.cmd][.new]") {
TEST_CASE("vm_c", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -695,7 +695,7 @@ TEST_CASE("vm_c", "[.cmd][.new]") {
}
}
TEST_CASE("vm_d", "[.cmd][.new]") {
TEST_CASE("vm_d", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -706,7 +706,7 @@ TEST_CASE("vm_d", "[.cmd][.new]") {
}
}
TEST_CASE("vm_io", "[.cmd][.new]") {
TEST_CASE("vm_io", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -717,7 +717,7 @@ TEST_CASE("vm_io", "[.cmd][.new]") {
}
}
TEST_CASE("im_a", "[.cmd][.new]") {
TEST_CASE("im_a", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -728,7 +728,7 @@ TEST_CASE("im_a", "[.cmd][.new]") {
}
}
TEST_CASE("im_b", "[.cmd][.new]") {
TEST_CASE("im_b", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -739,7 +739,7 @@ TEST_CASE("im_b", "[.cmd][.new]") {
}
}
TEST_CASE("im_c", "[.cmd][.new]") {
TEST_CASE("im_c", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -750,7 +750,7 @@ TEST_CASE("im_c", "[.cmd][.new]") {
}
}
TEST_CASE("im_d", "[.cmd][.new]") {
TEST_CASE("im_d", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -761,7 +761,7 @@ TEST_CASE("im_d", "[.cmd][.new]") {
}
}
TEST_CASE("im_io", "[.cmd][.new]") {
TEST_CASE("im_io", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -772,7 +772,7 @@ TEST_CASE("im_io", "[.cmd][.new]") {
}
}
TEST_CASE("adc", "[.cmd][.new]") {
TEST_CASE("adc", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -786,7 +786,7 @@ TEST_CASE("adc", "[.cmd][.new]") {
}
}
TEST_CASE("extsampling", "[.cmd][.new]") {
TEST_CASE("extsampling", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -816,7 +816,7 @@ TEST_CASE("extsampling", "[.cmd][.new]") {
}
}
TEST_CASE("extsamplingsrc", "[.cmd][.new]") {
TEST_CASE("extsamplingsrc", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -847,7 +847,7 @@ TEST_CASE("extsamplingsrc", "[.cmd][.new]") {
}
}
TEST_CASE("diodelay", "[.cmd][.new]") {
TEST_CASE("diodelay", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -870,7 +870,7 @@ TEST_CASE("diodelay", "[.cmd][.new]") {
}
}
TEST_CASE("led", "[.cmd][.new]") {
TEST_CASE("led", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();

60
slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp
View File

@ -1,14 +1,14 @@
#include "CmdProxy.h"
#include "sls/Detector.h"
#include "catch.hpp"
#include "sls/Detector.h"
#include "sls/sls_detector_defs.h"
#include <array>
#include <sstream>
#include <thread>
#include "sls/versionAPI.h"
#include "test-CmdProxy-global.h"
#include "tests/globals.h"
#include "sls/versionAPI.h"
using sls::CmdProxy;
using sls::Detector;
@ -17,7 +17,7 @@ using test::PUT;
/** temperature */
TEST_CASE("temp_fpgaext", "[.cmd][.new]") {
TEST_CASE("temp_fpgaext", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -32,7 +32,7 @@ TEST_CASE("temp_fpgaext", "[.cmd][.new]") {
}
}
TEST_CASE("temp_10ge", "[.cmd][.new]") {
TEST_CASE("temp_10ge", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -47,7 +47,7 @@ TEST_CASE("temp_10ge", "[.cmd][.new]") {
}
}
TEST_CASE("temp_dcdc", "[.cmd][.new]") {
TEST_CASE("temp_dcdc", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -62,7 +62,7 @@ TEST_CASE("temp_dcdc", "[.cmd][.new]") {
}
}
TEST_CASE("temp_sodl", "[.cmd][.new]") {
TEST_CASE("temp_sodl", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -77,7 +77,7 @@ TEST_CASE("temp_sodl", "[.cmd][.new]") {
}
}
TEST_CASE("temp_sodr", "[.cmd][.new]") {
TEST_CASE("temp_sodr", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -92,7 +92,7 @@ TEST_CASE("temp_sodr", "[.cmd][.new]") {
}
}
TEST_CASE("temp_fpgafl", "[.cmd][.new]") {
TEST_CASE("temp_fpgafl", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -107,7 +107,7 @@ TEST_CASE("temp_fpgafl", "[.cmd][.new]") {
}
}
TEST_CASE("temp_fpgafr", "[.cmd][.new]") {
TEST_CASE("temp_fpgafr", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -124,7 +124,7 @@ TEST_CASE("temp_fpgafr", "[.cmd][.new]") {
/* dacs */
TEST_CASE("Setting and reading back EIGER dacs", "[.cmd][.dacs][.new]") {
TEST_CASE("Setting and reading back EIGER dacs", "[.cmd][.dacs]") {
// vsvp, vtr, vrf, vrs, vsvn, vtgstv, vcmp_ll, vcmp_lr, vcal, vcmp_rl,
// rxb_rb, rxb_lb, vcmp_rr, vcp, vcn, vis, vthreshold
Detector det;
@ -233,7 +233,7 @@ TEST_CASE("Setting and reading back EIGER dacs", "[.cmd][.dacs][.new]") {
/* Network Configuration (Detector<->Receiver) */
TEST_CASE("txndelay_left", "[.cmd][.new]") {
TEST_CASE("txndelay_left", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -254,7 +254,7 @@ TEST_CASE("txndelay_left", "[.cmd][.new]") {
}
}
TEST_CASE("txndelay_right", "[.cmd][.new]") {
TEST_CASE("txndelay_right", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -277,7 +277,7 @@ TEST_CASE("txndelay_right", "[.cmd][.new]") {
/* Eiger Specific */
TEST_CASE("subexptime", "[.cmd][.new]") {
TEST_CASE("subexptime", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
@ -298,7 +298,7 @@ TEST_CASE("subexptime", "[.cmd][.new]") {
}
}
TEST_CASE("subdeadtime", "[.cmd][.new]") {
TEST_CASE("subdeadtime", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
@ -319,7 +319,7 @@ TEST_CASE("subdeadtime", "[.cmd][.new]") {
}
}
TEST_CASE("threshold", "[.cmd][.new]") {
TEST_CASE("threshold", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
@ -348,7 +348,7 @@ TEST_CASE("threshold", "[.cmd][.new]") {
}
}
TEST_CASE("thresholdnotb", "[.cmd][.new]") {
TEST_CASE("thresholdnotb", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
@ -377,7 +377,7 @@ TEST_CASE("thresholdnotb", "[.cmd][.new]") {
}
}
TEST_CASE("settingspath", "[.cmd][.new]") {
TEST_CASE("settingspath", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getSettingsPath();
@ -393,7 +393,7 @@ TEST_CASE("settingspath", "[.cmd][.new]") {
}
}
TEST_CASE("overflow", "[.cmd][.new]") {
TEST_CASE("overflow", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -414,7 +414,7 @@ TEST_CASE("overflow", "[.cmd][.new]") {
}
}
TEST_CASE("flippeddatax", "[.cmd][.new]") {
TEST_CASE("flippeddatax", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -435,7 +435,7 @@ TEST_CASE("flippeddatax", "[.cmd][.new]") {
}
}
TEST_CASE("trimen", "[.cmd][.this][.new]") {
TEST_CASE("trimen", "[.cmd][.this]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -456,7 +456,7 @@ TEST_CASE("trimen", "[.cmd][.this][.new]") {
}
}
TEST_CASE("ratecorr", "[.cmd][.new]") {
TEST_CASE("ratecorr", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -490,7 +490,7 @@ TEST_CASE("ratecorr", "[.cmd][.new]") {
}
}
TEST_CASE("readnlines", "[.cmd][.new]") {
TEST_CASE("readnlines", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -520,7 +520,7 @@ TEST_CASE("readnlines", "[.cmd][.new]") {
}
}
TEST_CASE("interruptsubframe", "[.cmd][.new]") {
TEST_CASE("interruptsubframe", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -544,7 +544,7 @@ TEST_CASE("interruptsubframe", "[.cmd][.new]") {
}
}
TEST_CASE("measuredperiod", "[.cmd][.new]") {
TEST_CASE("measuredperiod", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -576,7 +576,7 @@ TEST_CASE("measuredperiod", "[.cmd][.new]") {
}
}
TEST_CASE("measuredsubperiod", "[.cmd][.new]") {
TEST_CASE("measuredsubperiod", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -611,7 +611,7 @@ TEST_CASE("measuredsubperiod", "[.cmd][.new]") {
}
}
TEST_CASE("activate", "[.cmd][.new]") {
TEST_CASE("activate", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -652,7 +652,7 @@ TEST_CASE("activate", "[.cmd][.new]") {
}
}
TEST_CASE("partialreset", "[.cmd][.new]") {
TEST_CASE("partialreset", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -674,7 +674,7 @@ TEST_CASE("partialreset", "[.cmd][.new]") {
}
}
TEST_CASE("pulse", "[.cmd][.new]") {
TEST_CASE("pulse", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -689,7 +689,7 @@ TEST_CASE("pulse", "[.cmd][.new]") {
}
}
TEST_CASE("pulsenmove", "[.cmd][.new]") {
TEST_CASE("pulsenmove", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -704,7 +704,7 @@ TEST_CASE("pulsenmove", "[.cmd][.new]") {
}
}
TEST_CASE("pulsechip", "[.cmd][.new]") {
TEST_CASE("pulsechip", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();

12
slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp
View File

@ -1,14 +1,14 @@
#include "CmdProxy.h"
#include "sls/Detector.h"
#include "catch.hpp"
#include "sls/Detector.h"
#include "sls/sls_detector_defs.h"
#include <sstream>
#include "sls/Result.h"
#include "sls/ToString.h"
#include "sls/versionAPI.h"
#include "test-CmdProxy-global.h"
#include "tests/globals.h"
#include "sls/versionAPI.h"
using sls::CmdProxy;
using sls::Detector;
@ -17,7 +17,7 @@ using test::PUT;
/* dacs */
TEST_CASE("Setting and reading back GOTTHARD dacs", "[.cmd][.dacs][.new]") {
TEST_CASE("Setting and reading back GOTTHARD dacs", "[.cmd][.dacs]") {
// vref_ds, vcascn_pb, vcascp_pb, vout_cm, vcasc_out, vin_cm, vref_comp,
// ib_test_c
@ -97,7 +97,7 @@ TEST_CASE("Setting and reading back GOTTHARD dacs", "[.cmd][.dacs][.new]") {
/* Gotthard Specific */
TEST_CASE("roi", "[.cmd][.new]") {
TEST_CASE("roi", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -123,7 +123,7 @@ TEST_CASE("roi", "[.cmd][.new]") {
}
}
TEST_CASE("clearroi", "[.cmd][.new]") {
TEST_CASE("clearroi", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -143,7 +143,7 @@ TEST_CASE("clearroi", "[.cmd][.new]") {
}
}
TEST_CASE("exptimel", "[.cmd][.new]") {
TEST_CASE("exptimel", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();

48
slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
View File

@ -1,14 +1,14 @@
#include "CmdProxy.h"
#include "sls/Detector.h"
#include "catch.hpp"
#include "sls/Detector.h"
#include "sls/sls_detector_defs.h"
#include <sstream>
#include "sls/Result.h"
#include "sls/ToString.h"
#include "sls/versionAPI.h"
#include "test-CmdProxy-global.h"
#include "tests/globals.h"
#include "sls/versionAPI.h"
using sls::CmdProxy;
using sls::Detector;
@ -17,7 +17,7 @@ using test::PUT;
/* dacs */
TEST_CASE("Setting and reading back GOTTHARD2 dacs", "[.cmd][.dacs][.new]") {
TEST_CASE("Setting and reading back GOTTHARD2 dacs", "[.cmd][.dacs]") {
// vref_h_adc, vb_comp_fe, vb_comp_adc, vcom_cds,
// vref_restore, vb_opa_1st, vref_comp_fe, vcom_adc1,
// vref_prech, vref_l_adc, vref_cds, vb_cs,
@ -110,7 +110,7 @@ TEST_CASE("Setting and reading back GOTTHARD2 dacs", "[.cmd][.dacs][.new]") {
/* on chip dacs */
TEST_CASE("vchip_comp_fe", "[.cmd][.onchipdacs][.new]") {
TEST_CASE("vchip_comp_fe", "[.cmd][.onchipdacs]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -123,7 +123,7 @@ TEST_CASE("vchip_comp_fe", "[.cmd][.onchipdacs][.new]") {
}
}
TEST_CASE("vchip_opa_1st", "[.cmd][.onchipdacs][.new]") {
TEST_CASE("vchip_opa_1st", "[.cmd][.onchipdacs]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -136,7 +136,7 @@ TEST_CASE("vchip_opa_1st", "[.cmd][.onchipdacs][.new]") {
}
}
TEST_CASE("vchip_opa_fd", "[.cmd][.onchipdacs][.new]") {
TEST_CASE("vchip_opa_fd", "[.cmd][.onchipdacs]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -149,7 +149,7 @@ TEST_CASE("vchip_opa_fd", "[.cmd][.onchipdacs][.new]") {
}
}
TEST_CASE("vchip_comp_adc", "[.cmd][.onchipdacs][.new]") {
TEST_CASE("vchip_comp_adc", "[.cmd][.onchipdacs]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -162,7 +162,7 @@ TEST_CASE("vchip_comp_adc", "[.cmd][.onchipdacs][.new]") {
}
}
TEST_CASE("vchip_ref_comp_fe", "[.cmd][.onchipdacs][.new]") {
TEST_CASE("vchip_ref_comp_fe", "[.cmd][.onchipdacs]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -175,7 +175,7 @@ TEST_CASE("vchip_ref_comp_fe", "[.cmd][.onchipdacs][.new]") {
}
}
TEST_CASE("vchip_cs", "[.cmd][.onchipdacs][.new]") {
TEST_CASE("vchip_cs", "[.cmd][.onchipdacs]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -188,7 +188,7 @@ TEST_CASE("vchip_cs", "[.cmd][.onchipdacs][.new]") {
/* Gotthard2 Specific */
TEST_CASE("bursts", "[.cmd][.new]") {
TEST_CASE("bursts", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -262,7 +262,7 @@ TEST_CASE("bursts", "[.cmd][.new]") {
}
}
TEST_CASE("burstperiod", "[.cmd][.new]") {
TEST_CASE("burstperiod", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -284,7 +284,7 @@ TEST_CASE("burstperiod", "[.cmd][.new]") {
}
}
TEST_CASE("burstsl", "[.cmd][.new]") {
TEST_CASE("burstsl", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -295,7 +295,7 @@ TEST_CASE("burstsl", "[.cmd][.new]") {
}
}
TEST_CASE("inj_ch", "[.cmd][.new]") {
TEST_CASE("inj_ch", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -320,7 +320,7 @@ TEST_CASE("inj_ch", "[.cmd][.new]") {
}
}
TEST_CASE("vetophoton", "[.cmd][.new]") {
TEST_CASE("vetophoton", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -342,7 +342,7 @@ TEST_CASE("vetophoton", "[.cmd][.new]") {
}
}
TEST_CASE("vetoref", "[.cmd][.new]") {
TEST_CASE("vetoref", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -357,7 +357,7 @@ TEST_CASE("vetoref", "[.cmd][.new]") {
}
}
TEST_CASE("vetofile", "[.cmd][.new]") {
TEST_CASE("vetofile", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -371,7 +371,7 @@ TEST_CASE("vetofile", "[.cmd][.new]") {
}
}
TEST_CASE("burstmode", "[.cmd][.new]") {
TEST_CASE("burstmode", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -402,7 +402,7 @@ TEST_CASE("burstmode", "[.cmd][.new]") {
}
}
TEST_CASE("cdsgain", "[.cmd][.new]") {
TEST_CASE("cdsgain", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -432,7 +432,7 @@ TEST_CASE("cdsgain", "[.cmd][.new]") {
}
}
TEST_CASE("filter", "[.cmd][.new]") {
TEST_CASE("filter", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -462,7 +462,7 @@ TEST_CASE("filter", "[.cmd][.new]") {
}
}
TEST_CASE("currentsource", "[.cmd][.new]") {
TEST_CASE("currentsource", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -492,7 +492,7 @@ TEST_CASE("currentsource", "[.cmd][.new]") {
}
}
TEST_CASE("timingsource", "[.cmd][.new]") {
TEST_CASE("timingsource", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -522,7 +522,7 @@ TEST_CASE("timingsource", "[.cmd][.new]") {
}
}
TEST_CASE("veto", "[.cmd][.new]") {
TEST_CASE("veto", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -552,7 +552,7 @@ TEST_CASE("veto", "[.cmd][.new]") {
}
}
TEST_CASE("confadc", "[.cmd][.new]") {
TEST_CASE("confadc", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -599,7 +599,7 @@ TEST_CASE("confadc", "[.cmd][.new]") {
}
}
TEST_CASE("badchannels", "[.cmd][.new]") {
TEST_CASE("badchannels", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();

22
slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
View File

@ -1,12 +1,12 @@
#include "CmdProxy.h"
#include "sls/Detector.h"
#include "catch.hpp"
#include "sls/Detector.h"
#include "sls/sls_detector_defs.h"
#include <sstream>
#include "sls/versionAPI.h"
#include "test-CmdProxy-global.h"
#include "tests/globals.h"
#include "sls/versionAPI.h"
using sls::CmdProxy;
using sls::Detector;
@ -15,7 +15,7 @@ using test::PUT;
/* dacs */
TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmd][.dacs][.new]") {
TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmd][.dacs]") {
// vb_comp, vdd_prot, vin_com, vref_prech, vb_pixbuf, vb_ds, vref_ds,
// vref_comp
Detector det;
@ -96,7 +96,7 @@ TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmd][.dacs][.new]") {
/* Network Configuration (Detector<->Receiver) */
TEST_CASE("selinterface", "[.cmd][.new]") {
TEST_CASE("selinterface", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -127,7 +127,7 @@ TEST_CASE("selinterface", "[.cmd][.new]") {
/* Jungfrau Specific */
TEST_CASE("temp_threshold", "[.cmd][.new]") {
TEST_CASE("temp_threshold", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -157,7 +157,7 @@ TEST_CASE("temp_threshold", "[.cmd][.new]") {
}
}
TEST_CASE("temp_control", "[.cmd][.new]") {
TEST_CASE("temp_control", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -187,7 +187,7 @@ TEST_CASE("temp_control", "[.cmd][.new]") {
}
}
TEST_CASE("temp_event", "[.cmd][.new]") {
TEST_CASE("temp_event", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -208,7 +208,7 @@ TEST_CASE("temp_event", "[.cmd][.new]") {
}
}
TEST_CASE("auto_comp_disable", "[.cmd][.new]") {
TEST_CASE("auto_comp_disable", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -238,7 +238,7 @@ TEST_CASE("auto_comp_disable", "[.cmd][.new]") {
}
}
TEST_CASE("storagecells", "[.cmd][.new]") {
TEST_CASE("storagecells", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -273,7 +273,7 @@ TEST_CASE("storagecells", "[.cmd][.new]") {
}
}
TEST_CASE("storagecell_start", "[.cmd][.new]") {
TEST_CASE("storagecell_start", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -309,7 +309,7 @@ TEST_CASE("storagecell_start", "[.cmd][.new]") {
}
}
TEST_CASE("storagecell_delay", "[.cmd][.new]") {
TEST_CASE("storagecell_delay", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();

6
slsDetectorSoftware/tests/test-CmdProxy-moench.cpp
View File

@ -1,14 +1,14 @@
#include "CmdProxy.h"
#include "sls/Detector.h"
#include "catch.hpp"
#include "sls/Detector.h"
#include "sls/sls_detector_defs.h"
#include <sstream>
#include "sls/Result.h"
#include "sls/ToString.h"
#include "sls/versionAPI.h"
#include "test-CmdProxy-global.h"
#include "tests/globals.h"
#include "sls/versionAPI.h"
using sls::CmdProxy;
using sls::Detector;
@ -17,7 +17,7 @@ using test::PUT;
/* dacs */
TEST_CASE("Setting and reading back MOENCH dacs", "[.cmd][.dacs][.new]") {
TEST_CASE("Setting and reading back MOENCH dacs", "[.cmd][.dacs]") {
// vbp_colbuf, vipre, vin_cm", vb_sda, vcasc_sfp, vout_cm, vipre_cds,
// ibias_sfp

26
slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp
View File

@ -1,14 +1,14 @@
#include "CmdProxy.h"
#include "sls/Detector.h"
#include "catch.hpp"
#include "sls/Detector.h"
#include "sls/sls_detector_defs.h"
#include <sstream>
#include "sls/Result.h"
#include "sls/ToString.h"
#include "sls/versionAPI.h"
#include "test-CmdProxy-global.h"
#include "tests/globals.h"
#include "sls/versionAPI.h"
using sls::CmdProxy;
using sls::Detector;
@ -17,7 +17,7 @@ using test::PUT;
/* dacs */
TEST_CASE("Setting and reading back MYTHEN3 dacs", "[.cmd][.dacs][.new]") {
TEST_CASE("Setting and reading back MYTHEN3 dacs", "[.cmd][.dacs]") {
// vcassh, vth2, vshaper, vshaperneg, vipre_out, vth3, vth1,
// vicin, vcas, vpreamp, vpl, vipre, viinsh, vph, vtrim, vdcsh,
@ -117,7 +117,7 @@ TEST_CASE("Setting and reading back MYTHEN3 dacs", "[.cmd][.dacs][.new]") {
/* acquisition */
TEST_CASE("readout", "[.cmd][.new]") {
TEST_CASE("readout", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
// PUT only command
@ -134,7 +134,7 @@ TEST_CASE("readout", "[.cmd][.new]") {
/* Mythen3 Specific */
TEST_CASE("counters", "[.cmd][.new]") {
TEST_CASE("counters", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -166,7 +166,7 @@ TEST_CASE("counters", "[.cmd][.new]") {
}
}
TEST_CASE("gates", "[.cmd][.new]") {
TEST_CASE("gates", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -196,7 +196,7 @@ TEST_CASE("gates", "[.cmd][.new]") {
}
}
TEST_CASE("exptime1", "[.cmd][.new]") {
TEST_CASE("exptime1", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -225,7 +225,7 @@ TEST_CASE("exptime1", "[.cmd][.new]") {
}
}
TEST_CASE("exptime2", "[.cmd][.new]") {
TEST_CASE("exptime2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -254,7 +254,7 @@ TEST_CASE("exptime2", "[.cmd][.new]") {
}
}
TEST_CASE("exptime3", "[.cmd][.new]") {
TEST_CASE("exptime3", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -283,7 +283,7 @@ TEST_CASE("exptime3", "[.cmd][.new]") {
}
}
TEST_CASE("gatedelay", "[.cmd][.new]") {
TEST_CASE("gatedelay", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -319,7 +319,7 @@ TEST_CASE("gatedelay", "[.cmd][.new]") {
}
}
TEST_CASE("gatedelay1", "[.cmd][.new]") {
TEST_CASE("gatedelay1", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -348,7 +348,7 @@ TEST_CASE("gatedelay1", "[.cmd][.new]") {
}
}
TEST_CASE("gatedelay2", "[.cmd][.new]") {
TEST_CASE("gatedelay2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -377,7 +377,7 @@ TEST_CASE("gatedelay2", "[.cmd][.new]") {
}
}
TEST_CASE("gatedelay3", "[.cmd][.new]") {
TEST_CASE("gatedelay3", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();

44
slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp
View File

@ -1,14 +1,14 @@
#include "CmdProxy.h"
#include "sls/Detector.h"
#include "catch.hpp"
#include "sls/Detector.h"
#include "sls/sls_detector_defs.h"
#include <sstream>
#include "sls/Result.h"
#include "sls/ToString.h"
#include "sls/versionAPI.h"
#include "test-CmdProxy-global.h"
#include "tests/globals.h"
#include "sls/versionAPI.h"
using sls::CmdProxy;
using sls::Detector;
@ -17,7 +17,7 @@ using test::PUT;
/* Pattern */
TEST_CASE("pattern", "[.cmd][.new]") {
TEST_CASE("pattern", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -30,7 +30,7 @@ TEST_CASE("pattern", "[.cmd][.new]") {
}
}
TEST_CASE("savepattern", "[.cmd][.new]") {
TEST_CASE("savepattern", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -46,7 +46,7 @@ TEST_CASE("savepattern", "[.cmd][.new]") {
}
}
TEST_CASE("patioctrl", "[.cmd][.new]") {
TEST_CASE("patioctrl", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -76,7 +76,7 @@ TEST_CASE("patioctrl", "[.cmd][.new]") {
}
}
TEST_CASE("patword", "[.cmd][.new]") {
TEST_CASE("patword", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -112,7 +112,7 @@ TEST_CASE("patword", "[.cmd][.new]") {
}
}
TEST_CASE("patlimits", "[.cmd][.new]") {
TEST_CASE("patlimits", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -139,7 +139,7 @@ TEST_CASE("patlimits", "[.cmd][.new]") {
}
}
TEST_CASE("patloop0", "[.cmd][.new]") {
TEST_CASE("patloop0", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -165,7 +165,7 @@ TEST_CASE("patloop0", "[.cmd][.new]") {
}
}
TEST_CASE("patloop1", "[.cmd][.new]") {
TEST_CASE("patloop1", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -191,7 +191,7 @@ TEST_CASE("patloop1", "[.cmd][.new]") {
}
}
TEST_CASE("patloop2", "[.cmd][.new]") {
TEST_CASE("patloop2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -217,7 +217,7 @@ TEST_CASE("patloop2", "[.cmd][.new]") {
}
}
TEST_CASE("patnloop0", "[.cmd][.new]") {
TEST_CASE("patnloop0", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -243,7 +243,7 @@ TEST_CASE("patnloop0", "[.cmd][.new]") {
}
}
TEST_CASE("patnloop1", "[.cmd][.new]") {
TEST_CASE("patnloop1", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -269,7 +269,7 @@ TEST_CASE("patnloop1", "[.cmd][.new]") {
}
}
TEST_CASE("patnloop2", "[.cmd][.new]") {
TEST_CASE("patnloop2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -295,7 +295,7 @@ TEST_CASE("patnloop2", "[.cmd][.new]") {
}
}
TEST_CASE("patwait0", "[.cmd][.new]") {
TEST_CASE("patwait0", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -321,7 +321,7 @@ TEST_CASE("patwait0", "[.cmd][.new]") {
}
}
TEST_CASE("patwait1", "[.cmd][.new]") {
TEST_CASE("patwait1", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -347,7 +347,7 @@ TEST_CASE("patwait1", "[.cmd][.new]") {
}
}
TEST_CASE("patwait2", "[.cmd][.new]") {
TEST_CASE("patwait2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -373,7 +373,7 @@ TEST_CASE("patwait2", "[.cmd][.new]") {
}
}
TEST_CASE("patwaittime0", "[.cmd][.new]") {
TEST_CASE("patwaittime0", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -399,7 +399,7 @@ TEST_CASE("patwaittime0", "[.cmd][.new]") {
}
}
TEST_CASE("patwaittime1", "[.cmd][.new]") {
TEST_CASE("patwaittime1", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -425,7 +425,7 @@ TEST_CASE("patwaittime1", "[.cmd][.new]") {
}
}
TEST_CASE("patwaittime2", "[.cmd][.new]") {
TEST_CASE("patwaittime2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -451,7 +451,7 @@ TEST_CASE("patwaittime2", "[.cmd][.new]") {
}
}
TEST_CASE("patmask", "[.cmd][.new]") {
TEST_CASE("patmask", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -477,7 +477,7 @@ TEST_CASE("patmask", "[.cmd][.new]") {
}
}
TEST_CASE("patsetbit", "[.cmd][.new]") {
TEST_CASE("patsetbit", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -503,7 +503,7 @@ TEST_CASE("patsetbit", "[.cmd][.new]") {
}
}
TEST_CASE("patternstart", "[.cmd][.new]") {
TEST_CASE("patternstart", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_THROWS(proxy.Call("patternstart", {}, -1, GET));

76
slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
View File

@ -1,11 +1,11 @@
#include "CmdProxy.h"
#include "sls/Detector.h"
#include "catch.hpp"
#include "sls/Detector.h"
#include "sls/sls_detector_defs.h"
#include <sstream>
#include "tests/globals.h"
#include "sls/versionAPI.h"
#include "tests/globals.h"
using sls::CmdProxy;
using sls::Detector;
@ -19,7 +19,7 @@ python/scripts/list_tested_cmd.py to check if all commands are covered
/* configuration */
TEST_CASE("rx_version", "[.cmd][.rx][.new]") {
TEST_CASE("rx_version", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
std::ostringstream oss;
@ -33,7 +33,7 @@ TEST_CASE("rx_version", "[.cmd][.rx][.new]") {
/* acquisition */
TEST_CASE("rx_start", "[.cmd][.rx][.new]") {
TEST_CASE("rx_start", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
det.setFileWrite(false); // avoid writing or error on file creation
@ -51,7 +51,7 @@ TEST_CASE("rx_start", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_stop", "[.cmd][.rx][.new]") {
TEST_CASE("rx_stop", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
// PUT only command
@ -68,7 +68,7 @@ TEST_CASE("rx_stop", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_status", "[.cmd][.rx][.new]") {
TEST_CASE("rx_status", "[.cmd][.rx]") {
Detector det;
det.setFileWrite(false); // avoid writing or error on file creation
CmdProxy proxy(&det);
@ -86,7 +86,7 @@ TEST_CASE("rx_status", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_framescaught", "[.cmd][.rx][.new]") {
TEST_CASE("rx_framescaught", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
@ -111,7 +111,7 @@ TEST_CASE("rx_framescaught", "[.cmd][.rx][.new]") {
// }
}
TEST_CASE("rx_missingpackets", "[.cmd][.rx][.new]") {
TEST_CASE("rx_missingpackets", "[.cmd][.rx]") {
Detector det;
det.setFileWrite(false); // avoid writing or error on file creation
CmdProxy proxy(&det);
@ -138,7 +138,7 @@ TEST_CASE("rx_missingpackets", "[.cmd][.rx][.new]") {
/* Network Configuration (Detector<->Receiver) */
TEST_CASE("rx_printconfig", "[.cmd][.rx][.new]") {
TEST_CASE("rx_printconfig", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("rx_printconfig", {}, -1, GET));
@ -146,7 +146,7 @@ TEST_CASE("rx_printconfig", "[.cmd][.rx][.new]") {
/* Receiver Config */
TEST_CASE("rx_hostname", "[.cmd][.rx][.new]") {
TEST_CASE("rx_hostname", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getRxHostname();
@ -178,7 +178,7 @@ TEST_CASE("rx_hostname", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_tcpport", "[.cmd][.rx][.new]") {
TEST_CASE("rx_tcpport", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getRxPort();
@ -203,7 +203,7 @@ TEST_CASE("rx_tcpport", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_fifodepth", "[.cmd][.rx][.new]") {
TEST_CASE("rx_fifodepth", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getRxFifoDepth();
@ -227,7 +227,7 @@ TEST_CASE("rx_fifodepth", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_silent", "[.cmd][.rx][.new]") {
TEST_CASE("rx_silent", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getRxSilentMode();
@ -251,7 +251,7 @@ TEST_CASE("rx_silent", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_discardpolicy", "[.cmd][.rx][.new]") {
TEST_CASE("rx_discardpolicy", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getRxFrameDiscardPolicy();
@ -280,7 +280,7 @@ TEST_CASE("rx_discardpolicy", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_padding", "[.cmd][.rx][.new]") {
TEST_CASE("rx_padding", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getPartialFramesPadding();
@ -304,7 +304,7 @@ TEST_CASE("rx_padding", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_udpsocksize", "[.cmd][.rx][.new]") {
TEST_CASE("rx_udpsocksize", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
int64_t prev_val = det.getRxUDPSocketBufferSize().tsquash(
@ -323,7 +323,7 @@ TEST_CASE("rx_udpsocksize", "[.cmd][.rx][.new]") {
det.setRxUDPSocketBufferSize(prev_val);
}
TEST_CASE("rx_realudpsocksize", "[.cmd][.rx][.new]") {
TEST_CASE("rx_realudpsocksize", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
uint64_t val = 0;
@ -342,7 +342,7 @@ TEST_CASE("rx_realudpsocksize", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_lock", "[.cmd][.rx][.new]") {
TEST_CASE("rx_lock", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getRxLock();
@ -366,7 +366,7 @@ TEST_CASE("rx_lock", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_lastclient", "[.cmd][.rx][.new]") {
TEST_CASE("rx_lastclient", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
std::ostringstream oss;
@ -376,7 +376,7 @@ TEST_CASE("rx_lastclient", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_threads", "[.cmd][.rx][.new]") {
TEST_CASE("rx_threads", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
std::ostringstream oss;
@ -385,7 +385,7 @@ TEST_CASE("rx_threads", "[.cmd][.rx][.new]") {
/* File */
TEST_CASE("fformat", "[.cmd][.new]") {
TEST_CASE("fformat", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getFileFormat();
@ -404,7 +404,7 @@ TEST_CASE("fformat", "[.cmd][.new]") {
}
}
TEST_CASE("fpath", "[.cmd][.new]") {
TEST_CASE("fpath", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getFilePath();
@ -423,7 +423,7 @@ TEST_CASE("fpath", "[.cmd][.new]") {
}
}
TEST_CASE("fname", "[.cmd][.new]") {
TEST_CASE("fname", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getFileNamePrefix();
@ -447,7 +447,7 @@ TEST_CASE("fname", "[.cmd][.new]") {
}
}
TEST_CASE("findex", "[.cmd][.new]") {
TEST_CASE("findex", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getAcquisitionIndex();
@ -471,7 +471,7 @@ TEST_CASE("findex", "[.cmd][.new]") {
}
}
TEST_CASE("fwrite", "[.cmd][.new]") {
TEST_CASE("fwrite", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getFileWrite();
@ -517,7 +517,7 @@ TEST_CASE("fmaster", "[.cmd]") {
det.setMasterFileWrite(prev_val);
}
TEST_CASE("foverwrite", "[.cmd][.new]") {
TEST_CASE("foverwrite", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getFileOverWrite();
@ -541,7 +541,7 @@ TEST_CASE("foverwrite", "[.cmd][.new]") {
}
}
TEST_CASE("rx_framesperfile", "[.cmd][.rx][.new]") {
TEST_CASE("rx_framesperfile", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getFramesPerFile();
@ -572,7 +572,7 @@ TEST_CASE("rx_framesperfile", "[.cmd][.rx][.new]") {
/* ZMQ Streaming Parameters (Receiver<->Client) */
TEST_CASE("rx_zmqstream", "[.cmd][.rx][.new]") {
TEST_CASE("rx_zmqstream", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getRxZmqDataStream();
@ -598,7 +598,7 @@ TEST_CASE("rx_zmqstream", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_zmqfreq", "[.cmd][.rx][.new]") {
TEST_CASE("rx_zmqfreq", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getRxZmqFrequency();
@ -622,7 +622,7 @@ TEST_CASE("rx_zmqfreq", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_zmqstartfnum", "[.cmd][.rx][.new]") {
TEST_CASE("rx_zmqstartfnum", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getRxZmqStartingFrame();
@ -646,7 +646,7 @@ TEST_CASE("rx_zmqstartfnum", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_zmqport", "[.cmd][.rx][.new]") {
TEST_CASE("rx_zmqport", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val_zmqport = det.getRxZmqPort();
@ -686,7 +686,7 @@ TEST_CASE("rx_zmqport", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_zmqip", "[.cmd][.rx][.new]") {
TEST_CASE("rx_zmqip", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getRxZmqIP();
@ -706,7 +706,7 @@ TEST_CASE("rx_zmqip", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_zmqhwm", "[.cmd][.new]") {
TEST_CASE("rx_zmqhwm", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val =
@ -736,7 +736,7 @@ TEST_CASE("rx_zmqhwm", "[.cmd][.new]") {
/* CTB Specific */
TEST_CASE("rx_dbitlist", "[.cmd][.rx][.new]") {
TEST_CASE("rx_dbitlist", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -765,7 +765,7 @@ TEST_CASE("rx_dbitlist", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_dbitoffset", "[.cmd][.rx][.new]") {
TEST_CASE("rx_dbitoffset", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -801,7 +801,7 @@ TEST_CASE("rx_dbitoffset", "[.cmd][.rx][.new]") {
/* Moench */
TEST_CASE("rx_jsonaddheader", "[.cmd][.rx][.new]") {
TEST_CASE("rx_jsonaddheader", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getAdditionalJsonHeader();
@ -827,7 +827,7 @@ TEST_CASE("rx_jsonaddheader", "[.cmd][.rx][.new]") {
}
}
TEST_CASE("rx_jsonpara", "[.cmd][.rx][.new]") {
TEST_CASE("rx_jsonpara", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getAdditionalJsonHeader();
@ -859,7 +859,7 @@ TEST_CASE("rx_jsonpara", "[.cmd][.rx][.new]") {
/* Insignificant */
TEST_CASE("rx_frameindex", "[.cmd][.rx][.new]") {
TEST_CASE("rx_frameindex", "[.cmd][.rx]") {
Detector det;
CmdProxy proxy(&det);
proxy.Call("rx_frameindex", {}, -1, GET);

288
slsDetectorSoftware/tests/test-CmdProxy.cpp
View File

@ -23,7 +23,7 @@ TEST_CASE("Unknown command", "[.cmd]") {
/* configuration */
TEST_CASE("config", "[.cmd][.new]") {
TEST_CASE("config", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
// put only
@ -32,7 +32,7 @@ TEST_CASE("config", "[.cmd][.new]") {
// free: not testing
TEST_CASE("parameters", "[.cmd][.new]") {
TEST_CASE("parameters", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
// put only
@ -58,7 +58,7 @@ TEST_CASE("parameters", "[.cmd][.new]") {
*/
}
TEST_CASE("hostname", "[.cmd][.new]") {
TEST_CASE("hostname", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("hostname", {}, -1, GET));
@ -66,49 +66,49 @@ TEST_CASE("hostname", "[.cmd][.new]") {
// virtual: not testing
TEST_CASE("versions", "[.cmd][.new]") {
TEST_CASE("versions", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("versions", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("versions", {"0"}, -1, PUT));
}
TEST_CASE("packageversion", "[.cmd][.new]") {
TEST_CASE("packageversion", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("packageversion", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("packageversion", {"0"}, -1, PUT));
}
TEST_CASE("clientversion", "[.cmd][.new]") {
TEST_CASE("clientversion", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("clientversion", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("clientversion", {"0"}, -1, PUT));
}
TEST_CASE("firmwareversion", "[.cmd][.new]") {
TEST_CASE("firmwareversion", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("firmwareversion", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("firmwareversion", {"0"}, -1, PUT));
}
TEST_CASE("detectorserverversion", "[.cmd][.new]") {
TEST_CASE("detectorserverversion", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("detectorserverversion", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("detectorserverversion", {"0"}, -1, PUT));
}
TEST_CASE("serialnumber", "[.cmd][.new]") {
TEST_CASE("serialnumber", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("serialnumber", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("serialnumber", {"0"}, -1, PUT));
}
TEST_CASE("type", "[.cmd][.new]") {
TEST_CASE("type", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto dt = det.getDetectorType().squash();
@ -120,13 +120,13 @@ TEST_CASE("type", "[.cmd][.new]") {
// REQUIRE(dt == test::type);
}
TEST_CASE("detsize", "[.cmd][.new]") {
TEST_CASE("detsize", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("detsize", {}, -1, GET));
}
TEST_CASE("settingslist", "[.cmd][.new]") {
TEST_CASE("settingslist", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -138,7 +138,7 @@ TEST_CASE("settingslist", "[.cmd][.new]") {
}
}
TEST_CASE("settings", "[.cmd][.new]") {
TEST_CASE("settings", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -206,13 +206,13 @@ TEST_CASE("settings", "[.cmd][.new]") {
}
}
TEST_CASE("trimbits", "[.cmd][.new]") {
TEST_CASE("trimbits", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_THROWS(proxy.Call("trimbits", {}, -1, GET));
}
TEST_CASE("trimval", "[.cmd][.new]") {
TEST_CASE("trimval", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -250,7 +250,7 @@ TEST_CASE("trimval", "[.cmd][.new]") {
// acquire: not testing
TEST_CASE("frames", "[.cmd][.new]") {
TEST_CASE("frames", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val =
@ -274,7 +274,7 @@ TEST_CASE("frames", "[.cmd][.new]") {
det.setNumberOfFrames(prev_val);
}
TEST_CASE("triggers", "[.cmd][.new]") {
TEST_CASE("triggers", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val =
@ -344,7 +344,7 @@ TEST_CASE("exptime", "[.cmd][.time]") {
det.setExptime(-1, prev_val);
}
TEST_CASE("period", "[.cmd][.new]") {
TEST_CASE("period", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getPeriod();
@ -368,7 +368,7 @@ TEST_CASE("period", "[.cmd][.new]") {
}
}
TEST_CASE("delay", "[.cmd][.new]") {
TEST_CASE("delay", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -401,7 +401,7 @@ TEST_CASE("delay", "[.cmd][.new]") {
}
}
TEST_CASE("framesl", "[.cmd][.new]") {
TEST_CASE("framesl", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -412,7 +412,7 @@ TEST_CASE("framesl", "[.cmd][.new]") {
}
}
TEST_CASE("triggersl", "[.cmd][.new]") {
TEST_CASE("triggersl", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -423,7 +423,7 @@ TEST_CASE("triggersl", "[.cmd][.new]") {
}
}
TEST_CASE("delayl", "[.cmd][.new]") {
TEST_CASE("delayl", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -441,7 +441,7 @@ TEST_CASE("delayl", "[.cmd][.new]") {
}
}
TEST_CASE("periodl", "[.cmd][.new]") {
TEST_CASE("periodl", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -459,7 +459,7 @@ TEST_CASE("periodl", "[.cmd][.new]") {
}
}
TEST_CASE("dr", "[.cmd][.new]") {
TEST_CASE("dr", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -501,14 +501,14 @@ TEST_CASE("dr", "[.cmd][.new]") {
}
}
TEST_CASE("drlist", "[.cmd][.new]") {
TEST_CASE("drlist", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("drlist", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("drlist", {}, -1, PUT));
}
TEST_CASE("timing", "[.cmd][.new]") {
TEST_CASE("timing", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getTimingMode();
@ -570,14 +570,14 @@ TEST_CASE("timing", "[.cmd][.new]") {
}
}
TEST_CASE("timinglist", "[.cmd][.new]") {
TEST_CASE("timinglist", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("timinglist", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("timinglist", {}, -1, PUT));
}
TEST_CASE("speed", "[.cmd][.new]") {
TEST_CASE("speed", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -628,7 +628,7 @@ TEST_CASE("speed", "[.cmd][.new]") {
}
}
TEST_CASE("adcphase", "[.cmd][.new]") {
TEST_CASE("adcphase", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -667,7 +667,7 @@ TEST_CASE("adcphase", "[.cmd][.new]") {
}
}
TEST_CASE("maxadcphaseshift", "[.cmd][.new]") {
TEST_CASE("maxadcphaseshift", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -681,7 +681,7 @@ TEST_CASE("maxadcphaseshift", "[.cmd][.new]") {
}
}
TEST_CASE("dbitphase", "[.cmd][.new]") {
TEST_CASE("dbitphase", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -710,7 +710,7 @@ TEST_CASE("dbitphase", "[.cmd][.new]") {
}
}
TEST_CASE("maxdbitphaseshift", "[.cmd][.new]") {
TEST_CASE("maxdbitphaseshift", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -723,7 +723,7 @@ TEST_CASE("maxdbitphaseshift", "[.cmd][.new]") {
}
}
TEST_CASE("clkfreq", "[.cmd][.new]") {
TEST_CASE("clkfreq", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -737,7 +737,7 @@ TEST_CASE("clkfreq", "[.cmd][.new]") {
}
}
TEST_CASE("clkphase", "[.cmd][.new]") {
TEST_CASE("clkphase", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -775,7 +775,7 @@ TEST_CASE("clkphase", "[.cmd][.new]") {
}
}
TEST_CASE("clkdiv", "[.cmd][.new]") {
TEST_CASE("clkdiv", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -801,7 +801,7 @@ TEST_CASE("clkdiv", "[.cmd][.new]") {
}
}
TEST_CASE("maxclkphaseshift", "[.cmd][.new]") {
TEST_CASE("maxclkphaseshift", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -815,7 +815,7 @@ TEST_CASE("maxclkphaseshift", "[.cmd][.new]") {
}
}
TEST_CASE("highvoltage", "[.cmd][.new]") {
TEST_CASE("highvoltage", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -913,7 +913,7 @@ TEST_CASE("highvoltage", "[.cmd][.new]") {
}
}
TEST_CASE("powerchip", "[.cmd][.new]") {
TEST_CASE("powerchip", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -944,7 +944,7 @@ TEST_CASE("powerchip", "[.cmd][.new]") {
}
}
TEST_CASE("imagetest", "[.cmd][.new]") {
TEST_CASE("imagetest", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -974,7 +974,7 @@ TEST_CASE("imagetest", "[.cmd][.new]") {
}
}
TEST_CASE("extsig", "[.cmd][.new]") {
TEST_CASE("extsig", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1053,7 +1053,7 @@ TEST_CASE("extsig", "[.cmd][.new]") {
}
}
TEST_CASE("parallel", "[.cmd][.new]") {
TEST_CASE("parallel", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1085,21 +1085,21 @@ TEST_CASE("parallel", "[.cmd][.new]") {
/** temperature */
TEST_CASE("templist", "[.cmd][.new]") {
TEST_CASE("templist", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("templist", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("templist", {}, -1, PUT));
}
TEST_CASE("tempvalues", "[.cmd][.new]") {
TEST_CASE("tempvalues", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("tempvalues", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("tempvalues", {}, -1, PUT));
}
TEST_CASE("temp_adc", "[.cmd][.new]") {
TEST_CASE("temp_adc", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1114,7 +1114,7 @@ TEST_CASE("temp_adc", "[.cmd][.new]") {
}
}
TEST_CASE("temp_fpga", "[.cmd][.new]") {
TEST_CASE("temp_fpga", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1132,21 +1132,21 @@ TEST_CASE("temp_fpga", "[.cmd][.new]") {
/* dacs */
TEST_CASE("daclist", "[.cmd][.new]") {
TEST_CASE("daclist", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("daclist", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("daclist", {}, -1, PUT));
}
TEST_CASE("dacvalues", "[.cmd][.new]") {
TEST_CASE("dacvalues", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("dacvalues", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("dacvalues", {}, -1, PUT));
}
TEST_CASE("defaultdacs", "[.cmd][.new]") {
TEST_CASE("defaultdacs", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1161,7 +1161,7 @@ TEST_CASE("defaultdacs", "[.cmd][.new]") {
/* acquisition */
TEST_CASE("trigger", "[.cmd][.new]") {
TEST_CASE("trigger", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_THROWS(proxy.Call("trigger", {}, -1, GET));
@ -1181,10 +1181,10 @@ TEST_CASE("trigger", "[.cmd][.new]") {
det.getPeriod().tsquash("inconsistent period in test");
det.setTimingMode(defs::TRIGGER_EXPOSURE);
det.setNumberOfFrames(1);
det.setExptime(std::chrono::milliseconds(1));
det.setExptime(std::chrono::microseconds(200));
det.setPeriod(std::chrono::milliseconds(1));
auto startframenumber = det.getStartingFrameNumber().tsquash(
"inconsistent frame nr in test");
auto nextframenumber =
det.getNextFrameNumber().tsquash("inconsistent frame nr in test");
det.startDetector();
{
std::ostringstream oss;
@ -1192,16 +1192,18 @@ TEST_CASE("trigger", "[.cmd][.new]") {
REQUIRE(oss.str() == "trigger successful\n");
}
std::this_thread::sleep_for(std::chrono::seconds(2));
auto currentfnum = det.getStartingFrameNumber().tsquash(
"inconsistent frame nr in test");
REQUIRE(startframenumber + 1 == currentfnum);
auto currentfnum =
det.getNextFrameNumber().tsquash("inconsistent frame nr in test");
REQUIRE(nextframenumber + 1 == currentfnum);
det.stopDetector();
det.setTimingMode(prev_timing);
det.setNumberOfFrames(prev_frames);
det.setExptime(prev_exptime);
det.setPeriod(prev_period);
}
}
TEST_CASE("clearbusy", "[.cmd][.new]") {
TEST_CASE("clearbusy", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("clearbusy", {}, -1, PUT));
@ -1209,7 +1211,7 @@ TEST_CASE("clearbusy", "[.cmd][.new]") {
REQUIRE_THROWS(proxy.Call("clearbusy", {}, -1, GET));
}
TEST_CASE("start", "[.cmd][.new]") {
TEST_CASE("start", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
// PUT only command
@ -1226,13 +1228,17 @@ TEST_CASE("start", "[.cmd][.new]") {
}
prev_val = t[0];
}
det.setExptime(-1, std::chrono::seconds(2));
auto prev_frames =
det.getNumberOfFrames().tsquash("inconsistent #frames in test");
auto prev_period = det.getPeriod().tsquash("inconsistent period in test");
det.setExptime(-1, std::chrono::microseconds(200));
det.setPeriod(std::chrono::milliseconds(1));
det.setNumberOfFrames(10000);
{
std::ostringstream oss;
proxy.Call("start", {}, -1, PUT, oss);
REQUIRE(oss.str() == "start successful\n");
}
std::this_thread::sleep_for(std::chrono::milliseconds(200));
{
std::ostringstream oss;
proxy.Call("status", {}, -1, GET, oss);
@ -1240,15 +1246,19 @@ TEST_CASE("start", "[.cmd][.new]") {
}
det.stopDetector();
det.setExptime(-1, prev_val);
det.setPeriod(prev_period);
det.setNumberOfFrames(prev_frames);
}
TEST_CASE("stop", "[.cmd][.new]") {
TEST_CASE("stop", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
// PUT only command
REQUIRE_THROWS(proxy.Call("stop", {}, -1, GET));
auto det_type = det.getDetectorType().squash();
std::chrono::nanoseconds prev_val;
bool virtualDet =
det.isVirtualDetectorServer().tsquash("inconsistent virtual servers");
if (det_type != defs::MYTHEN3) {
prev_val = det.getExptime().tsquash("inconsistent exptime to test");
} else {
@ -1259,9 +1269,13 @@ TEST_CASE("stop", "[.cmd][.new]") {
}
prev_val = t[0];
}
det.setExptime(-1, std::chrono::seconds(2));
auto prev_frames =
det.getNumberOfFrames().tsquash("inconsistent #frames in test");
auto prev_period = det.getPeriod().tsquash("inconsistent period in test");
det.setExptime(-1, std::chrono::microseconds(200));
det.setPeriod(std::chrono::milliseconds(1));
det.setNumberOfFrames(10000);
det.startDetector();
std::this_thread::sleep_for(std::chrono::milliseconds(200));
{
std::ostringstream oss;
proxy.Call("status", {}, -1, GET, oss);
@ -1272,23 +1286,27 @@ TEST_CASE("stop", "[.cmd][.new]") {
proxy.Call("stop", {}, -1, PUT, oss);
REQUIRE(oss.str() == "stop successful\n");
}
if (det_type == defs::JUNGFRAU) {
{
std::ostringstream oss;
proxy.Call("status", {}, -1, GET, oss);
REQUIRE(oss.str() == "status stopped\n");
} else {
std::ostringstream oss;
proxy.Call("status", {}, -1, GET, oss);
REQUIRE(oss.str() == "status idle\n");
if (!virtualDet && det_type == defs::JUNGFRAU) {
REQUIRE(oss.str() == "status stopped\n");
} else {
REQUIRE(oss.str() == "status idle\n");
}
}
det.setExptime(-1, prev_val);
det.setPeriod(prev_period);
det.setNumberOfFrames(prev_frames);
}
TEST_CASE("status", "[.cmd][.new]") {
TEST_CASE("status", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
std::chrono::nanoseconds prev_val;
bool virtualDet =
det.isVirtualDetectorServer().tsquash("inconsistent virtual servers");
if (det_type != defs::MYTHEN3) {
prev_val = det.getExptime().tsquash("inconsistent exptime to test");
} else {
@ -1299,9 +1317,13 @@ TEST_CASE("status", "[.cmd][.new]") {
}
prev_val = t[0];
}
det.setExptime(-1, std::chrono::seconds(2));
auto prev_frames =
det.getNumberOfFrames().tsquash("inconsistent #frames in test");
auto prev_period = det.getPeriod().tsquash("inconsistent period in test");
det.setExptime(-1, std::chrono::microseconds(200));
det.setPeriod(std::chrono::milliseconds(1));
det.setNumberOfFrames(10000);
det.startDetector();
std::this_thread::sleep_for(std::chrono::milliseconds(200));
{
std::ostringstream oss;
proxy.Call("status", {}, -1, GET, oss);
@ -1311,42 +1333,48 @@ TEST_CASE("status", "[.cmd][.new]") {
{
std::ostringstream oss;
proxy.Call("status", {}, -1, GET, oss);
REQUIRE(oss.str() == "status idle\n");
if (!virtualDet && det_type == defs::JUNGFRAU) {
REQUIRE(oss.str() == "status stopped\n");
} else {
REQUIRE(oss.str() == "status idle\n");
}
}
det.setExptime(-1, prev_val);
det.setPeriod(prev_period);
det.setNumberOfFrames(prev_frames);
}
TEST_CASE("startframenumber", "[.cmd][.new]") {
TEST_CASE("nextframenumber", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
auto prev_sfnum = det.getStartingFrameNumber();
REQUIRE_THROWS(proxy.Call("startframenumber", {"0"}, -1, PUT));
auto prev_sfnum = det.getNextFrameNumber();
REQUIRE_THROWS(proxy.Call("nextframenumber", {"0"}, -1, PUT));
{
std::ostringstream oss;
proxy.Call("startframenumber", {"3"}, -1, PUT, oss);
REQUIRE(oss.str() == "startframenumber 3\n");
proxy.Call("nextframenumber", {"3"}, -1, PUT, oss);
REQUIRE(oss.str() == "nextframenumber 3\n");
}
{
std::ostringstream oss;
proxy.Call("startframenumber", {}, -1, GET, oss);
REQUIRE(oss.str() == "startframenumber 3\n");
proxy.Call("nextframenumber", {}, -1, GET, oss);
REQUIRE(oss.str() == "nextframenumber 3\n");
}
{
std::ostringstream oss;
proxy.Call("startframenumber", {"1"}, -1, PUT, oss);
REQUIRE(oss.str() == "startframenumber 1\n");
proxy.Call("nextframenumber", {"1"}, -1, PUT, oss);
REQUIRE(oss.str() == "nextframenumber 1\n");
}
for (int i = 0; i != det.size(); ++i) {
det.setStartingFrameNumber(prev_sfnum[i], {i});
det.setNextFrameNumber(prev_sfnum[i], {i});
}
} else {
REQUIRE_THROWS(proxy.Call("startframenumber", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("nextframenumber", {}, -1, GET));
}
}
TEST_CASE("scan", "[.cmd][.new]") {
TEST_CASE("scan", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
defs::dacIndex ind = defs::DAC_0;
@ -1466,18 +1494,19 @@ TEST_CASE("scan", "[.cmd][.new]") {
// Reset all dacs to previous value
// for (int i = 0; i != det.size(); ++i) {
// det.setDAC(ind, previous[i], false, {i});
// det.setDAC(notImplementedInd, notImplementedPrevious[i], false, {i});
// det.setDAC(notImplementedInd, notImplementedPrevious[i], false,
// {i});
// }
}
TEST_CASE("scanerrmsg", "[.cmd][.new]") {
TEST_CASE("scanerrmsg", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("scanerrmsg", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("scanerrmsg", {""}, -1, PUT));
}
TEST_CASE("gappixels", "[.cmd][.new]") {
TEST_CASE("gappixels", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1517,7 +1546,7 @@ TEST_CASE("gappixels", "[.cmd][.new]") {
/* Network Configuration (Detector<->Receiver) */
TEST_CASE("numinterfaces", "[.cmd][.new]") {
TEST_CASE("numinterfaces", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1550,7 +1579,7 @@ TEST_CASE("numinterfaces", "[.cmd][.new]") {
REQUIRE_THROWS(proxy.Call("numinterfaces", {"0"}, -1, PUT));
}
TEST_CASE("udp_srcip", "[.cmd][.new]") {
TEST_CASE("udp_srcip", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getSourceUDPIP();
@ -1565,13 +1594,13 @@ TEST_CASE("udp_srcip", "[.cmd][.new]") {
}
}
TEST_CASE("udp_dstip", "[.cmd][.new]") {
TEST_CASE("udp_dstip", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_THROWS(proxy.Call("udp_dstip", {"0.0.0.0"}, -1, PUT));
}
TEST_CASE("udp_srcmac", "[.cmd][.new]") {
TEST_CASE("udp_srcmac", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getSourceUDPMAC();
@ -1586,13 +1615,13 @@ TEST_CASE("udp_srcmac", "[.cmd][.new]") {
}
}
TEST_CASE("udp_dstmac", "[.cmd][.new]") {
TEST_CASE("udp_dstmac", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_THROWS(proxy.Call("udp_dstmac", {"00:00:00:00:00:00"}, -1, PUT));
}
TEST_CASE("udp_dstport", "[.cmd][.new]") {
TEST_CASE("udp_dstport", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getDestinationUDPPort();
@ -1606,7 +1635,7 @@ TEST_CASE("udp_dstport", "[.cmd][.new]") {
}
}
TEST_CASE("udp_srcip2", "[.cmd][.new]") {
TEST_CASE("udp_srcip2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1619,12 +1648,15 @@ TEST_CASE("udp_srcip2", "[.cmd][.new]") {
REQUIRE(oss.str() == "udp_srcip2 129.129.205.12\n");
}
for (int i = 0; i != det.size(); ++i) {
det.setSourceUDPIP2(prev_val[i], {i});
if (prev_val[i] != sls::IpAddr{"0.0.0.0"})
det.setSourceUDPIP2(prev_val[i], {i});
}
} else {
REQUIRE_THROWS(proxy.Call("udp_srcip2", {}, -1, GET));
}
}
TEST_CASE("udp_dstip2", "[.cmd][.new]") {
TEST_CASE("udp_dstip2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1635,7 +1667,7 @@ TEST_CASE("udp_dstip2", "[.cmd][.new]") {
}
}
TEST_CASE("udp_srcmac2", "[.cmd][.new]") {
TEST_CASE("udp_srcmac2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1656,7 +1688,7 @@ TEST_CASE("udp_srcmac2", "[.cmd][.new]") {
}
}
TEST_CASE("udp_dstmac2", "[.cmd][.new]") {
TEST_CASE("udp_dstmac2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1668,7 +1700,7 @@ TEST_CASE("udp_dstmac2", "[.cmd][.new]") {
}
}
TEST_CASE("udp_dstport2", "[.cmd][.new]") {
TEST_CASE("udp_dstport2", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1688,21 +1720,21 @@ TEST_CASE("udp_dstport2", "[.cmd][.new]") {
}
}
TEST_CASE("udp_reconfigure", "[.cmd][.new]") {
TEST_CASE("udp_reconfigure", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_THROWS(proxy.Call("udp_reconfigure", {}, -1, GET));
REQUIRE_NOTHROW(proxy.Call("udp_reconfigure", {}, -1, PUT));
}
TEST_CASE("udp_validate", "[.cmd][.new]") {
TEST_CASE("udp_validate", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_THROWS(proxy.Call("udp_validate", {}, -1, GET));
REQUIRE_NOTHROW(proxy.Call("udp_validate", {}, -1, PUT));
}
TEST_CASE("tengiga", "[.cmd][.new]") {
TEST_CASE("tengiga", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
@ -1726,7 +1758,7 @@ TEST_CASE("tengiga", "[.cmd][.new]") {
}
}
TEST_CASE("flowcontrol10g", "[.cmd][.new]") {
TEST_CASE("flowcontrol10g", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1756,7 +1788,7 @@ TEST_CASE("flowcontrol10g", "[.cmd][.new]") {
}
}
TEST_CASE("txndelay_frame", "[.cmd][.new]") {
TEST_CASE("txndelay_frame", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1785,7 +1817,7 @@ TEST_CASE("txndelay_frame", "[.cmd][.new]") {
/* ZMQ Streaming Parameters (Receiver<->Client) */
TEST_CASE("zmqport", "[.cmd][.new]") {
TEST_CASE("zmqport", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
@ -1833,7 +1865,7 @@ TEST_CASE("zmqport", "[.cmd][.new]") {
}
}
TEST_CASE("zmqip", "[.cmd][.new]") {
TEST_CASE("zmqip", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
std::ostringstream oss1, oss2;
@ -1849,7 +1881,7 @@ TEST_CASE("zmqip", "[.cmd][.new]") {
}
}
TEST_CASE("zmqhwm", "[.cmd][.new]") {
TEST_CASE("zmqhwm", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getClientZmqHwm();
@ -1878,7 +1910,7 @@ TEST_CASE("zmqhwm", "[.cmd][.new]") {
/* Advanced */
TEST_CASE("programfpga", "[.cmd][.new]") {
TEST_CASE("programfpga", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1894,7 +1926,7 @@ TEST_CASE("programfpga", "[.cmd][.new]") {
}
}
TEST_CASE("resetfpga", "[.cmd][.new]") {
TEST_CASE("resetfpga", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1910,7 +1942,7 @@ TEST_CASE("resetfpga", "[.cmd][.new]") {
}
}
TEST_CASE("copydetectorserver", "[.cmd][.new]") {
TEST_CASE("copydetectorserver", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1929,7 +1961,7 @@ TEST_CASE("copydetectorserver", "[.cmd][.new]") {
}
}
TEST_CASE("rebootcontroller", "[.cmd][.new]") {
TEST_CASE("rebootcontroller", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1945,7 +1977,7 @@ TEST_CASE("rebootcontroller", "[.cmd][.new]") {
}
}
TEST_CASE("update", "[.cmd][.new]") {
TEST_CASE("update", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -1963,7 +1995,7 @@ TEST_CASE("update", "[.cmd][.new]") {
}
}
TEST_CASE("reg", "[.cmd][.new]") {
TEST_CASE("reg", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -2006,7 +2038,7 @@ TEST_CASE("adcreg", "[.cmd]") {
}
}
TEST_CASE("setbit", "[.cmd][.new]") {
TEST_CASE("setbit", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -2028,7 +2060,7 @@ TEST_CASE("setbit", "[.cmd][.new]") {
}
}
TEST_CASE("clearbit", "[.cmd][.new]") {
TEST_CASE("clearbit", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -2050,7 +2082,7 @@ TEST_CASE("clearbit", "[.cmd][.new]") {
}
}
TEST_CASE("getbit", "[.cmd][.new]") {
TEST_CASE("getbit", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -2074,7 +2106,7 @@ TEST_CASE("getbit", "[.cmd][.new]") {
}
}
TEST_CASE("firmwaretest", "[.cmd][.new]") {
TEST_CASE("firmwaretest", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -2091,7 +2123,7 @@ TEST_CASE("firmwaretest", "[.cmd][.new]") {
}
}
TEST_CASE("bustest", "[.cmd][.new]") {
TEST_CASE("bustest", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -2108,7 +2140,7 @@ TEST_CASE("bustest", "[.cmd][.new]") {
}
}
TEST_CASE("initialchecks", "[.cmd][.new]") {
TEST_CASE("initialchecks", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto check = det.getInitialChecks();
@ -2130,7 +2162,7 @@ TEST_CASE("initialchecks", "[.cmd][.new]") {
det.setInitialChecks(check);
}
TEST_CASE("adcinvert", "[.cmd][.new]") {
TEST_CASE("adcinvert", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -2158,7 +2190,7 @@ TEST_CASE("adcinvert", "[.cmd][.new]") {
/* Insignificant */
TEST_CASE("port", "[.cmd][.new]") {
TEST_CASE("port", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getControlPort({0}).squash();
@ -2175,7 +2207,7 @@ TEST_CASE("port", "[.cmd][.new]") {
det.setControlPort(prev_val, {0});
}
TEST_CASE("stopport", "[.cmd][.new]") {
TEST_CASE("stopport", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getStopPort({0}).squash();
@ -2192,7 +2224,7 @@ TEST_CASE("stopport", "[.cmd][.new]") {
det.setStopPort(prev_val, {0});
}
TEST_CASE("lock", "[.cmd][.new]") {
TEST_CASE("lock", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto prev_val = det.getDetectorLock();
@ -2216,13 +2248,13 @@ TEST_CASE("lock", "[.cmd][.new]") {
}
}
TEST_CASE("execcommand", "[.cmd][.new]") {
TEST_CASE("execcommand", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
REQUIRE_NOTHROW(proxy.Call("execcommand", {"ls"}, -1, PUT));
}
TEST_CASE("framecounter", "[.cmd][.new]") {
TEST_CASE("framecounter", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
@ -2240,7 +2272,7 @@ TEST_CASE("framecounter", "[.cmd][.new]") {
}
}
TEST_CASE("runtime", "[.cmd][.new]") {
TEST_CASE("runtime", "[.cmd]") {
// TODO! can we test this?
Detector det;
CmdProxy proxy(&det);
@ -2258,7 +2290,7 @@ TEST_CASE("runtime", "[.cmd][.new]") {
}
}
TEST_CASE("frametime", "[.cmd][.new]") {
TEST_CASE("frametime", "[.cmd]") {
// TODO! can we test this?
Detector det;
CmdProxy proxy(&det);
@ -2276,7 +2308,7 @@ TEST_CASE("frametime", "[.cmd][.new]") {
}
}
TEST_CASE("user", "[.cmd][.new]") {
TEST_CASE("user", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
proxy.Call("user", {}, -1, GET);

10
slsSupportLib/include/sls/sls_detector_funcs.h
View File

@ -118,8 +118,8 @@ enum detFuncs {
F_GET_ADC_INVERT,
F_EXTERNAL_SAMPLING_SOURCE,
F_EXTERNAL_SAMPLING,
F_SET_STARTING_FRAME_NUMBER,
F_GET_STARTING_FRAME_NUMBER,
F_SET_NEXT_FRAME_NUMBER,
F_GET_NEXT_FRAME_NUMBER,
F_SET_QUAD,
F_GET_QUAD,
F_SET_INTERRUPT_SUBFRAME,
@ -216,6 +216,7 @@ enum detFuncs {
F_GET_BURSTS_LEFT,
F_START_READOUT,
F_SET_DEFAULT_DACS,
F_IS_VIRTUAL,
NUM_DET_FUNCTIONS,
RECEIVER_ENUM_START = 256, /**< detector function should not exceed this
@ -439,8 +440,8 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
case F_GET_ADC_INVERT: return "F_GET_ADC_INVERT";
case F_EXTERNAL_SAMPLING_SOURCE: return "F_EXTERNAL_SAMPLING_SOURCE";
case F_EXTERNAL_SAMPLING: return "F_EXTERNAL_SAMPLING";
case F_SET_STARTING_FRAME_NUMBER: return "F_SET_STARTING_FRAME_NUMBER";
case F_GET_STARTING_FRAME_NUMBER: return "F_GET_STARTING_FRAME_NUMBER";
case F_SET_NEXT_FRAME_NUMBER: return "F_SET_NEXT_FRAME_NUMBER";
case F_GET_NEXT_FRAME_NUMBER: return "F_GET_NEXT_FRAME_NUMBER";
case F_SET_QUAD: return "F_SET_QUAD";
case F_GET_QUAD: return "F_GET_QUAD";
case F_SET_INTERRUPT_SUBFRAME: return "F_SET_INTERRUPT_SUBFRAME";
@ -537,6 +538,7 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
case F_GET_BURSTS_LEFT: return "F_GET_BURSTS_LEFT";
case F_START_READOUT: return "F_START_READOUT";
case F_SET_DEFAULT_DACS: return "F_SET_DEFAULT_DACS";
case F_IS_VIRTUAL: return "F_IS_VIRTUAL";
case NUM_DET_FUNCTIONS: return "NUM_DET_FUNCTIONS";
case RECEIVER_ENUM_START: return "RECEIVER_ENUM_START";

14
slsSupportLib/include/sls/versionAPI.h
View File

@ -3,10 +3,10 @@
#define APILIB 0x201102
#define APIRECEIVER 0x201102
#define APIGUI 0x201102
#define APICTB 0x201110
#define APIGOTTHARD 0x201110
#define APIGOTTHARD2 0x201110
#define APIJUNGFRAU 0x201110
#define APIMYTHEN3 0x201110
#define APIMOENCH 0x201110
#define APIEIGER 0x201110
#define APICTB 0x201116
#define APIGOTTHARD 0x201116
#define APIGOTTHARD2 0x201116
#define APIJUNGFRAU 0x201116
#define APIMYTHEN3 0x201116
#define APIMOENCH 0x201116
#define APIEIGER 0x201116