mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-01-16 20:09:22 +01:00
bug solved in angular data merging
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@716 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user