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

Undoing all float to double changes

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@219 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-08-13 13:26:53 +00:00
parent 1c7f70e14e
commit c880f883e3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/mythenDetectorServer/server_funcs.c
View File

@ -842,13 +842,13 @@ int read_register(int file_des) {
int set_dac(int file_des) { int set_dac(int file_des) {
double retval; float retval;
int ret=OK; int ret=OK;
int arg[2]; int arg[2];
enum dacIndex ind; enum dacIndex ind;
int imod; int imod;
int n; int n;
double val; float val;
int idac=0; int idac=0;
sprintf(mess,"Can't set DAC\n"); sprintf(mess,"Can't set DAC\n");
@ -954,7 +954,7 @@ add possible potentiometers like in chiptest board!!!!!!!!!!!!!!!
int get_adc(int file_des) { int get_adc(int file_des) {
double retval; float retval;
int ret=OK; int ret=OK;
int arg[2]; int arg[2];
enum dacIndex ind; enum dacIndex ind;
@ -1312,8 +1312,8 @@ int set_module(int file_des) {
sls_detector_module myModule; sls_detector_module myModule;
int *myChip=malloc(NCHIP*sizeof(int)); int *myChip=malloc(NCHIP*sizeof(int));
int *myChan=malloc(NCHIP*NCHAN*sizeof(int)); int *myChan=malloc(NCHIP*NCHAN*sizeof(int));
double *myDac=malloc(NDAC*sizeof(int)); float *myDac=malloc(NDAC*sizeof(int));
double *myAdc=malloc(NADC*sizeof(int)); float *myAdc=malloc(NADC*sizeof(int));
int retval, n; int retval, n;
int ret=OK; int ret=OK;
int dr;//, ow; int dr;//, ow;
@ -1431,8 +1431,8 @@ int get_module(int file_des) {
sls_detector_module myModule; sls_detector_module myModule;
int *myChip=malloc(NCHIP*sizeof(int)); int *myChip=malloc(NCHIP*sizeof(int));
int *myChan=malloc(NCHIP*NCHAN*sizeof(int)); int *myChan=malloc(NCHIP*NCHAN*sizeof(int));
double *myDac=malloc(NDAC*sizeof(int)); float *myDac=malloc(NDAC*sizeof(int));
double *myAdc=malloc(NADC*sizeof(int)); float *myAdc=malloc(NADC*sizeof(int));
if (myDac) if (myDac)