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

Format (#506)

Browse Source 
Formatted package
This commit is contained in:
Dhanya Thattil 2022-08-05 15:39:34 +02:00 committed by GitHub
parent 7173785b29
commit 6bf9dbf6d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
89 changed files with 1366 additions and 1210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
integrationTests/test-integrationMulti.cpp
View File

@ -106,4 +106,3 @@ TEST_CASE("Set and read timers", "[.integration][.multi]") {
} }
} // namespace sls } // namespace sls

4
slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h
View File

@ -8,8 +8,8 @@
#include <qwt_plot.h> #include <qwt_plot.h>
#include <qwt_plot_curve.h> #include <qwt_plot_curve.h>
#include <qwt_plot_marker.h> #include <qwt_plot_marker.h>
#include <qwt_scale_div.h>
#include <qwt_plot_shapeitem.h> #include <qwt_plot_shapeitem.h>
#include <qwt_scale_div.h>
class QPen; class QPen;
class QwtSymbol; class QwtSymbol;
@ -176,5 +176,3 @@ class SlsQt1DPlot : public QwtPlot {
} // namespace sls } // namespace sls
#endif #endif

2
slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h
View File

@ -5,8 +5,8 @@
#include "SlsQt2DZoomer.h" #include "SlsQt2DZoomer.h"
#include <qlist.h> #include <qlist.h>
#include <qwt_plot.h> #include <qwt_plot.h>
#include <qwt_plot_spectrogram.h>
#include <qwt_plot_shapeitem.h> #include <qwt_plot_shapeitem.h>
#include <qwt_plot_spectrogram.h>
class QwtPlotPanner; class QwtPlotPanner;
class QwtScaleWidget; class QwtScaleWidget;

2
slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cpp
View File

@ -444,7 +444,6 @@ void SlsQt1DPlot::SetLog(int axisId, bool yes) {
Update(); Update();
} }
void SlsQt1DPlot::EnableRoiBox(std::array<int, 4> roi) { void SlsQt1DPlot::EnableRoiBox(std::array<int, 4> roi) {
if (roiBox == nullptr) { if (roiBox == nullptr) {
roiBox = new QwtPlotShapeItem(); roiBox = new QwtPlotShapeItem();
@ -465,7 +464,6 @@ void SlsQt1DPlot::DisableRoiBox() {
} }
} }
void SlsQt1DPlot::UnZoom() { void SlsQt1DPlot::UnZoom() {
setAxisScale(QwtPlot::xBottom, zoomer->x(), zoomer->x() + zoomer->w()); setAxisScale(QwtPlot::xBottom, zoomer->x(), zoomer->x() + zoomer->w());
setAxisScale(QwtPlot::yLeft, zoomer->y(), zoomer->y() + zoomer->h()); setAxisScale(QwtPlot::yLeft, zoomer->y(), zoomer->y() + zoomer->h());

19
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -59,7 +59,8 @@ int main(int argc, char **argv) {
case 'f': case 'f':
fname = optarg; fname = optarg;
LOG(sls::logDEBUG) << long_options[option_index].name << " " << optarg; LOG(sls::logDEBUG)
<< long_options[option_index].name << " " << optarg;
break; break;
case 'd': case 'd':
@ -101,7 +102,8 @@ int main(int argc, char **argv) {
app.exec(); app.exec();
} catch (const std::exception &e) { } catch (const std::exception &e) {
sls::qDefs::Message(sls::qDefs::CRITICAL, sls::qDefs::Message(sls::qDefs::CRITICAL,
std::string(e.what()) + "\nExiting Gui :'( ", "main"); std::string(e.what()) + "\nExiting Gui :'( ",
"main");
} }
return 0; return 0;
} }
@ -243,16 +245,14 @@ void qDetectorMain::SetUpDetector(const std::string &config_file, int multiID) {
default: default:
std::ostringstream os; std::ostringstream os;
os << det->getHostname() << " has " os << det->getHostname() << " has "
<< ToString(det->getDetectorType().squash()) << ToString(det->getDetectorType().squash()) << " detector type ("
<< " detector type (" << std::to_string(detType) << std::to_string(detType) << "). Exiting GUI.";
<< "). Exiting GUI.";
std::string errorMess = os.str(); std::string errorMess = os.str();
throw RuntimeError(errorMess.c_str()); throw RuntimeError(errorMess.c_str());
} }
std::ostringstream os; std::ostringstream os;
os << "SLS Detector GUI : " os << "SLS Detector GUI : " << ToString(det->getDetectorType().squash())
<< ToString(det->getDetectorType().squash()) << " - " << " - " << det->getHostname();
<< det->getHostname();
std::string title = os.str(); std::string title = os.str();
LOG(logINFO) << title; LOG(logINFO) << title;
setWindowTitle(QString(title.c_str())); setWindowTitle(QString(title.c_str()));
@ -344,7 +344,8 @@ void qDetectorMain::EnableModes(QAction *action) {
enable = actionExpert->isChecked(); enable = actionExpert->isChecked();
tabs->setTabEnabled(ADVANCED, enable); tabs->setTabEnabled(ADVANCED, enable);
bool visible = enable && (detType == slsDetectorDefs::EIGER || detType == slsDetectorDefs::MYTHEN3); bool visible = enable && (detType == slsDetectorDefs::EIGER ||
detType == slsDetectorDefs::MYTHEN3);
actionLoadTrimbits->setVisible(visible); actionLoadTrimbits->setVisible(visible);
actionSaveTrimbits->setVisible(visible); actionSaveTrimbits->setVisible(visible);
tabSettings->SetExportMode(enable); tabSettings->SetExportMode(enable);

16
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -628,7 +628,6 @@ void qDrawPlot::SetGapPixels(bool enable) {
isGapPixels = enable; isGapPixels = enable;
} }
void qDrawPlot::GetStatistics(double &min, double &max, double &sum) { void qDrawPlot::GetStatistics(double &min, double &max, double &sum) {
LOG(logDEBUG) << "Calculating Statistics"; LOG(logDEBUG) << "Calculating Statistics";
double *array = data2d; double *array = data2d;
@ -782,12 +781,12 @@ void qDrawPlot::GetData(detectorData *data, uint64_t frameIndex,
rxRoi.xmax += ((rxRoi.xmax / 1024) * 6 + (rxRoi.xmax / 256) * 2); rxRoi.xmax += ((rxRoi.xmax / 1024) * 6 + (rxRoi.xmax / 256) * 2);
rxRoi.ymin += ((rxRoi.ymin / 512) * 34 + (rxRoi.ymin / 256) * 2); rxRoi.ymin += ((rxRoi.ymin / 512) * 34 + (rxRoi.ymin / 256) * 2);
rxRoi.ymax += ((rxRoi.ymax / 512) * 34 + (rxRoi.ymax / 256) * 2); rxRoi.ymax += ((rxRoi.ymax / 512) * 34 + (rxRoi.ymax / 256) * 2);
LOG(logINFO) << "Rx_roi recalculated with gap pixels: " << ToString(rxRoi); LOG(logINFO) << "Rx_roi recalculated with gap pixels: "
<< ToString(rxRoi);
} }
LOG(logDEBUG) << "Rx_roi: " << ToString(rxRoi); LOG(logDEBUG) << "Rx_roi: " << ToString(rxRoi);
} }
// 1d check if npixelX has changed (m3 for different counters enabled) // 1d check if npixelX has changed (m3 for different counters enabled)
if (is1d && static_cast<int>(nPixelsX) != data->nx) { if (is1d && static_cast<int>(nPixelsX) != data->nx) {
nPixelsX = data->nx; nPixelsX = data->nx;
@ -1034,16 +1033,21 @@ void qDrawPlot::Update1dPlot() {
} }
lblRxRoiEnabled->hide(); lblRxRoiEnabled->hide();
} else { } else {
plot1d->EnableRoiBox(std::array<int, 4>{rxRoi.xmin, rxRoi.xmax, (int)plot1d->GetYMinimum(), (int)plot1d->GetYMaximum()}); plot1d->EnableRoiBox(std::array<int, 4>{
rxRoi.xmin, rxRoi.xmax, (int)plot1d->GetYMinimum(),
(int)plot1d->GetYMaximum()});
if (isGainDataExtracted) { if (isGainDataExtracted) {
gainplot1d->EnableRoiBox(std::array<int, 4>{rxRoi.xmin, rxRoi.xmax, 0, 3}); gainplot1d->EnableRoiBox(
std::array<int, 4>{rxRoi.xmin, rxRoi.xmax, 0, 3});
} }
lblRxRoiEnabled->show(); lblRxRoiEnabled->show();
} }
} }
// ymin and ymax could change (so replot roi every time) // ymin and ymax could change (so replot roi every time)
if (!rxRoi.completeRoi()) { if (!rxRoi.completeRoi()) {
plot1d->EnableRoiBox(std::array<int, 4>{rxRoi.xmin, rxRoi.xmax, (int)plot1d->GetYMinimum(), (int)plot1d->GetYMaximum()}); plot1d->EnableRoiBox(std::array<int, 4>{rxRoi.xmin, rxRoi.xmax,
(int)plot1d->GetYMinimum(),
(int)plot1d->GetYMaximum()});
} }
} }

12
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -7,8 +7,7 @@
namespace sls { namespace sls {
qTabAdvanced::qTabAdvanced(QWidget *parent, Detector *detector, qTabAdvanced::qTabAdvanced(QWidget *parent, Detector *detector, qDrawPlot *p)
qDrawPlot *p)
: QWidget(parent), det(detector), plot(p) { : QWidget(parent), det(detector), plot(p) {
setupUi(this); setupUi(this);
SetupWidgetWindow(); SetupWidgetWindow();
@ -445,8 +444,7 @@ void qTabAdvanced::SetDetectorUDPIP(bool force) {
std::string s = dispDetectorUDPIP->text().toAscii().constData(); std::string s = dispDetectorUDPIP->text().toAscii().constData();
LOG(logINFO) << "Setting Detector UDP IP:" << s; LOG(logINFO) << "Setting Detector UDP IP:" << s;
try { try {
det->setSourceUDPIP(IpAddr{s}, det->setSourceUDPIP(IpAddr{s}, {comboDetector->currentIndex()});
{comboDetector->currentIndex()});
} }
CATCH_HANDLE("Could not set Detector UDP IP.", CATCH_HANDLE("Could not set Detector UDP IP.",
"qTabAdvanced::SetDetectorUDPIP", this, "qTabAdvanced::SetDetectorUDPIP", this,
@ -463,8 +461,7 @@ void qTabAdvanced::SetDetectorUDPMAC(bool force) {
std::string s = dispDetectorUDPMAC->text().toAscii().constData(); std::string s = dispDetectorUDPMAC->text().toAscii().constData();
LOG(logINFO) << "Setting Detector UDP MAC:" << s; LOG(logINFO) << "Setting Detector UDP MAC:" << s;
try { try {
det->setSourceUDPMAC(MacAddr{s}, det->setSourceUDPMAC(MacAddr{s}, {comboDetector->currentIndex()});
{comboDetector->currentIndex()});
} }
CATCH_HANDLE("Could not set Detector UDP MAC.", CATCH_HANDLE("Could not set Detector UDP MAC.",
"qTabAdvanced::SetDetectorUDPMAC", this, "qTabAdvanced::SetDetectorUDPMAC", this,
@ -491,8 +488,7 @@ void qTabAdvanced::SetCltZMQIP(bool force) {
std::string s = dispZMQIP->text().toAscii().constData(); std::string s = dispZMQIP->text().toAscii().constData();
LOG(logINFO) << "Setting Client ZMQ IP:" << s; LOG(logINFO) << "Setting Client ZMQ IP:" << s;
try { try {
det->setClientZmqIp(IpAddr{s}, det->setClientZmqIp(IpAddr{s}, {comboDetector->currentIndex()});
{comboDetector->currentIndex()});
} }
CATCH_HANDLE("Could not set Client ZMQ IP.", CATCH_HANDLE("Could not set Client ZMQ IP.",
"qTabAdvanced::SetCltZMQIP", this, "qTabAdvanced::SetCltZMQIP", this,

12
slsDetectorGui/src/qTabSettings.cpp
View File

@ -255,7 +255,8 @@ void qTabSettings::GetHighVoltage() {
master_retvals.push_back(retvals[i]); master_retvals.push_back(retvals[i]);
} }
} }
retval = master_retvals.tsquash("Inconsistent values for high voltage."); retval =
master_retvals.tsquash("Inconsistent values for high voltage.");
} }
// spinHV // spinHV
@ -296,8 +297,7 @@ void qTabSettings::GetHighVoltage() {
} }
} }
} }
CATCH_DISPLAY("Could not get high voltage.", CATCH_DISPLAY("Could not get high voltage.", "qTabSettings::GetHighVoltage")
"qTabSettings::GetHighVoltage")
connect(spinHV, SIGNAL(valueChanged(int)), this, SLOT(SetHighVoltage())); connect(spinHV, SIGNAL(valueChanged(int)), this, SLOT(SetHighVoltage()));
connect(comboHV, SIGNAL(currentIndexChanged(int)), this, connect(comboHV, SIGNAL(currentIndexChanged(int)), this,
SLOT(SetHighVoltage())); SLOT(SetHighVoltage()));
@ -515,8 +515,7 @@ void qTabSettings::SetThresholdEnergies() {
slsDetectorDefs::detectorSettings sett = slsDetectorDefs::detectorSettings sett =
static_cast<slsDetectorDefs::detectorSettings>( static_cast<slsDetectorDefs::detectorSettings>(
comboSettings->currentIndex()); comboSettings->currentIndex());
LOG(logINFO) << "Setting Threshold Energies to " << ToString(eV) LOG(logINFO) << "Setting Threshold Energies to " << ToString(eV) << " (eV)";
<< " (eV)";
try { try {
det->setThresholdEnergy(eV, sett); det->setThresholdEnergy(eV, sett);
} }
@ -555,8 +554,7 @@ void qTabSettings::GetCounterMask() {
// if retval[i] = 2, chkCounter2 is checked // if retval[i] = 2, chkCounter2 is checked
for (auto i : retval) { for (auto i : retval) {
if (i > 3) { if (i > 3) {
throw RuntimeError( throw RuntimeError(std::string("Unknown counter index : ") +
std::string("Unknown counter index : ") +
std::to_string(static_cast<int>(i))); std::to_string(static_cast<int>(i)));
} }
counters[i]->setChecked(true); counters[i]->setChecked(true);

7
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1150,8 +1150,10 @@ int setModule(sls_detector_module myMod, char *mess) {
LOG(logINFO, ("Setting module with settings %d\n", myMod.reg)); LOG(logINFO, ("Setting module with settings %d\n", myMod.reg));
if (((myMod.nchan) > (detectorModules->nchan)) || ((myMod.ndac) > (detectorModules->ndac))) { if (((myMod.nchan) > (detectorModules->nchan)) ||
strcpy(mess, "Could not set module as the number of channels or dacs do not match to the one in the detector server\n"); ((myMod.ndac) > (detectorModules->ndac))) {
strcpy(mess, "Could not set module as the number of channels or dacs "
"do not match to the one in the detector server\n");
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
@ -2219,7 +2221,6 @@ int setTrimbits(int* chanregs, char* mess) {
return OK; return OK;
} }
int setAllTrimbits(int val) { int setAllTrimbits(int val) {
LOG(logINFO, ("Setting all trimbits to %d\n", val)); LOG(logINFO, ("Setting all trimbits to %d\n", val));
#ifndef VIRTUAL #ifndef VIRTUAL

6
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -862,7 +862,8 @@ int setROI(ROI arg) {
rois.ymin = -1; rois.ymin = -1;
rois.ymax = -1; rois.ymax = -1;
} else { } else {
LOG(logINFO, ("Setting ROI:(%d, %d, %d, %d)\n", arg.xmin, arg.xmax, arg.ymin, arg.ymax)); LOG(logINFO, ("Setting ROI:(%d, %d, %d, %d)\n", arg.xmin, arg.xmax,
arg.ymin, arg.ymax));
// validation // validation
// xmin divisible by 256 and less than 1280 // xmin divisible by 256 and less than 1280
if (((arg.xmin % NCHAN_PER_ADC) != 0) || if (((arg.xmin % NCHAN_PER_ADC) != 0) ||
@ -896,7 +897,8 @@ ROI getROI() {
if (rois.xmin == -1) { if (rois.xmin == -1) {
LOG(logINFO, ("\tROI: None\n")); LOG(logINFO, ("\tROI: None\n"));
} else { } else {
LOG(logINFO, ("ROI: (%d,%d,%d,%d)\n", rois.xmin, rois.xmax, rois.ymin, rois.ymax)); LOG(logINFO, ("ROI: (%d,%d,%d,%d)\n", rois.xmin, rois.xmax, rois.ymin,
rois.ymax));
} }
return rois; return rois;
} }

1
slsDetectorServers/moenchDetectorServer/RegisterDefs.h
View File

@ -572,7 +572,6 @@
#define PATTERN_SET_LSB_REG (0x82 << MEM_MAP_SHIFT) #define PATTERN_SET_LSB_REG (0x82 << MEM_MAP_SHIFT)
#define PATTERN_SET_MSB_REG (0x83 << MEM_MAP_SHIFT) #define PATTERN_SET_MSB_REG (0x83 << MEM_MAP_SHIFT)
/* Pattern Loop 3 Address RW regiser */ /* Pattern Loop 3 Address RW regiser */
#define PATTERN_LOOP_3_ADDR_REG (0x84 << MEM_MAP_SHIFT) #define PATTERN_LOOP_3_ADDR_REG (0x84 << MEM_MAP_SHIFT)

20
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -488,7 +488,6 @@ void setupDetector() {
// dynamic range // dynamic range
setDynamicRange(DEFAULT_DYNAMIC_RANGE); setDynamicRange(DEFAULT_DYNAMIC_RANGE);
// Initialization of acquistion parameters // Initialization of acquistion parameters
setNumFrames(DEFAULT_NUM_FRAMES); setNumFrames(DEFAULT_NUM_FRAMES);
setNumTriggers(DEFAULT_NUM_CYCLES); setNumTriggers(DEFAULT_NUM_CYCLES);
@ -1302,8 +1301,10 @@ void getModule(sls_detector_module* myMod) {
int setModule(sls_detector_module myMod, char *mess) { int setModule(sls_detector_module myMod, char *mess) {
LOG(logINFO, ("Setting module\n")); LOG(logINFO, ("Setting module\n"));
if (((myMod.nchan) > (detectorModules->nchan)) || ((myMod.ndac) > (detectorModules->ndac))) { if (((myMod.nchan) > (detectorModules->nchan)) ||
strcpy(mess, "Could not set module as the number of channels or dacs do not match to the one in the detector server\n"); ((myMod.ndac) > (detectorModules->ndac))) {
strcpy(mess, "Could not set module as the number of channels or dacs "
"do not match to the one in the detector server\n");
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
@ -1359,7 +1360,8 @@ int setTrimbits(int *trimbits) {
uint32_t prevRunClk = clkDivider[SYSTEM_C0]; uint32_t prevRunClk = clkDivider[SYSTEM_C0];
// set to trimming clock // set to trimming clock
if (setClockDividerWithTimeUpdateOption(SYSTEM_C0, DEFAULT_TRIMMING_RUN_CLKDIV, 0) == FAIL) { if (setClockDividerWithTimeUpdateOption(
SYSTEM_C0, DEFAULT_TRIMMING_RUN_CLKDIV, 0) == FAIL) {
LOG(logERROR, LOG(logERROR,
("Could not start trimming. Could not set to trimming clock\n")); ("Could not start trimming. Could not set to trimming clock\n"));
return FAIL; return FAIL;
@ -2271,7 +2273,8 @@ int setClockDivider(enum CLKINDEX ind, int val) {
return setClockDividerWithTimeUpdateOption(ind, val, 1); return setClockDividerWithTimeUpdateOption(ind, val, 1);
} }
int setClockDividerWithTimeUpdateOption(enum CLKINDEX ind, int val, int timeUpdate) { int setClockDividerWithTimeUpdateOption(enum CLKINDEX ind, int val,
int timeUpdate) {
if (ind < 0 || ind >= NUM_CLOCKS) { if (ind < 0 || ind >= NUM_CLOCKS) {
LOG(logERROR, ("Unknown clock index %d to set clock divider\n", ind)); LOG(logERROR, ("Unknown clock index %d to set clock divider\n", ind));
return FAIL; return FAIL;
@ -2470,7 +2473,8 @@ void *start_timer(void *arg) {
*((uint16_t *)(imageData + i * sizeof(uint16_t))) = (uint16_t)i; *((uint16_t *)(imageData + i * sizeof(uint16_t))) = (uint16_t)i;
break; break;
case 32: case 32:
*((uint32_t *)(imageData + i * sizeof(uint32_t))) = ((uint32_t)i & 0xFFFFFF); // 24 bit *((uint32_t *)(imageData + i * sizeof(uint32_t))) =
((uint32_t)i & 0xFFFFFF); // 24 bit
break; break;
default: default:
break; break;
@ -2492,7 +2496,6 @@ void *start_timer(void *arg) {
clock_gettime(CLOCK_REALTIME, &begin); clock_gettime(CLOCK_REALTIME, &begin);
usleep(expUs); usleep(expUs);
int srcOffset = 0; int srcOffset = 0;
// loop packet // loop packet
for (int i = 0; i != packetsPerFrame; ++i) { for (int i = 0; i != packetsPerFrame; ++i) {
@ -2712,7 +2715,8 @@ int setChipStatusRegister(int csr) {
uint32_t prevRunClk = clkDivider[SYSTEM_C0]; uint32_t prevRunClk = clkDivider[SYSTEM_C0];
// set to trimming clock // set to trimming clock
if (setClockDividerWithTimeUpdateOption(SYSTEM_C0, DEFAULT_TRIMMING_RUN_CLKDIV, 0) == FAIL) { if (setClockDividerWithTimeUpdateOption(
SYSTEM_C0, DEFAULT_TRIMMING_RUN_CLKDIV, 0) == FAIL) {
LOG(logERROR, LOG(logERROR,
("Could not set to trimming clock in order to change CSR\n")); ("Could not set to trimming clock in order to change CSR\n"));
return FAIL; return FAIL;

5
slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h
View File

@ -29,9 +29,10 @@ int eraseAndWriteToFlash(char *mess, enum PROGRAM_INDEX index,
ssize_t fsize, int forceDeleteNormalFile); ssize_t fsize, int forceDeleteNormalFile);
int getDrive(char *mess, enum PROGRAM_INDEX index); int getDrive(char *mess, enum PROGRAM_INDEX index);
/** Notify fpga not to touch flash, open src and flash drive to write */ /** Notify fpga not to touch flash, open src and flash drive to write */
int openFileForFlash(char *mess, enum PROGRAM_INDEX index, FILE **flashfd, FILE **srcfd, int openFileForFlash(char *mess, enum PROGRAM_INDEX index, FILE **flashfd,
FILE **srcfd, int forceDeleteNormalFile);
int checkNormalFile(char *mess, enum PROGRAM_INDEX index,
int forceDeleteNormalFile); int forceDeleteNormalFile);
int checkNormalFile(char *mess, enum PROGRAM_INDEX index, int forceDeleteNormalFile);
int eraseFlash(char *mess); int eraseFlash(char *mess);
/* write from tmp file to flash */ /* write from tmp file to flash */
int writeToFlash(char *mess, ssize_t fsize, FILE *flashfd, FILE *srcfd); int writeToFlash(char *mess, ssize_t fsize, FILE *flashfd, FILE *srcfd);

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

@ -569,7 +569,8 @@ int getFrequency(enum CLKINDEX ind);
int getVCOFrequency(enum CLKINDEX ind); int getVCOFrequency(enum CLKINDEX ind);
int getMaxClockDivider(); int getMaxClockDivider();
int setClockDivider(enum CLKINDEX ind, int val); int setClockDivider(enum CLKINDEX ind, int val);
int setClockDividerWithTimeUpdateOption(enum CLKINDEX ind, int val, int timeUpdate); int setClockDividerWithTimeUpdateOption(enum CLKINDEX ind, int val,
int timeUpdate);
int getClockDivider(enum CLKINDEX ind); int getClockDivider(enum CLKINDEX ind);
#elif GOTTHARD2D #elif GOTTHARD2D

18
slsDetectorServers/slsDetectorServer/src/communication_funcs.c
View File

@ -411,14 +411,14 @@ int sendModule(int file_des, sls_detector_module *myMod) {
LOG(level, ("Sending Module\n")); LOG(level, ("Sending Module\n"));
int ts = 0, n = 0; int ts = 0, n = 0;
n = sendData(file_des, &(myMod->serialnumber), n = sendData(file_des, &(myMod->serialnumber), sizeof(myMod->serialnumber),
sizeof(myMod->serialnumber), INT32); INT32);
if (!n) { if (!n) {
return -1; return -1;
} }
ts += n; ts += n;
LOG(level, ("serialno sent %d bytes. serialno: %d\n", n, LOG(level,
myMod->serialnumber)); ("serialno sent %d bytes. serialno: %d\n", n, myMod->serialnumber));
n = sendData(file_des, &(myMod->nchan), sizeof(myMod->nchan), INT32); n = sendData(file_des, &(myMod->nchan), sizeof(myMod->nchan), INT32);
if (!n) { if (!n) {
return -1; return -1;
@ -448,8 +448,7 @@ int sendModule(int file_des, sls_detector_module *myMod) {
return -1; return -1;
} }
ts += n; ts += n;
LOG(level, LOG(level, ("iodelay sent %d bytes. iodelay: %d\n", n, myMod->iodelay));
("iodelay sent %d bytes. iodelay: %d\n", n, myMod->iodelay));
n = sendData(file_des, &(myMod->tau), sizeof(myMod->tau), INT32); n = sendData(file_des, &(myMod->tau), sizeof(myMod->tau), INT32);
if (!n) { if (!n) {
return -1; return -1;
@ -494,8 +493,8 @@ int receiveModule(int file_des, sls_detector_module *myMod) {
return -1; return -1;
} }
ts += n; ts += n;
LOG(level, ("serialno received %d bytes. serialno: %d\n", n, LOG(level,
myMod->serialnumber)); ("serialno received %d bytes. serialno: %d\n", n, myMod->serialnumber));
n = receiveData(file_des, &(myMod->nchan), sizeof(myMod->nchan), INT32); n = receiveData(file_des, &(myMod->nchan), sizeof(myMod->nchan), INT32);
if (!n) { if (!n) {
return -1; return -1;
@ -525,8 +524,7 @@ int receiveModule(int file_des, sls_detector_module *myMod) {
return -1; return -1;
} }
ts += n; ts += n;
LOG(level, LOG(level, ("iodelay received %d bytes. iodelay: %d\n", n, myMod->iodelay));
("iodelay received %d bytes. iodelay: %d\n", n, myMod->iodelay));
n = receiveData(file_des, &(myMod->tau), sizeof(myMod->tau), INT32); n = receiveData(file_des, &(myMod->tau), sizeof(myMod->tau), INT32);
if (!n) { if (!n) {
return -1; return -1;

42
slsDetectorServers/slsDetectorServer/src/loadPattern.c
View File

@ -164,8 +164,10 @@ void writePatternWord(int addr, uint64_t word) {
int validate_getPatternWaitAddresses(char *message, int level, int *addr) { int validate_getPatternWaitAddresses(char *message, int level, int *addr) {
// validate input // validate input
if (level < 0 || level >= MAX_LEVELS) { if (level < 0 || level >= MAX_LEVELS) {
sprintf(message, sprintf(
"Cannot get patwait address. Level %d must be between 0 and %d.\n", level, MAX_LEVELS - 1); message,
"Cannot get patwait address. Level %d must be between 0 and %d.\n",
level, MAX_LEVELS - 1);
LOG(logERROR, (message)); LOG(logERROR, (message));
return FAIL; return FAIL;
} }
@ -203,8 +205,10 @@ int getPatternWaitAddress(int level) {
int validate_setPatternWaitAddresses(char *message, int level, int addr) { int validate_setPatternWaitAddresses(char *message, int level, int addr) {
// validate input // validate input
if (level < 0 || level >= MAX_LEVELS) { if (level < 0 || level >= MAX_LEVELS) {
sprintf(message, sprintf(
"Cannot set patwait address. Level %d must be between 0 and %d.\n", level, MAX_LEVELS - 1); message,
"Cannot set patwait address. Level %d must be between 0 and %d.\n",
level, MAX_LEVELS - 1);
LOG(logERROR, (message)); LOG(logERROR, (message));
return FAIL; return FAIL;
} }
@ -274,7 +278,8 @@ int validate_getPatternWaitTime(char *message, int level, uint64_t *waittime) {
// validate input // validate input
if (level < 0 || level >= MAX_LEVELS) { if (level < 0 || level >= MAX_LEVELS) {
sprintf(message, sprintf(message,
"Cannot get patwaittime. Level %d must be between 0 and %d.\n", level, MAX_LEVELS - 1); "Cannot get patwaittime. Level %d must be between 0 and %d.\n",
level, MAX_LEVELS - 1);
LOG(logERROR, (message)); LOG(logERROR, (message));
return FAIL; return FAIL;
} }
@ -313,7 +318,8 @@ int validate_setPatternWaitTime(char *message, int level, uint64_t waittime) {
// validate input // validate input
if (level < 0 || level >= MAX_LEVELS) { if (level < 0 || level >= MAX_LEVELS) {
sprintf(message, sprintf(message,
"Cannot set patwaittime. Level %d must be between 0 and %d.\n", level, MAX_LEVELS - 1); "Cannot set patwaittime. Level %d must be between 0 and %d.\n",
level, MAX_LEVELS - 1);
LOG(logERROR, (message)); LOG(logERROR, (message));
return FAIL; return FAIL;
} }
@ -376,7 +382,8 @@ int validate_getPatternLoopCycles(char *message, int level, int *numLoops) {
// validate input // validate input
if (level < 0 || level >= MAX_LEVELS) { if (level < 0 || level >= MAX_LEVELS) {
sprintf(message, sprintf(message,
"Cannot get patnloop. Level %d must be between 0 and %d.\n", level, MAX_LEVELS - 1); "Cannot get patnloop. Level %d must be between 0 and %d.\n",
level, MAX_LEVELS - 1);
LOG(logERROR, (message)); LOG(logERROR, (message));
return FAIL; return FAIL;
} }
@ -409,7 +416,8 @@ int validate_setPatternLoopCycles(char *message, int level, int numLoops) {
// validate input // validate input
if (level < 0 || level >= MAX_LEVELS) { if (level < 0 || level >= MAX_LEVELS) {
sprintf(message, sprintf(message,
"Cannot set patnloop. Level %d must be between 0 and %d.\n", level, MAX_LEVELS); "Cannot set patnloop. Level %d must be between 0 and %d.\n",
level, MAX_LEVELS);
LOG(logERROR, (message)); LOG(logERROR, (message));
return FAIL; return FAIL;
} }
@ -519,9 +527,10 @@ int validate_getPatternLoopAddresses(char *message, int level, int *startAddr,
int *stopAddr) { int *stopAddr) {
// validate input // validate input
if (level < 0 || level >= MAX_LEVELS) { if (level < 0 || level >= MAX_LEVELS) {
sprintf( sprintf(message,
message, "Cannot get patloop addresses. Level %d must be between 0 and "
"Cannot get patloop addresses. Level %d must be between 0 and %d.\n", level, MAX_LEVELS - 1); "%d.\n",
level, MAX_LEVELS - 1);
LOG(logERROR, (message)); LOG(logERROR, (message));
return FAIL; return FAIL;
} }
@ -591,9 +600,10 @@ int validate_setPatternLoopAddresses(char *message, int level, int startAddr,
int stopAddr) { int stopAddr) {
// validate input // validate input
if (level < 0 || level >= MAX_LEVELS) { if (level < 0 || level >= MAX_LEVELS) {
sprintf( sprintf(message,
message, "Cannot set patloop addresses. Level %d must be between 0 and "
"Cannot set patloop addresses. Level %d must be between 0 and %d.\n", level, MAX_LEVELS - 1); "%d.\n",
level, MAX_LEVELS - 1);
LOG(logERROR, (message)); LOG(logERROR, (message));
return FAIL; return FAIL;
} }
@ -975,8 +985,8 @@ int loadPatternFile(char *patFname, char *errMessage) {
int startAddr = 0; int startAddr = 0;
int stopAddr = 0; int stopAddr = 0;
// cannot scan values // cannot scan values
if (sscanf(line, "%s %d 0x%x 0x%x", command, &level, &startAddr, &stopAddr) != if (sscanf(line, "%s %d 0x%x 0x%x", command, &level, &startAddr,
4) { &stopAddr) != 4) {
strcpy(temp, "Could not scan patloop arguments.\n"); strcpy(temp, "Could not scan patloop arguments.\n");
break; break;
} }

53
slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c
View File

@ -110,7 +110,8 @@ int defineGPIOpins(char *mess) {
if (access(CMD_GPIO9_EXIST, F_OK) != 0) { if (access(CMD_GPIO9_EXIST, F_OK) != 0) {
if (executeCommand(CMD_GPIO9_DEFINE, retvals, logDEBUG1) == FAIL) { if (executeCommand(CMD_GPIO9_DEFINE, retvals, logDEBUG1) == FAIL) {
snprintf(mess, MAX_STR_LENGTH, snprintf(mess, MAX_STR_LENGTH,
"Could not define gpio9 (nConfig) for fpga (%s)\n", retvals); "Could not define gpio9 (nConfig) for fpga (%s)\n",
retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
@ -146,7 +147,8 @@ int FPGAdontTouchFlash(char *mess, int programming) {
// define gpio9 as output // define gpio9 as output
if (executeCommand(CMD_GPIO9_DEFINE_OUT, retvals, logDEBUG1) == FAIL) { if (executeCommand(CMD_GPIO9_DEFINE_OUT, retvals, logDEBUG1) == FAIL) {
snprintf(mess, MAX_STR_LENGTH, snprintf(mess, MAX_STR_LENGTH,
"Could not set gpio9 (nConfig) as output for fpga (%s)\n", retvals); "Could not set gpio9 (nConfig) as output for fpga (%s)\n",
retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
@ -156,7 +158,8 @@ int FPGAdontTouchFlash(char *mess, int programming) {
if (programming && latestKernelVerified == 1) { if (programming && latestKernelVerified == 1) {
if (executeCommand(CMD_GPIO3_DEFINE_OUT, retvals, logDEBUG1) == FAIL) { if (executeCommand(CMD_GPIO3_DEFINE_OUT, retvals, logDEBUG1) == FAIL) {
snprintf(mess, MAX_STR_LENGTH, snprintf(mess, MAX_STR_LENGTH,
"Could not set gpio3 (nCE) as output for fpga (%s)\n", retvals); "Could not set gpio3 (nCE) as output for fpga (%s)\n",
retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
@ -166,7 +169,8 @@ int FPGAdontTouchFlash(char *mess, int programming) {
// tell FPGA to not: gpio9 // tell FPGA to not: gpio9
if (executeCommand(CMD_GPIO9_DONT_TOUCH_FLASH, retvals, logDEBUG1) == if (executeCommand(CMD_GPIO9_DONT_TOUCH_FLASH, retvals, logDEBUG1) ==
FAIL) { FAIL) {
snprintf(mess, MAX_STR_LENGTH, snprintf(
mess, MAX_STR_LENGTH,
"Could not set gpio9 (nConfig) to not touch flash for fpga (%s)\n", "Could not set gpio9 (nConfig) to not touch flash for fpga (%s)\n",
retvals); retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
@ -178,7 +182,8 @@ int FPGAdontTouchFlash(char *mess, int programming) {
if (programming && latestKernelVerified == 1) { if (programming && latestKernelVerified == 1) {
if (executeCommand(CMD_GPIO3_DONT_TOUCH_FLASH, retvals, logDEBUG1) == if (executeCommand(CMD_GPIO3_DONT_TOUCH_FLASH, retvals, logDEBUG1) ==
FAIL) { FAIL) {
snprintf(mess, MAX_STR_LENGTH, snprintf(
mess, MAX_STR_LENGTH,
"Could not set gpio3 (nCE) to not touch flash for fpga (%s)\n", "Could not set gpio3 (nCE) to not touch flash for fpga (%s)\n",
retvals); retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
@ -198,7 +203,8 @@ int FPGATouchFlash(char *mess, int programming) {
// tell FPGA to touch flash to program itself // tell FPGA to touch flash to program itself
if (executeCommand(CMD_GPIO9_DEFINE_IN, retvals, logDEBUG1) == FAIL) { if (executeCommand(CMD_GPIO9_DEFINE_IN, retvals, logDEBUG1) == FAIL) {
snprintf(mess, MAX_STR_LENGTH, snprintf(mess, MAX_STR_LENGTH,
"Could not set gpio9 (nConfig) as input for fpga (%s)\n", retvals); "Could not set gpio9 (nConfig) as input for fpga (%s)\n",
retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
@ -207,7 +213,8 @@ int FPGATouchFlash(char *mess, int programming) {
if (programming && latestKernelVerified == 1) { if (programming && latestKernelVerified == 1) {
if (executeCommand(CMD_GPIO3_DEFINE_IN, retvals, logDEBUG1) == FAIL) { if (executeCommand(CMD_GPIO3_DEFINE_IN, retvals, logDEBUG1) == FAIL) {
snprintf(mess, MAX_STR_LENGTH, snprintf(mess, MAX_STR_LENGTH,
"Could not set gpio3 (nCE) as input for fpga (%s)\n", retvals); "Could not set gpio3 (nCE) as input for fpga (%s)\n",
retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
@ -341,8 +348,8 @@ int eraseAndWriteToFlash(char *mess, enum PROGRAM_INDEX index,
FILE *flashfd = NULL; FILE *flashfd = NULL;
FILE *srcfd = NULL; FILE *srcfd = NULL;
if (openFileForFlash(mess, index, &flashfd, &srcfd, forceDeleteNormalFile) == if (openFileForFlash(mess, index, &flashfd, &srcfd,
FAIL) { forceDeleteNormalFile) == FAIL) {
return FAIL; return FAIL;
} }
@ -446,8 +453,8 @@ int getDrive(char *mess, enum PROGRAM_INDEX index) {
return OK; return OK;
} }
int openFileForFlash(char *mess, enum PROGRAM_INDEX index, FILE **flashfd, FILE **srcfd, int openFileForFlash(char *mess, enum PROGRAM_INDEX index, FILE **flashfd,
int forceDeleteNormalFile) { FILE **srcfd, int forceDeleteNormalFile) {
// open src file // open src file
*srcfd = fopen(TEMP_PROG_FILE_NAME, "r"); *srcfd = fopen(TEMP_PROG_FILE_NAME, "r");
if (*srcfd == NULL) { if (*srcfd == NULL) {
@ -480,13 +487,13 @@ int openFileForFlash(char *mess, enum PROGRAM_INDEX index, FILE **flashfd, FILE
return OK; return OK;
} }
int checkNormalFile(char *mess, enum PROGRAM_INDEX index, int forceDeleteNormalFile) { int checkNormalFile(char *mess, enum PROGRAM_INDEX index,
int forceDeleteNormalFile) {
#ifndef VIRTUAL #ifndef VIRTUAL
// check if its a normal file or special file // check if its a normal file or special file
struct stat buf; struct stat buf;
if (stat(flashDriveName, &buf) == -1) { if (stat(flashDriveName, &buf) == -1) {
sprintf(mess, sprintf(mess, "Could not %s. Unable to find the flash drive %s\n",
"Could not %s. Unable to find the flash drive %s\n",
messageType, flashDriveName); messageType, flashDriveName);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
@ -507,9 +514,12 @@ int checkNormalFile(char *mess, enum PROGRAM_INDEX index, int forceDeleteNormalF
// user does not allow to fix it (default) // user does not allow to fix it (default)
if (forceDeleteNormalFile == 0) { if (forceDeleteNormalFile == 0) {
sprintf(mess, sprintf(mess,
"Could not %s. The flash drive %s found for fpga programming is a normal file. To " "Could not %s. The flash drive %s found for fpga "
"fix this (by deleting this file, creating the flash drive and proceeding with " "programming is a normal file. To "
"programming), re-run the programming command 'programfpga' with parameter " "fix this (by deleting this file, creating the flash drive "
"and proceeding with "
"programming), re-run the programming command "
"'programfpga' with parameter "
"'--force-delete-normal-file'\n", "'--force-delete-normal-file'\n",
messageType, flashDriveName); messageType, flashDriveName);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
@ -517,7 +527,8 @@ int checkNormalFile(char *mess, enum PROGRAM_INDEX index, int forceDeleteNormalF
} }
// fpga memory stays after a reboot, user allowed to fix it // fpga memory stays after a reboot, user allowed to fix it
LOG(logWARNING, ("Flash drive invalidated (normal file). Fixing it...\n")); LOG(logWARNING,
("Flash drive invalidated (normal file). Fixing it...\n"));
// user allows to fix it, so force delete normal file // user allows to fix it, so force delete normal file
char cmd[MAX_STR_LENGTH] = {0}; char cmd[MAX_STR_LENGTH] = {0};
@ -678,7 +689,8 @@ int waitForFPGAtoTouchFlash(char *mess) {
#ifdef VIRTUAL #ifdef VIRTUAL
return OK; return OK;
#endif #endif
LOG(logINFO, ("\tWaiting for FPGA to program from flash... \n\t[gpio7 (CD) should be High when done]\n")); LOG(logINFO, ("\tWaiting for FPGA to program from flash... \n\t[gpio7 (CD) "
"should be High when done]\n"));
int timeSpent = 0; int timeSpent = 0;
int result = 0; int result = 0;
@ -718,6 +730,7 @@ int waitForFPGAtoTouchFlash(char *mess) {
} }
LOG(logDEBUG1, ("gpi07 (CD)returned %d\n", result)); LOG(logDEBUG1, ("gpi07 (CD)returned %d\n", result));
} }
LOG(logINFO, ("\tFPGA has picked up the program from flash. gpio7 (CD) is High\n")); LOG(logINFO,
("\tFPGA has picked up the program from flash. gpio7 (CD) is High\n"));
return OK; return OK;
} }

5
slsDetectorServers/slsDetectorServer/src/programViaNios.c
View File

@ -7,8 +7,8 @@
#include "slsDetectorServer_defs.h" #include "slsDetectorServer_defs.h"
#include <string.h> #include <string.h>
#include <unistd.h> // usleep
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> // usleep
/* global variables */ /* global variables */
@ -151,8 +151,7 @@ int openFileForFlash(char *mess, FILE **flashfd) {
// check if its a normal file or special file // check if its a normal file or special file
struct stat buf; struct stat buf;
if (stat(flashDriveName, &buf) == -1) { if (stat(flashDriveName, &buf) == -1) {
sprintf(mess, sprintf(mess, "Could not %s. Unable to find the flash drive %s\n",
"Could not %s. Unable to find the flash drive %s\n",
messageType, flashDriveName); messageType, flashDriveName);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;

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

@ -1605,7 +1605,8 @@ int get_module(int file_des) {
// ensure nchan is not 0, else trimbits not copied // ensure nchan is not 0, else trimbits not copied
if (module.nchan == 0) { if (module.nchan == 0) {
strcpy(mess, "Could not get module as the number of channels to copy is 0\n"); strcpy(mess, "Could not get module as the number of channels to "
"copy is 0\n");
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
@ -1625,7 +1626,6 @@ int get_module(int file_des) {
return ret; return ret;
} }
int set_module(int file_des) { int set_module(int file_des) {
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
@ -1885,7 +1885,8 @@ int acquire(int blocking, int file_des) {
uint64_t sourcemac = getDetectorMAC(); uint64_t sourcemac = getDetectorMAC();
char src_mac[MAC_ADDRESS_SIZE]; char src_mac[MAC_ADDRESS_SIZE];
getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac); getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
sprintf(mess, sprintf(
mess,
"Invalid udp source mac address for this detector. Must be " "Invalid udp source mac address for this detector. Must be "
"same as hardware detector mac address %s\n", "same as hardware detector mac address %s\n",
src_mac); src_mac);
@ -1898,7 +1899,8 @@ int acquire(int blocking, int file_des) {
getIpAddressinString(src_ip, sourceip); getIpAddressinString(src_ip, sourceip);
sprintf( sprintf(
mess, mess,
"Invalid udp source ip address for this detector. Must be same " "Invalid udp source ip address for this detector. Must be "
"same "
"as hardware detector ip address %s in 1G readout mode \n", "as hardware detector ip address %s in 1G readout mode \n",
src_ip); src_ip);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
@ -2118,7 +2120,8 @@ int set_num_frames(int file_des) {
arg > MAX_FRAMES_IN_BURST_MODE) { arg > MAX_FRAMES_IN_BURST_MODE) {
ret = FAIL; ret = FAIL;
sprintf(mess, sprintf(mess,
"Could not set number of frames %lld. Must be less than equal to %d in " "Could not set number of frames %lld. Must be less "
"than equal to %d in "
"burst mode.\n", "burst mode.\n",
(long long unsigned int)arg, MAX_FRAMES_IN_BURST_MODE); (long long unsigned int)arg, MAX_FRAMES_IN_BURST_MODE);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
@ -9260,11 +9263,12 @@ int clear_all_udp_dst(int file_des) {
#endif #endif
{ {
numUdpDestinations = numdest; numUdpDestinations = numdest;
LOG(logINFOBLUE, ("Number of UDP Destinations: %d\n", LOG(logINFOBLUE,
numUdpDestinations)); ("Number of UDP Destinations: %d\n", numUdpDestinations));
ret = configureMAC(); ret = configureMAC();
if (ret == FAIL) { if (ret == FAIL) {
strcpy(mess, "Could not clear all destinations in the fpga.\n"); strcpy(mess,
"Could not clear all destinations in the fpga.\n");
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} }
} }
@ -9968,7 +9972,8 @@ int set_interpolation(int file_des) {
if (Server_VerifyLock() == OK) { if (Server_VerifyLock() == OK) {
if (getPumpProbe() && arg) { if (getPumpProbe() && arg) {
ret = FAIL; ret = FAIL;
sprintf(mess, "Could not set interpolation. Disable pump probe mode first.\n"); sprintf(mess, "Could not set interpolation. Disable pump probe "
"mode first.\n");
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} else { } else {
ret = setInterpolation(arg); ret = setInterpolation(arg);
@ -10024,7 +10029,8 @@ int set_pump_probe(int file_des) {
if (Server_VerifyLock() == OK) { if (Server_VerifyLock() == OK) {
if (getInterpolation() && arg) { if (getInterpolation() && arg) {
ret = FAIL; ret = FAIL;
sprintf(mess, "Could not set pump probe mode. Disable interpolation mode first.\n"); sprintf(mess, "Could not set pump probe mode. Disable "
"interpolation mode first.\n");
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} else { } else {
ret = setPumpProbe(arg); ret = setPumpProbe(arg);
@ -10033,7 +10039,8 @@ int set_pump_probe(int file_des) {
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} else { } else {
int retval = getPumpProbe(); int retval = getPumpProbe();
validate(&ret, mess, (int)arg, (int)retval, "set pump probe", DEC); validate(&ret, mess, (int)arg, (int)retval, "set pump probe",
DEC);
LOG(logDEBUG1, ("pump probe retval: %u\n", retval)); LOG(logDEBUG1, ("pump probe retval: %u\n", retval));
} }
} }

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

@ -10,7 +10,6 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
namespace sls { namespace sls {
using ns = std::chrono::nanoseconds; using ns = std::chrono::nanoseconds;
class detectorData; class detectorData;
@ -144,7 +143,8 @@ class Detector {
defs::detectorSettings settings = defs::STANDARD, defs::detectorSettings settings = defs::STANDARD,
bool trimbits = true, Positions pos = {}); bool trimbits = true, Positions pos = {});
/** [Mythen3] It loads trim files from settingspath. An energy of -1 will pick up values from detector */ /** [Mythen3] It loads trim files from settingspath. An energy of -1 will
* pick up values from detector */
void setThresholdEnergy(std::array<int, 3> threshold_ev, void setThresholdEnergy(std::array<int, 3> threshold_ev,
defs::detectorSettings settings = defs::STANDARD, defs::detectorSettings settings = defs::STANDARD,
bool trimbits = true, Positions pos = {}); bool trimbits = true, Positions pos = {});
@ -1495,13 +1495,15 @@ class Detector {
/** [Mythen3] */ /** [Mythen3] */
Result<bool> getInterpolation(Positions pos = {}) const; Result<bool> getInterpolation(Positions pos = {}) const;
/** [Mythen3] interpolation mode enables all counters and disables vth3. Disabling sets back counter mask and vth3. */ /** [Mythen3] interpolation mode enables all counters and disables vth3.
* Disabling sets back counter mask and vth3. */
void setInterpolation(bool value, Positions pos = {}); void setInterpolation(bool value, Positions pos = {});
/** [Mythen3] */ /** [Mythen3] */
Result<bool> getPumpProbe(Positions pos = {}) const; Result<bool> getPumpProbe(Positions pos = {}) const;
/** [Mythen3] pump probe mode only enables vth2. Disabling sets back to previous value */ /** [Mythen3] pump probe mode only enables vth2. Disabling sets back to
* previous value */
void setPumpProbe(bool value, Positions pos = {}); void setPumpProbe(bool value, Positions pos = {});
/** [Mythen3] */ /** [Mythen3] */

19
slsDetectorSoftware/include/sls/detectorData.h
View File

@ -11,11 +11,22 @@ namespace sls {
*/ */
class detectorData { class detectorData {
public: public:
detectorData(double progressIndex, std::string fileName, int nx, int ny, char *data, int databytes, int dynamicRange, uint64_t fileIndex, bool completeImage) detectorData(double progressIndex, std::string fileName, int nx, int ny,
: progressIndex(progressIndex), fileName(fileName), fileIndex(fileIndex), nx(nx), ny(ny), data(data), databytes(databytes), dynamicRange(dynamicRange), completeImage(completeImage){}; char *data, int databytes, int dynamicRange,
uint64_t fileIndex, bool completeImage)
: progressIndex(progressIndex), fileName(fileName),
fileIndex(fileIndex), nx(nx), ny(ny), data(data),
databytes(databytes), dynamicRange(dynamicRange),
completeImage(completeImage){};
detectorData(double progressIndex, std::string fileName, int nx, int ny, char *data, int databytes, int dynamicRange, uint64_t fileIndex, bool completeImage, std::array<int, 4> rxRoi) detectorData(double progressIndex, std::string fileName, int nx, int ny,
: progressIndex(progressIndex), fileName(fileName), fileIndex(fileIndex), nx(nx), ny(ny), data(data), databytes(databytes), dynamicRange(dynamicRange), completeImage(completeImage), rxRoi(rxRoi) {}; char *data, int databytes, int dynamicRange,
uint64_t fileIndex, bool completeImage,
std::array<int, 4> rxRoi)
: progressIndex(progressIndex), fileName(fileName),
fileIndex(fileIndex), nx(nx), ny(ny), data(data),
databytes(databytes), dynamicRange(dynamicRange),
completeImage(completeImage), rxRoi(rxRoi){};
/** /**
* data has to be deleted by caller * data has to be deleted by caller
*/ */

154
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -48,8 +48,8 @@ void CmdProxy::Call(const std::string &command,
if (it != functions.end()) { if (it != functions.end()) {
os << ((*this).*(it->second))(action); os << ((*this).*(it->second))(action);
} else { } else {
throw RuntimeError( throw RuntimeError(cmd +
cmd + " Unknown command, use list to list all commands"); " Unknown command, use list to list all commands");
} }
} }
@ -219,12 +219,10 @@ std::string CmdProxy::Acquire(int action) {
<< '\n'; << '\n';
} else { } else {
if (det->empty()) { if (det->empty()) {
throw RuntimeError( throw RuntimeError("This shared memory has no detectors added.");
"This shared memory has no detectors added.");
} }
if (det_id >= 0) { if (det_id >= 0) {
throw RuntimeError( throw RuntimeError("Individual detectors not allowed for readout.");
"Individual detectors not allowed for readout.");
} }
det->acquire(); det->acquire();
@ -456,7 +454,10 @@ std::string CmdProxy::Trimbits(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[fname]\n\t[Eiger][Mythen3] Put will load the trimbit file to detector. If no extension specified, serial number of each module is attached. Get will save the trimbits from the detector to file with serial number added to file name." os << "[fname]\n\t[Eiger][Mythen3] Put will load the trimbit file to "
"detector. If no extension specified, serial number of each "
"module is attached. Get will save the trimbits from the "
"detector to file with serial number added to file name."
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
@ -476,7 +477,6 @@ std::string CmdProxy::Trimbits(int action) {
return os.str(); return os.str();
} }
std::string CmdProxy::TrimEnergies(int action) { std::string CmdProxy::TrimEnergies(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
@ -553,8 +553,7 @@ std::string CmdProxy::Exptime(int action) {
} else if (cmd == "exptime3") { } else if (cmd == "exptime3") {
gateIndex = 2; gateIndex = 2;
} else { } else {
throw RuntimeError( throw RuntimeError("Unknown command, use list to list all commands");
"Unknown command, use list to list all commands");
} }
std::ostringstream os; std::ostringstream os;
@ -699,8 +698,7 @@ std::string CmdProxy::Adcphase(int action) {
auto det_type = det->getDetectorType().squash(defs::GENERIC); auto det_type = det->getDetectorType().squash(defs::GENERIC);
if (det_type == defs::EIGER || det_type == defs::MYTHEN3 || if (det_type == defs::EIGER || det_type == defs::MYTHEN3 ||
det_type == defs::GOTTHARD2) { det_type == defs::GOTTHARD2) {
throw RuntimeError( throw RuntimeError("adcphase not implemented for this detector");
"adcphase not implemented for this detector");
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
Result<int> t; Result<int> t;
@ -710,8 +708,7 @@ std::string CmdProxy::Adcphase(int action) {
} else if (args.size() == 1) { } else if (args.size() == 1) {
if (args[0] != "deg") { if (args[0] != "deg") {
throw RuntimeError("Unknown adcphase argument " + throw RuntimeError("Unknown adcphase argument " +
args[0] + args[0] + ". Did you mean deg? ");
". Did you mean deg? ");
} }
t = det->getADCPhaseInDegrees(std::vector<int>{det_id}); t = det->getADCPhaseInDegrees(std::vector<int>{det_id});
os << OutString(t) << " deg\n"; os << OutString(t) << " deg\n";
@ -754,8 +751,7 @@ std::string CmdProxy::Dbitphase(int action) {
auto det_type = det->getDetectorType().squash(defs::GENERIC); auto det_type = det->getDetectorType().squash(defs::GENERIC);
if (det_type == defs::EIGER || det_type == defs::MYTHEN3 || if (det_type == defs::EIGER || det_type == defs::MYTHEN3 ||
det_type == defs::GOTTHARD2) { det_type == defs::GOTTHARD2) {
throw RuntimeError( throw RuntimeError("dbitphase not implemented for this detector");
"dbitphase not implemented for this detector");
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
Result<int> t; Result<int> t;
@ -764,8 +760,8 @@ std::string CmdProxy::Dbitphase(int action) {
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (args.size() == 1) { } else if (args.size() == 1) {
if (args[0] != "deg") { if (args[0] != "deg") {
throw RuntimeError("Unknown dbitphase argument " + throw RuntimeError("Unknown dbitphase argument " + args[0] +
args[0] + ". Did you mean deg? "); ". Did you mean deg? ");
} }
t = det->getDBITPhaseInDegrees(std::vector<int>{det_id}); t = det->getDBITPhaseInDegrees(std::vector<int>{det_id});
os << OutString(t) << " deg\n"; os << OutString(t) << " deg\n";
@ -805,8 +801,7 @@ std::string CmdProxy::ClockFrequency(int action) {
} else { } else {
defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); defs::detectorType type = det->getDetectorType().squash(defs::GENERIC);
if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) { if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) {
throw RuntimeError( throw RuntimeError("clkfreq not implemented for this detector.");
"clkfreq not implemented for this detector.");
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
@ -836,8 +831,7 @@ std::string CmdProxy::ClockPhase(int action) {
} else { } else {
defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); defs::detectorType type = det->getDetectorType().squash(defs::GENERIC);
if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) { if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) {
throw RuntimeError( throw RuntimeError("clkphase not implemented for this detector.");
"clkphase not implemented for this detector.");
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
if (args.size() == 1) { if (args.size() == 1) {
@ -919,8 +913,7 @@ std::string CmdProxy::ClockDivider(int action) {
} else { } else {
defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); defs::detectorType type = det->getDetectorType().squash(defs::GENERIC);
if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) { if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) {
throw RuntimeError( throw RuntimeError("clkdiv not implemented for this detector.");
"clkdiv not implemented for this detector.");
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {
@ -1177,8 +1170,7 @@ std::string CmdProxy::DacList(const int action) {
"names. Cannot change them."); "names. Cannot change them.");
} }
if (det_id != -1) { if (det_id != -1) {
throw RuntimeError( throw RuntimeError("Cannot configure dacnames at module level");
"Cannot configure dacnames at module level");
} }
if (args.size() != 18) { if (args.size() != 18) {
WrongNumberOfParameters(18); WrongNumberOfParameters(18);
@ -1543,7 +1535,11 @@ std::string CmdProxy::UDPSourceIP(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[x.x.x.x] or auto\n\tIp address of the detector (source) udp interface. Must be same subnet as destination udp ip.\n\t[Eiger] Set only for 10G. For 1G, detector will replace with its own DHCP IP address. If 'auto' used, then ip is set to ip of rx_hostname." os << "[x.x.x.x] or auto\n\tIp address of the detector (source) udp "
"interface. Must be same subnet as destination udp "
"ip.\n\t[Eiger] Set only for 10G. For 1G, detector will replace "
"with its own DHCP IP address. If 'auto' used, then ip is set to "
"ip of rx_hostname."
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
auto t = det->getSourceUDPIP(std::vector<int>{det_id}); auto t = det->getSourceUDPIP(std::vector<int>{det_id});
@ -1576,7 +1572,11 @@ std::string CmdProxy::UDPSourceIP2(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[x.x.x.x] or auto\n\t[Jungfrau][Gotthard2] Ip address of the detector (source) udp interface 2. Must be same subnet as destination udp ip2.\n\t [Jungfrau] top half or inner interface\n\t [Gotthard2] veto debugging. If 'auto' used, then ip is set to ip of rx_hostname." os << "[x.x.x.x] or auto\n\t[Jungfrau][Gotthard2] Ip address of the "
"detector (source) udp interface 2. Must be same subnet as "
"destination udp ip2.\n\t [Jungfrau] top half or inner "
"interface\n\t [Gotthard2] veto debugging. If 'auto' used, then "
"ip is set to ip of rx_hostname."
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
auto t = det->getSourceUDPIP2(std::vector<int>{det_id}); auto t = det->getSourceUDPIP2(std::vector<int>{det_id});
@ -1591,8 +1591,8 @@ std::string CmdProxy::UDPSourceIP2(int action) {
IpAddr val; IpAddr val;
if (args[0] == "auto") { if (args[0] == "auto") {
val = getIpFromAuto(); val = getIpFromAuto();
LOG(logINFO) << "Setting udp_srcip2 of detector " << det_id << " to " LOG(logINFO) << "Setting udp_srcip2 of detector " << det_id
<< val; << " to " << val;
} else { } else {
val = IpAddr(args[0]); val = IpAddr(args[0]);
} }
@ -1744,7 +1744,8 @@ std::string CmdProxy::Rx_ROI(int action) {
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[xmin] [xmax] [ymin] [ymax]\n\tRegion of interest in " os << "[xmin] [xmax] [ymin] [ymax]\n\tRegion of interest in "
"receiver.\n\tOnly allowed at multi module level and without gap pixels." "receiver.\n\tOnly allowed at multi module level and without gap "
"pixels."
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
if (!args.empty()) { if (!args.empty()) {
@ -2144,8 +2145,7 @@ std::string CmdProxy::VetoFile(int action) {
"file should have 128 rows of gain index and 12 bit value in dec" "file should have 128 rows of gain index and 12 bit value in dec"
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
throw RuntimeError( throw RuntimeError("cannot get vetofile. Did you mean vetophoton?");
"cannot get vetofile. Did you mean vetophoton?");
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() != 2) { if (args.size() != 2) {
WrongNumberOfParameters(2); WrongNumberOfParameters(2);
@ -2266,8 +2266,7 @@ std::string CmdProxy::VetoAlgorithm(int action) {
defs::streamingInterface interface = defs::streamingInterface interface =
StringTo<defs::streamingInterface>(args[0]); StringTo<defs::streamingInterface>(args[0]);
if (interface == defs::streamingInterface::NONE) { if (interface == defs::streamingInterface::NONE) {
throw RuntimeError( throw RuntimeError("Must specify an interface to set algorithm");
"Must specify an interface to set algorithm");
} }
auto t = det->getVetoAlgorithm(interface, std::vector<int>{det_id}); auto t = det->getVetoAlgorithm(interface, std::vector<int>{det_id});
os << OutString(t) << ' ' << ToString(interface) << '\n'; os << OutString(t) << ' ' << ToString(interface) << '\n';
@ -2279,8 +2278,7 @@ std::string CmdProxy::VetoAlgorithm(int action) {
defs::streamingInterface interface = defs::streamingInterface interface =
StringTo<defs::streamingInterface>(args[1]); StringTo<defs::streamingInterface>(args[1]);
if (interface == defs::streamingInterface::NONE) { if (interface == defs::streamingInterface::NONE) {
throw RuntimeError( throw RuntimeError("Must specify an interface to set algorithm");
"Must specify an interface to set algorithm");
} }
det->setVetoAlgorithm(alg, interface, std::vector<int>{det_id}); det->setVetoAlgorithm(alg, interface, std::vector<int>{det_id});
os << ToString(alg) << ' ' << ToString(interface) << '\n'; os << ToString(alg) << ' ' << ToString(interface) << '\n';
@ -2368,7 +2366,9 @@ std::string CmdProxy::Counters(int action) {
if (args.empty()) { if (args.empty()) {
WrongNumberOfParameters(1); WrongNumberOfParameters(1);
} }
if (std::any_of(args.cbegin(), args.cend(), [](std::string s){ return (StringTo<int>(s) < 0 || StringTo<int>(s) > 2); })) { if (std::any_of(args.cbegin(), args.cend(), [](std::string s) {
return (StringTo<int>(s) < 0 || StringTo<int>(s) > 2);
})) {
throw RuntimeError("Invalid counter indices list. Example: 0 1 2"); throw RuntimeError("Invalid counter indices list. Example: 0 1 2");
} }
// convert vector to counter enable mask // convert vector to counter enable mask
@ -2402,8 +2402,7 @@ std::string CmdProxy::GateDelay(int action) {
} else if (cmd == "gatedelay3") { } else if (cmd == "gatedelay3") {
gateIndex = 2; gateIndex = 2;
} else { } else {
throw RuntimeError( throw RuntimeError("Unknown command, use list to list all commands");
"Unknown command, use list to list all commands");
} }
std::ostringstream os; std::ostringstream os;
@ -2705,12 +2704,17 @@ std::string CmdProxy::PatternWord(int action) {
return os.str(); return os.str();
} }
void CmdProxy::GetLevelAndUpdateArgIndex(int action, std::string levelSeparatedCommand, int& level, int& iArg, size_t nGetArgs, size_t nPutArgs) { void CmdProxy::GetLevelAndUpdateArgIndex(int action,
std::string levelSeparatedCommand,
int &level, int &iArg, size_t nGetArgs,
size_t nPutArgs) {
if (cmd == levelSeparatedCommand) { if (cmd == levelSeparatedCommand) {
++nGetArgs; ++nGetArgs;
++nPutArgs; ++nPutArgs;
} else { } else {
LOG(logWARNING) << "This command is deprecated and will be removed. Please migrate to " << levelSeparatedCommand; LOG(logWARNING) << "This command is deprecated and will be removed. "
"Please migrate to "
<< levelSeparatedCommand;
} }
if (action == defs::GET_ACTION && args.size() != nGetArgs) { if (action == defs::GET_ACTION && args.size() != nGetArgs) {
WrongNumberOfParameters(nGetArgs); WrongNumberOfParameters(nGetArgs);
@ -2725,9 +2729,9 @@ void CmdProxy::GetLevelAndUpdateArgIndex(int action, std::string levelSeparatedC
} }
std::string CmdProxy::PatternLoopAddresses(int action) { std::string CmdProxy::PatternLoopAddresses(int action) {
if (cmd != "patlimits" && cmd != "patloop0" && cmd != "patloop1" && cmd != "patloop2" && cmd != "patloop") { if (cmd != "patlimits" && cmd != "patloop0" && cmd != "patloop1" &&
throw RuntimeError( cmd != "patloop2" && cmd != "patloop") {
"Unknown command, use list to list all commands"); throw RuntimeError("Unknown command, use list to list all commands");
} }
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
@ -2737,17 +2741,17 @@ std::string CmdProxy::PatternLoopAddresses(int action) {
"of complete pattern." "of complete pattern."
<< '\n'; << '\n';
} else if (cmd == "patloop") { } else if (cmd == "patloop") {
os << "[0-6] [start addr] [stop addr] \n\t[Ctb][Moench][Mythen3] Limits of the loop level provided." os << "[0-6] [start addr] [stop addr] \n\t[Ctb][Moench][Mythen3] "
<< "\n\t[Mythen3] Level options: 0-3 only." "Limits of the loop level provided."
<< '\n'; << "\n\t[Mythen3] Level options: 0-3 only." << '\n';
} else { } else {
os << "Depreciated command. Use patloop." os << "Depreciated command. Use patloop." << '\n';
<< '\n';
} }
} else { } else {
int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 2; int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 2;
if (cmd != "patlimits") { if (cmd != "patlimits") {
GetLevelAndUpdateArgIndex(action, "patloop", level, iArg, nGetArgs, nPutArgs); GetLevelAndUpdateArgIndex(action, "patloop", level, iArg, nGetArgs,
nPutArgs);
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
auto t = auto t =
@ -2768,25 +2772,25 @@ std::string CmdProxy::PatternLoopAddresses(int action) {
} }
std::string CmdProxy::PatternLoopCycles(int action) { std::string CmdProxy::PatternLoopCycles(int action) {
if (cmd != "patnloop0" && cmd != "patnloop1" && cmd != "patnloop2" && cmd != "patnloop") { if (cmd != "patnloop0" && cmd != "patnloop1" && cmd != "patnloop2" &&
throw RuntimeError( cmd != "patnloop") {
"Unknown command, use list to list all commands"); throw RuntimeError("Unknown command, use list to list all commands");
} }
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
if (cmd == "patnloop") { if (cmd == "patnloop") {
os << "[0-6] [n_cycles] \n\t[Ctb][Moench][Mythen3] Number of cycles of " os << "[0-6] [n_cycles] \n\t[Ctb][Moench][Mythen3] Number of "
"cycles of "
"the loop level provided." "the loop level provided."
<< "\n\t[Mythen3] Level options: 0-3 only." << "\n\t[Mythen3] Level options: 0-3 only." << '\n';
<< '\n';
} else { } else {
os << "Depreciated command. Use patnloop." os << "Depreciated command. Use patnloop." << '\n';
<< '\n';
} }
} else { } else {
int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 1; int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 1;
GetLevelAndUpdateArgIndex(action, "patnloop", level, iArg, nGetArgs, nPutArgs); GetLevelAndUpdateArgIndex(action, "patnloop", level, iArg, nGetArgs,
nPutArgs);
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
auto t = det->getPatternLoopCycles(level, std::vector<int>{det_id}); auto t = det->getPatternLoopCycles(level, std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
@ -2802,15 +2806,16 @@ std::string CmdProxy::PatternLoopCycles(int action) {
} }
std::string CmdProxy::PatternWaitAddress(int action) { std::string CmdProxy::PatternWaitAddress(int action) {
if (cmd != "patwait0" && cmd != "patwait1" && cmd != "patwait2" && cmd != "patwait") { if (cmd != "patwait0" && cmd != "patwait1" && cmd != "patwait2" &&
throw RuntimeError( cmd != "patwait") {
"Unknown command, use list to list all commands"); throw RuntimeError("Unknown command, use list to list all commands");
} }
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
if (cmd == "patwait") { if (cmd == "patwait") {
os << "[0-6] [addr] \n\t[Ctb][Moench][Mythen3] Wait address for loop level provided." os << "[0-6] [addr] \n\t[Ctb][Moench][Mythen3] Wait address for "
"loop level provided."
<< "\n\t[Mythen3] Level options: 0-3 only."; << "\n\t[Mythen3] Level options: 0-3 only.";
} else { } else {
os << "Depreciated command. Use patwait."; os << "Depreciated command. Use patwait.";
@ -2818,7 +2823,8 @@ std::string CmdProxy::PatternWaitAddress(int action) {
os << '\n'; os << '\n';
} else { } else {
int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 1; int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 1;
GetLevelAndUpdateArgIndex(action, "patwait", level, iArg, nGetArgs, nPutArgs); GetLevelAndUpdateArgIndex(action, "patwait", level, iArg, nGetArgs,
nPutArgs);
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
auto t = det->getPatternWaitAddr(level, std::vector<int>{det_id}); auto t = det->getPatternWaitAddr(level, std::vector<int>{det_id});
os << OutStringHex(t, 4) << '\n'; os << OutStringHex(t, 4) << '\n';
@ -2834,9 +2840,9 @@ std::string CmdProxy::PatternWaitAddress(int action) {
} }
std::string CmdProxy::PatternWaitTime(int action) { std::string CmdProxy::PatternWaitTime(int action) {
if (cmd != "patwaittime0" && cmd != "patwaittime1" && cmd != "patwaittime2" && cmd != "patwaittime") { if (cmd != "patwaittime0" && cmd != "patwaittime1" &&
throw RuntimeError( cmd != "patwaittime2" && cmd != "patwaittime") {
"Unknown command, use list to list all commands"); throw RuntimeError("Unknown command, use list to list all commands");
} }
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
@ -2844,15 +2850,14 @@ std::string CmdProxy::PatternWaitTime(int action) {
if (cmd == "patwaittime") { if (cmd == "patwaittime") {
os << "[0-6] [n_clk] \n\t[Ctb][Moench][Mythen3] Wait time in clock " os << "[0-6] [n_clk] \n\t[Ctb][Moench][Mythen3] Wait time in clock "
"cycles for the loop provided." "cycles for the loop provided."
<< "\n\t[Mythen3] Level options: 0-3 only." << "\n\t[Mythen3] Level options: 0-3 only." << '\n';
<< '\n';
} else { } else {
os << "Depreciated command. Use patwaittime." os << "Depreciated command. Use patwaittime." << '\n';
<< '\n';
} }
} else { } else {
int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 1; int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 1;
GetLevelAndUpdateArgIndex(action, "patwaittime", level, iArg, nGetArgs, nPutArgs); GetLevelAndUpdateArgIndex(action, "patwaittime", level, iArg, nGetArgs,
nPutArgs);
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
auto t = det->getPatternWaitTime(level, std::vector<int>{det_id}); auto t = det->getPatternWaitTime(level, std::vector<int>{det_id});
os << OutString(t) << '\n'; os << OutString(t) << '\n';
@ -2965,8 +2970,7 @@ std::string CmdProxy::ProgramFpga(int action) {
bool forceDeteleNormalFile = false; bool forceDeteleNormalFile = false;
if (args.size() == 2) { if (args.size() == 2) {
if (args[1] != "--force-delete-normal-file") { if (args[1] != "--force-delete-normal-file") {
throw RuntimeError( throw RuntimeError("Could not scan second argument. Did you "
"Could not scan second argument. Did you "
"mean --force-delete-normal-file?"); "mean --force-delete-normal-file?");
} }
forceDeteleNormalFile = true; forceDeteleNormalFile = true;

22
slsDetectorSoftware/src/CmdProxy.h
View File

@ -254,8 +254,7 @@ namespace sls {
os << OutString(t) << '\n'; \ os << OutString(t) << '\n'; \
} else if (action == slsDetectorDefs::PUT_ACTION) { \ } else if (action == slsDetectorDefs::PUT_ACTION) { \
if (det_id != -1) { \ if (det_id != -1) { \
throw RuntimeError( \ throw RuntimeError("Cannot execute this at module level"); \
"Cannot execute this at module level"); \
} \ } \
if (args.size() != 1) { \ if (args.size() != 1) { \
WrongNumberOfParameters(1); \ WrongNumberOfParameters(1); \
@ -1196,7 +1195,10 @@ class CmdProxy {
/* Pattern */ /* Pattern */
std::string Pattern(int action); std::string Pattern(int action);
std::string PatternWord(int action); std::string PatternWord(int action);
void GetLevelAndUpdateArgIndex(int action, std::string levelSeparatedCommand, int& level, int& iArg, size_t nGetArgs, size_t nPutArgs); void GetLevelAndUpdateArgIndex(int action,
std::string levelSeparatedCommand,
int &level, int &iArg, size_t nGetArgs,
size_t nPutArgs);
std::string PatternLoopAddresses(int action); std::string PatternLoopAddresses(int action);
std::string PatternLoopCycles(int action); std::string PatternLoopCycles(int action);
std::string PatternWaitAddress(int action); std::string PatternWaitAddress(int action);
@ -1604,7 +1606,6 @@ class CmdProxy {
"out from in a round robin fashion. The entry must not have been " "out from in a round robin fashion. The entry must not have been "
"empty. Default: 0"); "empty. Default: 0");
INTEGER_COMMAND_VEC_ID( INTEGER_COMMAND_VEC_ID(
udp_srcmac, getSourceUDPMAC, setSourceUDPMAC, MacAddr, udp_srcmac, getSourceUDPMAC, setSourceUDPMAC, MacAddr,
"[x:x:x:x:x:x]\n\tMac address of the detector (source) udp " "[x:x:x:x:x:x]\n\tMac address of the detector (source) udp "
@ -1981,8 +1982,7 @@ class CmdProxy {
"users only."); "users only.");
INTEGER_COMMAND_VEC_ID( INTEGER_COMMAND_VEC_ID(
gainmode, getGainMode, setGainMode, gainmode, getGainMode, setGainMode, StringTo<slsDetectorDefs::gainMode>,
StringTo<slsDetectorDefs::gainMode>,
"[dynamicgain|forceswitchg1|forceswitchg2|fixg1|fixg2|fixg0]\n\t[" "[dynamicgain|forceswitchg1|forceswitchg2|fixg1|fixg2|fixg0]\n\t["
"Jungfrau] Gain mode.\n\tCAUTION: Do not use fixg0 without caution, " "Jungfrau] Gain mode.\n\tCAUTION: Do not use fixg0 without caution, "
"you can damage the detector!!!"); "you can damage the detector!!!");
@ -2047,11 +2047,15 @@ class CmdProxy {
INTEGER_COMMAND_VEC_ID(interpolation, getInterpolation, setInterpolation, INTEGER_COMMAND_VEC_ID(interpolation, getInterpolation, setInterpolation,
StringTo<int>, StringTo<int>,
"[0, 1]\n\t[Mythen3] Enables or disables " "[0, 1]\n\t[Mythen3] Enables or disables "
"interpolation. Default is disabled. Interpolation mode enables all counters and disables vth3. Disabling sets back counter mask and vth3."); "interpolation. Default is disabled. Interpolation "
"mode enables all counters and disables vth3. "
"Disabling sets back counter mask and vth3.");
INTEGER_COMMAND_VEC_ID(pumpprobe, getPumpProbe, setPumpProbe, StringTo<int>, INTEGER_COMMAND_VEC_ID(
pumpprobe, getPumpProbe, setPumpProbe, StringTo<int>,
"[0, 1]\n\t[Mythen3] Enables or disables pump probe " "[0, 1]\n\t[Mythen3] Enables or disables pump probe "
"mode. Default is disabled. Pump probe mode only enables vth2. Disabling sets back to previous value."); "mode. Default is disabled. Pump probe mode only enables vth2. "
"Disabling sets back to previous value.");
INTEGER_COMMAND_VEC_ID(apulse, getAnalogPulsing, setAnalogPulsing, INTEGER_COMMAND_VEC_ID(apulse, getAnalogPulsing, setAnalogPulsing,
StringTo<int>, StringTo<int>,

4
slsDetectorSoftware/src/CtbConfig.cpp
View File

@ -65,8 +65,6 @@ std::vector<std::string> CtbConfig::getDacNames() const {
return names; return names;
} }
const char* CtbConfig::shm_tag(){ const char *CtbConfig::shm_tag() { return shm_tag_; }
return shm_tag_;
}
} // namespace sls } // namespace sls

2
slsDetectorSoftware/src/CtbConfig.h
View File

@ -3,7 +3,6 @@
#include <vector> #include <vector>
namespace sls { namespace sls {
class CtbConfig { class CtbConfig {
static constexpr size_t name_length = 20; static constexpr size_t name_length = 20;
static constexpr size_t num_dacs = 18; static constexpr size_t num_dacs = 18;
@ -27,5 +26,4 @@ class CtbConfig {
static const char *shm_tag(); static const char *shm_tag();
}; };
} // namespace sls } // namespace sls

3
slsDetectorSoftware/src/Detector.cpp
View File

@ -55,8 +55,7 @@ void freeSharedMemory(int detectorIndex, int moduleIndex) {
using defs = slsDetectorDefs; using defs = slsDetectorDefs;
Detector::Detector(int shm_id) Detector::Detector(int shm_id) : pimpl(make_unique<DetectorImpl>(shm_id)) {}
: pimpl(make_unique<DetectorImpl>(shm_id)) {}
Detector::~Detector() = default; Detector::~Detector() = default;

33
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -185,8 +185,7 @@ void DetectorImpl::initializeMembers(bool verify) {
// get objects from single det shared memory (open) // get objects from single det shared memory (open)
for (int i = 0; i < shm()->totalNumberOfModules; i++) { for (int i = 0; i < shm()->totalNumberOfModules; i++) {
try { try {
modules.push_back( modules.push_back(make_unique<Module>(detectorIndex, i, verify));
make_unique<Module>(detectorIndex, i, verify));
} catch (...) { } catch (...) {
modules.clear(); modules.clear();
throw; throw;
@ -307,8 +306,7 @@ void DetectorImpl::addModule(const std::string &hostname) {
} }
auto pos = modules.size(); auto pos = modules.size();
modules.emplace_back( modules.emplace_back(make_unique<Module>(type, detectorIndex, pos, false));
make_unique<Module>(type, detectorIndex, pos, false));
shm()->totalNumberOfModules = modules.size(); shm()->totalNumberOfModules = modules.size();
modules[pos]->setControlPort(port); modules[pos]->setControlPort(port);
modules[pos]->setStopPort(port + 1); modules[pos]->setStopPort(port + 1);
@ -672,7 +670,6 @@ void DetectorImpl::readFrameFromReceiver() {
<< "\n\t databytes: " << multisize << "\n\t databytes: " << multisize
<< "\n\t dynamicRange: " << dynamicRange; << "\n\t dynamicRange: " << dynamicRange;
// send data to callback // send data to callback
if (data) { if (data) {
char *callbackImage = multiframe.get(); char *callbackImage = multiframe.get();
@ -1463,7 +1460,8 @@ defs::ROI DetectorImpl::getRxROI() const {
auto t = Parallel(&Module::getRxROI, {}); auto t = Parallel(&Module::getRxROI, {});
if (t.equal() && t.front().completeRoi()) { if (t.equal() && t.front().completeRoi()) {
LOG(logDEBUG) << "no roi"; LOG(logDEBUG) << "no roi";
return defs::ROI (0, shm()->numberOfChannels.x - 1, 0, shm()->numberOfChannels.y - 1); return defs::ROI(0, shm()->numberOfChannels.x - 1, 0,
shm()->numberOfChannels.y - 1);
} }
defs::xy numChansPerMod = modules[0]->getNumberOfChannels(); defs::xy numChansPerMod = modules[0]->getNumberOfChannels();
@ -1537,21 +1535,26 @@ void DetectorImpl::setRxROI(const defs::ROI arg) {
throw RuntimeError("Invalid Roi of size 0."); throw RuntimeError("Invalid Roi of size 0.");
} }
if (arg.completeRoi()) { if (arg.completeRoi()) {
throw RuntimeError("Did you mean the clear roi command (API: clearRxROI, cmd: rx_clearroi)?"); throw RuntimeError("Did you mean the clear roi command (API: "
"clearRxROI, cmd: rx_clearroi)?");
} }
if (arg.xmin > arg.xmax || arg.ymin > arg.ymax) { if (arg.xmin > arg.xmax || arg.ymin > arg.ymax) {
throw RuntimeError("Invalid Receiver Roi. xmin/ymin exceeds xmax/ymax."); throw RuntimeError(
"Invalid Receiver Roi. xmin/ymin exceeds xmax/ymax.");
} }
defs::xy numChansPerMod = modules[0]->getNumberOfChannels(); defs::xy numChansPerMod = modules[0]->getNumberOfChannels();
bool is2D = (numChansPerMod.y > 1 ? true : false); bool is2D = (numChansPerMod.y > 1 ? true : false);
defs::xy geometry = getPortGeometry(); defs::xy geometry = getPortGeometry();
if (!is2D && ((arg.ymin != -1 && arg.ymin != 0) || (arg.ymax != -1 && arg.ymax != 0))) { if (!is2D && ((arg.ymin != -1 && arg.ymin != 0) ||
throw RuntimeError("Invalid Receiver roi. Cannot set 2d roi for a 1d detector."); (arg.ymax != -1 && arg.ymax != 0))) {
throw RuntimeError(
"Invalid Receiver roi. Cannot set 2d roi for a 1d detector.");
} }
if (arg.xmin < 0 || arg.xmax >= shm()->numberOfChannels.x || (is2D && (arg.ymin < 0 || arg.ymax >= shm()->numberOfChannels.y))) { if (arg.xmin < 0 || arg.xmax >= shm()->numberOfChannels.x ||
(is2D && (arg.ymin < 0 || arg.ymax >= shm()->numberOfChannels.y))) {
throw RuntimeError("Invalid Receiver Roi. Outside detector range."); throw RuntimeError("Invalid Receiver Roi. Outside detector range.");
} }
@ -1576,7 +1579,8 @@ void DetectorImpl::setRxROI(const defs::ROI arg) {
--moduleRoi.xmax; --moduleRoi.xmax;
} }
} else { } else {
throw RuntimeError("Cannot have more than 2 modules for a Gotthard2 detector"); throw RuntimeError("Cannot have more than 2 modules for a "
"Gotthard2 detector");
} }
} else { } else {
// get module limits // get module limits
@ -1625,7 +1629,9 @@ void DetectorImpl::setRxROI(const defs::ROI arg) {
// metadata // metadata
if (arg.completeRoi()) { if (arg.completeRoi()) {
modules[0]->setRxROIMetadata(defs::ROI (0, shm()->numberOfChannels.x - 1, 0, shm()->numberOfChannels.y - 1)); modules[0]->setRxROIMetadata(defs::ROI(0, shm()->numberOfChannels.x - 1,
0,
shm()->numberOfChannels.y - 1));
} else { } else {
modules[0]->setRxROIMetadata(arg); modules[0]->setRxROIMetadata(arg);
} }
@ -1639,7 +1645,6 @@ void DetectorImpl::clearRxROI() {
shm()->rx_roi.ymax = -1; shm()->rx_roi.ymax = -1;
} }
std::vector<std::string> DetectorImpl::getCtbDacNames() const { std::vector<std::string> DetectorImpl::getCtbDacNames() const {
return ctb_shm()->getDacNames(); return ctb_shm()->getDacNames();
} }

12
slsDetectorSoftware/src/DetectorImpl.h
View File

@ -2,20 +2,20 @@
// Copyright (C) 2021 Contributors to the SLS Detector Package // Copyright (C) 2021 Contributors to the SLS Detector Package
#pragma once #pragma once
#include "CtbConfig.h"
#include "SharedMemory.h" #include "SharedMemory.h"
#include "sls/Result.h" #include "sls/Result.h"
#include "sls/logger.h" #include "sls/logger.h"
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
#include "CtbConfig.h"
#include <future>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <numeric>
#include <semaphore.h> #include <semaphore.h>
#include <string> #include <string>
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <future>
#include <numeric>
namespace sls { namespace sls {
@ -142,8 +142,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
} }
template <typename... CT> template <typename... CT>
void Parallel(void (Module::*somefunc)(CT...), void Parallel(void (Module::*somefunc)(CT...), std::vector<int> positions,
std::vector<int> positions,
typename NonDeduced<CT>::type... Args) { typename NonDeduced<CT>::type... Args) {
if (modules.empty()) if (modules.empty())
@ -296,8 +295,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
std::vector<char> readProgrammingFile(const std::string &fname); std::vector<char> readProgrammingFile(const std::string &fname);
void setNumberofUDPInterfaces(int n, Positions pos); void setNumberofUDPInterfaces(int n, Positions pos);
Result<int> getDefaultDac(defs::dacIndex index, Result<int> getDefaultDac(defs::dacIndex index, defs::detectorSettings sett,
defs::detectorSettings sett,
Positions pos = {}); Positions pos = {});
void setDefaultDac(defs::dacIndex index, int defaultValue, void setDefaultDac(defs::dacIndex index, int defaultValue,
defs::detectorSettings sett, Positions pos); defs::detectorSettings sett, Positions pos);

46
slsDetectorSoftware/src/Module.cpp
View File

@ -237,15 +237,16 @@ void Module::setAllThresholdEnergy(std::array<int, 3> e_eV,
throw RuntimeError("This detector should have called with 3 energies"); throw RuntimeError("This detector should have called with 3 energies");
} }
if (shm()->trimEnergies.empty()) { if (shm()->trimEnergies.empty()) {
throw RuntimeError( throw RuntimeError("Trim energies have not been defined for this "
"Trim energies have not been defined for this module yet! Use trimen."); "module yet! Use trimen.");
} }
std::vector<int> energy(e_eV.begin(), e_eV.end()); std::vector<int> energy(e_eV.begin(), e_eV.end());
// if all energies are same // if all energies are same
if (allEqualTo(energy, energy[0])) { if (allEqualTo(energy, energy[0])) {
if (energy[0] == -1) { if (energy[0] == -1) {
throw RuntimeError("Every energy provided to set threshold energy is -1. Typo?"); throw RuntimeError(
"Every energy provided to set threshold energy is -1. Typo?");
} }
energy.resize(1); energy.resize(1);
} }
@ -309,7 +310,9 @@ void Module::setAllThresholdEnergy(std::array<int, 3> e_eV,
trim2, trimbits); trim2, trimbits);
// csr // csr
if (myMod1.reg != myMod2.reg) { if (myMod1.reg != myMod2.reg) {
throw RuntimeError("setAllThresholdEnergy: chip shift register values do not match between files for energy (eV) " + throw RuntimeError(
"setAllThresholdEnergy: chip shift register values do not "
"match between files for energy (eV) " +
std::to_string(energy[i])); std::to_string(energy[i]));
} }
myMods[i].reg = myMod1.reg; myMods[i].reg = myMod1.reg;
@ -319,12 +322,10 @@ void Module::setAllThresholdEnergy(std::array<int, 3> e_eV,
sls_detector_module myMod{shm()->detType}; sls_detector_module myMod{shm()->detType};
myMod = myMods[0]; myMod = myMods[0];
// if multiple thresholds, combine // if multiple thresholds, combine
if (myMods.size() > 1) { if (myMods.size() > 1) {
auto counters = getSetBits(getCounterMask()); auto counters = getSetBits(getCounterMask());
// average vtrim of enabled counters // average vtrim of enabled counters
int sum = 0; int sum = 0;
for (size_t i = 0; i < counters.size(); ++i) { for (size_t i = 0; i < counters.size(); ++i) {
@ -364,7 +365,9 @@ void Module::setAllThresholdEnergy(std::array<int, 3> e_eV,
} }
// csr // csr
if (myMods[0].reg != myMods[1].reg || myMods[1].reg != myMods[2].reg) { if (myMods[0].reg != myMods[1].reg || myMods[1].reg != myMods[2].reg) {
throw RuntimeError("setAllThresholdEnergy: chip shift register values do not match between files for all energies"); throw RuntimeError(
"setAllThresholdEnergy: chip shift register values do not "
"match between files for all energies");
} }
} }
@ -2397,8 +2400,7 @@ void Module::setReceiverDbitList(std::vector<int> list) {
} }
for (auto &it : list) { for (auto &it : list) {
if (it < 0 || it > 63) { if (it < 0 || it > 63) {
throw RuntimeError( throw RuntimeError("Dbit list value must be between 0 and 63\n");
"Dbit list value must be between 0 and 63\n");
} }
} }
std::sort(begin(list), end(list)); std::sort(begin(list), end(list));
@ -3297,8 +3299,8 @@ void Module::setModule(sls_detector_module &module, bool trimbits) {
} }
} }
if (out_of_range) { if (out_of_range) {
LOG(logWARNING) LOG(logWARNING) << "Some trimbits were out of range, these have "
<< "Some trimbits were out of range, these have been replaced with 0 or 63."; "been replaced with 0 or 63.";
} }
// check dacs // check dacs
out_of_range = false; out_of_range = false;
@ -3318,7 +3320,8 @@ void Module::setModule(sls_detector_module &module, bool trimbits) {
} }
} }
if (out_of_range) { if (out_of_range) {
LOG(logWARNING) << "Some dacs were out of range, " LOG(logWARNING)
<< "Some dacs were out of range, "
"these have been replaced with 0/200 or 2800/2400."; "these have been replaced with 0/200 or 2800/2400.";
} }
} }
@ -3391,14 +3394,18 @@ void Module::sendModule(sls_detector_module *myMod, ClientSocket &client) {
ts += n; ts += n;
LOG(level) << "channels sent. " << n << " bytes"; LOG(level) << "channels sent. " << n << " bytes";
int expectedBytesSent = sizeof(sls_detector_module) - sizeof(myMod->dacs) - sizeof(myMod->chanregs) + (myMod->ndac * sizeof(int)) + (myMod->nchan * sizeof(int)); int expectedBytesSent = sizeof(sls_detector_module) - sizeof(myMod->dacs) -
sizeof(myMod->chanregs) +
(myMod->ndac * sizeof(int)) +
(myMod->nchan * sizeof(int));
if (expectedBytesSent != ts) { if (expectedBytesSent != ts) {
throw RuntimeError("Module size " + std::to_string(ts) + " sent does not match expected size to be sent " + std::to_string(expectedBytesSent)); throw RuntimeError("Module size " + std::to_string(ts) +
" sent does not match expected size to be sent " +
std::to_string(expectedBytesSent));
} }
} }
void Module::receiveModule(sls_detector_module *myMod, ClientSocket &client) { void Module::receiveModule(sls_detector_module *myMod, ClientSocket &client) {
constexpr TLogLevel level = logDEBUG1; constexpr TLogLevel level = logDEBUG1;
LOG(level) << "Receiving Module"; LOG(level) << "Receiving Module";
@ -3630,7 +3637,8 @@ sls_detector_module Module::readSettingsFile(const std::string &fname,
return myMod; return myMod;
} }
void Module::saveSettingsFile(sls_detector_module &myMod, const std::string &fname) { void Module::saveSettingsFile(sls_detector_module &myMod,
const std::string &fname) {
LOG(logDEBUG1) << moduleIndex << ": Saving settings to " << fname; LOG(logDEBUG1) << moduleIndex << ": Saving settings to " << fname;
std::ofstream outfile(fname); std::ofstream outfile(fname);
if (!outfile) { if (!outfile) {
@ -3654,9 +3662,11 @@ void Module::saveSettingsFile(sls_detector_module &myMod, const std::string &fna
sizeof(int) * (myMod.nchan)); sizeof(int) * (myMod.nchan));
break; break;
default: default:
throw RuntimeError("Saving settings file is not implemented for this detector."); throw RuntimeError(
"Saving settings file is not implemented for this detector.");
} }
LOG(logINFO) << "Settings for " << shm()->hostname << " written to " << fname; LOG(logINFO) << "Settings for " << shm()->hostname << " written to "
<< fname;
} }
void Module::sendProgram(bool blackfin, std::vector<char> buffer, void Module::sendProgram(bool blackfin, std::vector<char> buffer,

48
slsDetectorSoftware/src/Pattern.cpp
View File

@ -29,11 +29,13 @@ bool Pattern::operator==(const Pattern &other) const {
if (pat->limits[i] != other.pat->limits[i]) if (pat->limits[i] != other.pat->limits[i])
return false; return false;
} }
for (size_t i = 0; i < (sizeof(pat->startloop) / sizeof(pat->startloop[0])); ++i) { for (size_t i = 0; i < (sizeof(pat->startloop) / sizeof(pat->startloop[0]));
++i) {
if (pat->startloop[i] != other.pat->startloop[i]) if (pat->startloop[i] != other.pat->startloop[i])
return false; return false;
} }
for (size_t i = 0; i < (sizeof(pat->stoploop) / sizeof(pat->stoploop[0])); ++i) { for (size_t i = 0; i < (sizeof(pat->stoploop) / sizeof(pat->stoploop[0]));
++i) {
if (pat->stoploop[i] != other.pat->stoploop[i]) if (pat->stoploop[i] != other.pat->stoploop[i])
return false; return false;
} }
@ -70,11 +72,10 @@ void Pattern::validate() const {
for (int i = 0; i != MAX_PATTERN_LEVELS; ++i) { for (int i = 0; i != MAX_PATTERN_LEVELS; ++i) {
if (pat->startloop[i] >= MAX_PATTERN_LENGTH || if (pat->startloop[i] >= MAX_PATTERN_LENGTH ||
pat->stoploop[i] >= MAX_PATTERN_LENGTH) { pat->stoploop[i] >= MAX_PATTERN_LENGTH) {
throw RuntimeError( throw RuntimeError("Invalid Pattern loop address for level " +
"Invalid Pattern loop address for level " + ToString(i) + ToString(i) + std::string(" [") +
std::string(" [") + ToString(pat->startloop[i]) + ToString(pat->startloop[i]) + std::string(", ") +
std::string(", ") + ToString(pat->stoploop[i]) + ToString(pat->stoploop[i]) + std::string("]"));
std::string("]"));
} }
if (pat->wait[i] >= MAX_PATTERN_LENGTH) { if (pat->wait[i] >= MAX_PATTERN_LENGTH) {
throw RuntimeError("Invalid Pattern wait address for level " + throw RuntimeError("Invalid Pattern wait address for level " +
@ -129,8 +130,7 @@ void Pattern::load(const std::string &fname) {
} }
pat->limits[0] = StringTo<uint32_t>(args[1]); pat->limits[0] = StringTo<uint32_t>(args[1]);
pat->limits[1] = StringTo<uint32_t>(args[2]); pat->limits[1] = StringTo<uint32_t>(args[2]);
} } else if (cmd == "patloop0" || cmd == "patloop1" ||
else if (cmd == "patloop0" || cmd == "patloop1" ||
cmd == "patloop2" || cmd == "patloop") { cmd == "patloop2" || cmd == "patloop") {
int level = -1, iArg = 1; int level = -1, iArg = 1;
if (cmd == "patloop") { if (cmd == "patloop") {
@ -140,7 +140,8 @@ void Pattern::load(const std::string &fname) {
} }
level = StringTo<int>(args[iArg++]); level = StringTo<int>(args[iArg++]);
} else { } else {
LOG(logWARNING) << "Depreciated command. Please use patloop next time."; LOG(logWARNING)
<< "Depreciated command. Please use patloop next time.";
if (nargs != 2) { if (nargs != 2) {
throw RuntimeError("Invalid arguments for " + throw RuntimeError("Invalid arguments for " +
ToString(args)); ToString(args));
@ -148,7 +149,8 @@ void Pattern::load(const std::string &fname) {
level = cmd[cmd.find_first_of("012")] - '0'; level = cmd[cmd.find_first_of("012")] - '0';
} }
if (level < 0 || level >= MAX_PATTERN_LEVELS) { if (level < 0 || level >= MAX_PATTERN_LEVELS) {
throw RuntimeError("Invalid Pattern level. Options 0-" + std::to_string(MAX_PATTERN_LEVELS - 1)); throw RuntimeError("Invalid Pattern level. Options 0-" +
std::to_string(MAX_PATTERN_LEVELS - 1));
} }
int loop1 = StringTo<uint32_t>(args[iArg++]); int loop1 = StringTo<uint32_t>(args[iArg++]);
int loop2 = StringTo<uint32_t>(args[iArg++]); int loop2 = StringTo<uint32_t>(args[iArg++]);
@ -164,7 +166,8 @@ void Pattern::load(const std::string &fname) {
} }
level = StringTo<int>(args[iArg++]); level = StringTo<int>(args[iArg++]);
} else { } else {
LOG(logWARNING) << "Depreciated command. Please use patnloop next time."; LOG(logWARNING) << "Depreciated command. Please use "
"patnloop next time.";
if (nargs != 1) { if (nargs != 1) {
throw RuntimeError("Invalid arguments for " + throw RuntimeError("Invalid arguments for " +
ToString(args)); ToString(args));
@ -172,7 +175,8 @@ void Pattern::load(const std::string &fname) {
level = cmd[cmd.find_first_of("012")] - '0'; level = cmd[cmd.find_first_of("012")] - '0';
} }
if (level < 0 || level >= MAX_PATTERN_LEVELS) { if (level < 0 || level >= MAX_PATTERN_LEVELS) {
throw RuntimeError("Invalid Pattern level. Options 0-" + std::to_string(MAX_PATTERN_LEVELS - 1)); throw RuntimeError("Invalid Pattern level. Options 0-" +
std::to_string(MAX_PATTERN_LEVELS - 1));
} }
pat->nloop[level] = StringTo<uint32_t>(args[iArg++]); pat->nloop[level] = StringTo<uint32_t>(args[iArg++]);
} else if (cmd == "patwait0" || cmd == "patwait1" || } else if (cmd == "patwait0" || cmd == "patwait1" ||
@ -185,7 +189,8 @@ void Pattern::load(const std::string &fname) {
} }
level = StringTo<int>(args[iArg++]); level = StringTo<int>(args[iArg++]);
} else { } else {
LOG(logWARNING) << "Depreciated command. Please use patwait next time."; LOG(logWARNING)
<< "Depreciated command. Please use patwait next time.";
if (nargs != 1) { if (nargs != 1) {
throw RuntimeError("Invalid arguments for " + throw RuntimeError("Invalid arguments for " +
ToString(args)); ToString(args));
@ -193,7 +198,8 @@ void Pattern::load(const std::string &fname) {
level = cmd[cmd.find_first_of("012")] - '0'; level = cmd[cmd.find_first_of("012")] - '0';
} }
if (level < 0 || level >= MAX_PATTERN_LEVELS) { if (level < 0 || level >= MAX_PATTERN_LEVELS) {
throw RuntimeError("Invalid Pattern level. Options 0-" + std::to_string(MAX_PATTERN_LEVELS - 1)); throw RuntimeError("Invalid Pattern level. Options 0-" +
std::to_string(MAX_PATTERN_LEVELS - 1));
} }
pat->wait[level] = StringTo<uint32_t>(args[iArg++]); pat->wait[level] = StringTo<uint32_t>(args[iArg++]);
} else if (cmd == "patwaittime0" || cmd == "patwaittime1" || } else if (cmd == "patwaittime0" || cmd == "patwaittime1" ||
@ -206,7 +212,8 @@ void Pattern::load(const std::string &fname) {
} }
level = StringTo<int>(args[iArg++]); level = StringTo<int>(args[iArg++]);
} else { } else {
LOG(logWARNING) << "Depreciated command. Please use patwaittime next time."; LOG(logWARNING) << "Depreciated command. Please use "
"patwaittime next time.";
if (nargs != 1) { if (nargs != 1) {
throw RuntimeError("Invalid arguments for " + throw RuntimeError("Invalid arguments for " +
ToString(args)); ToString(args));
@ -214,7 +221,8 @@ void Pattern::load(const std::string &fname) {
level = cmd[cmd.find_first_of("012")] - '0'; level = cmd[cmd.find_first_of("012")] - '0';
} }
if (level < 0 || level >= MAX_PATTERN_LEVELS) { if (level < 0 || level >= MAX_PATTERN_LEVELS) {
throw RuntimeError("Invalid Pattern level. Options 0-" + std::to_string(MAX_PATTERN_LEVELS - 1)); throw RuntimeError("Invalid Pattern level. Options 0-" +
std::to_string(MAX_PATTERN_LEVELS - 1));
} }
pat->waittime[level] = StringTo<uint64_t>(args[iArg++]); pat->waittime[level] = StringTo<uint64_t>(args[iArg++]);
} else { } else {
@ -279,10 +287,12 @@ std::string Pattern::str() const {
<< ToStringHex(pat->limits[1], addr_width) << std::endl; << ToStringHex(pat->limits[1], addr_width) << std::endl;
for (int i = 0; i != MAX_PATTERN_LEVELS; ++i) { for (int i = 0; i != MAX_PATTERN_LEVELS; ++i) {
oss << "patloop " << i << ' ' << ToStringHex(pat->startloop[i], addr_width) << " " oss << "patloop " << i << ' '
<< ToStringHex(pat->startloop[i], addr_width) << " "
<< ToStringHex(pat->stoploop[i], addr_width) << std::endl << ToStringHex(pat->stoploop[i], addr_width) << std::endl
<< "patnloop " << pat->nloop[i] << std::endl << "patnloop " << pat->nloop[i] << std::endl
<< "patwait " << i << ' ' << ToStringHex(pat->wait[i], addr_width) << std::endl << "patwait " << i << ' ' << ToStringHex(pat->wait[i], addr_width)
<< std::endl
<< "patwaittime " << i << ' ' << pat->waittime[i] << std::endl; << "patwaittime " << i << ' ' << pat->waittime[i] << std::endl;
} }

5
slsDetectorSoftware/src/SharedMemory.h
View File

@ -13,17 +13,16 @@
#include "sls/logger.h" #include "sls/logger.h"
#include "sls/sls_detector_exceptions.h" #include "sls/sls_detector_exceptions.h"
#include <cstdlib>
#include <cerrno> // errno #include <cerrno> // errno
#include <cstdlib>
#include <cstring> // strerror #include <cstring> // strerror
#include <fcntl.h> // O_CREAT, O_TRUNC.. #include <fcntl.h> // O_CREAT, O_TRUNC..
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <string>
#include <sys/mman.h> // shared memory #include <sys/mman.h> // shared memory
#include <sys/stat.h> // fstat #include <sys/stat.h> // fstat
#include <unistd.h> #include <unistd.h>
#include <iostream>
#include <string>
namespace sls { namespace sls {

1
slsDetectorSoftware/tests/test-CmdProxy-global.h
View File

@ -10,5 +10,4 @@ void test_dac(slsDetectorDefs::dacIndex index, const std::string &dacname,
void test_onchip_dac(slsDetectorDefs::dacIndex index, void test_onchip_dac(slsDetectorDefs::dacIndex index,
const std::string &dacname, int dacvalue); const std::string &dacname, int dacvalue);
} // namespace sls } // namespace sls

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

@ -511,18 +511,23 @@ TEST_CASE("interpolation", "[.cmd]") {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("interpolation", {"1"}, -1, PUT, oss); proxy.Call("interpolation", {"1"}, -1, PUT, oss);
REQUIRE(oss.str() == "interpolation 1\n"); REQUIRE(oss.str() == "interpolation 1\n");
REQUIRE(det.getCounterMask().tsquash("inconsistent counter mask") == REQUIRE(det.getCounterMask().tsquash(
7); "inconsistent counter mask") == 7);
REQUIRE(det.getDAC(defs::VTH3, 0, {0}).tsquash("inconsistent vth3 dac value") == disabledDacValue); REQUIRE(det.getDAC(defs::VTH3, 0, {0})
.tsquash("inconsistent vth3 dac value") ==
disabledDacValue);
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("interpolation", {"0"}, -1, PUT, oss); proxy.Call("interpolation", {"0"}, -1, PUT, oss);
REQUIRE(oss.str() == "interpolation 0\n"); REQUIRE(oss.str() == "interpolation 0\n");
REQUIRE(det.getCounterMask().tsquash("inconsistent counter mask") == REQUIRE(det.getCounterMask().tsquash(
fixedMask[i]); "inconsistent counter mask") == fixedMask[i]);
uint32_t expectedVth3DacVal = (fixedMask[i] & 0x4 ? fixedVth3DacVal : disabledDacValue); uint32_t expectedVth3DacVal =
REQUIRE(det.getDAC(defs::VTH3, 0, {0}).tsquash("inconsistent vth3 dac value") == expectedVth3DacVal); (fixedMask[i] & 0x4 ? fixedVth3DacVal : disabledDacValue);
REQUIRE(det.getDAC(defs::VTH3, 0, {0})
.tsquash("inconsistent vth3 dac value") ==
expectedVth3DacVal);
} }
} }
@ -535,7 +540,6 @@ TEST_CASE("interpolation", "[.cmd]") {
det.setCounterMask(prev_mask[i], {i}); det.setCounterMask(prev_mask[i], {i});
det.setInterpolation(prev_interpolation[i], {i}); det.setInterpolation(prev_interpolation[i], {i});
det.setDAC(defs::VTH3, prev_vth3DacVal[i], 0, {i}); det.setDAC(defs::VTH3, prev_vth3DacVal[i], 0, {i});
} }
} else { } else {
REQUIRE_THROWS(proxy.Call("interpolation", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("interpolation", {}, -1, GET));
@ -567,9 +571,15 @@ TEST_CASE("pumpprobe", "[.cmd]") {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("pumpprobe", {"1"}, -1, PUT, oss); proxy.Call("pumpprobe", {"1"}, -1, PUT, oss);
REQUIRE(oss.str() == "pumpprobe 1\n"); REQUIRE(oss.str() == "pumpprobe 1\n");
REQUIRE(det.getDAC(defs::VTH1, 0, {0}).tsquash("inconsistent vth2 dac value") == disabledDacValue); REQUIRE(det.getDAC(defs::VTH1, 0, {0})
REQUIRE(det.getDAC(defs::VTH2, 0, {0}).tsquash("inconsistent vth2 dac value") == fixedVthDacVal); .tsquash("inconsistent vth2 dac value") ==
REQUIRE(det.getDAC(defs::VTH3, 0, {0}).tsquash("inconsistent vth2 dac value") == disabledDacValue); disabledDacValue);
REQUIRE(det.getDAC(defs::VTH2, 0, {0})
.tsquash("inconsistent vth2 dac value") ==
fixedVthDacVal);
REQUIRE(det.getDAC(defs::VTH3, 0, {0})
.tsquash("inconsistent vth2 dac value") ==
disabledDacValue);
} }
// interpolation and pump probe // interpolation and pump probe
REQUIRE_THROWS(proxy.Call("interpolation", {"1"}, -1, PUT)); REQUIRE_THROWS(proxy.Call("interpolation", {"1"}, -1, PUT));
@ -578,12 +588,21 @@ TEST_CASE("pumpprobe", "[.cmd]") {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("pumpprobe", {"0"}, -1, PUT, oss); proxy.Call("pumpprobe", {"0"}, -1, PUT, oss);
REQUIRE(oss.str() == "pumpprobe 0\n"); REQUIRE(oss.str() == "pumpprobe 0\n");
REQUIRE(det.getCounterMask().tsquash("inconsistent counter mask") == 7); REQUIRE(det.getCounterMask().tsquash(
REQUIRE(det.getDAC(defs::VTH1, 0, {0}).tsquash("inconsistent vth1 dac value") == (fixedMask[i] & 0x1 ? fixedVthDacVal : disabledDacValue)); "inconsistent counter mask") == 7);
REQUIRE(det.getDAC(defs::VTH2, 0, {0}).tsquash("inconsistent vth2 dac value") == (fixedMask[i] & 0x2 ? fixedVthDacVal : disabledDacValue)); REQUIRE(
REQUIRE(det.getDAC(defs::VTH3, 0, {0}).tsquash("inconsistent vth3 dac value") == (fixedMask[i] & 0x4 ? fixedVthDacVal : disabledDacValue)); det.getDAC(defs::VTH1, 0, {0})
.tsquash("inconsistent vth1 dac value") ==
(fixedMask[i] & 0x1 ? fixedVthDacVal : disabledDacValue));
REQUIRE(
det.getDAC(defs::VTH2, 0, {0})
.tsquash("inconsistent vth2 dac value") ==
(fixedMask[i] & 0x2 ? fixedVthDacVal : disabledDacValue));
REQUIRE(
det.getDAC(defs::VTH3, 0, {0})
.tsquash("inconsistent vth3 dac value") ==
(fixedMask[i] & 0x4 ? fixedVthDacVal : disabledDacValue));
} }
} }
{ {
std::ostringstream oss; std::ostringstream oss;

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

@ -192,7 +192,8 @@ TEST_CASE("patloop", "[.cmd]") {
REQUIRE(oss.str() == "patloop [0x0020, 0x005c]\n"); REQUIRE(oss.str() == "patloop [0x0020, 0x005c]\n");
} }
for (int iDet = 0; iDet != det.size(); ++iDet) { for (int iDet = 0; iDet != det.size(); ++iDet) {
det.setPatternLoopAddresses(iLoop, prev_val[iDet][0], prev_val[iDet][1], {iDet}); det.setPatternLoopAddresses(iLoop, prev_val[iDet][0],
prev_val[iDet][1], {iDet});
} }
} }
} else { } else {

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

@ -465,7 +465,8 @@ TEST_CASE("rx_roi", "[.cmd]") {
REQUIRE(oss.str() == "rx_roi [10, 15]\n"); REQUIRE(oss.str() == "rx_roi [10, 15]\n");
} }
REQUIRE_THROWS(proxy.Call("rx_roi", {"-1", "-1"}, -1, PUT)); REQUIRE_THROWS(proxy.Call("rx_roi", {"-1", "-1"}, -1, PUT));
REQUIRE_THROWS(proxy.Call("rx_roi", {"10", "15", "25", "30"}, -1, PUT)); REQUIRE_THROWS(
proxy.Call("rx_roi", {"10", "15", "25", "30"}, -1, PUT));
} }
// 2d // 2d
else { else {
@ -481,10 +482,18 @@ TEST_CASE("rx_roi", "[.cmd]") {
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("rx_roi", {"1", std::to_string(detsize.x - 5), "1", std::to_string(detsize.y - 5)}, -1, PUT, oss); proxy.Call("rx_roi",
REQUIRE(oss.str() == std::string("rx_roi [1, ") + std::to_string(detsize.x - 5) + std::string(", ") + std::to_string(detsize.y - 5) + std::string(", 1]\n")); {"1", std::to_string(detsize.x - 5), "1",
std::to_string(detsize.y - 5)},
-1, PUT, oss);
REQUIRE(oss.str() == std::string("rx_roi [1, ") +
std::to_string(detsize.x - 5) +
std::string(", ") +
std::to_string(detsize.y - 5) +
std::string(", 1]\n"));
} }
REQUIRE_THROWS(proxy.Call("rx_roi", {"-1", "-1", "-1", "-1"}, -1, PUT)); REQUIRE_THROWS(
proxy.Call("rx_roi", {"-1", "-1", "-1", "-1"}, -1, PUT));
} }
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {

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

@ -22,9 +22,8 @@ TEST_CASE("Calling help doesn't throw or cause segfault"){
auto commands = proxy.GetProxyCommands(); auto commands = proxy.GetProxyCommands();
std::ostringstream os; std::ostringstream os;
for (const auto &cmd : commands) for (const auto &cmd : commands)
REQUIRE_NOTHROW(proxy.Call(cmd, {}, -1, slsDetectorDefs::HELP_ACTION, os)); REQUIRE_NOTHROW(
proxy.Call(cmd, {}, -1, slsDetectorDefs::HELP_ACTION, os));
} }
TEST_CASE("Unknown command", "[.cmd]") { TEST_CASE("Unknown command", "[.cmd]") {
@ -338,8 +337,7 @@ TEST_CASE("threshold", "[.cmd]") {
det.setTrimEnergies(prev_energies); det.setTrimEnergies(prev_energies);
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
if (prev_threshold[i][0] >= 0) { if (prev_threshold[i][0] >= 0) {
std::cout std::cout << "prev cvalues:" << ToString(prev_threshold[i])
<< "prev cvalues:" << ToString(prev_threshold[i])
<< std::endl; << std::endl;
det.setThresholdEnergy(prev_threshold[i], prev_settings, det.setThresholdEnergy(prev_threshold[i], prev_settings,
true, {i}); true, {i});
@ -585,7 +583,8 @@ TEST_CASE("master", "[.cmd]") {
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
if (det_type == defs::EIGER || det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD || det_type == defs::GOTTHARD2) { if (det_type == defs::EIGER || det_type == defs::MYTHEN3 ||
det_type == defs::GOTTHARD || det_type == defs::GOTTHARD2) {
REQUIRE_NOTHROW(proxy.Call("master", {}, -1, GET)); REQUIRE_NOTHROW(proxy.Call("master", {}, -1, GET));
if (det_type == defs::EIGER) { if (det_type == defs::EIGER) {
// get previous master // get previous master
@ -2265,10 +2264,8 @@ TEST_CASE("scan", "[.cmd]") {
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {ToString(ind), "500", "1500", "500"}, -1, PUT, proxy.Call("scan", {ToString(ind), "500", "1500", "500"}, -1, PUT, oss);
oss); CHECK(oss.str() == "scan [" + ToString(ind) + ", 500, 1500, 500]\n");
CHECK(oss.str() ==
"scan [" + ToString(ind) + ", 500, 1500, 500]\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
@ -2279,8 +2276,8 @@ TEST_CASE("scan", "[.cmd]") {
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {ToString(ind), "500", "1500", "500", "2s"}, -1, proxy.Call("scan", {ToString(ind), "500", "1500", "500", "2s"}, -1, PUT,
PUT, oss); oss);
CHECK(oss.str() == CHECK(oss.str() ==
"scan [" + ToString(ind) + ", 500, 1500, 500, 2s]\n"); "scan [" + ToString(ind) + ", 500, 1500, 500, 2s]\n");
} }
@ -2305,16 +2302,14 @@ TEST_CASE("scan", "[.cmd]") {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {ToString(ind), "1500", "500", "-500"}, -1, PUT, proxy.Call("scan", {ToString(ind), "1500", "500", "-500"}, -1, PUT,
oss); oss);
CHECK(oss.str() == CHECK(oss.str() == "scan [" + ToString(ind) + ", 1500, 500, -500]\n");
"scan [" + ToString(ind) + ", 1500, 500, -500]\n");
} }
CHECK_THROWS(proxy.Call( CHECK_THROWS(proxy.Call(
"scan", {ToString(notImplementedInd), "500", "1500", "500"}, -1, "scan", {ToString(notImplementedInd), "500", "1500", "500"}, -1, PUT));
PUT)); CHECK_THROWS(
CHECK_THROWS(proxy.Call("scan", {ToString(ind), "500", "1500", "-500"}, proxy.Call("scan", {ToString(ind), "500", "1500", "-500"}, -1, PUT));
-1, PUT)); CHECK_THROWS(
CHECK_THROWS(proxy.Call("scan", {ToString(ind), "1500", "500", "500"}, proxy.Call("scan", {ToString(ind), "1500", "500", "500"}, -1, PUT));
-1, PUT));
if (det_type == defs::MYTHEN3 || defs::EIGER) { if (det_type == defs::MYTHEN3 || defs::EIGER) {
{ {

2
slsDetectorSoftware/tests/test-CtbConfig.cpp
View File

@ -3,8 +3,8 @@
#include <stdlib.h> #include <stdlib.h>
#include "SharedMemory.h"
#include "CtbConfig.h" #include "CtbConfig.h"
#include "SharedMemory.h"
#include <fstream> #include <fstream>
namespace sls { namespace sls {

3
slsDetectorSoftware/tests/test-SharedMemory.cpp
View File

@ -97,7 +97,6 @@ TEST_CASE("Move SharedMemory", "[detector]") {
shm.createSharedMemory(); shm.createSharedMemory();
shm()->x = 9; shm()->x = 9;
SharedMemory<Data> shm2(shm_id + 1, -1); SharedMemory<Data> shm2(shm_id + 1, -1);
shm2 = std::move(shm); // shm is now a moved from object! shm2 = std::move(shm); // shm is now a moved from object!
@ -135,7 +134,6 @@ TEST_CASE("Create several shared memories", "[detector]") {
TEST_CASE("Create create a shared memory with a tag") { TEST_CASE("Create create a shared memory with a tag") {
SharedMemory<int> shm(0, -1, "ctbdacs"); SharedMemory<int> shm(0, -1, "ctbdacs");
REQUIRE(shm.getName() == "/slsDetectorPackage_detector_0_ctbdacs"); REQUIRE(shm.getName() == "/slsDetectorPackage_detector_0_ctbdacs");
} }
TEST_CASE("Create create a shared memory with a tag when SLSDETNAME is set") { TEST_CASE("Create create a shared memory with a tag when SLSDETNAME is set") {
@ -156,7 +154,6 @@ TEST_CASE("Create create a shared memory with a tag when SLSDETNAME is set"){
unsetenv(SHM_ENV_NAME); unsetenv(SHM_ENV_NAME);
else else
setenv(SHM_ENV_NAME, old_slsdetname.c_str(), 1); setenv(SHM_ENV_NAME, old_slsdetname.c_str(), 1);
} }
TEST_CASE("map int64 to int32 throws") { TEST_CASE("map int64 to int32 throws") {

12
slsReceiverSoftware/include/sls/Receiver.h
View File

@ -4,7 +4,6 @@
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
#include <memory> #include <memory>
namespace sls { namespace sls {
class ClientInterface; class ClientInterface;
@ -40,16 +39,17 @@ class Receiver : private virtual slsDetectorDefs {
int64_t getReceiverVersion(); int64_t getReceiverVersion();
/** /**
* Start Acquisition Call back (slsMultiReceiver writes data if file write enabled) * Start Acquisition Call back (slsMultiReceiver writes data if file write
* if registerCallBackRawDataReady or registerCallBackRawDataModifyReady registered, * enabled) if registerCallBackRawDataReady or
* users get data * registerCallBackRawDataModifyReady registered, users get data callback
* callback arguments are: * arguments are:
* - file path * - file path
* - file name prefix * - file name prefix
* - file index * - file index
* - image size in bytes * - image size in bytes
*/ */
void registerCallBackStartAcquisition(int (*func)(const std::string &, const std::string &, void registerCallBackStartAcquisition(int (*func)(const std::string &,
const std::string &,
uint64_t, size_t, void *), uint64_t, size_t, void *),
void *arg); void *arg);

1
slsReceiverSoftware/src/Arping.h
View File

@ -37,4 +37,3 @@ class Arping {
}; };
} // namespace sls } // namespace sls

28
slsReceiverSoftware/src/BinaryDataFile.cpp
View File

@ -19,10 +19,12 @@ void BinaryDataFile::CloseFile() {
fd = nullptr; fd = nullptr;
} }
void BinaryDataFile::CreateFirstBinaryDataFile( void BinaryDataFile::CreateFirstBinaryDataFile(const std::string &fNamePrefix,
const std::string& fNamePrefix, const uint64_t fIndex,
const uint64_t fIndex, const bool ovEnable, const bool sMode, const bool ovEnable,
const uint32_t uPortNumber, const uint32_t mFramesPerFile) { const bool sMode,
const uint32_t uPortNumber,
const uint32_t mFramesPerFile) {
subFileIndex = 0; subFileIndex = 0;
numFramesInFile = 0; numFramesInFile = 0;
@ -41,15 +43,13 @@ void BinaryDataFile::CreateFile() {
numFramesInFile = 0; numFramesInFile = 0;
std::ostringstream os; std::ostringstream os;
os << fileNamePrefix << "_f" << subFileIndex os << fileNamePrefix << "_f" << subFileIndex << '_' << fileIndex << ".raw";
<< '_' << fileIndex << ".raw";
fileName = os.str(); fileName = os.str();
if (!overWriteEnable) { if (!overWriteEnable) {
if (nullptr == (fd = fopen(fileName.c_str(), "wx"))) { if (nullptr == (fd = fopen(fileName.c_str(), "wx"))) {
fd = nullptr; fd = nullptr;
throw RuntimeError("Could not create/overwrite file " + throw RuntimeError("Could not create/overwrite file " + fileName);
fileName);
} }
} else if (nullptr == (fd = fopen(fileName.c_str(), "w"))) { } else if (nullptr == (fd = fopen(fileName.c_str(), "w"))) {
fd = nullptr; fd = nullptr;
@ -64,7 +64,10 @@ void BinaryDataFile::CreateFile() {
} }
} }
void BinaryDataFile::WriteToFile(char *imageData, sls_receiver_header& header, const int imageSize, const uint64_t currentFrameNumber, const uint32_t numPacketsCaught) { void BinaryDataFile::WriteToFile(char *imageData, sls_receiver_header &header,
const int imageSize,
const uint64_t currentFrameNumber,
const uint32_t numPacketsCaught) {
// check if maxframesperfile = 0 for infinite // check if maxframesperfile = 0 for infinite
if (maxFramesPerFile && (numFramesInFile >= maxFramesPerFile)) { if (maxFramesPerFile && (numFramesInFile >= maxFramesPerFile)) {
CloseFile(); CloseFile();
@ -101,7 +104,12 @@ void BinaryDataFile::WriteToFile(char *imageData, sls_receiver_header& header, c
// if write error // if write error
if (ret != imageSize + sizeof(sls_receiver_header)) { if (ret != imageSize + sizeof(sls_receiver_header)) {
throw RuntimeError(std::to_string(index) + " : Write to file failed for image number " + std::to_string(currentFrameNumber) + ". Wrote " + std::to_string(ret) + " bytes instead of " + std::to_string(imageSize + sizeof(sls_receiver_header))); throw RuntimeError(
std::to_string(index) +
" : Write to file failed for image number " +
std::to_string(currentFrameNumber) + ". Wrote " +
std::to_string(ret) + " bytes instead of " +
std::to_string(imageSize + sizeof(sls_receiver_header)));
} }
} }

10
slsReceiverSoftware/src/BinaryDataFile.h
View File

@ -15,13 +15,13 @@ class BinaryDataFile : private virtual slsDetectorDefs, public File {
fileFormat GetFileFormat() const override; fileFormat GetFileFormat() const override;
void CloseFile() override; void CloseFile() override;
void CreateFirstBinaryDataFile(const std::string &fNamePrefix, void CreateFirstBinaryDataFile(const std::string &fNamePrefix,
const uint64_t fIndex, const uint64_t fIndex, const bool ovEnable,
const bool ovEnable, const bool sMode, const uint32_t uPortNumber,
const bool sMode,
const uint32_t uPortNumber,
const uint32_t mFramesPerFile) override; const uint32_t mFramesPerFile) override;
void WriteToFile(char *imageData, sls_receiver_header& header, const int imageSize, const uint64_t currentFrameNumber, const uint32_t numPacketsCaught) override; void WriteToFile(char *imageData, sls_receiver_header &header,
const int imageSize, const uint64_t currentFrameNumber,
const uint32_t numPacketsCaught) override;
private: private:
void CreateFile(); void CreateFile();

5
slsReceiverSoftware/src/ClientInterface.cpp
View File

@ -22,7 +22,6 @@
#include <unistd.h> #include <unistd.h>
#include <vector> #include <vector>
namespace sls { namespace sls {
using ns = std::chrono::nanoseconds; using ns = std::chrono::nanoseconds;
@ -34,7 +33,6 @@ using Interface = ServerInterface;
#define gettid() syscall(SYS_gettid) #define gettid() syscall(SYS_gettid)
#endif #endif
ClientInterface::~ClientInterface() { ClientInterface::~ClientInterface() {
killTcpThread = true; killTcpThread = true;
LOG(logINFO) << "Shutting down TCP Socket on port " << portNumber; LOG(logINFO) << "Shutting down TCP Socket on port " << portNumber;
@ -1176,7 +1174,8 @@ int ClientInterface::get_additional_json_header(Interface &socket) {
int ClientInterface::set_udp_socket_buffer_size(Interface &socket) { int ClientInterface::set_udp_socket_buffer_size(Interface &socket) {
auto size = socket.Receive<int>(); auto size = socket.Receive<int>();
if (size == 0) { if (size == 0) {
throw RuntimeError("Receiver socket buffer size must be greater than 0."); throw RuntimeError(
"Receiver socket buffer size must be greater than 0.");
} }
if (size > 0) { if (size > 0) {
verifyIdle(socket); verifyIdle(socket);

10
slsReceiverSoftware/src/ClientInterface.h
View File

@ -34,7 +34,8 @@ class ClientInterface : private virtual slsDetectorDefs {
//***callback functions*** //***callback functions***
/** params: file path, file name, file index, image size */ /** params: file path, file name, file index, image size */
void registerCallBackStartAcquisition(int (*func)(const std::string &, const std::string &, void registerCallBackStartAcquisition(int (*func)(const std::string &,
const std::string &,
uint64_t, size_t, void *), uint64_t, size_t, void *),
void *arg); void *arg);
@ -180,13 +181,12 @@ class ClientInterface : private virtual slsDetectorDefs {
} }
} }
int (ClientInterface::*flist[NUM_REC_FUNCTIONS])( int (ClientInterface::*flist[NUM_REC_FUNCTIONS])(ServerInterface &socket);
ServerInterface &socket);
//***callback parameters*** //***callback parameters***
int (*startAcquisitionCallBack)(const std::string &, const std::string &, uint64_t, size_t, int (*startAcquisitionCallBack)(const std::string &, const std::string &,
void *) = nullptr; uint64_t, size_t, void *) = nullptr;
void *pStartAcquisition{nullptr}; void *pStartAcquisition{nullptr};
void (*acquisitionFinishedCallBack)(uint64_t, void *) = nullptr; void (*acquisitionFinishedCallBack)(uint64_t, void *) = nullptr;
void *pAcquisitionFinished{nullptr}; void *pAcquisitionFinished{nullptr};

76
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -28,8 +28,7 @@ namespace sls {
const std::string DataProcessor::typeName = "DataProcessor"; const std::string DataProcessor::typeName = "DataProcessor";
DataProcessor::DataProcessor(int index) DataProcessor::DataProcessor(int index) : ThreadObject(index, typeName) {
: ThreadObject(index, typeName) {
LOG(logDEBUG) << "DataProcessor " << index << " created"; LOG(logDEBUG) << "DataProcessor " << index << " created";
} }
@ -40,9 +39,7 @@ bool DataProcessor::GetStartedFlag() const { return startedFlag; }
void DataProcessor::SetFifo(Fifo *f) { fifo = f; } void DataProcessor::SetFifo(Fifo *f) { fifo = f; }
void DataProcessor::SetGeneralData(GeneralData *g) { void DataProcessor::SetGeneralData(GeneralData *g) { generalData = g; }
generalData = g;
}
void DataProcessor::SetActivate(bool enable) { activated = enable; } void DataProcessor::SetActivate(bool enable) { activated = enable; }
@ -52,7 +49,9 @@ void DataProcessor::SetReceiverROI(ROI roi) {
receiverNoRoi = receiverRoi.noRoi(); receiverNoRoi = receiverRoi.noRoi();
} }
void DataProcessor::SetDataStreamEnable(bool enable) { dataStreamEnable = enable; } void DataProcessor::SetDataStreamEnable(bool enable) {
dataStreamEnable = enable;
}
void DataProcessor::SetStreamingFrequency(uint32_t value) { void DataProcessor::SetStreamingFrequency(uint32_t value) {
streamingFrequency = value; streamingFrequency = value;
@ -72,9 +71,7 @@ void DataProcessor::SetCtbDbitList(std::vector<int> value) {
ctbDbitList = value; ctbDbitList = value;
} }
void DataProcessor::SetCtbDbitOffset(int value) { void DataProcessor::SetCtbDbitOffset(int value) { ctbDbitOffset = value; }
ctbDbitOffset = value;
}
void DataProcessor::ResetParametersforNewAcquisition() { void DataProcessor::ResetParametersforNewAcquisition() {
StopRunning(); StopRunning();
@ -84,7 +81,8 @@ void DataProcessor::ResetParametersforNewAcquisition() {
currentFrameIndex = 0; currentFrameIndex = 0;
firstStreamerFrame = true; firstStreamerFrame = true;
streamCurrentFrame = false; streamCurrentFrame = false;
completeImageToStreamBeforeCropping = make_unique<char[]>(generalData->imageSize); completeImageToStreamBeforeCropping =
make_unique<char[]>(generalData->imageSize);
} }
void DataProcessor::RecordFirstIndex(uint64_t fnum) { void DataProcessor::RecordFirstIndex(uint64_t fnum) {
@ -120,15 +118,15 @@ void DataProcessor::SetupFileWriter(const bool filewriteEnable,
dataFile = new BinaryDataFile(index); dataFile = new BinaryDataFile(index);
break; break;
default: default:
throw RuntimeError( throw RuntimeError("Unknown file format (compile with hdf5 flags");
"Unknown file format (compile with hdf5 flags");
} }
} }
} }
void DataProcessor::CreateFirstFiles( void DataProcessor::CreateFirstFiles(const std::string &fileNamePrefix,
const std::string &fileNamePrefix, const uint64_t fileIndex,
const uint64_t fileIndex, const bool overWriteEnable, const bool silentMode, const bool overWriteEnable,
const bool silentMode,
const uint32_t udpPortNumber, const uint32_t udpPortNumber,
const uint64_t numImages, const uint64_t numImages,
const bool detectorDataStream) { const bool detectorDataStream) {
@ -158,8 +156,8 @@ void DataProcessor::CreateFirstFiles(
case HDF5: case HDF5:
dataFile->CreateFirstHDF5DataFile( dataFile->CreateFirstHDF5DataFile(
fileNamePrefix, fileIndex, overWriteEnable, silentMode, fileNamePrefix, fileIndex, overWriteEnable, silentMode,
udpPortNumber, generalData->framesPerFile, udpPortNumber, generalData->framesPerFile, numImages, nx, ny,
numImages, nx, ny, generalData->dynamicRange); generalData->dynamicRange);
break; break;
#endif #endif
case BINARY: case BINARY:
@ -184,22 +182,22 @@ uint32_t DataProcessor::GetFilesInAcquisition() const {
std::string DataProcessor::CreateVirtualFile( std::string DataProcessor::CreateVirtualFile(
const std::string &filePath, const std::string &fileNamePrefix, const std::string &filePath, const std::string &fileNamePrefix,
const uint64_t fileIndex, const bool overWriteEnable, const bool silentMode, const uint64_t fileIndex, const bool overWriteEnable, const bool silentMode,
const int modulePos, const int modulePos, const uint64_t numImages, const int numModX,
const uint64_t numImages, const int numModY, std::mutex *hdf5LibMutex) {
const int numModX, const int numModY,
std::mutex *hdf5LibMutex) {
if (receiverRoiEnabled) { if (receiverRoiEnabled) {
throw std::runtime_error("Skipping virtual hdf5 file since rx_roi is enabled."); throw std::runtime_error(
"Skipping virtual hdf5 file since rx_roi is enabled.");
} }
bool gotthard25um = bool gotthard25um = ((generalData->detType == GOTTHARD ||
((generalData->detType == GOTTHARD || generalData->detType == GOTTHARD2) && generalData->detType == GOTTHARD2) &&
(numModX * numModY) == 2); (numModX * numModY) == 2);
// 0 for infinite files // 0 for infinite files
uint32_t framesPerFile = uint32_t framesPerFile =
((generalData->framesPerFile == 0) ? numFramesCaught : generalData->framesPerFile); ((generalData->framesPerFile == 0) ? numFramesCaught
: generalData->framesPerFile);
// TODO: assumption 1: create virtual file even if no data in other // TODO: assumption 1: create virtual file even if no data in other
// files (they exist anyway) assumption2: virtual file max frame index // files (they exist anyway) assumption2: virtual file max frame index
@ -220,7 +218,8 @@ void DataProcessor::LinkFileInMaster(const std::string &masterFileName,
std::mutex *hdf5LibMutex) { std::mutex *hdf5LibMutex) {
if (receiverRoiEnabled) { if (receiverRoiEnabled) {
throw std::runtime_error("Should not be here, roi with hdf5 virtual should throw."); throw std::runtime_error(
"Should not be here, roi with hdf5 virtual should throw.");
} }
std::string fname{virtualFileName}, masterfname{masterFileName}; std::string fname{virtualFileName}, masterfname{masterFileName};
// if no virtual file, link data file // if no virtual file, link data file
@ -266,14 +265,16 @@ void DataProcessor::ThreadExecution() {
auto *memImage = reinterpret_cast<image_structure *>(buffer); auto *memImage = reinterpret_cast<image_structure *>(buffer);
// check dummy // check dummy
LOG(logDEBUG1) << "DataProcessor " << index << ", Numbytes:" << memImage->size; LOG(logDEBUG1) << "DataProcessor " << index
<< ", Numbytes:" << memImage->size;
if (memImage->size == DUMMY_PACKET_VALUE) { if (memImage->size == DUMMY_PACKET_VALUE) {
StopProcessing(buffer); StopProcessing(buffer);
return; return;
} }
try { try {
ProcessAnImage(memImage->header, memImage->size, memImage->firstIndex, memImage->data); ProcessAnImage(memImage->header, memImage->size, memImage->firstIndex,
memImage->data);
} catch (const std::exception &e) { } catch (const std::exception &e) {
fifo->FreeAddress(buffer); fifo->FreeAddress(buffer);
return; return;
@ -284,7 +285,8 @@ void DataProcessor::ThreadExecution() {
// copy the complete image back if roi enabled // copy the complete image back if roi enabled
if (receiverRoiEnabled) { if (receiverRoiEnabled) {
memImage->size = generalData->imageSize; memImage->size = generalData->imageSize;
memcpy(memImage->data, &completeImageToStreamBeforeCropping[0], generalData->imageSize); memcpy(memImage->data, &completeImageToStreamBeforeCropping[0],
generalData->imageSize);
} }
fifo->PushAddressToStream(buffer); fifo->PushAddressToStream(buffer);
} else { } else {
@ -306,7 +308,8 @@ void DataProcessor::StopProcessing(char *buf) {
LOG(logDEBUG1) << index << ": Processing Completed"; LOG(logDEBUG1) << index << ": Processing Completed";
} }
void DataProcessor::ProcessAnImage(sls_receiver_header & header, size_t &size, size_t &firstImageIndex, char* data) { void DataProcessor::ProcessAnImage(sls_receiver_header &header, size_t &size,
size_t &firstImageIndex, char *data) {
uint64_t fnum = header.detHeader.frameNumber; uint64_t fnum = header.detHeader.frameNumber;
LOG(logDEBUG1) << "DataProcessing " << index << ": fnum:" << fnum; LOG(logDEBUG1) << "DataProcessing " << index << ": fnum:" << fnum;
currentFrameIndex = fnum; currentFrameIndex = fnum;
@ -348,11 +351,11 @@ void DataProcessor::ProcessAnImage(sls_receiver_header & header, size_t &size, s
streamCurrentFrame = false; streamCurrentFrame = false;
} }
if (receiverRoiEnabled) { if (receiverRoiEnabled) {
// copy the complete image to stream before cropping // copy the complete image to stream before cropping
if (streamCurrentFrame) { if (streamCurrentFrame) {
memcpy(&completeImageToStreamBeforeCropping[0], data, generalData->imageSize); memcpy(&completeImageToStreamBeforeCropping[0], data,
generalData->imageSize);
} }
CropImage(size, data); CropImage(size, data);
} }
@ -368,8 +371,7 @@ void DataProcessor::ProcessAnImage(sls_receiver_header & header, size_t &size, s
rawDataModifyReadyCallBack(header, data, size, pRawDataReady); rawDataModifyReadyCallBack(header, data, size, pRawDataReady);
} }
} catch (const std::exception &e) { } catch (const std::exception &e) {
throw RuntimeError("Get Data Callback Error: " + throw RuntimeError("Get Data Callback Error: " + std::string(e.what()));
std::string(e.what()));
} }
// write to file // write to file
@ -508,8 +510,7 @@ void DataProcessor::RearrangeDbitData(size_t & size, char *data) {
const int numSamples = (ctbDigitalDataBytes / sizeof(uint64_t)); const int numSamples = (ctbDigitalDataBytes / sizeof(uint64_t));
// ceil as numResult8Bits could be decimal // ceil as numResult8Bits could be decimal
const int numResult8Bits = const int numResult8Bits = ceil((numSamples * ctbDbitList.size()) / 8.00);
ceil((numSamples * ctbDbitList.size()) / 8.00);
std::vector<uint8_t> result(numResult8Bits); std::vector<uint8_t> result(numResult8Bits);
uint8_t *dest = &result[0]; uint8_t *dest = &result[0];
@ -539,7 +540,8 @@ void DataProcessor::RearrangeDbitData(size_t & size, char *data) {
} }
// copy back to memory and update size // copy back to memory and update size
memcpy(data + nAnalogDataBytes, result.data(), numResult8Bits * sizeof(uint8_t)); memcpy(data + nAnalogDataBytes, result.data(),
numResult8Bits * sizeof(uint8_t));
size = numResult8Bits * sizeof(uint8_t); size = numResult8Bits * sizeof(uint8_t);
} }

27
slsReceiverSoftware/src/DataProcessor.h
View File

@ -56,18 +56,18 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
void CreateFirstFiles(const std::string &fileNamePrefix, void CreateFirstFiles(const std::string &fileNamePrefix,
const uint64_t fileIndex, const bool overWriteEnable, const uint64_t fileIndex, const bool overWriteEnable,
const bool silentMode, const bool silentMode, const uint32_t udpPortNumber,
const uint32_t udpPortNumber,
const uint64_t numImages, const uint64_t numImages,
const bool detectorDataStream); const bool detectorDataStream);
#ifdef HDF5C #ifdef HDF5C
uint32_t GetFilesInAcquisition() const; uint32_t GetFilesInAcquisition() const;
std::string CreateVirtualFile( std::string CreateVirtualFile(const std::string &filePath,
const std::string &filePath, const std::string &fileNamePrefix, const std::string &fileNamePrefix,
const uint64_t fileIndex, const bool overWriteEnable, const uint64_t fileIndex,
const bool overWriteEnable,
const bool silentMode, const int modulePos, const bool silentMode, const int modulePos,
const uint64_t numImages, const int numModX, const int numModY, const uint64_t numImages, const int numModX,
std::mutex *hdf5LibMutex); const int numModY, std::mutex *hdf5LibMutex);
void LinkFileInMaster(const std::string &masterFileName, void LinkFileInMaster(const std::string &masterFileName,
const std::string &virtualFileName, const std::string &virtualFileName,
const bool silentMode, std::mutex *hdf5LibMutex); const bool silentMode, std::mutex *hdf5LibMutex);
@ -82,10 +82,16 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
std::mutex *hdf5LibMutex); std::mutex *hdf5LibMutex);
/** params: sls_receiver_header, pointer to data, image size */ /** params: sls_receiver_header, pointer to data, image size */
void registerCallBackRawDataReady(void (*func)(sls_receiver_header&, char *, size_t, void *), void *arg); void registerCallBackRawDataReady(void (*func)(sls_receiver_header &,
char *, size_t, void *),
void *arg);
/** params: sls_receiver_header, pointer to data, reference to image size */ /** params: sls_receiver_header, pointer to data, reference to image size */
void registerCallBackRawDataModifyReady(void (*func)(sls_receiver_header&, char *, size_t &, void *), void *arg); void registerCallBackRawDataModifyReady(void (*func)(sls_receiver_header &,
char *, size_t &,
void *),
void *arg);
private: private:
void RecordFirstIndex(uint64_t fnum); void RecordFirstIndex(uint64_t fnum);
@ -106,7 +112,8 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
* Process an image popped from fifo, * Process an image popped from fifo,
* write to file if fw enabled & update parameters * write to file if fw enabled & update parameters
*/ */
void ProcessAnImage(sls_receiver_header & header, size_t &size, size_t &firstImageIndex, char* data); void ProcessAnImage(sls_receiver_header &header, size_t &size,
size_t &firstImageIndex, char *data);
/** /**
* Calls CheckTimer and CheckCount for streaming frequency and timer * Calls CheckTimer and CheckCount for streaming frequency and timer

41
slsReceiverSoftware/src/DataStreamer.cpp
View File

@ -31,9 +31,7 @@ void DataStreamer::SetFifo(Fifo *f) { fifo = f; }
void DataStreamer::SetGeneralData(GeneralData *g) { generalData = g; } void DataStreamer::SetGeneralData(GeneralData *g) { generalData = g; }
void DataStreamer::SetFileIndex(uint64_t value) { void DataStreamer::SetFileIndex(uint64_t value) { fileIndex = value; }
fileIndex = value;
}
void DataStreamer::SetNumberofPorts(xy np) { numPorts = np; } void DataStreamer::SetNumberofPorts(xy np) { numPorts = np; }
@ -68,8 +66,10 @@ void DataStreamer::ResetParametersforNewAcquisition(const std::string &fname) {
delete[] completeBuffer; delete[] completeBuffer;
completeBuffer = nullptr; completeBuffer = nullptr;
} }
if (generalData->detType == GOTTHARD && generalData->detectorRoi.xmin != -1) { if (generalData->detType == GOTTHARD &&
adcConfigured = generalData->GetAdcConfigured(index, generalData->detectorRoi); generalData->detectorRoi.xmin != -1) {
adcConfigured =
generalData->GetAdcConfigured(index, generalData->detectorRoi);
completeBuffer = new char[generalData->imageSizeComplete]; completeBuffer = new char[generalData->imageSizeComplete];
memset(completeBuffer, 0, generalData->imageSizeComplete); memset(completeBuffer, 0, generalData->imageSizeComplete);
} }
@ -82,8 +82,7 @@ void DataStreamer::RecordFirstIndex(uint64_t fnum, size_t firstImageIndex) {
<< ", First Streamer Index:" << fnum; << ", First Streamer Index:" << fnum;
} }
void DataStreamer::CreateZmqSockets(uint32_t port, void DataStreamer::CreateZmqSockets(uint32_t port, const IpAddr ip, int hwm) {
const IpAddr ip, int hwm) {
uint32_t portnum = port + index; uint32_t portnum = port + index;
std::string sip = ip.str(); std::string sip = ip.str();
try { try {
@ -117,12 +116,13 @@ void DataStreamer::CloseZmqSocket() {
void DataStreamer::ThreadExecution() { void DataStreamer::ThreadExecution() {
char *buffer = nullptr; char *buffer = nullptr;
fifo->PopAddressToStream(buffer); fifo->PopAddressToStream(buffer);
LOG(logDEBUG5) << "DataStreamer " << index << ", pop 0x" LOG(logDEBUG5) << "DataStreamer " << index << ", pop 0x" << std::hex
<< std::hex << (void *)(buffer) << std::dec << ":" << buffer; << (void *)(buffer) << std::dec << ":" << buffer;
auto *memImage = reinterpret_cast<image_structure *>(buffer); auto *memImage = reinterpret_cast<image_structure *>(buffer);
// check dummy // check dummy
LOG(logDEBUG1) << "DataStreamer " << index << ", Numbytes:" << memImage->size ; LOG(logDEBUG1) << "DataStreamer " << index
<< ", Numbytes:" << memImage->size;
if (memImage->size == DUMMY_PACKET_VALUE) { if (memImage->size == DUMMY_PACKET_VALUE) {
StopProcessing(buffer); StopProcessing(buffer);
return; return;
@ -130,7 +130,8 @@ void DataStreamer::ThreadExecution() {
// streamer first index needn't be the very first index // streamer first index needn't be the very first index
if (!startedFlag) { if (!startedFlag) {
RecordFirstIndex(memImage->header.detHeader.frameNumber, memImage->firstIndex); RecordFirstIndex(memImage->header.detHeader.frameNumber,
memImage->firstIndex);
} }
ProcessAnImage(memImage->header.detHeader, memImage->size, memImage->data); ProcessAnImage(memImage->header.detHeader, memImage->size, memImage->data);
@ -142,7 +143,8 @@ void DataStreamer::ThreadExecution() {
void DataStreamer::StopProcessing(char *buf) { void DataStreamer::StopProcessing(char *buf) {
LOG(logDEBUG1) << "DataStreamer " << index << ": Dummy"; LOG(logDEBUG1) << "DataStreamer " << index << ": Dummy";
if (!SendDummyHeader()) { if (!SendDummyHeader()) {
LOG(logERROR) << "Could not send zmq dummy header for streamer for port " LOG(logERROR)
<< "Could not send zmq dummy header for streamer for port "
<< zmqSocket->GetPortNumber(); << zmqSocket->GetPortNumber();
} }
@ -152,7 +154,8 @@ void DataStreamer::StopProcessing(char *buf) {
} }
/** buf includes only the standard header */ /** buf includes only the standard header */
void DataStreamer::ProcessAnImage(sls_detector_header header, size_t size, char* data) { void DataStreamer::ProcessAnImage(sls_detector_header header, size_t size,
char *data) {
uint64_t fnum = header.frameNumber; uint64_t fnum = header.frameNumber;
LOG(logDEBUG1) << "DataStreamer " << index << ": fnum:" << fnum; LOG(logDEBUG1) << "DataStreamer " << index << ": fnum:" << fnum;
@ -164,14 +167,16 @@ void DataStreamer::ProcessAnImage(sls_detector_header header, size_t size, char*
// imagesizecomplete and listener writes imagesize to size // imagesizecomplete and listener writes imagesize to size
if (!SendDataHeader(header, generalData->imageSizeComplete, if (!SendDataHeader(header, generalData->imageSizeComplete,
generalData->nPixelsXComplete, generalData->nPixelsYComplete)) { generalData->nPixelsXComplete,
generalData->nPixelsYComplete)) {
LOG(logERROR) << "Could not send zmq header for fnum " << fnum LOG(logERROR) << "Could not send zmq header for fnum " << fnum
<< " and streamer " << index; << " and streamer " << index;
} }
memcpy(completeBuffer + ((generalData->imageSize) * adcConfigured), memcpy(completeBuffer + ((generalData->imageSize) * adcConfigured),
data, size); data, size);
if (!zmqSocket->SendData(completeBuffer, generalData->imageSizeComplete)) { if (!zmqSocket->SendData(completeBuffer,
generalData->imageSizeComplete)) {
LOG(logERROR) << "Could not send zmq data for fnum " << fnum LOG(logERROR) << "Could not send zmq data for fnum " << fnum
<< " and streamer " << index; << " and streamer " << index;
} }
@ -180,7 +185,8 @@ void DataStreamer::ProcessAnImage(sls_detector_header header, size_t size, char*
// normal // normal
else { else {
if (!SendDataHeader(header, size, generalData->nPixelsX, generalData->nPixelsY)) { if (!SendDataHeader(header, size, generalData->nPixelsX,
generalData->nPixelsY)) {
LOG(logERROR) << "Could not send zmq header for fnum " << fnum LOG(logERROR) << "Could not send zmq header for fnum " << fnum
<< " and streamer " << index; << " and streamer " << index;
} }
@ -250,8 +256,7 @@ int DataStreamer::SendDataHeader(sls_detector_header header, uint32_t size,
void DataStreamer::RestreamStop() { void DataStreamer::RestreamStop() {
if (!SendDummyHeader()) { if (!SendDummyHeader()) {
throw RuntimeError( throw RuntimeError("Could not restream Dummy Header via ZMQ for port " +
"Could not restream Dummy Header via ZMQ for port " +
std::to_string(zmqSocket->GetPortNumber())); std::to_string(zmqSocket->GetPortNumber()));
} }
} }

4
slsReceiverSoftware/src/DataStreamer.h
View File

@ -47,8 +47,7 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject {
* @param ip streaming source ip * @param ip streaming source ip
* @param hwm streaming high water mark * @param hwm streaming high water mark
*/ */
void CreateZmqSockets(uint32_t port, const IpAddr ip, void CreateZmqSockets(uint32_t port, const IpAddr ip, int hwm);
int hwm);
void CloseZmqSocket(); void CloseZmqSocket();
void RestreamStop(); void RestreamStop();
@ -85,7 +84,6 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject {
int SendDataHeader(sls_detector_header header, uint32_t size = 0, int SendDataHeader(sls_detector_header header, uint32_t size = 0,
uint32_t nx = 0, uint32_t ny = 0); uint32_t nx = 0, uint32_t ny = 0);
static const std::string TypeName; static const std::string TypeName;
const GeneralData *generalData{nullptr}; const GeneralData *generalData{nullptr};
Fifo *fifo{nullptr}; Fifo *fifo{nullptr};

1
slsReceiverSoftware/src/Fifo.h
View File

@ -54,4 +54,3 @@ class Fifo : private virtual slsDetectorDefs {
}; };
} // namespace sls } // namespace sls

37
slsReceiverSoftware/src/File.h
View File

@ -26,8 +26,7 @@ class File : private virtual slsDetectorDefs {
#ifdef HDF5C #ifdef HDF5C
virtual std::string GetFileName() const { virtual std::string GetFileName() const {
LOG(logERROR) LOG(logERROR) << "This is a generic function GetFileName that "
<< "This is a generic function GetFileName that "
"should be overloaded by a derived class"; "should be overloaded by a derived class";
return std::string{}; return std::string{};
} }
@ -46,8 +45,7 @@ class File : private virtual slsDetectorDefs {
} }
virtual std::vector<std::string> GetParameterNames() const { virtual std::vector<std::string> GetParameterNames() const {
LOG(logERROR) LOG(logERROR) << "This is a generic function GetParameterNames that "
<< "This is a generic function GetParameterNames that "
"should be overloaded by a derived class"; "should be overloaded by a derived class";
return std::vector<std::string>{}; return std::vector<std::string>{};
}; };
@ -60,26 +58,31 @@ class File : private virtual slsDetectorDefs {
}; };
virtual void CreateFirstHDF5DataFile( virtual void CreateFirstHDF5DataFile(
const std::string& fileNamePrefix, const std::string &fileNamePrefix, const uint64_t fileIndex,
const uint64_t fileIndex, const bool overWriteEnable, const bool overWriteEnable, const bool silentMode,
const bool silentMode, const uint32_t udpPortNumber, const uint32_t udpPortNumber, const uint32_t maxFramesPerFile,
const uint32_t maxFramesPerFile, const uint64_t numImages, const uint64_t numImages, const uint32_t nPixelsX,
const uint32_t nPixelsX, const uint32_t nPixelsY, const uint32_t nPixelsY, const uint32_t dynamicRange) {
const uint32_t dynamicRange) { LOG(logERROR)
LOG(logERROR) << "This is a generic function CreateFirstHDF5DataFile that " << "This is a generic function CreateFirstHDF5DataFile that "
"should be overloaded by a derived class"; "should be overloaded by a derived class";
}; };
#endif #endif
virtual void CreateFirstBinaryDataFile( virtual void CreateFirstBinaryDataFile(const std::string &fileNamePrefix,
const std::string& fileNamePrefix, const uint64_t fileIndex,
const uint64_t fileIndex, const bool overWriteEnable, const bool overWriteEnable,
const bool silentMode, const uint32_t udpPortNumber, const bool silentMode,
const uint32_t udpPortNumber,
const uint32_t maxFramesPerFile) { const uint32_t maxFramesPerFile) {
LOG(logERROR) << "This is a generic function CreateFirstBinaryDataFile that " LOG(logERROR)
<< "This is a generic function CreateFirstBinaryDataFile that "
"should be overloaded by a derived class"; "should be overloaded by a derived class";
}; };
virtual void WriteToFile(char *imageData, sls_receiver_header& header, const int imageSize, const uint64_t currentFrameNumber,const uint32_t numPacketsCaught) = 0; virtual void WriteToFile(char *imageData, sls_receiver_header &header,
const int imageSize,
const uint64_t currentFrameNumber,
const uint32_t numPacketsCaught) = 0;
}; };
} // namespace sls } // namespace sls

49
slsReceiverSoftware/src/HDF5DataFile.cpp
View File

@ -28,18 +28,18 @@ HDF5DataFile::HDF5DataFile(int index, std::mutex *hdf5Lib)
}; };
H5::StrType strdatatype(H5::PredType::C_S1, sizeof(bitset_storage)); H5::StrType strdatatype(H5::PredType::C_S1, sizeof(bitset_storage));
parameterDataTypes = std::vector<H5::DataType>{ parameterDataTypes = std::vector<H5::DataType>{
H5::PredType::STD_U64LE, H5::PredType::STD_U32LE, H5::PredType::STD_U32LE, H5::PredType::STD_U64LE, H5::PredType::STD_U32LE,
H5::PredType::STD_U64LE, H5::PredType::STD_U64LE, H5::PredType::STD_U16LE, H5::PredType::STD_U32LE, H5::PredType::STD_U64LE,
H5::PredType::STD_U16LE, H5::PredType::STD_U16LE, H5::PredType::STD_U16LE, H5::PredType::STD_U64LE, H5::PredType::STD_U16LE,
H5::PredType::STD_U32LE, H5::PredType::STD_U16LE, H5::PredType::STD_U8LE, H5::PredType::STD_U16LE, H5::PredType::STD_U16LE,
H5::PredType::STD_U16LE, H5::PredType::STD_U32LE,
H5::PredType::STD_U16LE, H5::PredType::STD_U8LE,
H5::PredType::STD_U8LE, strdatatype}; H5::PredType::STD_U8LE, strdatatype};
} }
HDF5DataFile::~HDF5DataFile() { CloseFile(); } HDF5DataFile::~HDF5DataFile() { CloseFile(); }
std::string HDF5DataFile::GetFileName() const { std::string HDF5DataFile::GetFileName() const { return fileName; }
return fileName;
}
uint32_t HDF5DataFile::GetFilesInAcquisition() const { uint32_t HDF5DataFile::GetFilesInAcquisition() const {
return numFilesInAcquisition; return numFilesInAcquisition;
@ -54,9 +54,7 @@ std::vector<H5::DataType> HDF5DataFile::GetParameterDataTypes() const {
return parameterDataTypes; return parameterDataTypes;
} }
slsDetectorDefs::fileFormat HDF5DataFile::GetFileFormat() const { slsDetectorDefs::fileFormat HDF5DataFile::GetFileFormat() const { return HDF5; }
return HDF5;
}
void HDF5DataFile::CloseFile() { void HDF5DataFile::CloseFile() {
std::lock_guard<std::mutex> lock(*hdf5Lib); std::lock_guard<std::mutex> lock(*hdf5Lib);
@ -68,8 +66,7 @@ void HDF5DataFile::CloseFile() {
fd = nullptr; fd = nullptr;
} }
} catch (const H5::Exception &error) { } catch (const H5::Exception &error) {
LOG(logERROR) << "Could not close data HDF5 handles of index " LOG(logERROR) << "Could not close data HDF5 handles of index " << index;
<< index;
error.printErrorStack(); error.printErrorStack();
} }
if (dataSpace) { if (dataSpace) {
@ -90,9 +87,8 @@ void HDF5DataFile::CloseFile() {
} }
void HDF5DataFile::CreateFirstHDF5DataFile( void HDF5DataFile::CreateFirstHDF5DataFile(
const std::string& fNamePrefix, const std::string &fNamePrefix, const uint64_t fIndex, const bool owEnable,
const uint64_t fIndex, const bool owEnable, const bool sMode, const bool sMode, const uint32_t uPortNumber, const uint32_t mFramesPerFile,
const uint32_t uPortNumber, const uint32_t mFramesPerFile,
const uint64_t nImages, const uint32_t nX, const uint32_t nY, const uint64_t nImages, const uint32_t nX, const uint32_t nY,
const uint32_t dr) { const uint32_t dr) {
@ -134,8 +130,7 @@ void HDF5DataFile::CreateFile() {
numFilesInAcquisition++; numFilesInAcquisition++;
std::ostringstream os; std::ostringstream os;
os << fileNamePrefix << "_f" << subFileIndex os << fileNamePrefix << "_f" << subFileIndex << '_' << fileIndex << ".h5";
<< '_' << fileIndex << ".h5";
fileName = os.str(); fileName = os.str();
std::lock_guard<std::mutex> lock(*hdf5Lib); std::lock_guard<std::mutex> lock(*hdf5Lib);
@ -199,8 +194,8 @@ void HDF5DataFile::CreateFile() {
// dataset // dataset
dataSet = nullptr; dataSet = nullptr;
dataSet = new H5::DataSet(fd->createDataSet( dataSet = new H5::DataSet(
DATASET_NAME, dataType, *dataSpace, plist)); fd->createDataSet(DATASET_NAME, dataType, *dataSpace, plist));
for (unsigned int i = 0; i < parameterNames.size(); ++i) { for (unsigned int i = 0; i < parameterNames.size(); ++i) {
H5::DataSet *ds = new H5::DataSet(fd->createDataSet( H5::DataSet *ds = new H5::DataSet(fd->createDataSet(
parameterNames[i].c_str(), parameterDataTypes[i], parameterNames[i].c_str(), parameterDataTypes[i],
@ -210,8 +205,7 @@ void HDF5DataFile::CreateFile() {
} catch (const H5::Exception &error) { } catch (const H5::Exception &error) {
error.printErrorStack(); error.printErrorStack();
CloseFile(); CloseFile();
throw RuntimeError("Could not create HDF5 handles in object " + throw RuntimeError("Could not create HDF5 handles in object " + index);
index);
} }
if (!silentMode) { if (!silentMode) {
LOG(logINFO) << "[" << udpPortNumber LOG(logINFO) << "[" << udpPortNumber
@ -219,7 +213,10 @@ void HDF5DataFile::CreateFile() {
} }
} }
void HDF5DataFile::WriteToFile(char *imageData, sls_receiver_header& header, const int imageSize, const uint64_t currentFrameNumber, const uint32_t numPacketsCaught) { void HDF5DataFile::WriteToFile(char *imageData, sls_receiver_header &header,
const int imageSize,
const uint64_t currentFrameNumber,
const uint32_t numPacketsCaught) {
// check if maxframesperfile = 0 for infinite // check if maxframesperfile = 0 for infinite
if (maxFramesPerFile && (numFramesInFile >= maxFramesPerFile)) { if (maxFramesPerFile && (numFramesInFile >= maxFramesPerFile)) {
@ -320,8 +317,8 @@ void HDF5DataFile::WriteParameterDatasets(const uint64_t currentFrameNumber,
dataSetPara[2]->write(&header.packetNumber, parameterDataTypes[2], dataSetPara[2]->write(&header.packetNumber, parameterDataTypes[2],
memspace, *dataSpacePara); memspace, *dataSpacePara);
i = 3; i = 3;
dataSetPara[3]->write(&header.bunchId, parameterDataTypes[3], dataSetPara[3]->write(&header.bunchId, parameterDataTypes[3], memspace,
memspace, *dataSpacePara); *dataSpacePara);
i = 4; i = 4;
dataSetPara[4]->write(&header.timestamp, parameterDataTypes[4], dataSetPara[4]->write(&header.timestamp, parameterDataTypes[4],
memspace, *dataSpacePara); memspace, *dataSpacePara);
@ -335,8 +332,8 @@ void HDF5DataFile::WriteParameterDatasets(const uint64_t currentFrameNumber,
dataSetPara[7]->write(&header.column, parameterDataTypes[7], memspace, dataSetPara[7]->write(&header.column, parameterDataTypes[7], memspace,
*dataSpacePara); *dataSpacePara);
i = 8; i = 8;
dataSetPara[8]->write(&header.reserved, parameterDataTypes[8], dataSetPara[8]->write(&header.reserved, parameterDataTypes[8], memspace,
memspace, *dataSpacePara); *dataSpacePara);
i = 9; i = 9;
dataSetPara[9]->write(&header.debug, parameterDataTypes[9], memspace, dataSetPara[9]->write(&header.debug, parameterDataTypes[9], memspace,
*dataSpacePara); *dataSpacePara);

13
slsReceiverSoftware/src/HDF5DataFile.h
View File

@ -23,15 +23,16 @@ class HDF5DataFile : private virtual slsDetectorDefs, public File {
void CloseFile() override; void CloseFile() override;
void CreateFirstHDF5DataFile( void CreateFirstHDF5DataFile(const std::string &fNamePrefix,
const std::string& fNamePrefix,
const uint64_t fIndex, const bool owEnable, const uint64_t fIndex, const bool owEnable,
const bool sMode, const uint32_t uPortNumber, const bool sMode, const uint32_t uPortNumber,
const uint32_t mFramesPerFile, const uint64_t nImages, const uint32_t mFramesPerFile,
const uint32_t nX, const uint32_t nY, const uint64_t nImages, const uint32_t nX,
const uint32_t dr) override; const uint32_t nY, const uint32_t dr) override;
void WriteToFile(char *imageData, sls_receiver_header& header, const int imageSize, const uint64_t currentFrameNumber, const uint32_t numPacketsCaught) override; void WriteToFile(char *imageData, sls_receiver_header &header,
const int imageSize, const uint64_t currentFrameNumber,
const uint32_t numPacketsCaught) override;
private: private:
void CreateFile(); void CreateFile();

122
slsReceiverSoftware/src/Implementation.cpp
View File

@ -76,12 +76,12 @@ void Implementation::SetupFifoStructure() {
// create fifo structure // create fifo structure
try { try {
fifo.push_back(sls::make_unique<Fifo>(i, datasize, generalData->fifoDepth)); fifo.push_back(
sls::make_unique<Fifo>(i, datasize, generalData->fifoDepth));
} catch (...) { } catch (...) {
fifo.clear(); fifo.clear();
generalData->fifoDepth = 0; generalData->fifoDepth = 0;
throw RuntimeError( throw RuntimeError("Could not allocate memory for fifo structure " +
"Could not allocate memory for fifo structure " +
std::to_string(i) + ". FifoDepth is now 0."); std::to_string(i) + ". FifoDepth is now 0.");
} }
// set the listener & dataprocessor threads to point to the right fifo // set the listener & dataprocessor threads to point to the right fifo
@ -97,7 +97,8 @@ void Implementation::SetupFifoStructure() {
(double)(1024 * 1024) (double)(1024 * 1024)
<< " MB"; << " MB";
} }
LOG(logINFO) << generalData->numUDPInterfaces << " Fifo structure(s) reconstructed"; LOG(logINFO) << generalData->numUDPInterfaces
<< " Fifo structure(s) reconstructed";
} }
/************************************************** /**************************************************
@ -160,8 +161,7 @@ void Implementation::setDetectorType(const detectorType d) {
for (int i = 0; i < generalData->numUDPInterfaces; ++i) { for (int i = 0; i < generalData->numUDPInterfaces; ++i) {
try { try {
listener.push_back(sls::make_unique<Listener>( listener.push_back(sls::make_unique<Listener>(i, &status));
i, &status));
SetupListener(i); SetupListener(i);
dataProcessor.push_back(sls::make_unique<DataProcessor>(i)); dataProcessor.push_back(sls::make_unique<DataProcessor>(i));
SetupDataProcessor(i); SetupDataProcessor(i);
@ -208,7 +208,8 @@ void Implementation::SetupDataProcessor(int i) {
void Implementation::SetupDataStreamer(int i) { void Implementation::SetupDataStreamer(int i) {
dataStreamer[i]->SetFifo(fifo[i].get()); dataStreamer[i]->SetFifo(fifo[i].get());
dataStreamer[i]->SetGeneralData(generalData); dataStreamer[i]->SetGeneralData(generalData);
dataStreamer[i]->CreateZmqSockets(streamingPort, streamingSrcIP, streamingHwm); dataStreamer[i]->CreateZmqSockets(streamingPort, streamingSrcIP,
streamingHwm);
dataStreamer[i]->SetAdditionalJsonHeader(additionalJsonHeader); dataStreamer[i]->SetAdditionalJsonHeader(additionalJsonHeader);
dataStreamer[i]->SetFileIndex(fileIndex); dataStreamer[i]->SetFileIndex(fileIndex);
dataStreamer[i]->SetFlipRows(flipRows); dataStreamer[i]->SetFlipRows(flipRows);
@ -367,7 +368,8 @@ void Implementation::setArping(const bool i,
// setup interface // setup interface
for (int i = 0; i != generalData->numUDPInterfaces; ++i) { for (int i = 0; i != generalData->numUDPInterfaces; ++i) {
// ignore eiger with 2 interfaces (only udp port) // ignore eiger with 2 interfaces (only udp port)
if (i == 1 && (generalData->numUDPInterfaces == 1 || generalData->detType == EIGER)) { if (i == 1 && (generalData->numUDPInterfaces == 1 ||
generalData->detType == EIGER)) {
break; break;
} }
arping.SetInterfacesAndIps(i, eth[i], ips[i]); arping.SetInterfacesAndIps(i, eth[i], ips[i]);
@ -384,7 +386,8 @@ slsDetectorDefs::ROI Implementation::getReceiverROI() const {
void Implementation::setReceiverROI(const slsDetectorDefs::ROI arg) { void Implementation::setReceiverROI(const slsDetectorDefs::ROI arg) {
receiverRoi = arg; receiverRoi = arg;
if (generalData->numUDPInterfaces == 1 || generalData->detType == slsDetectorDefs::GOTTHARD2) { if (generalData->numUDPInterfaces == 1 ||
generalData->detType == slsDetectorDefs::GOTTHARD2) {
portRois[0] = arg; portRois[0] = arg;
} else { } else {
slsDetectorDefs::xy nPortDim(generalData->nPixelsX, slsDetectorDefs::xy nPortDim(generalData->nPixelsX,
@ -454,7 +457,8 @@ void Implementation::setReceiverROI(const slsDetectorDefs::ROI arg) {
for (size_t i = 0; i != dataProcessor.size(); ++i) for (size_t i = 0; i != dataProcessor.size(); ++i)
dataProcessor[i]->SetReceiverROI(portRois[i]); dataProcessor[i]->SetReceiverROI(portRois[i]);
LOG(logINFO) << "receiver roi: " << ToString(receiverRoi); LOG(logINFO) << "receiver roi: " << ToString(receiverRoi);
if (generalData->numUDPInterfaces == 2 && generalData->detType != slsDetectorDefs::GOTTHARD2) { if (generalData->numUDPInterfaces == 2 &&
generalData->detType != slsDetectorDefs::GOTTHARD2) {
LOG(logINFO) << "port rois: " << ToString(portRois); LOG(logINFO) << "port rois: " << ToString(portRois);
} }
} }
@ -552,7 +556,9 @@ void Implementation::setOverwriteEnable(const bool b) {
<< (overwriteEnable ? "enabled" : "disabled"); << (overwriteEnable ? "enabled" : "disabled");
} }
uint32_t Implementation::getFramesPerFile() const { return generalData->framesPerFile; } uint32_t Implementation::getFramesPerFile() const {
return generalData->framesPerFile;
}
void Implementation::setFramesPerFile(const uint32_t i) { void Implementation::setFramesPerFile(const uint32_t i) {
generalData->framesPerFile = i; generalData->framesPerFile = i;
@ -763,15 +769,15 @@ void Implementation::stopReceiver() {
// callback // callback
if (acquisitionFinishedCallBack) { if (acquisitionFinishedCallBack) {
try { try {
acquisitionFinishedCallBack((tot / generalData->numUDPInterfaces), acquisitionFinishedCallBack(
(tot / generalData->numUDPInterfaces),
pAcquisitionFinished); pAcquisitionFinished);
} catch (const std::exception &e) { } catch (const std::exception &e) {
// change status // change status
status = IDLE; status = IDLE;
LOG(logINFO) << "Receiver Stopped"; LOG(logINFO) << "Receiver Stopped";
LOG(logINFO) << "Status: " << ToString(status); LOG(logINFO) << "Status: " << ToString(status);
throw RuntimeError( throw RuntimeError("Acquisition Finished Callback Error: " +
"Acquisition Finished Callback Error: " +
std::string(e.what())); std::string(e.what()));
} }
} }
@ -862,7 +868,8 @@ void Implementation::SetupWriter() {
try { try {
for (unsigned int i = 0; i < dataProcessor.size(); ++i) { for (unsigned int i = 0; i < dataProcessor.size(); ++i) {
std::ostringstream os; std::ostringstream os;
os << filePath << "/" << fileName << "_d" << (modulePos * generalData->numUDPInterfaces + i); os << filePath << "/" << fileName << "_d"
<< (modulePos * generalData->numUDPInterfaces + i);
std::string fileNamePrefix = os.str(); std::string fileNamePrefix = os.str();
dataProcessor[i]->CreateFirstFiles( dataProcessor[i]->CreateFirstFiles(
fileNamePrefix, fileIndex, overwriteEnable, silentMode, fileNamePrefix, fileIndex, overwriteEnable, silentMode,
@ -893,8 +900,7 @@ void Implementation::StartMasterWriter() {
masterAttributes.framePadding = framePadding; masterAttributes.framePadding = framePadding;
masterAttributes.scanParams = scanParams; masterAttributes.scanParams = scanParams;
masterAttributes.totalFrames = numberOfTotalFrames; masterAttributes.totalFrames = numberOfTotalFrames;
masterAttributes.receiverRoi = masterAttributes.receiverRoi = receiverRoiMetadata;
receiverRoiMetadata;
masterAttributes.exptime = acquisitionTime; masterAttributes.exptime = acquisitionTime;
masterAttributes.period = acquisitionPeriod; masterAttributes.period = acquisitionPeriod;
masterAttributes.burstMode = burstMode; masterAttributes.burstMode = burstMode;
@ -908,14 +914,17 @@ void Implementation::StartMasterWriter() {
masterAttributes.quad = quadEnable; masterAttributes.quad = quadEnable;
masterAttributes.readNRows = readNRows; masterAttributes.readNRows = readNRows;
masterAttributes.ratecorr = rateCorrections; masterAttributes.ratecorr = rateCorrections;
masterAttributes.adcmask = masterAttributes.adcmask = generalData->tengigaEnable
generalData->tengigaEnable ? generalData->adcEnableMaskTenGiga : generalData->adcEnableMaskOneGiga; ? generalData->adcEnableMaskTenGiga
masterAttributes.analog = (generalData->readoutType == ANALOG_ONLY || : generalData->adcEnableMaskOneGiga;
masterAttributes.analog =
(generalData->readoutType == ANALOG_ONLY ||
generalData->readoutType == ANALOG_AND_DIGITAL) generalData->readoutType == ANALOG_AND_DIGITAL)
? 1 ? 1
: 0; : 0;
masterAttributes.analogSamples = generalData->nAnalogSamples; masterAttributes.analogSamples = generalData->nAnalogSamples;
masterAttributes.digital = (generalData->readoutType == DIGITAL_ONLY || masterAttributes.digital =
(generalData->readoutType == DIGITAL_ONLY ||
generalData->readoutType == ANALOG_AND_DIGITAL) generalData->readoutType == ANALOG_AND_DIGITAL)
? 1 ? 1
: 0; : 0;
@ -947,10 +956,9 @@ void Implementation::StartMasterWriter() {
// create virtual hdf5 file (if multiple files) // create virtual hdf5 file (if multiple files)
if (dataProcessor[0]->GetFilesInAcquisition() > 1 || if (dataProcessor[0]->GetFilesInAcquisition() > 1 ||
(numPorts.x * numPorts.y) > 1) { (numPorts.x * numPorts.y) > 1) {
virtualFileName = virtualFileName = dataProcessor[0]->CreateVirtualFile(
dataProcessor[0]->CreateVirtualFile( filePath, fileName, fileIndex, overwriteEnable, silentMode,
filePath, fileName, fileIndex, overwriteEnable, modulePos, numberOfTotalFrames, numPorts.x, numPorts.y,
silentMode, modulePos, numberOfTotalFrames, numPorts.x, numPorts.y,
&hdf5LibMutex); &hdf5LibMutex);
} }
// link file in master // link file in master
@ -962,7 +970,8 @@ void Implementation::StartMasterWriter() {
#endif #endif
} catch (std::exception &e) { } catch (std::exception &e) {
// ignore it and just print it // ignore it and just print it
LOG(logWARNING) << "Caught exception when handling virtual hdf5 file [" << e.what() << "]"; LOG(logWARNING) << "Caught exception when handling virtual hdf5 file ["
<< e.what() << "]";
} }
} }
@ -996,8 +1005,7 @@ int Implementation::getNumberofUDPInterfaces() const {
// not Eiger // not Eiger
void Implementation::setNumberofUDPInterfaces(const int n) { void Implementation::setNumberofUDPInterfaces(const int n) {
if (generalData->detType == EIGER) { if (generalData->detType == EIGER) {
throw RuntimeError( throw RuntimeError("Cannot set number of UDP interfaces for Eiger");
"Cannot set number of UDP interfaces for Eiger");
} }
if (generalData->numUDPInterfaces != n) { if (generalData->numUDPInterfaces != n) {
@ -1020,8 +1028,7 @@ void Implementation::setNumberofUDPInterfaces(const int n) {
for (int i = 0; i < generalData->numUDPInterfaces; ++i) { for (int i = 0; i < generalData->numUDPInterfaces; ++i) {
// listener and dataprocessor threads // listener and dataprocessor threads
try { try {
listener.push_back(sls::make_unique<Listener>( listener.push_back(sls::make_unique<Listener>(i, &status));
i, &status));
SetupListener(i); SetupListener(i);
dataProcessor.push_back(sls::make_unique<DataProcessor>(i)); dataProcessor.push_back(sls::make_unique<DataProcessor>(i));
SetupDataProcessor(i); SetupDataProcessor(i);
@ -1120,15 +1127,18 @@ int Implementation::getUDPSocketBufferSize() const {
void Implementation::setUDPSocketBufferSize(const int s) { void Implementation::setUDPSocketBufferSize(const int s) {
size_t listSize = listener.size(); size_t listSize = listener.size();
if ((generalData->detType == JUNGFRAU || generalData->detType == GOTTHARD2) && if ((generalData->detType == JUNGFRAU ||
generalData->detType == GOTTHARD2) &&
(int)listSize != generalData->numUDPInterfaces) { (int)listSize != generalData->numUDPInterfaces) {
throw RuntimeError( throw RuntimeError("Number of Interfaces " +
"Number of Interfaces " + std::to_string(generalData->numUDPInterfaces) + std::to_string(generalData->numUDPInterfaces) +
" do not match listener size " + std::to_string(listSize)); " do not match listener size " +
std::to_string(listSize));
} }
for (auto &l : listener) { for (auto &l : listener) {
l->CreateDummySocketForUDPSocketBufferSize(s, actualUDPSocketBufferSize); l->CreateDummySocketForUDPSocketBufferSize(s,
actualUDPSocketBufferSize);
} }
} }
@ -1160,8 +1170,7 @@ void Implementation::setDataStreamEnable(const bool enable) {
dataStreamEnable = false; dataStreamEnable = false;
for (const auto &it : dataProcessor) for (const auto &it : dataProcessor)
it->SetDataStreamEnable(dataStreamEnable); it->SetDataStreamEnable(dataStreamEnable);
throw RuntimeError( throw RuntimeError("Could not set data stream enable.");
"Could not set data stream enable.");
} }
} }
SetThreadPriorities(); SetThreadPriorities();
@ -1212,9 +1221,7 @@ void Implementation::setStreamingPort(const uint32_t i) {
LOG(logINFO) << "Streaming Port: " << streamingPort; LOG(logINFO) << "Streaming Port: " << streamingPort;
} }
IpAddr Implementation::getStreamingSourceIP() const { IpAddr Implementation::getStreamingSourceIP() const { return streamingSrcIP; }
return streamingSrcIP;
}
void Implementation::setStreamingSourceIP(const IpAddr ip) { void Implementation::setStreamingSourceIP(const IpAddr ip) {
streamingSrcIP = ip; streamingSrcIP = ip;
@ -1250,8 +1257,7 @@ Implementation::getAdditionalJsonParameter(const std::string &key) const {
if (additionalJsonHeader.find(key) != additionalJsonHeader.end()) { if (additionalJsonHeader.find(key) != additionalJsonHeader.end()) {
return additionalJsonHeader.at(key); return additionalJsonHeader.at(key);
} }
throw RuntimeError("No key " + key + throw RuntimeError("No key " + key + " found in additional json header");
" found in additional json header");
} }
void Implementation::setAdditionalJsonParameter(const std::string &key, void Implementation::setAdditionalJsonParameter(const std::string &key,
@ -1482,11 +1488,14 @@ void Implementation::setNumberofDigitalSamples(const uint32_t i) {
generalData->SetNumberOfDigitalSamples(i); generalData->SetNumberOfDigitalSamples(i);
SetupFifoStructure(); SetupFifoStructure();
} }
LOG(logINFO) << "Number of Digital Samples: " << generalData->nDigitalSamples; LOG(logINFO) << "Number of Digital Samples: "
<< generalData->nDigitalSamples;
LOG(logINFO) << "Packets per Frame: " << (generalData->packetsPerFrame); LOG(logINFO) << "Packets per Frame: " << (generalData->packetsPerFrame);
} }
uint32_t Implementation::getCounterMask() const { return generalData->counterMask; } uint32_t Implementation::getCounterMask() const {
return generalData->counterMask;
}
void Implementation::setCounterMask(const uint32_t i) { void Implementation::setCounterMask(const uint32_t i) {
if (generalData->counterMask != i) { if (generalData->counterMask != i) {
@ -1498,7 +1507,9 @@ void Implementation::setCounterMask(const uint32_t i) {
LOG(logINFO) << "Number of counters: " << ncounters; LOG(logINFO) << "Number of counters: " << ncounters;
} }
uint32_t Implementation::getDynamicRange() const { return generalData->dynamicRange; } uint32_t Implementation::getDynamicRange() const {
return generalData->dynamicRange;
}
void Implementation::setDynamicRange(const uint32_t i) { void Implementation::setDynamicRange(const uint32_t i) {
if (generalData->dynamicRange != i) { if (generalData->dynamicRange != i) {
@ -1510,10 +1521,13 @@ void Implementation::setDynamicRange(const uint32_t i) {
LOG(logINFO) << "Dynamic Range: " << generalData->dynamicRange; LOG(logINFO) << "Dynamic Range: " << generalData->dynamicRange;
} }
slsDetectorDefs::ROI Implementation::getROI() const { return generalData->detectorRoi; } slsDetectorDefs::ROI Implementation::getROI() const {
return generalData->detectorRoi;
}
void Implementation::setDetectorROI(slsDetectorDefs::ROI arg) { void Implementation::setDetectorROI(slsDetectorDefs::ROI arg) {
if (generalData->detectorRoi.xmin != arg.xmin || generalData->detectorRoi.xmax != arg.xmax) { if (generalData->detectorRoi.xmin != arg.xmin ||
generalData->detectorRoi.xmax != arg.xmax) {
// only for gotthard // only for gotthard
generalData->SetDetectorROI(arg); generalData->SetDetectorROI(arg);
SetupFifoStructure(); SetupFifoStructure();
@ -1523,7 +1537,9 @@ void Implementation::setDetectorROI(slsDetectorDefs::ROI arg) {
LOG(logINFO) << "Packets per Frame: " << (generalData->packetsPerFrame); LOG(logINFO) << "Packets per Frame: " << (generalData->packetsPerFrame);
} }
bool Implementation::getTenGigaEnable() const { return generalData->tengigaEnable; } bool Implementation::getTenGigaEnable() const {
return generalData->tengigaEnable;
}
void Implementation::setTenGigaEnable(const bool b) { void Implementation::setTenGigaEnable(const bool b) {
if (generalData->tengigaEnable != b) { if (generalData->tengigaEnable != b) {
@ -1541,11 +1557,12 @@ void Implementation::setTenGigaEnable(const bool b) {
} }
LOG(logDEBUG) << "Detector datastream updated [Left: " LOG(logDEBUG) << "Detector datastream updated [Left: "
<< ToString(detectorDataStream[LEFT]) << ToString(detectorDataStream[LEFT])
<< ", Right: " << ", Right: " << ToString(detectorDataStream[RIGHT])
<< ToString(detectorDataStream[RIGHT]) << "]"; << "]";
} }
} }
LOG(logINFO) << "Ten Giga: " << ( generalData->tengigaEnable ? "enabled" : "disabled"); LOG(logINFO) << "Ten Giga: "
<< (generalData->tengigaEnable ? "enabled" : "disabled");
LOG(logINFO) << "Packets per Frame: " << (generalData->packetsPerFrame); LOG(logINFO) << "Packets per Frame: " << (generalData->packetsPerFrame);
} }
@ -1618,8 +1635,7 @@ void Implementation::setThresholdEnergy(const int value) {
void Implementation::setThresholdEnergy(const std::array<int, 3> value) { void Implementation::setThresholdEnergy(const std::array<int, 3> value) {
thresholdAllEnergyeV = value; thresholdAllEnergyeV = value;
LOG(logINFO) << "Threshold Energy (eV): " LOG(logINFO) << "Threshold Energy (eV): " << ToString(thresholdAllEnergyeV);
<< ToString(thresholdAllEnergyeV);
} }
void Implementation::setRateCorrections(const std::vector<int64_t> &t) { void Implementation::setRateCorrections(const std::vector<int64_t> &t) {

112
slsReceiverSoftware/src/Listener.cpp
View File

@ -31,9 +31,7 @@ Listener::Listener(int index, std::atomic<runStatus> *status)
Listener::~Listener() = default; Listener::~Listener() = default;
bool Listener::isPortDisabled() const { bool Listener::isPortDisabled() const { return disabledPort; }
return disabledPort;
}
uint64_t Listener::GetPacketsCaught() const { return numPacketsCaught; } uint64_t Listener::GetPacketsCaught() const { return numPacketsCaught; }
@ -84,7 +82,8 @@ void Listener::SetEthernetInterface(const std::string e) {
eth = ""; eth = "";
} }
if (!eth.length()) { if (!eth.length()) {
LOG(logWARNING) << "ethernet interface for udp port " << udpPortNumber << " is empty. Listening to all"; LOG(logWARNING) << "ethernet interface for udp port " << udpPortNumber
<< " is empty. Listening to all";
} }
} }
@ -107,10 +106,7 @@ void Listener::SetFrameDiscardPolicy(frameDiscardPolicy value) {
frameDiscardMode = value; frameDiscardMode = value;
} }
void Listener::SetSilentMode(bool enable) { void Listener::SetSilentMode(bool enable) { silentMode = enable; }
silentMode = enable;
}
void Listener::ResetParametersforNewAcquisition() { void Listener::ResetParametersforNewAcquisition() {
StopRunning(); StopRunning();
@ -163,9 +159,10 @@ void Listener::CreateUDPSocket(int& actualSize) {
} }
try { try {
udpSocket = make_unique<UdpRxSocket>(udpPortNumber, packetSize, udpSocket = make_unique<UdpRxSocket>(
(eth.length() ? InterfaceNameToIp(eth).str().c_str() udpPortNumber, packetSize,
: nullptr), generalData->udpSocketBufferSize); (eth.length() ? InterfaceNameToIp(eth).str().c_str() : nullptr),
generalData->udpSocketBufferSize);
LOG(logINFO) << index << ": UDP port opened at port " << udpPortNumber; LOG(logINFO) << index << ": UDP port opened at port " << udpPortNumber;
} catch (...) { } catch (...) {
throw RuntimeError("Could not create UDP socket on port " + throw RuntimeError("Could not create UDP socket on port " +
@ -192,8 +189,8 @@ void Listener::CreateDummySocketForUDPSocketBufferSize(int s, int& actualSize) {
// custom setup (s != 0) // custom setup (s != 0)
// default setup at startup (s = 0) // default setup at startup (s = 0)
int size = (s == 0 ? generalData->udpSocketBufferSize : s); int size = (s == 0 ? generalData->udpSocketBufferSize : s);
LOG(logINFO) << "Testing UDP Socket Buffer size " << size << " with test port " LOG(logINFO) << "Testing UDP Socket Buffer size " << size
<< udpPortNumber; << " with test port " << udpPortNumber;
int previousSize = generalData->udpSocketBufferSize; int previousSize = generalData->udpSocketBufferSize;
generalData->udpSocketBufferSize = size; generalData->udpSocketBufferSize = size;
@ -209,10 +206,10 @@ void Listener::CreateDummySocketForUDPSocketBufferSize(int s, int& actualSize) {
// create dummy socket // create dummy socket
try { try {
UdpRxSocket g(udpPortNumber, packetSize, UdpRxSocket g(
(eth.length() udpPortNumber, packetSize,
? InterfaceNameToIp(eth).str().c_str() (eth.length() ? InterfaceNameToIp(eth).str().c_str() : nullptr),
: nullptr), generalData->udpSocketBufferSize); generalData->udpSocketBufferSize);
// doubled due to kernel bookkeeping (could also be less due to // doubled due to kernel bookkeeping (could also be less due to
// permissions) // permissions)
@ -245,8 +242,8 @@ void Listener::SetHardCodedPosition(uint16_t r, uint16_t c) {
void Listener::ThreadExecution() { void Listener::ThreadExecution() {
char *buffer; char *buffer;
fifo->GetNewAddress(buffer); fifo->GetNewAddress(buffer);
LOG(logDEBUG5) << "Listener " << index << ", pop 0x" LOG(logDEBUG5) << "Listener " << index << ", pop 0x" << std::hex
<< std::hex << (void *)(buffer) << std::dec << ":" << buffer; << (void *)(buffer) << std::dec << ":" << buffer;
auto *memImage = reinterpret_cast<image_structure *>(buffer); auto *memImage = reinterpret_cast<image_structure *>(buffer);
// udpsocket doesnt exist // udpsocket doesnt exist
@ -284,12 +281,13 @@ void Listener::StopListening(char *buf, size_t & size) {
size = DUMMY_PACKET_VALUE; size = DUMMY_PACKET_VALUE;
fifo->PushAddress(buf); fifo->PushAddress(buf);
StopRunning(); StopRunning();
LOG(logDEBUG1) << index << ": Listening Completed. Packets (" << udpPortNumber LOG(logDEBUG1) << index << ": Listening Completed. Packets ("
<< ") : " << numPacketsCaught; << udpPortNumber << ") : " << numPacketsCaught;
} }
/* buf includes the fifo header and packet header */ /* buf includes the fifo header and packet header */
uint32_t Listener::ListenToAnImage(sls_receiver_header & dstHeader, char *dstData) { uint32_t Listener::ListenToAnImage(sls_receiver_header &dstHeader,
char *dstData) {
uint64_t fnum = 0; uint64_t fnum = 0;
uint32_t pnum = 0; uint32_t pnum = 0;
@ -316,7 +314,8 @@ uint32_t Listener::ListenToAnImage(sls_receiver_header & dstHeader, char *dstDat
// carry over packet // carry over packet
if (carryOverFlag) { if (carryOverFlag) {
LOG(logDEBUG3) << index << "carry flag"; LOG(logDEBUG3) << index << "carry flag";
GetPacketIndices(fnum, pnum, bnum, standardHeader, carryOverPacket.get(), srcDetHeader); GetPacketIndices(fnum, pnum, bnum, standardHeader,
carryOverPacket.get(), srcDetHeader);
// future packet // future packet
if (fnum != currentFrameIndex) { if (fnum != currentFrameIndex) {
@ -327,10 +326,13 @@ uint32_t Listener::ListenToAnImage(sls_receiver_header & dstHeader, char *dstDat
carryOverFlag = false; carryOverFlag = false;
return 0; return 0;
} }
return HandleFuturePacket(false, numpackets, fnum, isHeaderEmpty, imageSize, dstHeader); return HandleFuturePacket(false, numpackets, fnum, isHeaderEmpty,
imageSize, dstHeader);
} }
CopyPacket(dstData, carryOverPacket.get(), dsize, hsize, corrected_dsize, numpackets, isHeaderEmpty, standardHeader, dstHeader, srcDetHeader, pnum, bnum); CopyPacket(dstData, carryOverPacket.get(), dsize, hsize,
corrected_dsize, numpackets, isHeaderEmpty, standardHeader,
dstHeader, srcDetHeader, pnum, bnum);
carryOverFlag = false; carryOverFlag = false;
} }
@ -346,12 +348,14 @@ uint32_t Listener::ListenToAnImage(sls_receiver_header & dstHeader, char *dstDat
if (rc <= 0) { if (rc <= 0) {
if (numpackets == 0) if (numpackets == 0)
return 0; return 0;
return HandleFuturePacket(true, numpackets, fnum, isHeaderEmpty, imageSize, dstHeader); return HandleFuturePacket(true, numpackets, fnum, isHeaderEmpty,
imageSize, dstHeader);
} }
numPacketsCaught++; numPacketsCaught++;
numPacketsStatistic++; numPacketsStatistic++;
GetPacketIndices(fnum, pnum, bnum, standardHeader, listeningPacket.get(), srcDetHeader); GetPacketIndices(fnum, pnum, bnum, standardHeader,
listeningPacket.get(), srcDetHeader);
// Eiger Firmware in a weird state // Eiger Firmware in a weird state
if (generalData->detType == EIGER && fnum == 0) { if (generalData->detType == EIGER && fnum == 0) {
@ -383,9 +387,12 @@ uint32_t Listener::ListenToAnImage(sls_receiver_header & dstHeader, char *dstDat
if (fnum != currentFrameIndex) { if (fnum != currentFrameIndex) {
carryOverFlag = true; carryOverFlag = true;
memcpy(carryOverPacket.get(), &listeningPacket[0], packetSize); memcpy(carryOverPacket.get(), &listeningPacket[0], packetSize);
return HandleFuturePacket(false, numpackets, fnum, isHeaderEmpty, imageSize, dstHeader); return HandleFuturePacket(false, numpackets, fnum, isHeaderEmpty,
imageSize, dstHeader);
} }
CopyPacket(dstData, listeningPacket.get(), dsize, hsize, corrected_dsize, numpackets, isHeaderEmpty, standardHeader, dstHeader, srcDetHeader, pnum, bnum); CopyPacket(dstData, listeningPacket.get(), dsize, hsize,
corrected_dsize, numpackets, isHeaderEmpty, standardHeader,
dstHeader, srcDetHeader, pnum, bnum);
} }
// complete image // complete image
@ -397,7 +404,10 @@ uint32_t Listener::ListenToAnImage(sls_receiver_header & dstHeader, char *dstDat
return imageSize; return imageSize;
} }
size_t Listener::HandleFuturePacket(bool EOA, uint32_t numpackets, uint64_t fnum, bool isHeaderEmpty, size_t imageSize, sls_receiver_header& dstHeader) { size_t Listener::HandleFuturePacket(bool EOA, uint32_t numpackets,
uint64_t fnum, bool isHeaderEmpty,
size_t imageSize,
sls_receiver_header &dstHeader) {
switch (frameDiscardMode) { switch (frameDiscardMode) {
case DISCARD_EMPTY_FRAMES: case DISCARD_EMPTY_FRAMES:
if (!numpackets) { if (!numpackets) {
@ -424,8 +434,10 @@ size_t Listener::HandleFuturePacket(bool EOA, uint32_t numpackets, uint64_t fnum
// no packet to get bnum // no packet to get bnum
dstHeader.detHeader.row = row; dstHeader.detHeader.row = row;
dstHeader.detHeader.column = column; dstHeader.detHeader.column = column;
dstHeader.detHeader.detType = static_cast<uint8_t>(generalData->detType); dstHeader.detHeader.detType =
dstHeader.detHeader.version = static_cast<uint8_t>(SLS_DETECTOR_HEADER_VERSION); static_cast<uint8_t>(generalData->detType);
dstHeader.detHeader.version =
static_cast<uint8_t>(SLS_DETECTOR_HEADER_VERSION);
} }
if (!EOA) { if (!EOA) {
++currentFrameIndex; ++currentFrameIndex;
@ -433,7 +445,12 @@ size_t Listener::HandleFuturePacket(bool EOA, uint32_t numpackets, uint64_t fnum
return imageSize; return imageSize;
} }
void Listener::CopyPacket(char* dst, char* src, uint32_t dataSize, uint32_t detHeaderSize, uint32_t correctedDataSize, uint32_t &numpackets, bool &isHeaderEmpty, bool standardHeader, sls_receiver_header& dstHeader, sls_detector_header * srcDetHeader, uint32_t pnum, uint64_t bnum) { void Listener::CopyPacket(char *dst, char *src, uint32_t dataSize,
uint32_t detHeaderSize, uint32_t correctedDataSize,
uint32_t &numpackets, bool &isHeaderEmpty,
bool standardHeader, sls_receiver_header &dstHeader,
sls_detector_header *srcDetHeader, uint32_t pnum,
uint64_t bnum) {
// copy packet data // copy packet data
switch (generalData->detType) { switch (generalData->detType) {
@ -449,7 +466,8 @@ void Listener::CopyPacket(char* dst, char* src, uint32_t dataSize, uint32_t detH
case CHIPTESTBOARD: case CHIPTESTBOARD:
case MOENCH: case MOENCH:
if (pnum == (generalData->packetsPerFrame - 1)) if (pnum == (generalData->packetsPerFrame - 1))
memcpy(dst + (pnum * dataSize), &src[detHeaderSize], correctedDataSize); memcpy(dst + (pnum * dataSize), &src[detHeaderSize],
correctedDataSize);
else else
memcpy(dst + (pnum * dataSize), &src[detHeaderSize], dataSize); memcpy(dst + (pnum * dataSize), &src[detHeaderSize], dataSize);
break; break;
@ -459,26 +477,32 @@ void Listener::CopyPacket(char* dst, char* src, uint32_t dataSize, uint32_t detH
} }
++numpackets; ++numpackets;
dstHeader.packetsMask[( dstHeader
(pnum < MAX_NUM_PACKETS) ? pnum : MAX_NUM_PACKETS - 1)] = 1; .packetsMask[((pnum < MAX_NUM_PACKETS) ? pnum : MAX_NUM_PACKETS - 1)] =
1;
// writer header // writer header
if (isHeaderEmpty) { if (isHeaderEmpty) {
if (standardHeader) { if (standardHeader) {
memcpy((char *)&dstHeader, (char *)srcDetHeader, sizeof(sls_detector_header)); memcpy((char *)&dstHeader, (char *)srcDetHeader,
sizeof(sls_detector_header));
} else { } else {
dstHeader.detHeader.frameNumber = currentFrameIndex; dstHeader.detHeader.frameNumber = currentFrameIndex;
dstHeader.detHeader.bunchId = bnum; dstHeader.detHeader.bunchId = bnum;
dstHeader.detHeader.row = row; dstHeader.detHeader.row = row;
dstHeader.detHeader.column = column; dstHeader.detHeader.column = column;
dstHeader.detHeader.detType = static_cast<uint8_t>(generalData->detType); dstHeader.detHeader.detType =
dstHeader.detHeader.version = static_cast<uint8_t>(SLS_DETECTOR_HEADER_VERSION); static_cast<uint8_t>(generalData->detType);
dstHeader.detHeader.version =
static_cast<uint8_t>(SLS_DETECTOR_HEADER_VERSION);
} }
isHeaderEmpty = false; isHeaderEmpty = false;
} }
} }
void Listener::GetPacketIndices(uint64_t &fnum, uint32_t &pnum, uint64_t &bnum, bool standardHeader, char* packet, sls_detector_header*& header) { void Listener::GetPacketIndices(uint64_t &fnum, uint32_t &pnum, uint64_t &bnum,
bool standardHeader, char *packet,
sls_detector_header *&header) {
if (standardHeader) { if (standardHeader) {
header = (sls_detector_header *)(&packet[0]); header = (sls_detector_header *)(&packet[0]);
fnum = header->frameNumber; fnum = header->frameNumber;
@ -487,14 +511,14 @@ void Listener::GetPacketIndices(uint64_t &fnum, uint32_t &pnum, uint64_t &bnum,
// set first packet to be odd or even (check required when switching // set first packet to be odd or even (check required when switching
// from roi to no roi) // from roi to no roi)
if (generalData->detType == GOTTHARD && !startedFlag) { if (generalData->detType == GOTTHARD && !startedFlag) {
oddStartingPacket = generalData->SetOddStartingPacket(index, &packet[0]); oddStartingPacket =
generalData->SetOddStartingPacket(index, &packet[0]);
} }
generalData->GetHeaderInfo(index, &packet[0], oddStartingPacket, fnum, pnum, bnum); generalData->GetHeaderInfo(index, &packet[0], oddStartingPacket, fnum,
pnum, bnum);
} }
} }
void Listener::PrintFifoStatistics() { void Listener::PrintFifoStatistics() {
LOG(logDEBUG1) << "numFramesStatistic:" << numFramesStatistic LOG(logDEBUG1) << "numFramesStatistic:" << numFramesStatistic
<< " numPacketsStatistic:" << numPacketsStatistic << " numPacketsStatistic:" << numPacketsStatistic

16
slsReceiverSoftware/src/Listener.h
View File

@ -47,7 +47,6 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
void SetFrameDiscardPolicy(frameDiscardPolicy value); void SetFrameDiscardPolicy(frameDiscardPolicy value);
void SetSilentMode(bool enable); void SetSilentMode(bool enable);
void ResetParametersforNewAcquisition(); void ResetParametersforNewAcquisition();
void CreateUDPSocket(int &actualSize); void CreateUDPSocket(int &actualSize);
void ShutDownUDPSocket(); void ShutDownUDPSocket();
@ -87,11 +86,20 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
*/ */
uint32_t ListenToAnImage(sls_receiver_header &dstHeader, char *dstData); uint32_t ListenToAnImage(sls_receiver_header &dstHeader, char *dstData);
size_t HandleFuturePacket(bool EOA, uint32_t numpackets, uint64_t fnum, bool isHeaderEmpty, size_t imageSize, sls_receiver_header& rxHeader); size_t HandleFuturePacket(bool EOA, uint32_t numpackets, uint64_t fnum,
bool isHeaderEmpty, size_t imageSize,
sls_receiver_header &rxHeader);
void CopyPacket(char* dst, char* src, uint32_t dataSize, uint32_t detHeaderSize, uint32_t correctedDataSize, uint32_t &numpackets, bool &isHeaderEmpty, bool standardHeader, sls_receiver_header& rxHeader, sls_detector_header* detHeader, uint32_t pnum, uint64_t bnum); void CopyPacket(char *dst, char *src, uint32_t dataSize,
uint32_t detHeaderSize, uint32_t correctedDataSize,
uint32_t &numpackets, bool &isHeaderEmpty,
bool standardHeader, sls_receiver_header &rxHeader,
sls_detector_header *detHeader, uint32_t pnum,
uint64_t bnum);
void GetPacketIndices(uint64_t &fnum, uint32_t &pnum, uint64_t &bnum, bool standardHeader, char* packet, sls_detector_header*& header); void GetPacketIndices(uint64_t &fnum, uint32_t &pnum, uint64_t &bnum,
bool standardHeader, char *packet,
sls_detector_header *&header);
void PrintFifoStatistics(); void PrintFifoStatistics();

167
slsReceiverSoftware/src/MasterAttributes.cpp
View File

@ -3,7 +3,6 @@
#include "MasterAttributes.h" #include "MasterAttributes.h"
#include <time.h> #include <time.h>
namespace sls { namespace sls {
void MasterAttributes::GetBinaryAttributes( void MasterAttributes::GetBinaryAttributes(
@ -33,8 +32,7 @@ void MasterAttributes::GetBinaryAttributes(
GetCtbBinaryAttributes(w); GetCtbBinaryAttributes(w);
break; break;
default: default:
throw RuntimeError( throw RuntimeError("Unknown Detector type to get master attributes");
"Unknown Detector type to get master attributes");
} }
GetFinalBinaryAttributes(w); GetFinalBinaryAttributes(w);
w->EndObject(); w->EndObject();
@ -66,8 +64,7 @@ void MasterAttributes::WriteHDF5Attributes(H5::H5File *fd, H5::Group *group) {
WriteCtbHDF5Attributes(fd, group); WriteCtbHDF5Attributes(fd, group);
break; break;
default: default:
throw RuntimeError( throw RuntimeError("Unknown Detector type to get master attributes");
"Unknown Detector type to get master attributes");
} }
WriteFinalHDF5Attributes(fd, group); WriteFinalHDF5Attributes(fd, group);
} }
@ -169,14 +166,15 @@ void MasterAttributes::GetFinalBinaryAttributes(
} }
#ifdef HDF5C #ifdef HDF5C
void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd,
H5::Group *group) {
char c[1024]{}; char c[1024]{};
// version // version
{ {
double version = BINARY_WRITER_VERSION; double version = BINARY_WRITER_VERSION;
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::Attribute attribute = H5::Attribute attribute = fd->createAttribute(
fd->createAttribute("Version", H5::PredType::NATIVE_DOUBLE, dataspace); "Version", H5::PredType::NATIVE_DOUBLE, dataspace);
attribute.write(H5::PredType::NATIVE_DOUBLE, &version); attribute.write(H5::PredType::NATIVE_DOUBLE, &version);
} }
// timestamp // timestamp
@ -211,22 +209,22 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd, H5::Group *grou
// geometry x // geometry x
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Geometry in x axis", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "Geometry in x axis", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&geometry.x, H5::PredType::NATIVE_INT); dataset.write(&geometry.x, H5::PredType::NATIVE_INT);
} }
// geometry y // geometry y
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Geometry in y axis", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "Geometry in y axis", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&geometry.y, H5::PredType::NATIVE_INT); dataset.write(&geometry.y, H5::PredType::NATIVE_INT);
} }
// Image Size // Image Size
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = H5::DataSet dataset = group->createDataSet(
group->createDataSet("Image Size", H5::PredType::NATIVE_INT, dataspace); "Image Size", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&imageSize, H5::PredType::NATIVE_INT); dataset.write(&imageSize, H5::PredType::NATIVE_INT);
H5::DataSpace dataspaceAttr = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspaceAttr = H5::DataSpace(H5S_SCALAR);
H5::StrType strdatatype(H5::PredType::C_S1, 256); H5::StrType strdatatype(H5::PredType::C_S1, 256);
@ -239,22 +237,22 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd, H5::Group *grou
// npixels x // npixels x
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Number of pixels in x axis", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "Number of pixels in x axis", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&nPixels.x, H5::PredType::NATIVE_INT); dataset.write(&nPixels.x, H5::PredType::NATIVE_INT);
} }
// npixels y // npixels y
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Number of pixels in y axis", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "Number of pixels in y axis", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&nPixels.y, H5::PredType::NATIVE_INT); dataset.write(&nPixels.y, H5::PredType::NATIVE_INT);
} }
// Maximum frames per file // Maximum frames per file
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Maximum frames per file", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "Maximum frames per file", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&maxFramesPerFile, H5::PredType::NATIVE_INT); dataset.write(&maxFramesPerFile, H5::PredType::NATIVE_INT);
} }
// Frame Discard Policy // Frame Discard Policy
@ -269,8 +267,8 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd, H5::Group *grou
// Frame Padding // Frame Padding
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Frame Padding", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "Frame Padding", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&framePadding, H5::PredType::NATIVE_INT); dataset.write(&framePadding, H5::PredType::NATIVE_INT);
} }
// Scan Parameters // Scan Parameters
@ -285,47 +283,48 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd, H5::Group *grou
// Total Frames // Total Frames
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Total Frames", H5::DataSet dataset = group->createDataSet(
H5::PredType::STD_U64LE, dataspace); "Total Frames", H5::PredType::STD_U64LE, dataspace);
dataset.write(&totalFrames, H5::PredType::STD_U64LE); dataset.write(&totalFrames, H5::PredType::STD_U64LE);
} }
// Receiver Roi xmin // Receiver Roi xmin
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("receiver roi xmin", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "receiver roi xmin", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&receiverRoi.xmin, H5::PredType::NATIVE_INT); dataset.write(&receiverRoi.xmin, H5::PredType::NATIVE_INT);
} }
// Receiver Roi xmax // Receiver Roi xmax
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("receiver roi xmax", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "receiver roi xmax", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&receiverRoi.xmax, H5::PredType::NATIVE_INT); dataset.write(&receiverRoi.xmax, H5::PredType::NATIVE_INT);
} }
// Receiver Roi ymin // Receiver Roi ymin
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("receiver roi ymin", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "receiver roi ymin", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&receiverRoi.ymin, H5::PredType::NATIVE_INT); dataset.write(&receiverRoi.ymin, H5::PredType::NATIVE_INT);
} }
// Receiver Roi ymax // Receiver Roi ymax
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("receiver roi ymax", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "receiver roi ymax", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&receiverRoi.ymax, H5::PredType::NATIVE_INT); dataset.write(&receiverRoi.ymax, H5::PredType::NATIVE_INT);
} }
} }
void MasterAttributes::WriteFinalHDF5Attributes(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteFinalHDF5Attributes(H5::H5File *fd,
H5::Group *group) {
char c[1024]{}; char c[1024]{};
// Total Frames in file // Total Frames in file
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Frames in File", H5::DataSet dataset = group->createDataSet(
H5::PredType::STD_U64LE, dataspace); "Frames in File", H5::PredType::STD_U64LE, dataspace);
dataset.write(&framesInFile, H5::PredType::STD_U64LE); dataset.write(&framesInFile, H5::PredType::STD_U64LE);
} }
// additional json header // additional json header
@ -362,8 +361,8 @@ void MasterAttributes::WriteHDF5Period(H5::H5File *fd, H5::Group *group) {
void MasterAttributes::WriteHDF5DynamicRange(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5DynamicRange(H5::H5File *fd, H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = H5::DataSet dataset = group->createDataSet(
group->createDataSet("Dynamic Range", H5::PredType::NATIVE_INT, dataspace); "Dynamic Range", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&dynamicRange, H5::PredType::NATIVE_INT); dataset.write(&dynamicRange, H5::PredType::NATIVE_INT);
H5::DataSpace dataspaceAttr = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspaceAttr = H5::DataSpace(H5S_SCALAR);
H5::StrType strdatatype(H5::PredType::C_S1, 256); H5::StrType strdatatype(H5::PredType::C_S1, 256);
@ -375,8 +374,8 @@ void MasterAttributes::WriteHDF5DynamicRange(H5::H5File *fd, H5::Group *group) {
void MasterAttributes::WriteHDF5TenGiga(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5TenGiga(H5::H5File *fd, H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Ten Giga Enable", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "Ten Giga Enable", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&tenGiga, H5::PredType::NATIVE_INT); dataset.write(&tenGiga, H5::PredType::NATIVE_INT);
} }
@ -384,38 +383,40 @@ void MasterAttributes::WriteHDF5ROI(H5::H5File *fd, H5::Group *group) {
// Roi xmin // Roi xmin
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = H5::DataSet dataset = group->createDataSet(
group->createDataSet("roi xmin", H5::PredType::NATIVE_INT, dataspace); "roi xmin", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&detectorRoi.xmin, H5::PredType::NATIVE_INT); dataset.write(&detectorRoi.xmin, H5::PredType::NATIVE_INT);
} }
// Roi xmax // Roi xmax
{ {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = H5::DataSet dataset = group->createDataSet(
group->createDataSet("roi xmax", H5::PredType::NATIVE_INT, dataspace); "roi xmax", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&detectorRoi.xmax, H5::PredType::NATIVE_INT); dataset.write(&detectorRoi.xmax, H5::PredType::NATIVE_INT);
} }
} }
void MasterAttributes::WriteHDF5NumUDPInterfaces(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5NumUDPInterfaces(H5::H5File *fd,
H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Number of UDP Interfaces", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "Number of UDP Interfaces", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&numUDPInterfaces, H5::PredType::NATIVE_INT); dataset.write(&numUDPInterfaces, H5::PredType::NATIVE_INT);
} }
void MasterAttributes::WriteHDF5ReadNRows(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5ReadNRows(H5::H5File *fd, H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = H5::DataSet dataset = group->createDataSet(
group->createDataSet("Number of rows", H5::PredType::NATIVE_INT, dataspace); "Number of rows", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&readNRows, H5::PredType::NATIVE_INT); dataset.write(&readNRows, H5::PredType::NATIVE_INT);
} }
void MasterAttributes::WriteHDF5ThresholdEnergy(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5ThresholdEnergy(H5::H5File *fd,
H5::Group *group) {
char c[1024]{}; char c[1024]{};
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Threshold Energy", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "Threshold Energy", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&thresholdEnergyeV, H5::PredType::NATIVE_INT); dataset.write(&thresholdEnergyeV, H5::PredType::NATIVE_INT);
H5::DataSpace dataspaceAttr = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspaceAttr = H5::DataSpace(H5S_SCALAR);
H5::StrType strdatatype(H5::PredType::C_S1, 256); H5::StrType strdatatype(H5::PredType::C_S1, 256);
@ -425,7 +426,8 @@ void MasterAttributes::WriteHDF5ThresholdEnergy(H5::H5File *fd, H5::Group *group
attribute.write(strdatatype, c); attribute.write(strdatatype, c);
} }
void MasterAttributes::WriteHDF5ThresholdEnergies(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5ThresholdEnergies(H5::H5File *fd,
H5::Group *group) {
char c[1024]{}; char c[1024]{};
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::StrType strdatatype(H5::PredType::C_S1, 1024); H5::StrType strdatatype(H5::PredType::C_S1, 1024);
@ -462,7 +464,8 @@ void MasterAttributes::WriteHDF5SubQuad(H5::H5File *fd, H5::Group *group) {
dataset.write(&quad, H5::PredType::NATIVE_INT); dataset.write(&quad, H5::PredType::NATIVE_INT);
} }
void MasterAttributes::WriteHDF5RateCorrections(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5RateCorrections(H5::H5File *fd,
H5::Group *group) {
char c[1024]{}; char c[1024]{};
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::StrType strdatatype(H5::PredType::C_S1, 1024); H5::StrType strdatatype(H5::PredType::C_S1, 1024);
@ -474,8 +477,8 @@ void MasterAttributes::WriteHDF5RateCorrections(H5::H5File *fd, H5::Group *group
void MasterAttributes::WriteHDF5CounterMask(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5CounterMask(H5::H5File *fd, H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = H5::DataSet dataset = group->createDataSet(
group->createDataSet("Counter Mask", H5::PredType::STD_U32LE, dataspace); "Counter Mask", H5::PredType::STD_U32LE, dataspace);
dataset.write(&counterMask, H5::PredType::STD_U32LE); dataset.write(&counterMask, H5::PredType::STD_U32LE);
} }
@ -491,7 +494,8 @@ void MasterAttributes::WriteHDF5ExptimeArray(H5::H5File *fd, H5::Group *group) {
} }
} }
void MasterAttributes::WriteHDF5GateDelayArray(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5GateDelayArray(H5::H5File *fd,
H5::Group *group) {
for (int i = 0; i != 3; ++i) { for (int i = 0; i != 3; ++i) {
char c[1024]{}; char c[1024]{};
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
@ -529,43 +533,45 @@ void MasterAttributes::WriteHDF5AdcMask(H5::H5File *fd, H5::Group *group) {
void MasterAttributes::WriteHDF5AnalogFlag(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5AnalogFlag(H5::H5File *fd, H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = H5::DataSet dataset = group->createDataSet(
group->createDataSet("Analog Flag", H5::PredType::NATIVE_INT, dataspace); "Analog Flag", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&analog, H5::PredType::NATIVE_INT); dataset.write(&analog, H5::PredType::NATIVE_INT);
} }
void MasterAttributes::WriteHDF5AnalogSamples(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5AnalogSamples(H5::H5File *fd,
H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = H5::DataSet dataset = group->createDataSet(
group->createDataSet("Analog Samples", H5::PredType::NATIVE_INT, dataspace); "Analog Samples", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&analogSamples, H5::PredType::NATIVE_INT); dataset.write(&analogSamples, H5::PredType::NATIVE_INT);
} }
void MasterAttributes::WriteHDF5DigitalFlag(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5DigitalFlag(H5::H5File *fd, H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = H5::DataSet dataset = group->createDataSet(
group->createDataSet("Digital Flag", H5::PredType::NATIVE_INT, dataspace); "Digital Flag", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&digital, H5::PredType::NATIVE_INT); dataset.write(&digital, H5::PredType::NATIVE_INT);
} }
void MasterAttributes::WriteHDF5DigitalSamples(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5DigitalSamples(H5::H5File *fd,
H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Digital Samples", H5::DataSet dataset = group->createDataSet(
H5::PredType::NATIVE_INT, dataspace); "Digital Samples", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&digitalSamples, H5::PredType::NATIVE_INT); dataset.write(&digitalSamples, H5::PredType::NATIVE_INT);
} }
void MasterAttributes::WriteHDF5DbitOffset(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5DbitOffset(H5::H5File *fd, H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = H5::DataSet dataset = group->createDataSet(
group->createDataSet("Dbit Offset", H5::PredType::NATIVE_INT, dataspace); "Dbit Offset", H5::PredType::NATIVE_INT, dataspace);
dataset.write(&dbitoffset, H5::PredType::NATIVE_INT); dataset.write(&dbitoffset, H5::PredType::NATIVE_INT);
} }
void MasterAttributes::WriteHDF5DbitList(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteHDF5DbitList(H5::H5File *fd, H5::Group *group) {
H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR); H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
H5::DataSet dataset = group->createDataSet("Dbit Bitset List", H5::DataSet dataset = group->createDataSet(
H5::PredType::STD_U64LE, dataspace); "Dbit Bitset List", H5::PredType::STD_U64LE, dataspace);
dataset.write(&dbitlist, H5::PredType::STD_U64LE); dataset.write(&dbitlist, H5::PredType::STD_U64LE);
} }
#endif #endif
@ -586,7 +592,8 @@ void MasterAttributes::GetGotthardBinaryAttributes(
}; };
#ifdef HDF5C #ifdef HDF5C
void MasterAttributes::WriteGotthardHDF5Attributes(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteGotthardHDF5Attributes(H5::H5File *fd,
H5::Group *group) {
MasterAttributes::WriteHDF5Exptime(fd, group); MasterAttributes::WriteHDF5Exptime(fd, group);
MasterAttributes::WriteHDF5Period(fd, group); MasterAttributes::WriteHDF5Period(fd, group);
MasterAttributes::WriteHDF5ROI(fd, group); MasterAttributes::WriteHDF5ROI(fd, group);
@ -606,7 +613,8 @@ void MasterAttributes::GetJungfrauBinaryAttributes(
} }
#ifdef HDF5C #ifdef HDF5C
void MasterAttributes::WriteJungfrauHDF5Attributes(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteJungfrauHDF5Attributes(H5::H5File *fd,
H5::Group *group) {
MasterAttributes::WriteHDF5Exptime(fd, group); MasterAttributes::WriteHDF5Exptime(fd, group);
MasterAttributes::WriteHDF5Period(fd, group); MasterAttributes::WriteHDF5Period(fd, group);
MasterAttributes::WriteHDF5NumUDPInterfaces(fd, group); MasterAttributes::WriteHDF5NumUDPInterfaces(fd, group);
@ -639,7 +647,8 @@ void MasterAttributes::GetEigerBinaryAttributes(
} }
#ifdef HDF5C #ifdef HDF5C
void MasterAttributes::WriteEigerHDF5Attributes(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteEigerHDF5Attributes(H5::H5File *fd,
H5::Group *group) {
MasterAttributes::WriteHDF5DynamicRange(fd, group); MasterAttributes::WriteHDF5DynamicRange(fd, group);
MasterAttributes::WriteHDF5TenGiga(fd, group); MasterAttributes::WriteHDF5TenGiga(fd, group);
MasterAttributes::WriteHDF5Exptime(fd, group); MasterAttributes::WriteHDF5Exptime(fd, group);
@ -678,7 +687,8 @@ void MasterAttributes::GetMythen3BinaryAttributes(
} }
#ifdef HDF5C #ifdef HDF5C
void MasterAttributes::WriteMythen3HDF5Attributes(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteMythen3HDF5Attributes(H5::H5File *fd,
H5::Group *group) {
MasterAttributes::WriteHDF5DynamicRange(fd, group); MasterAttributes::WriteHDF5DynamicRange(fd, group);
MasterAttributes::WriteHDF5TenGiga(fd, group); MasterAttributes::WriteHDF5TenGiga(fd, group);
MasterAttributes::WriteHDF5Period(fd, group); MasterAttributes::WriteHDF5Period(fd, group);
@ -701,7 +711,8 @@ void MasterAttributes::GetGotthard2BinaryAttributes(
} }
#ifdef HDF5C #ifdef HDF5C
void MasterAttributes::WriteGotthard2HDF5Attributes(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteGotthard2HDF5Attributes(H5::H5File *fd,
H5::Group *group) {
MasterAttributes::WriteHDF5Exptime(fd, group); MasterAttributes::WriteHDF5Exptime(fd, group);
MasterAttributes::WriteHDF5Period(fd, group); MasterAttributes::WriteHDF5Period(fd, group);
MasterAttributes::WriteHDF5BurstMode(fd, group); MasterAttributes::WriteHDF5BurstMode(fd, group);
@ -723,7 +734,8 @@ void MasterAttributes::GetMoenchBinaryAttributes(
} }
#ifdef HDF5C #ifdef HDF5C
void MasterAttributes::WriteMoenchHDF5Attributes(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteMoenchHDF5Attributes(H5::H5File *fd,
H5::Group *group) {
MasterAttributes::WriteHDF5Exptime(fd, group); MasterAttributes::WriteHDF5Exptime(fd, group);
MasterAttributes::WriteHDF5Period(fd, group); MasterAttributes::WriteHDF5Period(fd, group);
MasterAttributes::WriteHDF5TenGiga(fd, group); MasterAttributes::WriteHDF5TenGiga(fd, group);
@ -757,7 +769,8 @@ void MasterAttributes::GetCtbBinaryAttributes(
} }
#ifdef HDF5C #ifdef HDF5C
void MasterAttributes::WriteCtbHDF5Attributes(H5::H5File *fd, H5::Group *group) { void MasterAttributes::WriteCtbHDF5Attributes(H5::H5File *fd,
H5::Group *group) {
MasterAttributes::WriteHDF5Exptime(fd, group); MasterAttributes::WriteHDF5Exptime(fd, group);
MasterAttributes::WriteHDF5Period(fd, group); MasterAttributes::WriteHDF5Period(fd, group);
MasterAttributes::WriteHDF5TenGiga(fd, group); MasterAttributes::WriteHDF5TenGiga(fd, group);

5
slsReceiverSoftware/src/MasterAttributes.h
View File

@ -7,21 +7,18 @@
#include "sls/logger.h" #include "sls/logger.h"
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
#include <chrono>
#include <rapidjson/prettywriter.h> #include <rapidjson/prettywriter.h>
#include <rapidjson/stringbuffer.h> #include <rapidjson/stringbuffer.h>
#include <chrono>
#ifdef HDF5C #ifdef HDF5C
#include "H5Cpp.h" #include "H5Cpp.h"
#endif #endif
namespace sls { namespace sls {
using ns = std::chrono::nanoseconds; using ns = std::chrono::nanoseconds;
class MasterAttributes { class MasterAttributes {
public: public:
// (before acquisition) // (before acquisition)

37
slsReceiverSoftware/src/MasterFileUtility.cpp
View File

@ -70,7 +70,8 @@ void LinkHDF5FileInMaster(std::string &masterFileName,
// create link for data dataset // create link for data dataset
H5::DataSet dset = fd->openDataSet(DATASET_NAME); H5::DataSet dset = fd->openDataSet(DATASET_NAME);
std::string linkname = std::string("/entry/data/") + std::string(DATASET_NAME); std::string linkname =
std::string("/entry/data/") + std::string(DATASET_NAME);
if (H5Lcreate_external(dataFilename.c_str(), DATASET_NAME, if (H5Lcreate_external(dataFilename.c_str(), DATASET_NAME,
masterfd.getLocId(), linkname.c_str(), masterfd.getLocId(), linkname.c_str(),
H5P_DEFAULT, H5P_DEFAULT) < 0) { H5P_DEFAULT, H5P_DEFAULT) < 0) {
@ -152,8 +153,7 @@ std::string CreateMasterHDF5File(const std::string &filePath,
error.printErrorStack(); error.printErrorStack();
if (fd != nullptr) if (fd != nullptr)
fd->close(); fd->close();
throw RuntimeError( throw RuntimeError("Could not create/overwrite master HDF5 handles");
"Could not create/overwrite master HDF5 handles");
} }
if (!silentMode) { if (!silentMode) {
LOG(logINFO) << "Master File: " << fileName; LOG(logINFO) << "Master File: " << fileName;
@ -165,13 +165,12 @@ std::string CreateVirtualHDF5File(
const std::string &filePath, const std::string &fileNamePrefix, const std::string &filePath, const std::string &fileNamePrefix,
const uint64_t fileIndex, const bool overWriteEnable, const bool silentMode, const uint64_t fileIndex, const bool overWriteEnable, const bool silentMode,
const int modulePos, const int numUnitsPerReadout, const int modulePos, const int numUnitsPerReadout,
const uint32_t maxFramesPerFile, const uint32_t maxFramesPerFile, const uint32_t nPixelsX,
const uint32_t nPixelsX, const uint32_t nPixelsY, const uint32_t nPixelsY, const uint32_t dynamicRange,
const uint32_t dynamicRange, const uint64_t numImagesCaught, const uint64_t numImagesCaught, const int numModX, const int numModY,
const int numModX, const int numModY, const H5::DataType dataType, const H5::DataType dataType, const std::vector<std::string> parameterNames,
const std::vector<std::string> parameterNames, const std::vector<H5::DataType> parameterDataTypes,
const std::vector<H5::DataType> parameterDataTypes, std::mutex *hdf5LibMutex, std::mutex *hdf5LibMutex, bool gotthard25um) {
bool gotthard25um) {
// virtual file name // virtual file name
std::ostringstream osfn; std::ostringstream osfn;
@ -210,7 +209,8 @@ std::string CreateVirtualHDF5File(
// dataspace // dataspace
hsize_t vdsDims[DATA_RANK] = {numImagesCaught, numModY * nDimy, hsize_t vdsDims[DATA_RANK] = {numImagesCaught, numModY * nDimy,
numModZ * nDimz}; numModZ * nDimz};
hsize_t vdsDimsPara[VDS_PARA_RANK] = {numImagesCaught, numModY * numModZ}; hsize_t vdsDimsPara[VDS_PARA_RANK] = {numImagesCaught,
numModY * numModZ};
H5::DataSpace vdsDataSpace(DATA_RANK, vdsDims, nullptr); H5::DataSpace vdsDataSpace(DATA_RANK, vdsDims, nullptr);
H5::DataSpace vdsDataSpacePara(VDS_PARA_RANK, vdsDimsPara, nullptr); H5::DataSpace vdsDataSpacePara(VDS_PARA_RANK, vdsDimsPara, nullptr);
@ -290,17 +290,19 @@ std::string CreateVirtualHDF5File(
H5::DataSpace srcDataSpace(DATA_RANK, srcDims, srcDimsMax); H5::DataSpace srcDataSpace(DATA_RANK, srcDims, srcDimsMax);
hsize_t srcDimsPara[PARA_RANK] = {nDimx}; hsize_t srcDimsPara[PARA_RANK] = {nDimx};
hsize_t srcDimsMaxPara[PARA_RANK] = {H5S_UNLIMITED}; hsize_t srcDimsMaxPara[PARA_RANK] = {H5S_UNLIMITED};
H5::DataSpace srcDataSpacePara(PARA_RANK, srcDimsPara, srcDimsMaxPara); H5::DataSpace srcDataSpacePara(PARA_RANK, srcDimsPara,
srcDimsMaxPara);
// temporary fixfor corner case bug: // temporary fixfor corner case bug:
// (framescaught not multiple of framesperfile, // (framescaught not multiple of framesperfile,
// virtual parameter datasets error loading (bad scalar value)) // virtual parameter datasets error loading (bad scalar value))
if (nDimx != maxFramesPerFile) { if (nDimx != maxFramesPerFile) {
hsize_t count[1] = {nDimx}; hsize_t count[1] = {nDimx};
hsize_t start[1] = {0}; hsize_t start[1] = {0};
srcDataSpacePara.selectHyperslab(H5S_SELECT_SET, count, start, strideBetweenBlocksPara, blockSizePara); srcDataSpacePara.selectHyperslab(
H5S_SELECT_SET, count, start, strideBetweenBlocksPara,
blockSizePara);
} }
// mapping of property list // mapping of property list
plist.setVirtual(vdsDataSpace, relative_srcFileName.c_str(), plist.setVirtual(vdsDataSpace, relative_srcFileName.c_str(),
DATASET_NAME, srcDataSpace); DATASET_NAME, srcDataSpace);
@ -325,8 +327,8 @@ std::string CreateVirtualHDF5File(
framesSaved += nDimx; framesSaved += nDimx;
} }
// datasets // datasets
H5::DataSet vdsDataSet(fd->createDataSet(DATASET_NAME, dataType, H5::DataSet vdsDataSet(
vdsDataSpace, plist)); fd->createDataSet(DATASET_NAME, dataType, vdsDataSpace, plist));
for (unsigned int p = 0; p < paraSize; ++p) { for (unsigned int p = 0; p < paraSize; ++p) {
H5::DataSet vdsDataSetPara(fd->createDataSet( H5::DataSet vdsDataSetPara(fd->createDataSet(
@ -340,8 +342,7 @@ std::string CreateVirtualHDF5File(
if (fd) { if (fd) {
fd->close(); fd->close();
} }
throw RuntimeError( throw RuntimeError("Could not create/overwrite virtual HDF5 handles");
"Could not create/overwrite virtual HDF5 handles");
} }
if (!silentMode) { if (!silentMode) {
LOG(logINFO) << "Virtual File: " << fileName; LOG(logINFO) << "Virtual File: " << fileName;

16
slsReceiverSoftware/src/MasterFileUtility.h
View File

@ -10,9 +10,6 @@ namespace sls {
namespace masterFileUtility { namespace masterFileUtility {
std::string CreateMasterBinaryFile(const std::string &filePath, std::string CreateMasterBinaryFile(const std::string &filePath,
const std::string &fileNamePrefix, const std::string &fileNamePrefix,
const uint64_t fileIndex, const uint64_t fileIndex,
@ -37,13 +34,12 @@ std::string CreateVirtualHDF5File(
const std::string &filePath, const std::string &fileNamePrefix, const std::string &filePath, const std::string &fileNamePrefix,
const uint64_t fileIndex, const bool overWriteEnable, const bool silentMode, const uint64_t fileIndex, const bool overWriteEnable, const bool silentMode,
const int modulePos, const int numUnitsPerReadout, const int modulePos, const int numUnitsPerReadout,
const uint32_t maxFramesPerFile, const uint32_t maxFramesPerFile, const uint32_t nPixelsX,
const uint32_t nPixelsX, const uint32_t nPixelsY, const uint32_t nPixelsY, const uint32_t dynamicRange,
const uint32_t dynamicRange, const uint64_t numImagesCaught, const uint64_t numImagesCaught, const int numModX, const int numModY,
const int numModX, const int numModY, const H5::DataType dataType, const H5::DataType dataType, const std::vector<std::string> parameterNames,
const std::vector<std::string> parameterNames, const std::vector<H5::DataType> parameterDataTypes,
const std::vector<H5::DataType> parameterDataTypes, std::mutex *hdf5LibMutex, std::mutex *hdf5LibMutex, bool gotthard25um);
bool gotthard25um);
#endif #endif
} // namespace masterFileUtility } // namespace masterFileUtility

6
slsReceiverSoftware/src/MultiReceiverApp.cpp
View File

@ -54,7 +54,8 @@ void printHelp() {
int StartAcq(const std::string &filePath, const std::string &fileName, int StartAcq(const std::string &filePath, const std::string &fileName,
uint64_t fileIndex, size_t imageSize, void *objectPointer) { uint64_t fileIndex, size_t imageSize, void *objectPointer) {
LOG(sls::logINFOBLUE) << "#### StartAcq: filePath:" << filePath LOG(sls::logINFOBLUE) << "#### StartAcq: filePath:" << filePath
<< " fileName:" << fileName << " fileIndex:" << fileIndex << " fileName:" << fileName
<< " fileIndex:" << fileIndex
<< " imageSize:" << imageSize << " ####"; << " imageSize:" << imageSize << " ####";
return 0; return 0;
} }
@ -101,7 +102,8 @@ void GetData(slsDetectorDefs::sls_receiver_header& header, char *dataPointer,
* @param modifiedImageSize new data size in bytes after the callback. * @param modifiedImageSize new data size in bytes after the callback.
* This will be the size written/streamed. (only smaller value is allowed). * This will be the size written/streamed. (only smaller value is allowed).
*/ */
void GetData(slsDetectorDefs::sls_receiver_header& header, char *dataPointer, size_t &modifiedImageSize, void *objectPointer) { void GetData(slsDetectorDefs::sls_receiver_header &header, char *dataPointer,
size_t &modifiedImageSize, void *objectPointer) {
slsDetectorDefs::sls_detector_header detectorHeader = header.detHeader; slsDetectorDefs::sls_detector_header detectorHeader = header.detHeader;
PRINT_IN_COLOR( PRINT_IN_COLOR(

6
slsReceiverSoftware/src/Receiver.cpp
View File

@ -128,8 +128,10 @@ int64_t Receiver::getReceiverVersion() {
return tcpipInterface->getReceiverVersion(); return tcpipInterface->getReceiverVersion();
} }
void Receiver::registerCallBackStartAcquisition( void Receiver::registerCallBackStartAcquisition(int (*func)(const std::string &,
int (*func)(const std::string &, const std::string &, uint64_t, size_t, void *), const std::string &,
uint64_t, size_t,
void *),
void *arg) { void *arg) {
tcpipInterface->registerCallBackStartAcquisition(func, arg); tcpipInterface->registerCallBackStartAcquisition(func, arg);
} }

4
slsReceiverSoftware/src/ThreadObject.cpp
View File

@ -25,8 +25,8 @@ ThreadObject::ThreadObject(int index, std::string type)
try { try {
threadObject = std::thread(&ThreadObject::RunningThread, this); threadObject = std::thread(&ThreadObject::RunningThread, this);
} catch (...) { } catch (...) {
throw RuntimeError("Could not create " + type + throw RuntimeError("Could not create " + type + " thread with index " +
" thread with index " + std::to_string(index)); std::to_string(index));
} }
} }

5
slsReceiverSoftware/src/receiver_defs.h
View File

@ -43,7 +43,9 @@ struct image_structure {
slsDetectorDefs::sls_receiver_header header; slsDetectorDefs::sls_receiver_header header;
char data[]; char data[];
}; };
#define IMAGE_STRUCTURE_HEADER_SIZE (sizeof(size_t) + sizeof(size_t) + sizeof(slsDetectorDefs::sls_receiver_header)) #define IMAGE_STRUCTURE_HEADER_SIZE \
(sizeof(size_t) + sizeof(size_t) + \
sizeof(slsDetectorDefs::sls_receiver_header))
// hdf5 // hdf5
#define MAX_CHUNKED_IMAGES (1) #define MAX_CHUNKED_IMAGES (1)
@ -64,7 +66,6 @@ struct image_structure {
#define STREAMER_PRIORITY (10) #define STREAMER_PRIORITY (10)
#define TCP_PRIORITY (10) #define TCP_PRIORITY (10)
#ifdef HDF5C #ifdef HDF5C
#define DATASET_NAME "/data" #define DATASET_NAME "/data"
#endif #endif

1
slsReceiverSoftware/tests/test-CircularFifo.cpp
View File

@ -6,7 +6,6 @@
namespace sls { namespace sls {
TEST_CASE("Empty buffer") { TEST_CASE("Empty buffer") {
CircularFifo<char> fifo(0); CircularFifo<char> fifo(0);

3
slsSupportLib/include/sls/StaticVector.h
View File

@ -192,8 +192,7 @@ bool operator!=(const std::vector<T> &lhs,
} }
template <typename T, size_t Capacity> template <typename T, size_t Capacity>
std::ostream &operator<<(std::ostream &os, std::ostream &operator<<(std::ostream &os, const StaticVector<T, Capacity> &c) {
const StaticVector<T, Capacity> &c) {
return os << ToString(c); return os << ToString(c);
} }

6
slsSupportLib/include/sls/ZmqSocket.h
View File

@ -9,8 +9,8 @@
*@short functions to open/close zmq sockets *@short functions to open/close zmq sockets
*/ */
#include "sls/sls_detector_exceptions.h"
#include "sls/container_utils.h" #include "sls/container_utils.h"
#include "sls/sls_detector_exceptions.h"
#include <map> #include <map>
#include <memory> #include <memory>
@ -23,7 +23,6 @@ namespace sls {
// #define ZMQ_DETAIL // #define ZMQ_DETAIL
#define ROIVERBOSITY #define ROIVERBOSITY
/** zmq header structure */ /** zmq header structure */
struct zmqHeader { struct zmqHeader {
/** true if incoming data, false if end of acquisition */ /** true if incoming data, false if end of acquisition */
@ -224,8 +223,7 @@ class ZmqSocket {
/** Socket descriptor */ /** Socket descriptor */
mySocketDescriptors sockfd; mySocketDescriptors sockfd;
std::unique_ptr<char[]> header_buffer = std::unique_ptr<char[]> header_buffer = make_unique<char[]>(MAX_STR_LENGTH);
make_unique<char[]>(MAX_STR_LENGTH);
}; };
} // namespace sls } // namespace sls

1
slsSupportLib/src/ServerSocket.cpp
View File

@ -15,7 +15,6 @@
#include <stdexcept> #include <stdexcept>
#include <unistd.h> #include <unistd.h>
namespace sls { namespace sls {
#define DEFAULT_PACKET_SIZE 1286 #define DEFAULT_PACKET_SIZE 1286

3
slsSupportLib/src/ToString.cpp
View File

@ -123,8 +123,7 @@ std::ostream &operator<<(std::ostream &os,
std::string ToString(const slsDetectorDefs::currentSrcParameters &r) { std::string ToString(const slsDetectorDefs::currentSrcParameters &r) {
std::ostringstream oss; std::ostringstream oss;
if (r.fix < -1 || r.fix > 1 || r.normal < -1 || r.normal > 1) { if (r.fix < -1 || r.fix > 1 || r.normal < -1 || r.normal > 1) {
throw RuntimeError( throw RuntimeError("Invalid current source parameters. Cannot print.");
"Invalid current source parameters. Cannot print.");
} }
oss << '['; oss << '[';
if (r.enable) { if (r.enable) {

1
slsSupportLib/src/ZmqSocket.cpp
View File

@ -417,4 +417,3 @@ void ZmqSocket::mySocketDescriptors::Close() {
}; };
} // namespace sls } // namespace sls

6
slsSupportLib/src/file_utils.cpp
View File

@ -60,8 +60,7 @@ std::vector<char> readBinaryFile(const std::string &fname,
// check if it exists // check if it exists
struct stat st; struct stat st;
if (stat(fname.c_str(), &st) != 0) { if (stat(fname.c_str(), &st) != 0) {
throw RuntimeError(errorPrefix + throw RuntimeError(errorPrefix + std::string(" (file does not exist)"));
std::string(" (file does not exist)"));
} }
FILE *fp = fopen(fname.c_str(), "rb"); FILE *fp = fopen(fname.c_str(), "rb");
@ -76,8 +75,7 @@ std::vector<char> readBinaryFile(const std::string &fname,
std::vector<char> buffer(filesize, 0); std::vector<char> buffer(filesize, 0);
if ((ssize_t)fread(buffer.data(), sizeof(char), filesize, fp) != filesize) { if ((ssize_t)fread(buffer.data(), sizeof(char), filesize, fp) != filesize) {
throw RuntimeError(errorPrefix + throw RuntimeError(errorPrefix + std::string(" (Could not read file)"));
std::string(" (Could not read file)"));
} }
if (fclose(fp) != 0) { if (fclose(fp) != 0) {

9
slsSupportLib/tests/test-ToString.cpp
View File

@ -333,8 +333,7 @@ TEST_CASE("streamingInterface") {
REQUIRE(ToString(defs::streamingInterface::ETHERNET_10GB) == "10gbe"); REQUIRE(ToString(defs::streamingInterface::ETHERNET_10GB) == "10gbe");
REQUIRE(ToString(defs::streamingInterface::LOW_LATENCY_LINK) == "lll"); REQUIRE(ToString(defs::streamingInterface::LOW_LATENCY_LINK) == "lll");
REQUIRE(ToString(defs::streamingInterface::LOW_LATENCY_LINK | REQUIRE(ToString(defs::streamingInterface::LOW_LATENCY_LINK |
defs::streamingInterface::ETHERNET_10GB) == defs::streamingInterface::ETHERNET_10GB) == "lll, 10gbe");
"lll, 10gbe");
} }
// Speed level // Speed level
@ -353,10 +352,8 @@ TEST_CASE("string to speedLevel") {
defs::speedLevel::HALF_SPEED); defs::speedLevel::HALF_SPEED);
REQUIRE(StringTo<defs::speedLevel>("quarter_speed") == REQUIRE(StringTo<defs::speedLevel>("quarter_speed") ==
defs::speedLevel::QUARTER_SPEED); defs::speedLevel::QUARTER_SPEED);
REQUIRE(StringTo<defs::speedLevel>("108") == REQUIRE(StringTo<defs::speedLevel>("108") == defs::speedLevel::G2_108MHZ);
defs::speedLevel::G2_108MHZ); REQUIRE(StringTo<defs::speedLevel>("144") == defs::speedLevel::G2_144MHZ);
REQUIRE(StringTo<defs::speedLevel>("144") ==
defs::speedLevel::G2_144MHZ);
} }
} // namespace sls } // namespace sls

3
slsSupportLib/tests/test-UdpRxSocket.cpp
View File

@ -33,8 +33,7 @@ int open_socket(int port) {
const std::string portname = std::to_string(port); const std::string portname = std::to_string(port);
if (getaddrinfo(host, portname.c_str(), &hints, &res)) { if (getaddrinfo(host, portname.c_str(), &hints, &res)) {
throw RuntimeError("Failed at getaddrinfo with " + throw RuntimeError("Failed at getaddrinfo with " + std::string(host));
std::string(host));
} }
int fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol); int fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
if (fd == -1) { if (fd == -1) {

3
slsSupportLib/tests/test-ZmqSocket.cpp
View File

@ -5,7 +5,6 @@
namespace sls { namespace sls {
TEST_CASE("Throws when cannot create socket") { TEST_CASE("Throws when cannot create socket") {
REQUIRE_THROWS(ZmqSocket("sdiasodjajpvv", 5076001)); REQUIRE_THROWS(ZmqSocket("sdiasodjajpvv", 5076001));
} }
@ -118,4 +117,4 @@ TEST_CASE("Send header and data") {
} }
} }
} //namespace } // namespace sls

12
tests/src/testclient.cpp
View File

@ -38,7 +38,8 @@ int main(int argc, char **argv) {
for (int i = 0; i != 100; ++i) { for (int i = 0; i != 100; ++i) {
std::cout << "Sending: " << i << "\n"; std::cout << "Sending: " << i << "\n";
auto socket = sls::ClientSocket("test", hostname, port); auto socket = sls::ClientSocket("test", hostname, port);
std::cout << "Sent: " << socket.Send(sls::func_id::read_int) << " bytes\n"; std::cout << "Sent: " << socket.Send(sls::func_id::read_int)
<< " bytes\n";
std::cout << "Sent: " << socket.Send(i) << " bytes\n"; std::cout << "Sent: " << socket.Send(i) << " bytes\n";
} }
@ -46,7 +47,8 @@ int main(int argc, char **argv) {
for (int i = 0; i != 5; ++i) { for (int i = 0; i != 5; ++i) {
std::cout << "Sending data\n"; std::cout << "Sending data\n";
auto socket = sls::ClientSocket("test", hostname, port); auto socket = sls::ClientSocket("test", hostname, port);
std::cout << "Sent: " << socket.Send(sls::func_id::read_data) << " bytes\n"; std::cout << "Sent: " << socket.Send(sls::func_id::read_data)
<< " bytes\n";
std::cout << "Sent: " << socket.Send(data.get(), sls::DATA_SIZE) std::cout << "Sent: " << socket.Send(data.get(), sls::DATA_SIZE)
<< " bytes\n"; << " bytes\n";
} }
@ -54,7 +56,8 @@ int main(int argc, char **argv) {
// Send too little data // Send too little data
{ {
auto socket = sls::ClientSocket("test", hostname, port); auto socket = sls::ClientSocket("test", hostname, port);
std::cout << "Sent: " << socket.Send(sls::func_id::read_data) << " bytes\n"; std::cout << "Sent: " << socket.Send(sls::func_id::read_data)
<< " bytes\n";
std::cout << "Sent: " << socket.Send(data.get(), sls::DATA_SIZE / 2) std::cout << "Sent: " << socket.Send(data.get(), sls::DATA_SIZE / 2)
<< " bytes\n"; << " bytes\n";
} }
@ -71,7 +74,8 @@ int main(int argc, char **argv) {
for (int i = 0; i != 10; ++i) { for (int i = 0; i != 10; ++i) {
std::cout << "Sending: " << i << "\n"; std::cout << "Sending: " << i << "\n";
auto socket = sls::ClientSocket("test", hostname, port); auto socket = sls::ClientSocket("test", hostname, port);
std::cout << "Sent: " << socket.Send(sls::func_id::read_int) << " bytes\n"; std::cout << "Sent: " << socket.Send(sls::func_id::read_int)
<< " bytes\n";
std::cout << "Sent: " << socket.Send(i) << " bytes\n"; std::cout << "Sent: " << socket.Send(i) << " bytes\n";
} }

13
tests/test.cpp
View File

@ -30,13 +30,14 @@ int main(int argc, char *argv[]) {
sls::test::my_ip = "undefined"; sls::test::my_ip = "undefined";
Catch::Session session; Catch::Session session;
auto cli = auto cli = session.cli() |
session.cli() |
sls::Opt(sls::test::hostname, "hostname")["-hn"]["--hostname"]( sls::Opt(sls::test::hostname, "hostname")["-hn"]["--hostname"](
"Detector hostname for integration tests") | "Detector hostname for integration tests") |
sls::Opt(sls::test::detector_type, "detector_type")["-dt"]["--detector_type"]( sls::Opt(sls::test::detector_type,
"detector_type")["-dt"]["--detector_type"](
"Detector type for integration tests") | "Detector type for integration tests") |
sls::Opt(sls::test::my_ip, "my_ip")["-hip"]["--host_ip"]("Host ip address"); sls::Opt(sls::test::my_ip,
"my_ip")["-hip"]["--host_ip"]("Host ip address");
session.cli(cli); session.cli(cli);
@ -47,8 +48,8 @@ int main(int argc, char *argv[]) {
sls::test::type = slsDetectorDefs::GENERIC; sls::test::type = slsDetectorDefs::GENERIC;
if (!sls::test::detector_type.empty()) { if (!sls::test::detector_type.empty()) {
sls::test::type = sls::test::type = sls::StringTo<slsDetectorDefs::detectorType>(
sls::StringTo<slsDetectorDefs::detectorType>(sls::test::detector_type); sls::test::detector_type);
} }
return session.run(); return session.run();