diff --git a/base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product b/base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product index 1fafc5e34d..88d390b567 100644 --- a/base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product +++ b/base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product @@ -25,6 +25,9 @@ -XX:ErrorFile=C:\Instrument\Scratch\CrashDumps\ibex_client_%p.log -Dlog4j2.formatMsgNoLookups=true -Djdk.util.zip.disableZip64ExtraFieldValidation=true +"-DEPICS_PVA_ADDR_LIST=127.0.0.1 130.246.51.255" +-DEPICS_PVA_AUTO_ADDR_LIST=NO +-DEPICS_PVA_CONN_TMO=5 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts @@ -62,6 +65,7 @@ + @@ -93,6 +97,7 @@ + @@ -119,8 +124,6 @@ - - diff --git a/base/uk.ac.stfc.isis.ibex.epics/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.epics/META-INF/MANIFEST.MF index f5d08ac621..5bd3460fd8 100644 --- a/base/uk.ac.stfc.isis.ibex.epics/META-INF/MANIFEST.MF +++ b/base/uk.ac.stfc.isis.ibex.epics/META-INF/MANIFEST.MF @@ -20,7 +20,9 @@ Require-Bundle: uk.ac.stfc.isis.ibex.jaxb;bundle-version="1.0.0", uk.ac.stfc.isis.ibex.e4.ui, org.eclipse.equinox.registry, org.apache.commons.commons-codec;bundle-version="1.15.0";visibility:=reexport, - joda-time;bundle-version="2.11.0";visibility:=reexport + joda-time;bundle-version="2.11.0";visibility:=reexport, + org.diirt.support.diirt-pva;bundle-version="3.1.8", + org.epics.pvaccess;bundle-version="5.1.2" Export-Package: uk.ac.stfc.isis.ibex.epics.adapters, uk.ac.stfc.isis.ibex.epics.conversion, uk.ac.stfc.isis.ibex.epics.conversion.json, diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/kafka_dae_diagnostics.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/kafka_dae_diagnostics.opi new file mode 100644 index 0000000000..5c8e8c202a --- /dev/null +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/kafka_dae_diagnostics.opi @@ -0,0 +1,1909 @@ + + + + + false + -1 + -1 + + false + + + + 5.1.0 + + + + 6 + 600 + + true + + $(NAME) + + + true + true + true + true + true + Display + 800 + -336ad6f:141c65e96ed:-7fff + -1 + -1 + + + false + true + 0.0 + + + + Event time offset (ns) + false + + + + false + 0.0 + 0.0 + + Header 3 + + 0.0 + false + 0 + + Header 3 + + true + true + 0.0 + + + + counts + false + + + + false + 0.0 + 0.0 + + Header 3 + + 0.0 + false + 0 + + Header 3 + + true + 2 + false + + + + false + + + + 0 + 1 + true + false + + + + 337 + Spectra plot + + + + + + + + + "pva://$(P)KDAEDIAG:SPEC:"+pvInt1+":"+pvInt0+":X" + + loc://_KDAEDIAG:SPECTRUM + loc://_KDAEDIAG:PERIOD + + + + "pva://$(P)KDAEDIAG:SPEC:"+pvInt1+":"+pvInt0+":Y" + + loc://_KDAEDIAG:SPECTRUM + loc://_KDAEDIAG:PERIOD + + + + true + true + false + + + false + false + false + + + ISIS_GraphLabels_NEW + + $(trace_0_y_pv) +$(trace_0_y_pv_value) + false + 100000 + false + 1 + Spectrum + 0 + 4 + 0 + + + + 0 + 100 + 0 + true + 0 + pva://$(P)KDAEDIAG:SPEC:0:0:X + + 1 + pva://$(P)KDAEDIAG:SPEC:0:0:Y + + 1 + false + + + true + XY Graph + 783 + 4d7a784b:165b353e7d6:-699e + 4 + 36 + + + + false + + + + 0 + 1 + true + + ISIS_Button_NEW + + false + + + + 1 + + Dummy + 0 + + + + + true + true + false + + + + + false + + true + Action Button + 1 + -648922a4:1624e4fa0bd:-7f69 + 198 + -13 + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 163 + false + + true + + Events (Current Run) + + + true + true + false + + + true + + false + true + Grouping Container + 273 + -17d74797:19bc74d7323:-7d90 + 4 + 384 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Events: + + false + 1 + true + Label + 133 + true + -17d74797:19bc74d7323:-7d8f + 0 + 6 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 0 + false + pva://$(P)KDAEDIAG:EVENTS + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 97 + false + -17d74797:19bc74d7323:-7d8e + 138 + 6 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Event messages (ev44): + + false + 1 + true + Label + 133 + true + -17d74797:19bc74d7323:-7d69 + 0 + 30 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 0 + false + pva://$(P)KDAEDIAG:EVENTMESSAGES + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 97 + false + -17d74797:19bc74d7323:-7d68 + 138 + 30 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Events size: + + false + 1 + true + Label + 133 + true + -17d74797:19bc74d7323:-7d25 + 0 + 78 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 3 + false + pva://$(P)KDAEDIAG:EVENTMODEFILEMB + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 97 + false + -17d74797:19bc74d7323:-7d24 + 138 + 78 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Count rate: + + false + 1 + true + Label + 133 + true + -17d74797:19bc74d7323:-7cc5 + 0 + 54 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 3 + false + pva://$(P)KDAEDIAG:COUNTRATE + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 97 + false + -17d74797:19bc74d7323:-7cc4 + 138 + 54 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Event Data rate (avg): + + false + 1 + true + Label + 133 + true + -17d74797:19bc74d7323:-7c59 + 0 + 102 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 3 + false + pva://$(P)KDAEDIAG:EVENTMODEDATARATE + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 97 + false + -17d74797:19bc74d7323:-7c58 + 138 + 102 + + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 133 + false + + true + + Diagnostic Histogram + + + true + true + false + + + true + + false + true + Grouping Container + 241 + -17d74797:19bc74d7323:-7d0a + 276 + 384 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Periods: + + false + 1 + true + Label + 103 + true + -17d74797:19bc74d7323:-7d09 + 0 + 6 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 0 + false + pva://$(P)KDAEDIAG:NUMPERIODS + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 91 + false + -17d74797:19bc74d7323:-7d08 + 114 + 6 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Spectra: + + false + 1 + true + Label + 103 + true + -17d74797:19bc74d7323:-7d07 + 0 + 30 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 0 + false + pva://$(P)KDAEDIAG:NUMSPECTRA + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 91 + false + -17d74797:19bc74d7323:-7d06 + 114 + 30 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Time bins: + + false + 1 + true + Label + 103 + true + -17d74797:19bc74d7323:-7d05 + 0 + 54 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 0 + false + pva://$(P)KDAEDIAG:NUMTIMECHANNELS + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 91 + false + -17d74797:19bc74d7323:-7d04 + 114 + 54 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Histogram size: + + false + 1 + true + Label + 103 + true + -17d74797:19bc74d7323:-7cf9 + 0 + 78 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 3 + false + pva://$(P)KDAEDIAG:HISTMEMORY + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 91 + false + -17d74797:19bc74d7323:-7cf8 + 114 + 78 + + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 109 + false + + true + + Current Run + + + true + true + false + + + true + + false + true + Grouping Container + 271 + -17d74797:19bc74d7323:-7cd8 + 516 + 384 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Start timestamp: + + false + 1 + true + Label + 103 + true + -17d74797:19bc74d7323:-7cd7 + 0 + 6 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 1 + false + pva://$(P)KDAEDIAG:START_TIME + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 91 + false + -17d74797:19bc74d7323:-7cd6 + 114 + 6 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Run duration: + + false + 1 + true + Label + 103 + true + -17d74797:19bc74d7323:-7cd5 + 0 + 54 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 1 + false + pva://$(P)KDAEDIAG:RUNDURATION + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 91 + false + -17d74797:19bc74d7323:-7cd4 + 114 + 54 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Stop timestamp: + + false + 1 + true + Label + 103 + true + -17d74797:19bc74d7323:-7c4d + 0 + 30 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 1 + false + pva://$(P)KDAEDIAG:STOP_TIME + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 91 + false + -17d74797:19bc74d7323:-7c4c + 114 + 30 + + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 85 + false + + true + + Diagnostics Latency + + + true + true + false + + + true + + false + true + Grouping Container + 271 + -17d74797:19bc74d7323:-7c7c + 516 + 492 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_5 + + + true + true + false + + + false + Event Processing Latency: + + false + 1 + true + Label + 145 + true + -17d74797:19bc74d7323:-7c67 + 0 + 6 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update_4 + 3 + false + pva://$(P)KDAEDIAG:PROCESSINGLAG + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 91 + false + -17d74797:19bc74d7323:-7c66 + 150 + 6 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_1 + + + true + true + false + + + false + Diag PV update rate: + + false + 1 + true + Label + 145 + true + -17d74797:19bc74d7323:-7c65 + 0 + 30 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update_1 + 3 + false + pva://$(P)KDAEDIAG:DIAGNOSTICSLAG + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 91 + false + -17d74797:19bc74d7323:-7c64 + 150 + 30 + + + + + false + + + + + + + 0 + 1 + true + + ISIS_Header1_NEW + + + + + 37 + 0 + Label + + + true + true + false + + + false + Kafka DAE Diagnostics + + false + 1 + true + Label + 321 + true + -17d74797:19bc74d7323:-7c44 + 4 + 0 + + + + false + + + + + + + 0 + 1 + true + + Header 3 + + + + + 20 + 2 + Label_1 + + + true + true + false + + + false + Spectrum: + + false + 1 + true + Label + 73 + true + -17d74797:19bc74d7323:-7c20 + 360 + 9 + + + + false + + + + + + + 0 + 1 + true + + Header 3 + + + + + 20 + 2 + Label_2 + + + true + true + false + + + false + Period: + + false + 1 + true + Label + 67 + true + -17d74797:19bc74d7323:-7c1f + 552 + 9 + + + + false + false + + + + true + + + + 3 + 1 + false + true + + Header 3 + + false + + + + 0 + 20 + 1 + false + false + 1.7976931348623157E308 + 0.0 + Spinner + 10.0 + 3 + false + loc://_KDAEDIAG:SPECTRUM(0) + + + + true + true + false + + + true + 1.0 + $(pv_name) +$(pv_value) + false + 1 + true + Spinner + 97 + -17d74797:19bc74d7323:-7c1e + 439 + 9 + + + + false + false + + + + true + + + + 3 + 1 + false + true + + Header 3 + + false + + + + 0 + 20 + 1 + false + false + 1.7976931348623157E308 + 0.0 + Spinner_1 + 10.0 + 3 + false + loc://_KDAEDIAG:PERIOD(0) + + + + true + true + false + + + true + 1.0 + $(pv_name) +$(pv_value) + false + 1 + true + Spinner + 97 + -17d74797:19bc74d7323:-7c15 + 624 + 9 + + \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index d166ee5c62..4b55a9e06b 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -4098,5 +4098,15 @@ + + Kafka DAE Diagnostics + + DEBUG + kafka_dae_diagnostics.opi + Kafka DAE Diagnostics + + + +