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

somehow it works with the receive adc in receieveModule blocked. added DDACS_DOUBLE to makefile to make it work with client

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@221 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-08-15 15:33:04 +00:00
parent 398b1aa844
commit 73424d0376
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/gotthardDetectorServer/communication_funcs.c
View File

@ -419,7 +419,7 @@ int receiveModule(int file_des, sls_detector_module* myMod) {
printf("received %d adcs\n",nAdcs);
#endif
if (ndacdiff<=0) {
ts+=receiveDataOnly(file_des,myMod->dacs, sizeof(double)*nDacs);
ts+=receiveDataOnly(file_des,myMod->dacs, sizeof(dacs_t)*nDacs);
#ifdef VERBOSE
printf("dacs received\n");
#endif
@ -431,9 +431,9 @@ int receiveModule(int file_des, sls_detector_module* myMod) {
free(dacptr);
return FAIL;
}
/*
if (nadcdiff<=0) {
ts+=receiveDataOnly(file_des,myMod->adcs, sizeof(double)*nAdcs);
// printf("ndacdiff\t11vref_ds:%f\n",myMod->dacs[0]);printf("11vin_cm:%f\n",myMod->dacs[5]);
/* if (nadcdiff<=0) {
ts+=receiveDataOnly(file_des,myMod->adcs, sizeof(dacs_t)*nAdcs);
#ifdef VERBOSE
printf("adcs received\n");
#endif
@ -444,7 +444,7 @@ int receiveModule(int file_des, sls_detector_module* myMod) {
ts+=receiveDataOnly(file_des,adcptr, sizeof(double)*nadcdiff);
free(adcptr);
return FAIL;
}*/
} *///printf("nadcdiff\t22vref_ds:%f\n",myMod->dacs[0]);printf("22vin_cm:%f\n",myMod->dacs[5]);
if (nchipdiff<=0) {
ts+=receiveDataOnly(file_des,myMod->chipregs, sizeof(int)*nChips);
#ifdef VERBOSE
@ -457,8 +457,7 @@ int receiveModule(int file_des, sls_detector_module* myMod) {
ts+=receiveDataOnly(file_des,chipptr, sizeof(int)*nchipdiff);
free(chipptr);
return FAIL;
}
}//printf("nchipdiff\t33vref_ds:%f\n",myMod->dacs[0]);printf("33vin_cm:%f\n",myMod->dacs[5]);
if (nchandiff<=0) {
ts+=receiveDataOnly(file_des,myMod->chanregs, sizeof(int)*nChans);
#ifdef VERBOSE
@ -471,7 +470,7 @@ int receiveModule(int file_des, sls_detector_module* myMod) {
ts+=receiveDataOnly(file_des,chanptr, sizeof(int)*nchandiff);
free(chanptr);
return FAIL;
}
}//printf("nchandiff\t44vref_ds:%f\n",myMod->dacs[0]);printf("44vin_cm:%f\n",myMod->dacs[5]);
#ifdef VERBOSE
printf("received module %d of size %d register %x\n",myMod->module,ts,myMod->reg);
#endif