From c880f883e37cca16a55d68298ad0148aecffb724 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Mon, 13 Aug 2012 13:26:53 +0000 Subject: [PATCH] Undoing all float to double changes git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@219 951219d9-93cf-4727-9268-0efd64621fa3 --- .../mythenDetectorServer/server_funcs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/slsDetectorSoftware/mythenDetectorServer/server_funcs.c b/slsDetectorSoftware/mythenDetectorServer/server_funcs.c index 17311af19..2e655decd 100755 --- a/slsDetectorSoftware/mythenDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/mythenDetectorServer/server_funcs.c @@ -842,13 +842,13 @@ int read_register(int file_des) { int set_dac(int file_des) { - double retval; + float retval; int ret=OK; int arg[2]; enum dacIndex ind; int imod; int n; - double val; + float val; int idac=0; sprintf(mess,"Can't set DAC\n"); @@ -954,7 +954,7 @@ add possible potentiometers like in chiptest board!!!!!!!!!!!!!!! int get_adc(int file_des) { - double retval; + float retval; int ret=OK; int arg[2]; enum dacIndex ind; @@ -1312,8 +1312,8 @@ int set_module(int file_des) { sls_detector_module myModule; int *myChip=malloc(NCHIP*sizeof(int)); int *myChan=malloc(NCHIP*NCHAN*sizeof(int)); - double *myDac=malloc(NDAC*sizeof(int)); - double *myAdc=malloc(NADC*sizeof(int)); + float *myDac=malloc(NDAC*sizeof(int)); + float *myAdc=malloc(NADC*sizeof(int)); int retval, n; int ret=OK; int dr;//, ow; @@ -1431,8 +1431,8 @@ int get_module(int file_des) { sls_detector_module myModule; int *myChip=malloc(NCHIP*sizeof(int)); int *myChan=malloc(NCHIP*NCHAN*sizeof(int)); - double *myDac=malloc(NDAC*sizeof(int)); - double *myAdc=malloc(NADC*sizeof(int)); + float *myDac=malloc(NDAC*sizeof(int)); + float *myAdc=malloc(NADC*sizeof(int)); if (myDac)