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

fix with virtual server

Browse Source
This commit is contained in:
maliakal_d
2020-05-19 19:11:05 +02:00
parent e208d3ebe8
commit 6d71d6cf9f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -430,7 +430,7 @@ void setupDetector() {
setTiming(DEFAULT_TIMING_MODE); setTiming(DEFAULT_TIMING_MODE);
setNumIntGates(DEFAULT_INTERNAL_GATES); setNumIntGates(DEFAULT_INTERNAL_GATES);
setNumGates(DEFAULT_EXTERNAL_GATES); setNumGates(DEFAULT_EXTERNAL_GATES);
for (int i = 0; i != 2; ++i) { for (int i = 0; i != 3; ++i) {
setExpTime(i, DEFAULT_GATE_WIDTH); setExpTime(i, DEFAULT_GATE_WIDTH);
setGateDelay(i, DEFAULT_GATE_DELAY); setGateDelay(i, DEFAULT_GATE_DELAY);
} }
@ -850,7 +850,7 @@ int getNumGates() { return bus_r(ASIC_EXP_EXT_GATE_NUMBER_REG); }
void updateGatePeriod() { void updateGatePeriod() {
uint64_t max = 0; uint64_t max = 0;
for (int i = 0; i != 2; ++i) { for (int i = 0; i != 3; ++i) {
// TODO: only those counters enabled (when updated to mask in firmware) // TODO: only those counters enabled (when updated to mask in firmware)
uint64_t sum = getExpTime(i) + getGateDelay(i); uint64_t sum = getExpTime(i) + getGateDelay(i);
if (sum > max) { if (sum > max) {
@ -1219,9 +1219,9 @@ void setTiming(enum timingMode arg) {
} }
enum timingMode getTiming() { enum timingMode getTiming() {
uint32_t extTrigger = (bus_r(EXT_SIGNAL_REG) | EXT_SIGNAL_MSK); uint32_t extTrigger = (bus_r(EXT_SIGNAL_REG) & EXT_SIGNAL_MSK);
uint32_t extGate = uint32_t extGate =
(bus_r(ASIC_EXP_STATUS_REG) | ASIC_EXP_STAT_GATE_SRC_EXT_MSK); (bus_r(ASIC_EXP_STATUS_REG) & ASIC_EXP_STAT_GATE_SRC_EXT_MSK);
if (extTrigger) { if (extTrigger) {
if (extGate) { if (extGate) {
// external trigger, external gating // external trigger, external gating

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

@ -2163,7 +2163,7 @@ int set_exptime(int file_des) {
} }
// all gate indices // all gate indices
else { else {
for (int i = 0; i != 2; ++i) { for (int i = 0; i != 3; ++i) {
ret = setExpTime(i, val); ret = setExpTime(i, val);
int64_t retval = getExpTime(i); int64_t retval = getExpTime(i);
LOG(logDEBUG1, ("retval exptime %lld ns (index:%d)\n", LOG(logDEBUG1, ("retval exptime %lld ns (index:%d)\n",
@ -7199,7 +7199,7 @@ int set_gate_delay(int file_des) {
} }
// all gate indices // all gate indices
else { else {
for (int i = 0; i != 2; ++i) { for (int i = 0; i != 3; ++i) {
ret = setGateDelay(i, val); ret = setGateDelay(i, val);
int64_t retval = getGateDelay(i); int64_t retval = getGateDelay(i);
LOG(logDEBUG1, ("retval gate delay %lld ns (index:%d)\n", LOG(logDEBUG1, ("retval gate delay %lld ns (index:%d)\n",
@ -7257,10 +7257,10 @@ int get_exptime_all_gates(int file_des) {
#if !defined(MYTHEN3D) #if !defined(MYTHEN3D)
functionNotImplemented(); functionNotImplemented();
#else #else
for (int i = 0; i != 2; ++i) { for (int i = 0; i != 3; ++i) {
retvals[i] = getExpTime(i); retvals[i] = getExpTime(i);
LOG(logDEBUG1, ("retval exptime %lld ns (index:%d)\n", LOG(logINFO, ("retval exptime %lld ns (index:%d)\n",
(long long int)retvals[i], i)); (long long int)retvals[i], i));
} }
#endif #endif
return Server_SendResult(file_des, INT64, retvals, sizeof(retvals)); return Server_SendResult(file_des, INT64, retvals, sizeof(retvals));
@ -7274,7 +7274,7 @@ int get_gate_delay_all_gates(int file_des) {
#if !defined(MYTHEN3D) #if !defined(MYTHEN3D)
functionNotImplemented(); functionNotImplemented();
#else #else
for (int i = 0; i != 2; ++i) { for (int i = 0; i != 3; ++i) {
retvals[i] = getGateDelay(i); retvals[i] = getGateDelay(i);
LOG(logDEBUG1, ("retval gate delay %lld ns (index:%d)\n", LOG(logDEBUG1, ("retval gate delay %lld ns (index:%d)\n",
(long long int)retvals[i], i)); (long long int)retvals[i], i));