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

added callbacks (but should still implement them in the base classes)

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@182 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-05-22 15:34:12 +00:00
parent 0bab16cde7
commit d30ad5faac
13 changed files with 145 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/usersFunctions/usersFunctions.cpp
View File

@ -118,7 +118,7 @@ int caput(chid ch_id, double value) {
*/
float angle(float ichan, float encoder, float totalOffset, float conv_r, float center, float offset, float tilt, int direction) {
float defaultAngleFunction(float ichan, float encoder, float totalOffset, float conv_r, float center, float offset, float tilt, int direction) {
(void) tilt; /* to avoid warning: unused parameter */
@ -134,7 +134,7 @@ float angle(float ichan, float encoder, float totalOffset, float conv_r, float c
/* reads the encoder and returns the position */
float get_position() {
float defaultGetPosition() {
#ifdef VERBOSE
printf("Getting motor position \n");
#endif
@ -164,7 +164,7 @@ float get_position() {
/* moves the encoder to position p */
int go_to_position(float p) {
int defaultGoToPosition(float p) {
#ifdef VERBOSE
printf("Setting motor position \n");
#endif
@ -191,7 +191,7 @@ int go_to_position(float p) {
/* moves the encoder to position p without waiting */
int go_to_position_no_wait(float p) {
int defaultGoToPositionNoWait(float p) {
#ifdef VERBOSE
printf("Setting motor position no wait \n");
#endif
@ -215,9 +215,6 @@ int go_to_position_no_wait(float p) {
return (int)p;
pos=p;
return (int)pos;
}
@ -225,7 +222,7 @@ int go_to_position_no_wait(float p) {
/* reads I0 and returns the intensity */
float get_i0(int t) {
float defaultGetI0(int t) {
#ifdef VERBOSE
printf("Getting I0 readout \n");
#endif
@ -261,7 +258,7 @@ float get_i0(int t) {
}
int connect_channels() {
int defaultConnectChannels() {
#ifdef EPICS
//double value = 256;
/* channel name */
@ -311,7 +308,7 @@ int connect_channels() {
return 0;
}
int disconnect_channels() {
int defaultDisconnectChannels() {
#ifdef EPICS
/* close channel connect */
disconnect_channel(ch_i0);
@ -326,6 +323,11 @@ int disconnect_channels() {
int defaultDataReadyFunc(detectorData* d) {
#ifdef VERBOSE
printf("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU Data received \n");
#endif
return 0;
}

20
slsDetectorSoftware/usersFunctions/usersFunctions.h
View File

@ -13,7 +13,7 @@ Functions depending on the experimental setup should be defined here
#include <cadef.h>
#include <epicsEvent.h>
#endif
#include "detectorData.h"
#ifdef __cplusplus
extern "C" {
@ -29,17 +29,15 @@ extern "C" {
#endif
float angle(float ichan, float encoder, float totalOffset, float conv_r, float center, float offset, float tilt, int direction);
float get_position();
int go_to_position(float p);
int go_to_position_no_wait(float p);
int connect_channels();
int disconnect_channels();
float get_i0(int t);
float defaultAngleFunction(float ichan, float encoder, float totalOffset, float conv_r, float center, float offset, float tilt, int direction);
float defaultGetPosition();
int defaultGoToPosition(float p);
int defaultGoToPositionNoWait(float p);
int defaultConnectChannels();
int defaultDisconnectChannels();
float defaultGetI0(int t);
int defaultDataReadyFunc(detectorData* d);