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

Detectors types can (should) be configured in the multiSlsDetector structure

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@181 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-05-22 12:24:15 +00:00
parent 83ee449e3c
commit 0bab16cde7
13 changed files with 650 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -252,7 +252,7 @@ void postProcessing::doProcessing(float *lfdata, int delflag, string fname) {
#endif
cout << "lock 1" << endl;
// cout << "lock 1" << endl;
pthread_mutex_lock(&mp);
if ((getCurrentPositionIndex()>=getNumberOfPositions() && posfinished==1 && queuesize==1)) {
@ -262,7 +262,7 @@ void postProcessing::doProcessing(float *lfdata, int delflag, string fname) {
np=finalizeMerging();
/** file writing */
incrementPositionIndex();
cout << "unlock 1" << endl;
// cout << "unlock 1" << endl;
pthread_mutex_unlock(&mp);
@ -283,16 +283,16 @@ void postProcessing::doProcessing(float *lfdata, int delflag, string fname) {
} else {
thisData=new detectorData(getMergedCounts(),getMergedErrors(),getMergedPositions(),getCurrentProgress(),(fname+ext).c_str(),np);
cout << "lock 2" << endl;
// cout << "lock 2" << endl;
pthread_mutex_lock(&mg);
finalDataQueue.push(thisData);
cout << "unlock 2" << endl;
// cout << "unlock 2" << endl;
pthread_mutex_unlock(&mg);
}
cout << "lock 3" << endl;
// cout << "lock 3" << endl;
pthread_mutex_lock(&mp);
}
cout << "unlock 3" << endl;
// cout << "unlock 3" << endl;
pthread_mutex_unlock(&mp);
if (ffcdata)