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

bug solved in angular data merging

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@716 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2014-01-17 08:25:42 +00:00
parent 15e1ac8750
commit 28ad4a1f8c
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.cpp
View File

@ -330,7 +330,6 @@ int angularConversionStatic::finalizeMerging(double *mp, double *mv, double *me,
int np=0;
for (int ibin=0; ibin<nb; ibin++) {
if (mm[ibin]>0) {
#ifdef VERBOSE
cout << "finalize " << ibin << " "<< mm[ibin] << " " << mp[ibin]<< " " << mv[ibin] << " " << me[ibin] << endl;
#endif
@ -452,9 +451,10 @@ int angularConversionStatic::addPointToMerging(double p1, double v1, double e1,
// #ifdef VERBOSE
// cout << "add " << ibin << " "<< mm[ibin] << " " << mp[ibin]<< mv[ibin] << me[ibin] << endl;
// #endif
} else
} else {
cout << "Bin out of range! " << ibin << endl;
return slsDetectorDefs::FAIL;
}
return slsDetectorDefs::OK;

10
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -233,9 +233,13 @@ void postProcessing::doProcessing(double *lfdata, int delflag, string fname) {
#endif
addFrame(lfdata,currentPosition, currentI0, t, fname, 0);
cout << "++++++++++++++++++++" << GetCurrentPositionIndex() << " " << npos << " " << positionFinished() << " " << dataQueueSize() << endl;
if ((GetCurrentPositionIndex()>=npos && dataQueueSize()) || npos<2) {
//&&
if ((GetCurrentPositionIndex()>=npos && positionFinished() && dataQueueSize()) || npos<2) {
while(positionFinished()==0) {
;
}
#ifdef VERBOSE
cout << "finalize dataset" << endl;
#endif
@ -248,7 +252,7 @@ void postProcessing::doProcessing(double *lfdata, int delflag, string fname) {
fname=createFileName();
pthread_mutex_unlock(&mp);
//}
if((*correctionMask)&(1<<WRITE_FILE)) {
writeDataFile (fname+ext,np,val, err,ang,'f');
}