diff --git a/slsDetectorServers/mythen3DetectorServer/mythen3.c b/slsDetectorServers/mythen3DetectorServer/mythen3.c index a03fd736d..9ece1637d 100644 --- a/slsDetectorServers/mythen3DetectorServer/mythen3.c +++ b/slsDetectorServers/mythen3DetectorServer/mythen3.c @@ -304,8 +304,6 @@ patternParameters *setChannelRegisterChip(int ichip, char *mask, chanReg |= (0x1 << (3 + icounter)); } } - chanReg /= 2; - // deserialize if (chanReg & CHAN_REG_BAD_CHANNEL_MSK) { LOG(logINFOBLUE, ("badchannel [chanReg:0x%x modCounter:%d, modChan:%d, " @@ -313,6 +311,8 @@ patternParameters *setChannelRegisterChip(int ichip, char *mask, chanReg, ichip * NCHAN + ich * NCOUNTERS, ichip * NCHAN_1_COUNTER + ich, ichip, ich)); } + chanReg /= 2; + // deserialize for (int i = 0; i < 23; i++) { patword = clearBit(SIGNAL_clk, patword); pat->word[iaddr++] = patword; diff --git a/slsDetectorServers/slsDetectorServer/src/loadPattern.c b/slsDetectorServers/slsDetectorServer/src/loadPattern.c index 90ef5b6d4..4d4c9dcdd 100644 --- a/slsDetectorServers/slsDetectorServer/src/loadPattern.c +++ b/slsDetectorServers/slsDetectorServer/src/loadPattern.c @@ -170,10 +170,12 @@ int validate_writePatternWord(char *message, int addr, uint64_t word) { uint64_t retval = readPatternWord(addr); LOG(logDEBUG1, ("Pattern word (addr:0x%x) retval: 0x%llx\n", addr, (long long int)retval)); - char mode[128]; - memset(mode, 0, sizeof(mode)); - sprintf(mode, "set pattern word for addr 0x%x", addr); - validate64(&ret, message, word, retval, "set pattern word", HEX); + // runs for every pattern word: only build the message on a mismatch + if (retval != word) { + char mode[64]; + sprintf(mode, "set pattern word for addr 0x%x", addr); + validate64(&ret, message, word, retval, mode, HEX); + } #endif return ret; } @@ -835,7 +837,7 @@ int loadPattern(char *message, enum TLogLevel printLevel, int ret = OK; memset(clientPatternfile, 0, MAX_STR_LENGTH); memcpy(clientPatternfile, patfname, MAX_STR_LENGTH); - printf("Client Pattern File:%s\n", clientPatternfile); + LOG(logDEBUG1, ("Client Pattern File:%s\n", clientPatternfile)); #ifdef MYTHEN3D trimmingPrint = printLevel; #endif diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 0b86ec503..1199bfb5f 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -9,4 +9,4 @@ #define APIEIGER "10.1.0 0x260807" #define APIXILINXCTB "10.0.0 0x250828" #define APIJUNGFRAU "10.1.0 0x261002" -#define APIMYTHEN3 "10.0.0 0x250828" +#define APIMYTHEN3 "10.1.0 0x261022"