detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-22 11:38:53 +01:00
Code Issues Actions Packages Releases Activity

receiver read frequency from gui can be set now

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@567 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-05-21 13:43:25 +00:00
parent 3afbf35e0f
commit 0e73372cf8
11 changed files with 177 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@@ -71,8 +71,6 @@ void slsDetectorUtils::acquire(int delflag){
void *status;
if ((*correctionMask&(1<< ANGULAR_CONVERSION)) || (*correctionMask&(1<< I0_NORMALIZATION)) || getActionMode(angCalLog) || (getScanMode(0)==positionScan)|| (getScanMode(1)==positionScan)) {
if (connectChannels==0)
if (connect_channels) {
@@ -127,6 +125,11 @@ void slsDetectorUtils::acquire(int delflag){
if(setReceiverOnline()==OFFLINE_FLAG)
*stoppedFlag=1;
//multi detectors shouldnt have different receiver read frequencies enabled/disabled
if(setReadReceiverFrequency(0) < 0){
std::cout << "Error: The receiver read frequency is invalid:" << setReadReceiverFrequency(0) << std::endl;
*stoppedFlag=1;
}
//resets frames caught in receiver
resetFramesCaught();
@@ -619,9 +622,9 @@ double slsDetectorUtils::getCurrentProgress() {
void slsDetectorUtils::incrementProgress(int i) {
void slsDetectorUtils::incrementProgress() {
pthread_mutex_lock(&mp);
progressIndex+=i;
progressIndex++;
cout << fixed << setprecision(2) << setw (6) << 100.*((double)progressIndex)/((double)totalProgress) << " \%";
pthread_mutex_unlock(&mp);
#ifdef VERBOSE
@@ -633,7 +636,18 @@ void slsDetectorUtils::incrementProgress(int i) {
};
void slsDetectorUtils::setCurrentProgress(int i){
pthread_mutex_lock(&mp);
progressIndex++;
progressIndex=i;
cout << fixed << setprecision(2) << setw (6) << 100.*((double)progressIndex)/((double)totalProgress) << " \%";
pthread_mutex_unlock(&mp);
#ifdef VERBOSE
cout << endl;
#else
cout << "\r" << flush;
#endif
}
int slsDetectorUtils::retrieveDetectorSetup(string const fname1, int level){