From ef494e76af04a4f0dc3e0078141b6c12b1a2afdc Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Thu, 22 Aug 2024 18:46:03 +0200 Subject: [PATCH] changes --- Packages/MIES/MIES_Publish.ipf | 6 ++++-- .../tests/HardwareBasic/UTF_TestPulseAndTPDuringDAQ.ipf | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Packages/MIES/MIES_Publish.ipf b/Packages/MIES/MIES_Publish.ipf index a354369334..40f2c907b3 100644 --- a/Packages/MIES/MIES_Publish.ipf +++ b/Packages/MIES/MIES_Publish.ipf @@ -27,6 +27,8 @@ End threadsafe Function PUB_Publish(variable jsonID, string messageFilter, [variable releaseJSON]) variable err string payload + + printf "PUB_Publish: %s\r", messageFilter releaseJSON = ParamIsDefault(releaseJSON) ? 1 : !!releaseJSON payload = JSON_Dump(jsonID) @@ -663,7 +665,7 @@ threadsafe Function PUB_TPResult(STRUCT TPZMQData &tpzmq) variable jsonId = JSON_New() string adUnit = GetADChannelUnit(tpzmq.clampMode) string daUnit = GetDAChannelUnit(tpzmq.clampMode) - + path = "properties" JSON_AddTreeObject(jsonID, path) JSON_AddVariable(jsonID, path + "/tp marker", tpzmq.marker) @@ -714,7 +716,7 @@ threadsafe static Function PUB_CheckPublishingTime(string pubFilter, variable pe variable curTime = DateTime TUFXOP_AcquireLock/N=(pubFilter) - lastTime = TSDS_ReadVar(pubFilter, defValue = curTime, create = 1) + lastTime = TSDS_ReadVar(pubFilter, defValue = 0, create = 1) if(lastTime + period < curTime) TSDS_Write(pubFilter, var = curTime + period) TUFXOP_ReleaseLock/N=(pubFilter) diff --git a/Packages/tests/HardwareBasic/UTF_TestPulseAndTPDuringDAQ.ipf b/Packages/tests/HardwareBasic/UTF_TestPulseAndTPDuringDAQ.ipf index 8d4badf931..6f72ade0ad 100644 --- a/Packages/tests/HardwareBasic/UTF_TestPulseAndTPDuringDAQ.ipf +++ b/Packages/tests/HardwareBasic/UTF_TestPulseAndTPDuringDAQ.ipf @@ -1399,6 +1399,10 @@ End /// UTF_TD_GENERATOR DeviceNameGeneratorMD1 static Function TestTPPublishing([str]) string str + + TUFXOP_Clear/Z/N=(ZMQ_FILTER_TPRESULT_1S) + TUFXOP_Clear/Z/N=(ZMQ_FILTER_TPRESULT_5S) + TUFXOP_Clear/Z/N=(ZMQ_FILTER_TPRESULT_10S) STRUCT DAQSettings s InitDAQSettingsFromString(s, "MD1_RA0_I0_L0_BKG1_STP1_TP1" + \ @@ -1406,8 +1410,9 @@ static Function TestTPPublishing([str]) AcquireData_NG(s, str) - CtrlNamedBackGround StopTPAfterFiveSeconds, start=(ticks + TP_DURATION_S * 60), period=1, proc=StopTPAfterFiveSeconds_IGNORE PrepareForPublishTest() + + CtrlNamedBackGround StopTPAfterFiveSeconds, start=(ticks + TP_DURATION_S * 60), period=1, proc=StopTPAfterFiveSeconds_IGNORE End static Function TestTPPublishing_REENTRY([str])