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

slsDetectorSoftware & eiger server: fixed coordinates in 2 d, but switch to row (x), col(y); numdetx and numdety sent to all receivers now, likely bug fix virtual file linked in master for 1 mod jungfrau; xccoord and y coord calculated at setdetector pos and given to listener

Browse Source
This commit is contained in:
maliakal_d
2018-08-15 19:02:16 +02:00
parent b3ccd5e1a1
commit 87e8333dfd
13 changed files with 156 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3976,14 +3976,10 @@ int slsDetector::configureMAC() {
if (thisDetector->myDetectorType == JUNGFRAU ||
thisDetector->myDetectorType == EIGER) {
sendpos = true;
int max = multiDet->getNumberOfDetectors(X);
if(!detId) {
pos[0] = 0;
pos[1] = 0;
} else {
pos[1] = detId / max;
pos[0] = (detId % max) * ((thisDetector->myDetectorType == EIGER) ? 2 : 1); // for horiz. udp ports
}
int max = multiDet->getNumberOfDetectors(Y);
pos[0] = (detId % max); // row
pos[1] = (detId / max) * ((thisDetector->myDetectorType == EIGER) ? 2 : 1);// col for horiz. udp ports
}
#ifdef VERBOSE
cout << "SLS [" << detId << "] - (" << pos[0] << "," << pos[1] << "," <<
@ -5288,8 +5284,7 @@ string slsDetector::setReceiver(string receiverIP) {
#endif
if(setDetectorType()!= GENERIC){
if(!detId)
sendMultiDetectorSize();
sendMultiDetectorSize();
setDetectorId();
setDetectorHostname();
setUDPConnection();