detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 10:04:39 +01:00
Code Issues Actions Packages Releases Activity

somewhere in between

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-05-30 19:00:11 +02:00
parent f74710998d
commit 2465eafff0
7 changed files with 1199 additions and 1094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c
View File

@@ -1148,24 +1148,6 @@ int getTemperature(int tempSensor, int imod){
}
//settings
int initConfGain(int isettings,int val,int imod){
int retval;
u_int32_t addr=DAQ_REG;
if(isettings!=-1){
//#ifdef VERBOSE
printf("Setting Gain with val:0x%x\n",val);
//#endif
bus_w(addr,val);
}
retval=bus_r(addr);
//#ifdef VERBOSE
printf("Gain Reg Value is 0x%x\n",bus_r(addr));
//#endif
return retval;
}

2
slsDetectorSoftware/jungfrauDetectorServer/mcb_funcs.c
View File

@@ -171,7 +171,7 @@ int setSettings(int i, int imod) {
int isett=-1,val=-1,retval=-1;
enum conf_gain {
dynamic = 0x0f00, //dynamic
dynamichighgain0 = 0x0f01, //dynamichighgain0
dynamichighgain0 = v, //dynamichighgain0
fixgain1 = 0x0f02, //fixgain1
fixgain2 = 0x0f06, //fixgain2
forceswitchgain1 = 0x1f00, //forceswitchgain1