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

solved bug concerning headers

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@185 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
x04sa
2012-06-01 07:25:02 +00:00
parent 0ef003646e
commit 0a561c1c1f
3 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3854,11 +3854,10 @@ int slsDetector::executeTrimming(trimMode mode, int par1, int par2, int imod){
if (controlSocket) {
if (controlSocket->Connect()>=0) {
controlSocket->SendDataOnly(&fnum,sizeof(fnum));
#ifndef VERBOSE
controlSocket->SendDataOnly(&mode,sizeof(mode));
#else
#ifdef VERBOSE
std::cout<< "sending mode bytes= "<< controlSocket->SendDataOnly(&mode,sizeof(mode)) << std::endl;
#endif
controlSocket->SendDataOnly(&mode,sizeof(mode));
controlSocket->SendDataOnly(arg,sizeof(arg));
controlSocket->ReceiveDataOnly(&ret,sizeof(ret));

7
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -97,7 +97,6 @@ void slsDetectorUtils::acquire(int delflag){
ns1=1;
//cout << "action at start" << endl;
if (*stoppedFlag==0) {
executeAction(startScript);
@ -142,6 +141,8 @@ void slsDetectorUtils::acquire(int delflag){
break;
createFileName();
if (*stoppedFlag==0) {
executeAction(scriptBefore);
} else
@ -149,6 +150,7 @@ void slsDetectorUtils::acquire(int delflag){
if (*stoppedFlag==0) {
executeAction(headerBefore);
@ -195,8 +197,9 @@ void slsDetectorUtils::acquire(int delflag){
pthread_mutex_lock(&mp);
while (queuesize){
pthread_mutex_unlock(&mp);
usleep(10000);
usleep(100000);
pthread_mutex_lock(&mp);
}
pthread_mutex_unlock(&mp);