detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 16:20:03 +02:00
Code Issues Actions Packages Releases Activity

bugfix:trimval gave first pixel value and not -1 if all are different

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-17 12:04:54 +02:00
parent d63933b2de
commit 722fb58010
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.7 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.8
View File

Binary file not shown.

23
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -299,6 +299,12 @@ void allocateDetectorStructureMemory(){
(detectorModules)->offset=0; (detectorModules)->offset=0;
(detectorModules)->reg=0; (detectorModules)->reg=0;
thisSettings = UNINITIALIZED; thisSettings = UNINITIALIZED;
// if trimval requested, should return -1 to acknowledge unknown
int ichan=0;
for (ichan=0; ichan<(detectorModules->nchan); ichan++) {
*((detectorModules->chanregs)+ichan) = -1;
}
} }
@ -554,7 +560,7 @@ int setModule(sls_detector_module myMod, int delay){
if(myMod.nchan==0 && myMod.nchip == 0) if(myMod.nchan==0 && myMod.nchip == 0)
cprintf(BLUE,"Setting module without trimbits\n"); cprintf(BLUE,"Setting module without trimbits\n");
else{ else{
cprintf(GREEN,"Setting module with trimbits\n"); printf("Setting module with trimbits\n");
//includ gap pixels //includ gap pixels
unsigned int tt[263680]; unsigned int tt[263680];
int iy,ichip,ix,ip=0,ich=0; int iy,ichip,ix,ip=0,ich=0;
@ -1063,11 +1069,24 @@ int setAllTrimbits(int val){
} }
} }
} }
cprintf(GREEN, "All trimbits have been set to %d\n", val);
return OK; return OK;
} }
int getAllTrimbits(){ int getAllTrimbits(){
return *((detectorModules->chanregs)); int ichan=0;
int value = *((detectorModules->chanregs));
if (detectorModules){
for (ichan=0; ichan<(detectorModules->nchan); ichan++) {
if(*((detectorModules->chanregs)+ichan) != value) {
value= -1;
break;
}
}
}
printf("Value of all Trimbits: %d\n", value);
return value;
} }
int getBebFPGATemp(){ int getBebFPGATemp(){