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

fixed comparisons to build with clang

Browse Source
This commit is contained in:
Erik Frojdh 2019-02-08 10:16:32 +01:00
parent bf0e0ac601
commit 0e120330f4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5386,7 +5386,7 @@ int multiSlsDetector::setCTBPattern(std::string fname) {
uint64_t word; uint64_t word;
int addr = 0; int addr = 0;
FILE* fd = fopen(fname.c_str(), "r"); FILE* fd = fopen(fname.c_str(), "r");
if (fd > 0) { if (fd) {
while (fread(&word, sizeof(word), 1, fd)) { while (fread(&word, sizeof(word), 1, fd)) {
for (unsigned int idet = 0; idet < detectors.size(); ++idet) for (unsigned int idet = 0; idet < detectors.size(); ++idet)
detectors[idet]->setCTBWord(addr, word); detectors[idet]->setCTBWord(addr, word);

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -9563,7 +9563,7 @@ int slsDetector::setCTBPattern(string fname) {
int addr=0; int addr=0;
FILE *fd=fopen(fname.c_str(),"r"); FILE *fd=fopen(fname.c_str(),"r");
if (fd>0) { if (fd) {
while (fread(&word, sizeof(word), 1,fd)) { while (fread(&word, sizeof(word), 1,fd)) {
setCTBWord(addr,word); setCTBWord(addr,word);
// cout << hex << addr << " " << word << dec << endl; // cout << hex << addr << " " << word << dec << endl;

2
slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp
View File

@ -103,7 +103,7 @@ int postProcessingFuncs::addFrame(double *data, double *pos, double *I0, double
if (I0>0) { if (I0 != NULL) {
i0=*I0; i0=*I0;
totalI0+=i0; totalI0+=i0;
} else } else