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

@ -1,5 +1,6 @@
#ifndef DEFAULT_ANGLE_FUNCTION_H
#define DEFAULT_ANGLE_FUNCTION_H
#include <stdio.h>
/*
contains the conversion channel-angle for a module channel
@ -9,7 +10,17 @@
#include <math.h>
double defaultAngleFunction(double ichan, double encoder, double totalOffset, double conv_r, double center, double offset, double tilt, int direction) {\
(void) tilt; \
(void) tilt;
double ang;
ang=180./PI*(center*conv_r+direction*atan((double)(ichan-center)*conv_r))+encoder+totalOffset+offset;
//#ifdef VERBOSE
// printf("%d %f %f %f %f %f %f %d\n", ichan, ang, center, encoder, totalOffset, conv_r, offset, direction);
//#endif
return ang; \
return 180./PI*(center*conv_r+direction*atan((double)(ichan-center)*conv_r))+encoder+totalOffset+offset; };
#endif