diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 2dfe6df9f..9d2277c0d 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -427,6 +427,7 @@ string multiSlsDetector::getHostname(int pos) { s+=detectors[ip]->getHostname(); s+=string("+"); } + cout << s <getTotalNumberOfChannels(); - if (nch_leftwriteDataFile(outfile,n, data+off, pe, pa, dataformat, choff); nch_left-=n; @@ -3359,7 +3365,7 @@ int multiSlsDetector::writeDataFile(string fname, int *data) { for (int i=0; inumberOfDetectors; i++) { if (detectors[i]) { #ifdef VERBOSE - cout << " write " << i << endl; + cout << " write " << i << " position " << off << " offset " << choff << endl; #endif detectors[i]->writeDataFile(outfile, detectors[i]->getTotalNumberOfChannels(), data+off, choff); choff+=detectors[i]->getMaxNumberOfChannels(); diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 3e89adb6d..637b67ac5 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -919,7 +919,7 @@ string slsDetectorCommand::cmdHostname(int narg, char *args[], int action){ } ostringstream os; - int ivar;//, ival; + int ivar=-1;//, ival; string var=string(args[0]); char hostname[1000]; @@ -933,6 +933,9 @@ string slsDetectorCommand::cmdHostname(int narg, char *args[], int action){ if (vvstr.fail()) ivar=-1; } + + + p=string(args[0]).find("hostname"); if (p==string::npos) { diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp index c28dd0ab0..7e3688efa 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp @@ -179,9 +179,6 @@ void postProcessing::doProcessing(float *lfdata, int delflag, string fname) { // /** write raw data file */ // if (*correctionMask==0 && delflag==1) { // // delete [] fdata; - - - // ; // } else {