solved bug in angular conversion

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@186 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-06-01 13:57:31 +00:00
parent 0a561c1c1f
commit ed84d21da0
3 changed files with 39 additions and 23 deletions

View File

@ -181,7 +181,6 @@ void postProcessing::doProcessing(float *lfdata, int delflag, string fname) {
// ;
// } else {
float *rcdata=NULL, *rcerr=NULL;
@ -235,7 +234,7 @@ void postProcessing::doProcessing(float *lfdata, int delflag, string fname) {
ang=convertAngles();
writeDataFile (fname+ext, ffcdata, ffcerr,ang);
}
if (*correctionMask&(1<< ANGULAR_CONVERSION) && getNumberOfPositions()>0) {
#ifdef VERBOSE
cout << "**************Current position index is " << getCurrentPositionIndex() << endl;
@ -252,10 +251,8 @@ void postProcessing::doProcessing(float *lfdata, int delflag, string fname) {
#ifdef VERBOSE
cout << "add to merging "<< getCurrentPositionIndex() << endl;
#endif
if (*correctionMask&(1<< ANGULAR_CONVERSION))
addToMerging(ang, ffcdata, ffcerr, badChannelMask );
#ifdef VERBOSE
cout << getCurrentPositionIndex() << " " << getNumberOfPositions() << endl;