detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

void pointers added to callback functions

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@199 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
ramani_n
2012-06-22 12:12:29 +00:00
parent 6298136a19
commit 67471563b0
10 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -1,4 +1,3 @@
#ifndef SLS_DETECTOR_USERS_H
#define SLS_DETECTOR_USERS_H
@ -354,32 +353,32 @@ class slsDetectorUsers
\param func function for reading the detector position
*/
virtual void registerGetPositionCallback( float (*func)(void))=0;
virtual void registerGetPositionCallback( float (*func)(void*),void *arg)=0;
/**
@short register callback for connecting to the epics channels
\param func function for connecting to the epics channels
*/
virtual void registerConnectChannelsCallback( int (*func)(void))=0;
virtual void registerConnectChannelsCallback( int (*func)(void*),void *arg)=0;
/**
@short register callback to disconnect the epics channels
\param func function to disconnect the epics channels
*/
virtual void registerDisconnectChannelsCallback( int (*func)(void))=0;
virtual void registerDisconnectChannelsCallback( int (*func)(void*),void *arg)=0;
/**
@short register callback for moving the detector
\param func function for moving the detector
*/
virtual void registerGoToPositionCallback( int (*func)(float))=0;
virtual void registerGoToPositionCallback( int (*func)(float,void*),void *arg)=0;
/**
@short register callback for moving the detector without waiting
\param func function for moving the detector
*/
virtual void registerGoToPositionNoWaitCallback( int (*func)(float))=0;
virtual void registerGoToPositionNoWaitCallback( int (*func)(float,void*),void *arg)=0;
/**
@short register calbback reading to I0
\param func function for reading the I0 (called with parameter 0 before the acquisition, 1 after and the return value used as I0)
*/
virtual void registerGetI0Callback( float (*func)(int))=0;
virtual void registerGetI0Callback( float (*func)(int,void*),void *arg)=0;
/************************************************************************