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

gotthard and jungfrau servers do not need to send whole module for sending settings anymore

Browse Source
This commit is contained in:
maliakal_d
2018-05-22 14:52:53 +02:00
parent 3f61206289
commit bdf9373e0d
17 changed files with 298 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 5b01b4cbd808a3c43f1ec97032a1020c8f2ce37a
Revision: 144
Repsitory UUID: 3f6120628938fb0820908fb82574418039a3b352
Revision: 150
Branch: developer
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3807
Last Changed Date: 2018-05-02 17:42:08.000000002 +0200 ./RegisterDefs.h
Last Changed Rev: 3829
Last Changed Date: 2018-05-15 13:48:54.000000002 +0200 ./RegisterDefs.h

6
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "5b01b4cbd808a3c43f1ec97032a1020c8f2ce37a"
#define GITREPUUID "3f6120628938fb0820908fb82574418039a3b352"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3807
#define GITDATE 0x20180502
#define GITREV 0x3829
#define GITDATE 0x20180515
#define GITBRANCH "developer"

40
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -356,6 +356,13 @@ void allocateDetectorStructureMemory(){
(detectorModules)->offset=0;
(detectorModules)->reg=0;
thisSettings = UNINITIALIZED;
{ // initialize to -1
int i = 0;
for (i = 0; i < NDAC; ++i) {
dacValues[i] = -1;
}
}
}
@ -377,17 +384,7 @@ void setupDetector() {
initDac(8); //only for old board compatibility
//set dacs
printf("Setting Default Dac values\n");
{
int i = 0;
int retval[2]={-1,-1};
const int defaultvals[NDAC] = DEFAULT_DAC_VALS;
for(i = 0; i < NDAC; ++i) {
setDAC((enum DACINDEX)i,defaultvals[i],0,0,retval);
if (retval[0] != defaultvals[i])
cprintf(RED, "Warning: Setting dac %d failed, wrote %d, read %d\n",i ,defaultvals[i], retval[0]);
}
}
setDefaultDacs();
bus_w(DAQ_REG, 0x0); /* Only once at server startup */
@ -422,7 +419,26 @@ void setupDetector() {
}
int setDefaultDacs() {
int ret = OK;
printf("Setting Default Dac values\n");
{
int i = 0;
int retval[2]={-1,-1};
const int defaultvals[NDAC] = DEFAULT_DAC_VALS;
for(i = 0; i < NDAC; ++i) {
// if not already default, set it to default
if (dacValues[i] != defaultvals[i]) {
setDAC((enum DACINDEX)i,defaultvals[i],0,0,retval);
if (retval[0] != defaultvals[i]) {
cprintf(RED, "Warning: Setting dac %d failed, wrote %d, read %d\n",i ,defaultvals[i], retval[0]);
ret = FAIL;
}
}
}
}
return ret;
}