diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index f0a51b33f..16bea3d0a 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -5386,7 +5386,7 @@ int multiSlsDetector::setCTBPattern(std::string fname) { uint64_t word; int addr = 0; FILE* fd = fopen(fname.c_str(), "r"); - if (fd > 0) { + if (fd) { while (fread(&word, sizeof(word), 1, fd)) { for (unsigned int idet = 0; idet < detectors.size(); ++idet) detectors[idet]->setCTBWord(addr, word); diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index d01827955..ec3069375 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -9563,7 +9563,7 @@ int slsDetector::setCTBPattern(string fname) { int addr=0; FILE *fd=fopen(fname.c_str(),"r"); - if (fd>0) { + if (fd) { while (fread(&word, sizeof(word), 1,fd)) { setCTBWord(addr,word); // cout << hex << addr << " " << word << dec << endl; diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp index f92d132ad..a6845c8d6 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp @@ -103,7 +103,7 @@ int postProcessingFuncs::addFrame(double *data, double *pos, double *I0, double - if (I0>0) { + if (I0 != NULL) { i0=*I0; totalI0+=i0; } else