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

shadowing variables

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-05 17:01:29 +02:00
parent cbacf471d6
commit 33f726ff7e
6 changed files with 73 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
slsReceiverSoftware/include/slsReceiverImplementation.h
View File

@ -472,38 +472,38 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* @param i ROI
* @return OK or FAIL
*/
int setROI(const std::vector<ROI> i);
int setROI(const std::vector<ROI> new_roi);
/**
* Set the streaming frequency
* @param freq 0 for timer, n for nth frame frequency
* @return OK or FAIL
*/
int setStreamingFrequency(const uint32_t freq);
/**
* Set the streaming frequency
* @param freq 0 for timer, n for nth frame frequency
* @return OK or FAIL
*/
int setStreamingFrequency(const uint32_t freq);
/**
* Sets the timer between frames streamed when frequency is set to 0
* @param time_in_ms timer between frames streamed
*/
void setStreamingTimer(const uint32_t time_in_ms);
/**
* Set the data stream enable
* @param enable data stream enable
* @return OK or FAIL
*/
int setDataStreamEnable(const bool enable);
/**
* Sets the timer between frames streamed when frequency is set to 0
* @param time_in_ms timer between frames streamed
*/
void setStreamingTimer(const uint32_t time_in_ms);
/**
* Set the data stream enable
* @param enable data stream enable
* @return OK or FAIL
*/
int setDataStreamEnable(const bool enable);
/**
* Set streaming port
* @param i streaming port
*/
void setStreamingPort(const uint32_t i);
/**
* Set streaming port
* @param i streaming port
*/
void setStreamingPort(const uint32_t i);
/**
* Set streaming source ip
* @param c streaming source ip
*/
void setStreamingSourceIP(const char* c);
/**
* Set streaming source ip
* @param c streaming source ip
*/
void setStreamingSourceIP(const char *c);
/**
* Set additional json header

56
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -737,40 +737,38 @@ int slsReceiverImplementation::setUDPSocketBufferSize(const int64_t s) {
/***acquisition parameters***/
int slsReceiverImplementation::setROI(const std::vector<slsDetectorDefs::ROI> i) {
int slsReceiverImplementation::setROI(const std::vector<slsDetectorDefs::ROI> new_roi) {
bool change = false;
if (roi.size() != i.size())
change = true;
if (roi.size() != new_roi.size())
change = true;
else {
for (unsigned int iloop = 0; iloop < i.size(); ++iloop) {
if (
(roi[iloop].xmin != i[iloop].xmin) ||
(roi[iloop].xmax != i[iloop].xmax) ||
(roi[iloop].ymin != i[iloop].ymin) ||
(roi[iloop].xmax != i[iloop].xmax)) {
change = true;
break;
}
for (size_t i = 0; i != new_roi.size(); ++i) {
if ((roi[i].xmin != new_roi[i].xmin) ||
(roi[i].xmax != new_roi[i].xmax) ||
(roi[i].ymin != new_roi[i].ymin) ||
(roi[i].xmax != new_roi[i].xmax)) {
change = true;
break;
}
}
}
if (change) {
roi = i;
switch(myDetectorType) {
case GOTTHARD:
generalData->SetROI(i);
framesPerFile = generalData->maxFramesPerFile;
break;
case MOENCH:
generalData->setImageSize(roi, numberOfSamples, tengigaEnable);
break;
case CHIPTESTBOARD:
generalData->setImageSize(roi, numberOfSamples, tengigaEnable, readoutFlags);
break;
default:
break;
roi = new_roi;
switch (myDetectorType) {
case GOTTHARD:
generalData->SetROI(new_roi);
framesPerFile = generalData->maxFramesPerFile;
break;
case MOENCH:
generalData->setImageSize(roi, numberOfSamples, tengigaEnable);
break;
case CHIPTESTBOARD:
generalData->setImageSize(roi, numberOfSamples, tengigaEnable,
readoutFlags);
break;
default:
break;
}
for (const auto& it : dataProcessor)
it->SetPixelDimension();
@ -784,7 +782,7 @@ int slsReceiverImplementation::setROI(const std::vector<slsDetectorDefs::ROI> i)
if (!roi.size())
sstm << "0";
else {
for (unsigned int i = 0; i < roi.size(); ++i) {
for (size_t i = 0; i < roi.size(); ++i) {
sstm << "( " <<
roi[i].xmin << ", " <<
roi[i].xmax << ", " <<

2
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -789,7 +789,7 @@ int slsReceiverTCPIPInterface::setup_udp(){
receiver->setUDPPortNumber2(port2);
FILE_LOG(logINFO) << "Receiver UDP IP 2: " << ip2;
// get eth
std::string temp = genericSocket::ipToName(ip2);
temp = genericSocket::ipToName(ip2);
if (temp == "none"){
ret = FAIL;
strcpy(mess, "Failed to get 2nd ethernet interface or IP \n");