corrections to the angular conversion made at the beamline

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@536 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
x04sa
2013-04-29 08:46:47 +00:00
parent 689a8a6b44
commit 3c3ab6fc9d
6 changed files with 136 additions and 97 deletions

View File

@ -6,10 +6,8 @@ Functions depending on the experimental setup should be defined here
******************************************************************/
//#define PI 3.14159265358979323846
#ifdef __cplusplus
#include <iostream>
#endif
#define PI 3.14159265358979323846
#ifdef EPICS
#include <cadef.h>
@ -31,20 +29,17 @@ extern "C" {
#endif
// double defaultAngleFunction(double ichan, double encoder, double totalOffset, double conv_r, double center, double offset, double tilt, int direction);
double defaultGetPosition(void *d);
int defaultGoToPosition(double p,void *d);
int defaultGoToPositionNoWait(double p,void *d);
int defaultConnectChannels(void *d);
int defaultDisconnectChannels(void *d);
double defaultGetI0(int t,void *d);
// double defaultAngleFunction(double ichan, double encoder, double totalOffset, double conv_r, double center, double offset, double tilt, int direction);
double defaultGetPosition(void*);
int defaultGoToPosition(double p, void*);
int defaultGoToPositionNoWait(double p, void*);
int defaultConnectChannels(void*);
int defaultDisconnectChannels(void*);
double defaultGetI0(int t, void*);
int defaultDataReadyFunc(detectorData* d, int i, void* p);
int defaultRawDataReadyFunc(double* d, int np, void* p);
int defaultDataReadyFunc(detectorData* d, void*);
#ifdef __cplusplus
int defaultWriteReceiverDataFunc(char* d, int np, FILE* f, void* p);
#endif
#ifdef __cplusplus
};