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

Merge pull request #376 from slsdetectorgroup/datastreamFix

Browse Source 
eiger datastream fix for 1g
This commit is contained in:
Dhanya Thattil 2022-02-11 16:23:09 +01:00 committed by GitHub
commit 7eb9cb1840
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/slsdet/detector.py
View File

@ -1924,7 +1924,7 @@ class Detector(CppDetectorApi):
def datastream(self):
"""
datastream [left|right] [0, 1]
[Eiger] Enables or disables data streaming from left or/and right side of detector. 1 (enabled) by default.
[Eiger] Enables or disables data streaming from left or/and right side of detector for 10GbE mode. 1 (enabled) by default.
"""
result = {}
for port in [defs.LEFT, defs.RIGHT]:

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2105,6 +2105,9 @@ int setDataStream(enum portPosition port, int enable) {
LOG(logERROR, ("Invalid setDataStream enable argument: %d\n", enable));
return FAIL;
}
LOG(logINFO,
("%s 10GbE %s datastream\n", (enable ? "Enabling" : "Disabling"),
(port == LEFT ? "left" : "right")));
#ifdef VIRTUAL
if (port == LEFT) {
eiger_virtual_left_datastream = enable;

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

@ -8266,9 +8266,6 @@ int get_datastream(int file_des) {
"Only left and right allowed\n",
arg);
LOG(logERROR, (mess));
} else if (enableTenGigabitEthernet(GET_FLAG) == 0) {
retval = 1;
LOG(logINFO, ("Datastream always enabled for 1g\n"));
} else {
ret = getDataStream(arg, &retval);
LOG(logDEBUG1, ("datastream (%s) retval: %u\n",
@ -8315,14 +8312,6 @@ int set_datastream(int file_des) {
ret = FAIL;
sprintf(mess, "Could not %s. Invalid enable %d. \n", msg, enable);
LOG(logERROR, (mess));
} else if (enableTenGigabitEthernet(GET_FLAG) == 0 && enable == 0) {
ret = FAIL;
sprintf(mess,
"Could not %s. Disabling is only enabled in 10g mode.\n",
msg);
LOG(logERROR, (mess));
} else if (enableTenGigabitEthernet(GET_FLAG) == 0 && enable == 1) {
LOG(logINFO, ("Datastream always enabled for 1g\n"));
} else {
ret = setDataStream(port, enable);
if (ret == FAIL) {

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

@ -1147,8 +1147,8 @@ class Detector {
Result<bool> getDataStream(const defs::portPosition port,
Positions pos = {}) const;
/** [Eiger] enable or disable data streaming from left or right of detector.
* Default: enabled
/** [Eiger] enable or disable data streaming from left or right of detector
* for 10GbE. Default: enabled
*/
void setDataStream(const defs::portPosition port, const bool enable,
Positions pos = {});

4
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -1804,7 +1804,9 @@ std::string CmdProxy::DataStream(int action) {
os << cmd << ' ';
if (action == defs::HELP_ACTION) {
os << "[left|right] [0, 1]\n\t[Eiger] Enables or disables data "
"streaming from left or/and right side of detector. 1 (enabled) "
"streaming from left or/and right side of detector for 10 GbE "
"mode. "
"1 (enabled) "
"by default."
<< '\n';
} else if (action == defs::GET_ACTION) {

21
slsReceiverSoftware/src/Implementation.cpp
View File

@ -1466,6 +1466,21 @@ void Implementation::setTenGigaEnable(const bool b) {
generalData->SetTenGigaEnable(b);
SetupFifoStructure();
// datastream can be disabled/enabled only for Eiger 10GbE
if (detType == EIGER) {
if (!b) {
detectorDataStream[LEFT] = 1;
detectorDataStream[RIGHT] = 1;
} else {
detectorDataStream[LEFT] = detectorDataStream10GbE[LEFT];
detectorDataStream[RIGHT] = detectorDataStream10GbE[RIGHT];
}
LOG(logINFO) << "Detector datastream updated [Left: "
<< sls::ToString(detectorDataStream[LEFT])
<< ", Right: "
<< sls::ToString(detectorDataStream[RIGHT]) << "]";
}
}
LOG(logINFO) << "Ten Giga: " << (tengigaEnable ? "enabled" : "disabled");
LOG(logINFO) << "Packets per Frame: " << (generalData->packetsPerFrame);
@ -1532,9 +1547,9 @@ bool Implementation::getDetectorDataStream(const portPosition port) const {
void Implementation::setDetectorDataStream(const portPosition port,
const bool enable) {
int index = (port == LEFT ? 0 : 1);
detectorDataStream[index] = enable;
LOG(logINFO) << "Detector datastream (" << sls::ToString(port)
<< " Port): " << sls::ToString(detectorDataStream[index]);
detectorDataStream10GbE[index] = enable;
LOG(logINFO) << "Detector 10GbE datastream (" << sls::ToString(port)
<< " Port): " << sls::ToString(detectorDataStream10GbE[index]);
}
int Implementation::getReadNRows() const { return readNRows; }

1
slsReceiverSoftware/src/Implementation.h
View File

@ -356,6 +356,7 @@ class Implementation : private virtual slsDetectorDefs {
bool quadEnable{false};
bool activated{true};
std::array<bool, 2> detectorDataStream = {{true, true}};
std::array<bool, 2> detectorDataStream10GbE = {{true, true}};
int readNRows{0};
int thresholdEnergyeV{-1};
std::array<int, 3> thresholdAllEnergyeV = {{-1, -1, -1}};

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

@ -12,4 +12,4 @@
#define APIJUNGFRAU 0x220203
#define APIMYTHEN3 0x220203
#define APIMOENCH 0x220203
#define APIEIGER 0x220204
#define APIEIGER 0x220207