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

couldnt commit changes, tried to merge, probably messy

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@139 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-03-15 09:57:20 +00:00
parent c2846e72e7
commit 14bc483310
2 changed files with 192 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1321,7 +1321,21 @@ typedef struct sharedSlsDetector {
*/
masterFlags setMaster(masterFlags flag);
/**
Loads dark image or gain image from a file and sends it to the detector
\param index is 0 for dark image and 1 for gain image
\param fname file name to load data from
*/
int loadImageToDetector(imageType index,string const fname);
/**
Called from loadImageToDetector to send the image to detector
\param index is 0 for dark image and 1 for gain image
\param arg image
*/
int sendImageToDetector(imageType index,short int arg[]);
/**
Sets/gets the synchronization mode of the various detectors
@ -1330,9 +1344,6 @@ typedef struct sharedSlsDetector {
*/
synchronizationMode setSynchronization(synchronizationMode sync=GET_SYNCHRONIZATION_MODE);
int loadImageToDetector(imageType index,string const fname);
protected: