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

after some debugging at the beamline

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@137 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
x04sa
2012-03-09 14:40:10 +00:00
parent b070938f57
commit 7c07ae5a5a
8 changed files with 75 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/usersFunctions/usersFunctions.cpp
View File

@ -152,7 +152,7 @@ float get_position() {
pos=value;
} else
printf(ca_message(status));
#endif;
#endif
@ -171,12 +171,12 @@ int go_to_position(float p) {
int status;
if (ch_pos<0) return -1;
/* /\* caput and wait until done *\/ */
if ((status = caput(ch_pos, p)) == ECA_NORMAL)
if ((status = caput(ch_pos, p)) == ECA_NORMAL) {
;
#ifdef VERBOSE
printf("caput: success\n");
#endif
else
} else
printf(ca_message(status));
#else
pos=p;
@ -199,13 +199,12 @@ int go_to_position_no_wait(float p) {
int status;
if (ch_pos<0) return -1;
/* /\* caput and wait until done *\/ */
if ((status = caputq(ch_pos, p)) == ECA_NORMAL)
if ((status = caputq(ch_pos, p)) == ECA_NORMAL) {
;
#ifdef VERBOSE
printf("caputq: success\n");
#endif
else
} else
printf(ca_message(status));
#else
pos=p;
@ -244,7 +243,7 @@ float get_i0() {
printf(ca_message(status));
#else
i0++;
#endif;
#endif
//"ca_get X04SA-ES2-SC:CH6"
return i0;