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

multisize to numberofdetectors

Browse Source
This commit is contained in:
maliakal_d
2020-06-17 09:57:56 +02:00
parent e09fc8cd2b
commit b5781e1f9b
8 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -315,7 +315,7 @@ void DetectorImpl::updateDetectorSize() {
<< multi_shm()->numberOfChannels.y;
for (auto &d : detectors) {
d->updateMultiSize(multi_shm()->numberOfDetector);
d->updateNumberOfDetector(multi_shm()->numberOfDetector);
}
}

20
slsDetectorSoftware/src/Module.cpp
View File

@ -375,8 +375,8 @@ void Module::initializeDetectorStructure(detectorType type) {
shm()->shmversion = SLS_SHMVERSION;
memset(shm()->hostname, 0, MAX_STR_LENGTH);
shm()->myDetectorType = type;
shm()->multiSize.x = 0;
shm()->multiSize.y = 0;
shm()->numberOfDetector.x = 0;
shm()->numberOfDetector.y = 0;
shm()->controlPort = DEFAULT_PORTNO;
shm()->stopPort = DEFAULT_PORTNO + 1;
sls::strcpy_safe(shm()->settingsDir, getenv("HOME"));
@ -558,9 +558,9 @@ void Module::setReadNLines(const int value) {
int Module::getReadNLines() { return sendToDetector<int>(F_GET_READ_N_LINES); }
void Module::updateMultiSize(slsDetectorDefs::xy det) {
shm()->multiSize = det;
int args[2] = {shm()->multiSize.y, detId};
void Module::updateNumberOfDetector(slsDetectorDefs::xy det) {
shm()->numberOfDetector = det;
int args[2] = {shm()->numberOfDetector.y, detId};
sendToDetector(F_SET_POSITION, args, nullptr);
}
@ -1434,15 +1434,17 @@ void Module::setReceiverHostname(const std::string &receiverIP) {
// populate from shared memory
retval.detType = shm()->myDetectorType;
retval.multiSize.x = shm()->multiSize.x;
retval.multiSize.y = shm()->multiSize.y;
retval.numberOfDetector.x = shm()->numberOfDetector.x;
retval.numberOfDetector.y = shm()->numberOfDetector.y;
retval.detId = detId;
memset(retval.hostname, 0, sizeof(retval.hostname));
strcpy_safe(retval.hostname, shm()->hostname);
LOG(logDEBUG1) << "detType:" << retval.detType << std::endl
<< "multiSize.x:" << retval.multiSize.x << std::endl
<< "multiSize.y:" << retval.multiSize.y << std::endl
<< "numberOfDetector.x:" << retval.numberOfDetector.x
<< std::endl
<< "numberOfDetector.y:" << retval.numberOfDetector.y
<< std::endl
<< "detId:" << retval.detId << std::endl
<< "hostname:" << retval.hostname << std::endl
<< "udpInterfaces:" << retval.udpInterfaces << std::endl

10
slsDetectorSoftware/src/Module.h
View File

@ -26,20 +26,14 @@ struct sharedSlsDetector {
/* FIXED PATTERN FOR STATIC FUNCTIONS. DO NOT CHANGE, ONLY APPEND ------*/
/** shared memory version */
int shmversion;
/** is the hostname (or IP address) of the detector. needs to be set
* before starting the communication */
char hostname[MAX_STR_LENGTH];
/** detector type \ see :: detectorType*/
slsDetectorDefs::detectorType myDetectorType;
/** END OF FIXED PATTERN -----------------------------------------------*/
/** Number of detectors in multi list in x dir and y dir */
slsDetectorDefs::xy multiSize;
slsDetectorDefs::xy numberOfDetector;
/** is the port used for control functions */
int controlPort;
@ -212,7 +206,7 @@ class Module : public virtual slsDetectorDefs {
* Set Detector offset in shared memory in dimension d
* @param det detector size
*/
void updateMultiSize(slsDetectorDefs::xy det);
void updateNumberOfDetector(slsDetectorDefs::xy det);
int setControlPort(int port_number);