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

receiver: readout flag bug fix, clent:send roi for ctb and moench

Browse Source
This commit is contained in:
maliakal_d
2019-03-06 10:55:51 +01:00
parent d3c1193a71
commit 2676e8b43d
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2478,7 +2478,7 @@ std::string slsDetector::setReceiver(const std::string &receiverIP) {
setReceiverStreamingIP(getReceiverStreamingIP()); setReceiverStreamingIP(getReceiverStreamingIP());
setAdditionalJsonHeader(thisDetector->receiver_additionalJsonHeader); setAdditionalJsonHeader(thisDetector->receiver_additionalJsonHeader);
enableDataStreamingFromReceiver(enableDataStreamingFromReceiver(-1)); enableDataStreamingFromReceiver(enableDataStreamingFromReceiver(-1));
if (thisDetector->myDetectorType == GOTTHARD) { if (thisDetector->myDetectorType == GOTTHARD || thisDetector->myDetectorType == CHIPTESTBOARD || thisDetector->myDetectorType == MOENCH) {
sendROI(-1, nullptr); sendROI(-1, nullptr);
} }
} }

27
slsReceiverSoftware/include/GeneralData.h
View File

@ -555,18 +555,21 @@ public:
* @param t tengiga enable * @param t tengiga enable
*/ */
void setImageSize(slsDetectorDefs::readOutFlags f, std::vector<slsDetectorDefs::ROI> i, int s, bool t) { void setImageSize(slsDetectorDefs::readOutFlags f, std::vector<slsDetectorDefs::ROI> i, int s, bool t) {
int nchans = 0; int nchans = 0;
if (f & slsDetectorDefs::NORMAL_READOUT || f & slsDetectorDefs::ANALOG_AND_DIGITAL) { if (f != slsDetectorDefs::GET_READOUT_FLAGS) {
nchans += NCHAN_ANALOG; // analog channels
if (f == slsDetectorDefs::NORMAL_READOUT || f & slsDetectorDefs::ANALOG_AND_DIGITAL) {
// if roi nchans += NCHAN_ANALOG;
if (i.size()) { // if roi
nchans = abs(i[0].xmax - i[0].xmin); if (i.size()) {
} nchans = abs(i[0].xmax - i[0].xmin);
} }
if (f & slsDetectorDefs::DIGITAL_ONLY || f & slsDetectorDefs::ANALOG_AND_DIGITAL) }
nchans += NCHAN_DIGITAL; // digital channels
if (f & slsDetectorDefs::DIGITAL_ONLY || f & slsDetectorDefs::ANALOG_AND_DIGITAL) {
nchans += NCHAN_DIGITAL;
}
}
nPixelsX = nchans; nPixelsX = nchans;
nPixelsY = s; nPixelsY = s;
// 10G // 10G

4
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -69,7 +69,7 @@ void slsReceiverImplementation::InitializeMembers() {
flippedData[0] = 0; flippedData[0] = 0;
flippedData[1] = 0; flippedData[1] = 0;
gapPixelsEnable = false; gapPixelsEnable = false;
readoutFlags = NORMAL_READOUT; readoutFlags = GET_READOUT_FLAGS;
//*** receiver parameters *** //*** receiver parameters ***
numThreads = 1; numThreads = 1;
@ -457,7 +457,7 @@ int slsReceiverImplementation::setReadOutFlags(const readOutFlags f) {
} }
std::string flag; std::string flag;
if (f == NORMAL_READOUT) if (f == NORMAL_READOUT)
flag = "none"; flag = "normal(analog, no digital)";
else if (f & STORE_IN_RAM) else if (f & STORE_IN_RAM)
flag.append("storeinram "); flag.append("storeinram ");
if (f & TOT_MODE) if (f & TOT_MODE)