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

reshuffling by Anna

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@179 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-05-14 13:39:18 +00:00
parent b484ad7f20
commit b5e966bb58
19 changed files with 528 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -219,16 +219,16 @@ void postProcessing::doProcessing(float *fdata, int delflag, string fname) {
if (*correctionMask!=0) {
if (*correctionMask&(1<< ANGULAR_CONVERSION))
ang=convertAngles(currentPosition);
ang=convertAngles();
writeDataFile (fname+ext, ffcdata, ffcerr,ang);
}
if (*correctionMask&(1<< ANGULAR_CONVERSION) && (*numberOfPositions)>0) {
if (*correctionMask&(1<< ANGULAR_CONVERSION) && getNumberOfPositions()>0) {
#ifdef VERBOSE
cout << "**************Current position index is " << currentPositionIndex << endl;
cout << "**************Current position index is " << getCurrentPositionIndex() << endl;
#endif
// if (*numberOfPositions>0) {
if (currentPositionIndex<=1) {
if (getCurrentPositionIndex()<=1) {
#ifdef VERBOSE
cout << "reset merging " << endl;
@ -237,7 +237,7 @@ void postProcessing::doProcessing(float *fdata, int delflag, string fname) {
}
#ifdef VERBOSE
cout << "add to merging "<< currentPositionIndex << endl;
cout << "add to merging "<< getCurrentPositionIndex() << endl;
#endif
if (*correctionMask&(1<< ANGULAR_CONVERSION))
@ -245,20 +245,20 @@ void postProcessing::doProcessing(float *fdata, int delflag, string fname) {
#ifdef VERBOSE
cout << currentPositionIndex << " " << (*numberOfPositions) << endl;
cout << getCurrentPositionIndex() << " " << getNumberOfPositions() << endl;
#endif
pthread_mutex_lock(&mp);
if ((currentPositionIndex>=(*numberOfPositions) && posfinished==1 && queuesize==1)) {
if ((getCurrentPositionIndex()>=getNumberOfPositions() && posfinished==1 && queuesize==1)) {
#ifdef VERBOSE
cout << "finalize merging " << currentPositionIndex<< endl;
cout << "finalize merging " << getCurrentPositionIndex()<< endl;
#endif
np=finalizeMerging();
/** file writing */
currentPositionIndex++;
incrementPositionIndex();
pthread_mutex_unlock(&mp);
@ -329,8 +329,6 @@ int postProcessing::fillBadChannelMask() {
int nbad=0;
if (*correctionMask&(1<< DISCARD_BAD_CHANNELS)) {
nbad=getBadChannelCorrection();
#ifdef VERBOSE