mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-11 20:37:15 +02:00
Merge branch 'm3dacfix' of github.com:slsdetectorgroup/slsDetectorPackage into m3dacfix
This commit is contained in:
Binary file not shown.
@ -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) {
|
||||||
|
Reference in New Issue
Block a user