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

jungfrau: api changed from set/getFilterCell to set/getNumberOfFilterCells, storagecells command line changed to extrastoragecells, fixed wrong numberof arguments parsing message

Browse Source
This commit is contained in:
maliakal_d
2021-10-21 11:59:10 +02:00
parent 9b321d2ee1
commit 76dc6db5c0
16 changed files with 89 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -498,7 +498,7 @@ void setupDetector() {
setFlipRows(DEFAULT_FLIP_ROWS);
if (getChipVersion() == 11) {
setFilterResistor(DEFAULT_FILTER_RESISTOR);
setFilterCell(DEFAULT_FILTER_CELL);
setNumberOfFilterCells(DEFAULT_FILTER_CELL);
}
setReadNRows(MAX_ROWS_PER_READOUT);
}
@ -2206,7 +2206,7 @@ int setFilterResistor(int value) {
return FAIL;
}
int getFilterCell() {
int getNumberOfFilterCells() {
#ifdef VIRTUAL
uint32_t addr = CONFIG_V11_REG;
#else
@ -2223,7 +2223,7 @@ int getFilterCell() {
return (__builtin_popcount(retval));
}
void setFilterCell(int iCell) {
void setNumberOfFilterCells(int iCell) {
if (iCell > MAX_FILTER_CELL_VAL) {
return;
}
@ -2240,8 +2240,8 @@ void setFilterCell(int iCell) {
bus_w(addr, bus_r(addr) | ((value << CONFIG_V11_FLTR_CLL_OFST) &
CONFIG_V11_FLTR_CLL_MSK));
}
LOG(logINFO,
("Setting Filter Cell to %d [Reg:0x%x]\n", iCell, bus_r(addr)));
LOG(logINFO, ("Setting Number of Filter Cells to %d [Reg:0x%x]\n", iCell,
bus_r(addr)));
}
void disableCurrentSource() {