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

minor cleanup

Browse Source
This commit is contained in:
Erik Frojdh
2018-10-10 12:17:28 +02:00
parent 6147383677
commit 74bd223fda
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -607,8 +607,6 @@ void multiSlsDetector::addSlsDetector (std::string s) {
int pos = (int)detectors.size(); int pos = (int)detectors.size();
// slsDetector* sdet = new slsDetector(type, detId, pos, false);
// detectors.push_back(sdet);
detectors.push_back(sls::make_unique<slsDetector>(type, detId, pos, false)); detectors.push_back(sls::make_unique<slsDetector>(type, detId, pos, false));
@ -654,7 +652,7 @@ std::string multiSlsDetector::getDetectorType(int detPos) {
int multiSlsDetector::getNumberOfDetectors() { int multiSlsDetector::getNumberOfDetectors() {
return (int)detectors.size(); return detectors.size();
} }
@ -664,7 +662,8 @@ int multiSlsDetector::getNumberOfDetectors(dimension d) {
void multiSlsDetector::getNumberOfDetectors(int& nx, int& ny) { void multiSlsDetector::getNumberOfDetectors(int& nx, int& ny) {
nx=thisMultiDetector->numberOfDetector[X];ny=thisMultiDetector->numberOfDetector[Y]; nx=thisMultiDetector->numberOfDetector[X];
ny=thisMultiDetector->numberOfDetector[Y];
} }
@ -2975,10 +2974,6 @@ int multiSlsDetector::createReceivingDataSockets(const bool destroy) {
uint32_t portnum = stoi(detectors[iSocket / numSocketsPerDetector]->getClientStreamingPort()); uint32_t portnum = stoi(detectors[iSocket / numSocketsPerDetector]->getClientStreamingPort());
portnum += (iSocket % numSocketsPerDetector); portnum += (iSocket % numSocketsPerDetector);
try { try {
// ZmqSocket* z = new ZmqSocket(
// detectors[iSocket / numSocketsPerDetector]->getClientStreamingIP().c_str(),
// portnum);
// zmqSocket.push_back(z);
zmqSocket.push_back(sls::make_unique<ZmqSocket>(detectors[iSocket / numSocketsPerDetector]->getClientStreamingIP().c_str(), zmqSocket.push_back(sls::make_unique<ZmqSocket>(detectors[iSocket / numSocketsPerDetector]->getClientStreamingIP().c_str(),
portnum)); portnum));
printf("Zmq Client[%lu] at %s\n", iSocket, zmqSocket.back()->GetZmqServerAddress()); printf("Zmq Client[%lu] at %s\n", iSocket, zmqSocket.back()->GetZmqServerAddress());