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

slsReceiver & client: 10genable allowed for moench and ctb, ctb server: better way to divide to packets to send via udp

Browse Source
This commit is contained in:
maliakal_d
2019-02-28 10:09:54 +01:00
parent 302d9f0633
commit 7f2197fc4f
8 changed files with 198 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -424,8 +424,10 @@ void slsDetector::initializeDetectorStructure(detectorType type) {
thisDetector->receiver_framesPerFile = JFRAU_MAX_FRAMES_PER_FILE;
break;
case CHIPTESTBOARD:
thisDetector->receiver_framesPerFile = CTB_MAX_FRAMES_PER_FILE;
break;
case MOENCH:
thisDetector->receiver_framesPerFile = JFRAU_MAX_FRAMES_PER_FILE;
thisDetector->receiver_framesPerFile = MOENCH_MAX_FRAMES_PER_FILE;
break;
default:
break;
@ -2420,10 +2422,11 @@ std::string slsDetector::setReceiver(const std::string &receiverIP) {
thisDetector->timerValue[SUBFRAME_ACQUISITION_TIME]);
setTimer(SUBFRAME_DEADTIME, thisDetector->timerValue[SUBFRAME_DEADTIME]);
}
setDynamicRange(thisDetector->dynamicRange);
if (thisDetector->myDetectorType == CHIPTESTBOARD || thisDetector->myDetectorType == MOENCH) {
setTimer(SAMPLES, thisDetector->timerValue[SAMPLES]);
enableTenGigabitEthernet(thisDetector->tenGigaEnable);
}
setDynamicRange(thisDetector->dynamicRange);
if (thisDetector->myDetectorType == EIGER) {
setFlippedData(X, -1);
activate(-1);

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -354,7 +354,7 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
++i;
/*! \page config
- <b>tengiga [i]</b> enables/disables 10GbE in system (detector & receiver). 1 enabled 10GbE, 0 enables 1GbE. Used in EIGER only. \c Returns \c (int)
- <b>tengiga [i]</b> enables/disables 10GbE in system (detector & receiver). 1 enabled 10GbE, 0 enables 1GbE. Used in EIGER, Moench and ChipTestBoard only. \c Returns \c (int)
*/
descrToFuncMap[i].m_pFuncName = "tengiga"; //
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdReceiver;