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

some more changes in the acquisition function

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@172 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-04-13 15:26:36 +00:00
parent ab4e569b6c
commit 1b6f8259c7
10 changed files with 249 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/usersFunctions/usersFunctions.cpp
View File

@ -225,7 +225,7 @@ int go_to_position_no_wait(float p) {
/* reads I0 and returns the intensity */
float get_i0() {
float get_i0(int t) {
#ifdef VERBOSE
printf("Getting I0 readout \n");
#endif
@ -240,7 +240,15 @@ float get_i0() {
#ifdef VERBOSE
printf("caget: %f\n", value);
#endif
i0=value;
if (t==0)
i0=value;
else
i0=value-i0;
} else
printf(ca_message(status));
#else
@ -249,6 +257,7 @@ float get_i0() {
//"ca_get X04SA-ES2-SC:CH6"
return i0;
}

3
slsDetectorSoftware/usersFunctions/usersFunctions.h
View File

@ -36,9 +36,10 @@ extern "C" {
int connect_channels();
int disconnect_channels();
float get_i0();
float get_i0(int t);