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

Changed everywhere from float to double, even mythenDetectorServer and the standalone files

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@206 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-08-02 12:58:08 +00:00
parent 3795dcedfe
commit 5aebcd4888
47 changed files with 615 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -58,8 +58,8 @@ int bus_w(int addr,int val);
//read register
int bus_r(int addr);
float setDAC(enum dacIndex ind, float val, int imod);
float getADC(enum dacIndex ind, int imod);
double setDAC(enum dacIndex ind, double val, int imod);
double getADC(enum dacIndex ind, int imod);
int setChannel(sls_detector_channel myChan);
int getChannel(sls_detector_channel *myChan);

14
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -776,13 +776,13 @@ int read_register(int file_des) {
int set_dac(int file_des) {
float retval;
double retval;
int ret=OK;
int arg[2];
enum dacIndex ind;
int imod;
int n;
float val;
double val;
sprintf(mess,"Can't set DAC\n");
@ -880,7 +880,7 @@ int set_dac(int file_des) {
int get_adc(int file_des) {
float retval;
double retval;
int ret=OK;
int arg[2];
enum dacIndex ind;
@ -1239,8 +1239,8 @@ int set_module(int file_des) {
sls_detector_module myModule;
int *myChip=malloc(getNumberOfChipsPerModule()*sizeof(int));
int *myChan=malloc(getNumberOfChannelsPerModule()*sizeof(int));
float *myDac=malloc(getNumberOfDACsPerModule()*sizeof(int));
float *myAdc=malloc(getNumberOfADCsPerModule()*sizeof(int));
double *myDac=malloc(getNumberOfDACsPerModule()*sizeof(int));
double *myAdc=malloc(getNumberOfADCsPerModule()*sizeof(int));
int retval, n;
int ret=OK;
int dr;//, ow;
@ -1343,8 +1343,8 @@ int get_module(int file_des) {
sls_detector_module myModule;
int *myChip=malloc(getNumberOfChipsPerModule()*sizeof(int));
int *myChan=malloc(getNumberOfChannelsPerModule()*sizeof(int));
float *myDac=malloc(getNumberOfDACsPerModule()*sizeof(int));
float *myAdc=malloc(getNumberOfADCsPerModule()*sizeof(int));
double *myDac=malloc(getNumberOfDACsPerModule()*sizeof(int));
double *myAdc=malloc(getNumberOfADCsPerModule()*sizeof(int));
if (myDac)