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

minor

Browse Source
This commit is contained in:
Erik Frojdh
2020-07-31 12:15:02 +02:00
parent 40d0430f2e
commit 459a715b9c
1 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
slsDetectorSoftware/src/Module.cpp
View File

@ -1462,7 +1462,7 @@ void Module::setVetoPhoton(const int chipIndex, const int numPhotons,
std::to_string(energy)); std::to_string(energy));
} }
std::ifstream infile(fname.c_str()); std::ifstream infile(fname.c_str());
if (!infile.is_open()) { if (!infile) {
throw RuntimeError("Could not set veto photon. Could not open file: " + throw RuntimeError("Could not set veto photon. Could not open file: " +
fname); fname);
} }
@ -1533,19 +1533,14 @@ void Module::setVetoFile(const int chipIndex, const std::string &fname) {
throw RuntimeError("Could not set veto file. Invalid chip index: " + throw RuntimeError("Could not set veto file. Invalid chip index: " +
std::to_string(chipIndex)); std::to_string(chipIndex));
} }
std::ifstream infile(fname.c_str());
if (!infile.is_open()) { std::ifstream input_file(fname);
if (!input_file) {
throw RuntimeError("Could not set veto file for chip " + throw RuntimeError("Could not set veto file for chip " +
std::to_string(chipIndex) + std::to_string(chipIndex) +
". Could not open file: " + fname); ". Could not open file: " + fname);
} }
std::ifstream input_file(fname);
if (!input_file.is_open()) {
throw RuntimeError("Could not open veto file " + fname +
" for reading");
}
std::vector<int> gainIndices; std::vector<int> gainIndices;
std::vector<int> values; std::vector<int> values;
@ -1925,7 +1920,7 @@ void Module::setLEDEnable(bool enable) {
void Module::setPattern(const std::string &fname) { void Module::setPattern(const std::string &fname) {
auto pat = sls::make_unique<patternParameters>(); auto pat = sls::make_unique<patternParameters>();
std::ifstream input_file(fname); std::ifstream input_file(fname);
if (!input_file.is_open()) { if (!input_file) {
throw RuntimeError("Could not open pattern file " + fname + throw RuntimeError("Could not open pattern file " + fname +
" for reading"); " for reading");
} }
@ -3081,7 +3076,7 @@ sls_detector_module Module::readSettingsFile(const std::string &fname,
} else { } else {
infile.open(fname.c_str(), std::ios_base::in); infile.open(fname.c_str(), std::ios_base::in);
} }
if (!infile.is_open()) { if (!infile) {
throw RuntimeError("Could not open settings file: " + fname); throw RuntimeError("Could not open settings file: " + fname);
} }
@ -3218,18 +3213,15 @@ void Module::programFPGAviaBlackfin(std::vector<char> buffer) {
void Module::programFPGAviaNios(std::vector<char> buffer) { void Module::programFPGAviaNios(std::vector<char> buffer) {
uint64_t filesize = buffer.size(); uint64_t filesize = buffer.size();
int fnum = F_PROGRAM_FPGA;
int ret = FAIL;
char mess[MAX_STR_LENGTH] = {0};
LOG(logINFO) << "Sending programming binary (from rbf) to detector " LOG(logINFO) << "Sending programming binary (from rbf) to detector "
<< moduleId << " (" << shm()->hostname << ")"; << moduleId << " (" << shm()->hostname << ")";
auto client = DetectorSocket(shm()->hostname, shm()->controlPort); auto client = DetectorSocket(shm()->hostname, shm()->controlPort);
client.Send(&fnum, sizeof(fnum)); client.Send(F_PROGRAM_FPGA);
// filesize // filesize
client.Send(&filesize, sizeof(filesize)); client.Send(filesize);
client.Receive(&ret, sizeof(ret)); if (client.Receive<int>() == FAIL) {
if (ret == FAIL) { char mess[MAX_STR_LENGTH]{};
client.Receive(mess, sizeof(mess)); client.Receive(mess, sizeof(mess));
std::ostringstream os; std::ostringstream os;
os << "Detector " << moduleId << " (" << shm()->hostname << ")" os << "Detector " << moduleId << " (" << shm()->hostname << ")"
@ -3237,9 +3229,9 @@ void Module::programFPGAviaNios(std::vector<char> buffer) {
throw RuntimeError(os.str()); throw RuntimeError(os.str());
} }
// program // program
client.Send(&buffer[0], filesize); client.Send(buffer);
client.Receive(&ret, sizeof(ret)); if (client.Receive<int>() == FAIL) {
if (ret == FAIL) { char mess[MAX_STR_LENGTH]{};
client.Receive(mess, sizeof(mess)); client.Receive(mess, sizeof(mess));
std::ostringstream os; std::ostringstream os;
os << "Detector " << moduleId << " (" << shm()->hostname << ")" os << "Detector " << moduleId << " (" << shm()->hostname << ")"