detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-06-08 02:58:40 +02:00
Code Issues Actions Packages Releases Activity

insert tolerance check again
Build on RHEL9 docker image / build (push) Failing after 3m38s
Details
Build on RHEL8 docker image / build (push) Failing after 4m47s
Details
Run Simulator Tests on local RHEL9 / build (push) Successful in 17m59s
Details
Run Simulator Tests on local RHEL8 / build (push) Successful in 20m27s
Details

Browse Source
This commit is contained in:
muelle_m1
2026-04-24 13:42:13 +02:00
parent 8ff128b062
commit 795668be8a
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
BIN
View File
Binary file not shown.
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
+12 -3
View File
@@ -1150,8 +1150,12 @@ int getNumTransceiverSamples() { return ntSamples; }
int setExpTime(int64_t val) {
setPatternWaitInterval(0, val);
// Tolerance: three clock periods in ns.
int64_t retval = getExpTime();
if (val != retval) {
int64_t toleranceNs = 3 * (1000000000 / clkFrequency[RUN_CLK]);
int64_t diff = val - retval;
if (diff < -toleranceNs || diff > toleranceNs) {
return FAIL;
}
return OK;
@@ -1171,7 +1175,9 @@ int setPeriod(int64_t val) {
// validate for tolerance
int64_t retval = getPeriod();
val /= (NS_TO_CLK_CYCLE * clkFrequency[SYNC_CLK]);
if (val != retval) {
int64_t toleranceNs = 3 * (1000000000 / clkFrequency[SYNC_CLK]);
int64_t diff = val - retval;
if (diff < -toleranceNs || diff > toleranceNs) {
return FAIL;
}
return OK;
@@ -1195,12 +1201,15 @@ int setDelayAfterTrigger(int64_t val) {
// validate for tolerance
int64_t retval = getDelayAfterTrigger();
val /= (NS_TO_CLK_CYCLE * clkFrequency[SYNC_CLK]);
if (val != retval) {
int64_t toleranceNs = 3 * (1000000000 / clkFrequency[SYNC_CLK]);
int64_t diff = val - retval;
if (diff < -toleranceNs || diff > toleranceNs) {
return FAIL;
}
return OK;
}
int64_t getDelayAfterTrigger() {
return get64BitReg(DELAY_LSB_REG, DELAY_MSB_REG) /
(NS_TO_CLK_CYCLE * clkFrequency[SYNC_CLK]);
slsDetectorServers/slsDetectorServer/src/loadPattern.c
+4 -2
View File
@@ -307,7 +307,9 @@ uint64_t getPatternWaitInterval(int level) {
LOG(logERROR, ("runclk is 0. Cannot divide by 0. Returning -1.\n"));
return -1;
}
return (double)numClocks / (NS_TO_CLK_CYCLE * runclk);
double conv = NS_TO_CLK_CYCLE * runclk;
uint64_t waitNs = (uint64_t)(numClocks / conv + 0.5);
return waitNs;
}
int validate_setPatternWaitClocksAndInterval(char *message, int level,
@@ -381,7 +383,7 @@ void setPatternWaitInterval(int level, uint64_t t) {
#elif MYTHEN3D
runclk = clkDivider[SYSTEM_C0];
#endif
uint64_t numClocks = t * (NS_TO_CLK_CYCLE * runclk);
uint64_t numClocks = (uint64_t)(t * (NS_TO_CLK_CYCLE * runclk) + 0.5);
setPatternWaitClocks(level, numClocks);
}
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
+11 -3
View File
@@ -768,8 +768,12 @@ int getNumTransceiverSamples() {
int setExpTime(int64_t val) {
setPatternWaitInterval(0, val);
// Tolerance: three clock periods in ns.
int64_t retval = getExpTime();
if (val != retval) {
int64_t toleranceNs = 3 * (1000000000 / clkFrequency[RUN_CLK]);
int64_t diff = val - retval;
if (diff < -toleranceNs || diff > toleranceNs) {
return FAIL;
}
return OK;
@@ -789,7 +793,9 @@ int setPeriod(int64_t val) {
// validate for tolerance
int64_t retval = getPeriod();
val /= (NS_TO_CLK_CYCLE * clkFrequency[RUN_CLK]);
if (val != retval) {
int64_t toleranceNs = 3 * (1000000000 / clkFrequency[RUN_CLK]);
int64_t diff = val - retval;
if (diff < -toleranceNs || diff > toleranceNs) {
return FAIL;
}
return OK;
@@ -812,7 +818,9 @@ int setDelayAfterTrigger(int64_t val) {
// validate for tolerance
int64_t retval = getDelayAfterTrigger();
val /= (NS_TO_CLK_CYCLE * clkFrequency[RUN_CLK]);
if (val != retval) {
int64_t toleranceNs = 3 * (1000000000 / clkFrequency[RUN_CLK]);
int64_t diff = val - retval;
if (diff < -toleranceNs || diff > toleranceNs) {
return FAIL;
}
return OK;