flatfield directory field added to shared memory - Server works with newest firmware versions

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@22 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2011-01-28 13:24:03 +00:00
parent 9f64dd01d8
commit f882a61802
18 changed files with 709 additions and 314 deletions

View File

@ -1,7 +1,9 @@
#include "usersFunctions.h"
#include <math.h>
#include <stdio.h>
float pos;
float i0=0;
/*
contains the conversion channel-angle for a module channel
@ -11,7 +13,8 @@ float pos;
float angle(int ichan, float encoder, float totalOffset, float conv_r, float center, float offset, float tilt, int direction) {
(void) offset; // to avoid warning: unused parameter
(void) tilt; // to avoid warning: unused parameter
float ang;
ang=180./PI*(center*conv_r+atan((float)(ichan-center)*conv_r))+encoder+totalOffset;
@ -23,25 +26,39 @@ float angle(int ichan, float encoder, float totalOffset, float conv_r, float cen
/* reads the encoder and returns the position */
float get_position() {
#ifdef VERBOSE
printf("Getting motor position \n");
#endif
return pos;
}
/* moves the encoder to position p */
int go_to_position(float p) {
#ifdef VERBOSE
printf("Setting motor position \n");
#endif
pos=p;
return pos;
}
/* moves the encoder to position p without waiting */
int go_to_position_no_wait(float p) {
#ifdef VERBOSE
printf("Setting motor position no wait \n");
#endif
pos=p;
return pos;
}
/* reads I0 and returns the intensity */
float get_i0() {
return 100.;
#ifdef VERBOSE
printf("Getting I0 readout \n");
#endif
return i0++;
}