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

AngularConversion splitted in a static file and in one file dependent on slsDetectorBase

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@240 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-09-05 10:12:49 +00:00
parent ca75754b83
commit 6b34cb8e71
14 changed files with 1636 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/usersFunctions/usersFunctions.h
View File

@ -6,7 +6,7 @@ Functions depending on the experimental setup should be defined here
******************************************************************/
#define PI 3.14159265358979323846
//#define PI 3.14159265358979323846
#ifdef EPICS
@ -14,7 +14,6 @@ Functions depending on the experimental setup should be defined here
#include <epicsEvent.h>
#endif
#include "detectorData.h"
#include "angleFunction.h"
#ifdef __cplusplus
extern "C" {
@ -30,7 +29,7 @@ extern "C" {
#endif
double defaultAngleFunction(double ichan, double encoder, double totalOffset, double conv_r, double center, double offset, double tilt, int direction);
// 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);