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

removed salas code for the time being, implemented overwrite, fixed prob of communciating between detector and receiver for settimer

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@803 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-03-25 15:32:12 +00:00
parent b743ab2d04
commit 8b833b0f7e
20 changed files with 314 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/eigerDetectorServer/EigerHighLevelFunctions.c
View File

@ -35,8 +35,8 @@ unsigned int eigergetphotonenergy = 8000;
unsigned int EigerGetPhotonEnergy(){return eigergetphotonenergy;}
/* for later */
int eigernumberofexposureseries = 1;
unsigned int EigerGetNumberOfExposureSeries(){return eigernumberofexposureseries;}
int EigerSetNumberOfExposureSeries(unsigned int i){eigernumberofexposureseries = i;}
int EigerGetNumberOfExposureSeries(){return eigernumberofexposureseries;}
int EigerSetNumberOfExposureSeries(int i){eigernumberofexposureseries = i;return 1;}

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

7
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -144,7 +144,10 @@ int setDAC(enum detDacIndex ind, int val, int imod){
char iname[10];
strcpy(iname,EigerGetDACName((int)ind));
//#ifdef VERBOSE
printf("Setting dac %d: %s to %d mV\n",ind, iname,val);
if(val >= 0)
printf("Setting dac %d: %s to %d mV\n",ind, iname,val);
else
printf("Getting dac %d: %s\n",ind, iname);
//#endif
if(val >= 0)
EigerSetDAC(iname,val/1000);
@ -267,7 +270,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val){
if(val >= 0){
printf(" Setting exp time: %fs\n",val/(1E9));
EigerSetExposureTime(val/(1E9));
}return EigerGetExposureTime();
}return (EigerGetExposureTime()*(1E9));
case FRAME_PERIOD:
if(val >= 0){
printf(" Setting acq period: %fs\n",val/(1E9));