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

bug fix for inverted select for chipv1.1

Browse Source
This commit is contained in:
maliakal_d
2021-10-19 11:40:50 +02:00
parent b8b7966d79
commit 54097ba21c
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -2261,16 +2261,18 @@ void enableCurrentSource(int fix, uint64_t select, int normal) {
} else {
// select
// invert select first
uint64_t tmp = select;
uint64_t inverted = 0;
for (int i = 0; i !=64; ++i) {
for (int i = 0; i != 64; ++i) {
// get each bit from LSB side
int bit = (select >> i) & 0x1;
uint64_t bit = (tmp >> i) & 0x1;
// push the bit into MSB side
inverted |= (bit << (63 - i));
}
LOG(logINFO, ("\tSetting selection to 0x%lx (inverted from 0x%lx)\n",
(long unsigned int) inverted, (long unsigned int)select));
set64BitReg(inverted, CRRNT_SRC_COL_LSB_REG, CRRNT_SRC_COL_MSB_REG);
// normal
if (normal) {
LOG(logINFO, ("\tEnabling normal\n"))
@ -2323,7 +2325,18 @@ uint64_t getSelectCurrentSource() {
return ((bus_r(DAQ_REG) & DAQ_CRRNT_SRC_CLMN_SLCT_MSK) >>
DAQ_CRRNT_SRC_CLMN_SLCT_OFST);
} else {
return get64BitReg(CRRNT_SRC_COL_LSB_REG, CRRNT_SRC_COL_MSB_REG);
// invert the select
uint64_t retval = get64BitReg(CRRNT_SRC_COL_LSB_REG, CRRNT_SRC_COL_MSB_REG);
uint64_t tmp = retval;
uint64_t inverted = 0;
for (int i = 0; i != 64; ++i) {
// get each bit from LSB side
uint64_t bit = (tmp >> i) & 0x1;
// push the bit into MSB side
inverted |= (bit << (63 - i));
}
return inverted;
}
}