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

updated number of measurements to reflect in acquire

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@248 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-09-10 17:55:26 +00:00
parent e257e2f796
commit d92a6649ee
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -40,6 +40,14 @@ slsDetectorUtils::slsDetectorUtils() {
void slsDetectorUtils::acquire(int delflag){ void slsDetectorUtils::acquire(int delflag){
// setTotalProgress();
//moved these 2 here for measurement change
progressIndex=0;
*stoppedFlag=0;
int measurement = (int)setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1);
for(int im=0;im<measurement;im++) {
angCalLogClass *aclog=NULL; angCalLogClass *aclog=NULL;
enCalLogClass *eclog=NULL; enCalLogClass *eclog=NULL;
@ -73,12 +81,6 @@ void slsDetectorUtils::acquire(int delflag){
// setTotalProgress();
progressIndex=0;
*stoppedFlag=0;
pthread_mutex_lock(&mp); pthread_mutex_lock(&mp);
resetFinalDataQueue(); resetFinalDataQueue();
@ -326,10 +328,14 @@ void slsDetectorUtils::acquire(int delflag){
delete eclog; delete eclog;
if (acquisition_finished) { if (acquisition_finished) {
acquisition_finished(getCurrentProgress(),getDetectorStatus(),acqFinished_p); acquisition_finished(getCurrentProgress(),getDetectorStatus(),acqFinished_p);
} }
}
} }
@ -349,7 +355,7 @@ int slsDetectorUtils::setTotalProgress() {
nc=timerValue[CYCLES_NUMBER]; nc=timerValue[CYCLES_NUMBER];
if (timerValue[MEASUREMENTS_NUMBER]>0) if (timerValue[MEASUREMENTS_NUMBER]>0)
nc=timerValue[MEASUREMENTS_NUMBER]; nm=timerValue[MEASUREMENTS_NUMBER];
if (*numberOfPositions>0) if (*numberOfPositions>0)
npos=*numberOfPositions; npos=*numberOfPositions;