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

Defaultdacs (#214)

Browse Source
This commit is contained in:
Dhanya Thattil
2020-11-13 08:31:02 +01:00
committed by GitHub
parent b6b9a5d598
commit 4c4e2ccb6b
24 changed files with 151 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

56
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -48,6 +48,8 @@ double systemFrequency = 0;
int highvoltage = 0;
int dacValues[NDAC] = {};
int onChipdacValues[ONCHIP_NDAC][NCHIP] = {};
int defaultDacValues[NDAC] = {};
int defaultOnChipdacValues[ONCHIP_NDAC][NCHIP] = {};
int injectedChannelsOffset = 0;
int injectedChannelsIncrement = 0;
int vetoReference[NCHIP][NCHAN];
@ -389,9 +391,13 @@ void setupDetector() {
cdsGain = 0;
memset(clkPhase, 0, sizeof(clkPhase));
memset(dacValues, 0, sizeof(dacValues));
for (int i = 0; i < NDAC; ++i) {
defaultDacValues[i] = -1;
}
for (int i = 0; i < ONCHIP_NDAC; ++i) {
for (int j = 0; j < NCHIP; ++j) {
onChipdacValues[i][j] = -1;
defaultOnChipdacValues[i][j] = -1;
}
}
memset(vetoReference, 0, sizeof(vetoReference));
@ -475,6 +481,40 @@ void setupDetector() {
setCurrentSource(DEFAULT_CURRENT_SOURCE);
}
int setDefaultDacs() {
int ret = OK;
LOG(logINFOBLUE, ("Setting Default Dac values\n"));
for (int i = 0; i < NDAC; ++i) {
if (defaultDacValues[i] != -1) {
setDAC((enum DACINDEX)i, defaultDacValues[i], 0);
if (dacValues[i] != defaultDacValues[i]) {
ret = FAIL;
LOG(logERROR, ("Setting dac %d failed, wrote %d, read %d\n", i,
defaultDacValues[i], dacValues[i]));
}
}
}
LOG(logINFOBLUE, ("Setting Default On-chip Dac values\n"));
for (int ichip = 0; ichip < NCHIP; ++ichip) {
for (int idac = 0; idac < ONCHIP_NDAC; ++idac) {
if (defaultOnChipdacValues[idac][ichip] != -1) {
setOnChipDAC((enum ONCHIP_DACINDEX)idac, ichip,
defaultOnChipdacValues[idac][ichip]);
if (onChipdacValues[idac][ichip] !=
defaultOnChipdacValues[idac][ichip]) {
ret = FAIL;
LOG(logERROR,
("Setting on-chip dac %d (ichip:%d) failed, "
"wrote %d, read %d\n",
idac, ichip, defaultOnChipdacValues[idac][ichip],
onChipdacValues[idac][ichip]));
}
}
}
}
return ret;
}
int readConfigFile() {
if (initError == FAIL) {
@ -691,6 +731,18 @@ int readConfigFile() {
break;
}
// set default on chip dac variable
// specific chip
if (ichip != -1) {
defaultOnChipdacValues[idac][ichip] = value;
}
// all chips
else {
for (int i = 0; i < NCHIP; ++i) {
defaultOnChipdacValues[idac][i] = value;
}
}
// set on chip dac
if (setOnChipDAC(idac, ichip, value) == FAIL) {
sprintf(initErrorMessage,
@ -703,7 +755,6 @@ int readConfigFile() {
// dac command
else {
enum DACINDEX idac = 0;
int value = 0;
@ -752,6 +803,9 @@ int readConfigFile() {
break;
}
// set default dac variables
defaultDacValues[idac] = value;
// set dac
setDAC(idac, value, 0);
int retval = getDAC(idac, 0);