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

Merge branch 'm3dacfix' of github.com:slsdetectorgroup/slsDetectorPackage into m3dacfix

Browse Source
This commit is contained in:
bergamaschi
2021-05-25 15:09:52 +02:00
parent d05b0ef77f bd8f51fb1a
commit 9626b2b8f9
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

19
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -1213,6 +1213,19 @@ int validateAndSetDac(enum dacIndex ind, int val, int mV) {
setDAC(serverDacIndex, val, mV); setDAC(serverDacIndex, val, mV);
retval = getDAC(serverDacIndex, mV); retval = getDAC(serverDacIndex, mV);
} }
#ifdef MYTHEN3D
if (serverDacIndex == M_VTHRESHOLD && retval == -1) {
ret = FAIL;
uint32_t counter_retval = getCounterMask();
if (counter_retval != MAX_COUNTER_MSK) {
strcpy(mess, "Could not set all threshold dacs as not all "
"counters enabled\n");
} else {
sprintf(mess, "Could not set all threshold dacs\n");
}
LOG(logERROR, (mess));
}
#endif
#ifdef EIGERD #ifdef EIGERD
if (val != GET_FLAG && getSettings() != UNDEFINED) { if (val != GET_FLAG && getSettings() != UNDEFINED) {
// changing dac changes settings to undefined // changing dac changes settings to undefined
@ -7588,8 +7601,10 @@ int set_pattern(int file_des) {
LOG(logINFO, LOG(logINFO,
("Setting Pattern Word (printing every 10 words that are not 0\n")); ("Setting Pattern Word (printing every 10 words that are not 0\n"));
/****************************************************************************************************************/ /****************************************************************************************************************/
/* I SUGGEST TO VALIDATE THE VALUES HERE AND THEN WRITE THE PATTERN IN A SEPARATE FUNCTION WHICH COULD BE REUSED*/ /* I SUGGEST TO VALIDATE THE VALUES HERE AND THEN WRITE THE PATTERN IN A
/* added loadPattern.c/h - the same func could be reused also in readDefaultPattern */ * SEPARATE FUNCTION WHICH COULD BE REUSED*/
/* added loadPattern.c/h - the same func could be reused also in
* readDefaultPattern */
/***************************************************************************************************************/ /***************************************************************************************************************/
for (int i = 0; i < MAX_PATTERN_LENGTH; ++i) { for (int i = 0; i < MAX_PATTERN_LENGTH; ++i) {