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

fixed bug subexptime >=2.2 was set to weird value, was a int to int64_t error in server

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-07-18 13:37:13 +02:00
parent bdf725be48
commit 9c9d946d70
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/eigerDetectorServer/FebControl.c
View File

@ -46,7 +46,7 @@ unsigned int Feb_Control_subFrameMode;
unsigned int Feb_Control_nimages; unsigned int Feb_Control_nimages;
double Feb_Control_exposure_time_in_sec; double Feb_Control_exposure_time_in_sec;
int Feb_Control_subframe_exposure_time_in_10nsec; int64_t Feb_Control_subframe_exposure_time_in_10nsec;
double Feb_Control_exposure_period_in_sec; double Feb_Control_exposure_period_in_sec;
int64_t Feb_Control_RateTable_Tau_in_nsec = -1; int64_t Feb_Control_RateTable_Tau_in_nsec = -1;
@ -1372,12 +1372,12 @@ int Feb_Control_SetExposureTime(double the_exposure_time_in_sec){
} }
double Feb_Control_GetExposureTime(){return Feb_Control_exposure_time_in_sec;} double Feb_Control_GetExposureTime(){return Feb_Control_exposure_time_in_sec;}
int Feb_Control_SetSubFrameExposureTime(int the_subframe_exposure_time_in_10nsec){ int Feb_Control_SetSubFrameExposureTime(int64_t the_subframe_exposure_time_in_10nsec){
Feb_Control_subframe_exposure_time_in_10nsec = the_subframe_exposure_time_in_10nsec; Feb_Control_subframe_exposure_time_in_10nsec = the_subframe_exposure_time_in_10nsec;
printf("Sub Frame Exposure time set to: %d\n",Feb_Control_subframe_exposure_time_in_10nsec); printf("Sub Frame Exposure time set to: %lld\n",(long long int)Feb_Control_subframe_exposure_time_in_10nsec);
return 1; return 1;
} }
int Feb_Control_GetSubFrameExposureTime(){return Feb_Control_subframe_exposure_time_in_10nsec*10;} int64_t Feb_Control_GetSubFrameExposureTime(){return Feb_Control_subframe_exposure_time_in_10nsec*10;}
int Feb_Control_SetExposurePeriod(double the_exposure_period_in_sec){ int Feb_Control_SetExposurePeriod(double the_exposure_period_in_sec){
Feb_Control_exposure_period_in_sec = the_exposure_period_in_sec; Feb_Control_exposure_period_in_sec = the_exposure_period_in_sec;

4
slsDetectorSoftware/eigerDetectorServer/FebControl.h
View File

@ -159,8 +159,8 @@ int Feb_Control_GetModuleNumber();
unsigned int Feb_Control_GetNExposures(); unsigned int Feb_Control_GetNExposures();
int Feb_Control_SetExposureTime(double the_exposure_time_in_sec); int Feb_Control_SetExposureTime(double the_exposure_time_in_sec);
double Feb_Control_GetExposureTime(); double Feb_Control_GetExposureTime();
int Feb_Control_SetSubFrameExposureTime(int the_subframe_exposure_time_in_10nsec); int Feb_Control_SetSubFrameExposureTime(int64_t the_subframe_exposure_time_in_10nsec);
int Feb_Control_GetSubFrameExposureTime(); int64_t Feb_Control_GetSubFrameExposureTime();
int Feb_Control_SetExposurePeriod(double the_exposure_period_in_sec); int Feb_Control_SetExposurePeriod(double the_exposure_period_in_sec);
double Feb_Control_GetExposurePeriod(); double Feb_Control_GetExposurePeriod();
int Feb_Control_SetDynamicRange(unsigned int four_eight_sixteen_or_thirtytwo); int Feb_Control_SetDynamicRange(unsigned int four_eight_sixteen_or_thirtytwo);

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.3 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.4
View File

Binary file not shown.

8
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: f65bc993ef8b3548b52e677b3f42ae6229611d73 Repsitory UUID: 468f0d5ce1b80c2aec7b0e950777eda657431302
Revision: 203 Revision: 205
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 327 Last Changed Rev: 16
Last Changed Date: 2016-07-12 16:45:00 +0200 Last Changed Date: 2016-07-15 15:45:40 +0200

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "f65bc993ef8b3548b52e677b3f42ae6229611d73" #define SVNREPUUID "468f0d5ce1b80c2aec7b0e950777eda657431302"
//#define SVNREV 0x327 //#define SVNREV 0x16
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x327 #define SVNREV 0x16
#define SVNDATE 0x20160712 #define SVNDATE 0x20160715
// //

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -858,7 +858,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val){
case SUBFRAME_ACQUISITION_TIME: case SUBFRAME_ACQUISITION_TIME:
if(val >= 0){ if(val >= 0){
printf(" Setting sub exp time: %dns\n",(int)val/10); printf(" Setting sub exp time: %lldns\n",(long long int)val/10);
Feb_Control_SetSubFrameExposureTime(val/10); Feb_Control_SetSubFrameExposureTime(val/10);
} }
return (Feb_Control_GetSubFrameExposureTime()); return (Feb_Control_GetSubFrameExposureTime());