detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 08:10:02 +02:00
Code Issues Actions Packages Releases Activity

angular conversion data ready callback working also with 0 positions, and multislsdetector write data file fixed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@256 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi 2012-09-17 15:31:20 +00:00
parent 4b3fecbaf0
commit 5f78b4534f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3416,10 +3416,10 @@ int multiSlsDetector::writeDataFile(string fname, double *data, double *err, dou
off+=n; off+=n;
if (pe) if (pe)
pe=pe+off; pe=err+off;
if (pa) if (pa)
pa=pa+off; pa=ang+off;
} }

3
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -184,7 +184,8 @@ void postProcessing::doProcessing(double *lfdata, int delflag, string fname) {
writeDataFile (fname+ext, ffcdata, ffcerr,ang); writeDataFile (fname+ext, ffcdata, ffcerr,ang);
} }
if (*correctionMask&(1<< ANGULAR_CONVERSION) && getNumberOfPositions()>0) { // if (*correctionMask&(1<< ANGULAR_CONVERSION) && getNumberOfPositions()>0) {
if (*correctionMask&(1<< ANGULAR_CONVERSION)) {
#ifdef VERBOSE #ifdef VERBOSE
cout << "**************Current position index is " << getCurrentPositionIndex() << endl; cout << "**************Current position index is " << getCurrentPositionIndex() << endl;
#endif #endif