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

faster acquisition for multidetector and angualr data merging independent of angular direction

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@156 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
x04sa
2012-03-22 13:25:19 +00:00
parent bc8b0860b4
commit e3ca421c3c
8 changed files with 117 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/usersFunctions/usersFunctions.c
View File

@ -123,9 +123,15 @@ float angle(int ichan, float encoder, float totalOffset, float conv_r, float cen
(void) tilt; /* to avoid warning: unused parameter */
float ang;
ang=180./PI*(center*conv_r+atan((float)(ichan-center)*conv_r))+encoder+totalOffset+offset;
cout <<"***" << offset << " " << ang << endl;
return direction*ang;
}

5
slsDetectorSoftware/usersFunctions/usersFunctions.cpp
View File

@ -126,6 +126,11 @@ float angle(int ichan, float encoder, float totalOffset, float conv_r, float cen
ang=180./PI*(center*conv_r+atan((float)(ichan-center)*conv_r))+encoder+totalOffset+offset;
// printf("*** %f %f\n",offset,ang);
return direction*ang;
}