diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 793e60beb..052b95060 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -4610,10 +4610,10 @@ int slsDetector::loadImageToDetector(imageType index,string const fname){ #endif if(readDataFile(fname,arg)){ - std::cout<< "Could not open file "<< fname << std::endl; + ret = sendImageToDetector(index,arg); return ret; } - ret = sendImageToDetector(index,arg); + std::cout<< "Could not open file "<< fname << std::endl; return ret; } @@ -5444,66 +5444,6 @@ int slsDetector::saveSettingsFile(string fname, int imod) { } -int slsDetector::testFunction(int times) { - int i,count=0; - runStatus s; - short int dataVals[thisDetector->nChans*thisDetector->nChips]; - - for(i=0;inChans*thisDetector->nChips);j++) - cout<<"\t"<