diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index d72a8cd..43068e7 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -15,7 +15,7 @@ jobs: shell: bash -l {0} steps: - uses: actions/checkout@v3 - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true channels: conda-forge,defaults diff --git a/docs/releases.rst b/docs/releases.rst index 4c3605c..7f44836 100644 --- a/docs/releases.rst +++ b/docs/releases.rst @@ -12,6 +12,7 @@ Notes for the next major or minor release of `webmonchow`. **Of interest to the User**: - PR #XYZ one-liner description +- PR #15 Add NOM messages for translation, pvsd and dasmon **Of interest to the Developer:** diff --git a/src/webmonchow/amq/services/dasmon.json b/src/webmonchow/amq/services/dasmon.json index bbb8075..400033f 100644 --- a/src/webmonchow/amq/services/dasmon.json +++ b/src/webmonchow/amq/services/dasmon.json @@ -19,6 +19,11 @@ "message": {"src_name": "dasmon", "status": "0"}} ], + "/topic/SNS.NOM.STATUS.DASMON": [ + {"frequency": 10, + "message": {"src_name": "dasmon", + "status": "0"}} + ], "/topic/SNS.HYSA.APP.DASMON": [ {"frequency": 10, "message": @@ -85,5 +90,24 @@ "total_time": 2993.14 } } + ], + "/topic/SNS.NOM.APP.DASMON": [ + {"frequency": 10, + "message": + {"monitors": {"1": 0, "2": 0, "8": 0}, + "count_rate": 0, + "has_states_count": 0, + "paused": false, + "recording": false, + "scan_index": 0, + "scanning": false, + "system_dasmon": 0, + "system_postprocessing": "Created NOM reduction script", + "system_pvsd": 0, + "total_charge": 3.03988e+10, + "total_counts": 111735, + "total_time": 2993.14 + } + } ] } diff --git a/src/webmonchow/amq/services/pvsd.json b/src/webmonchow/amq/services/pvsd.json index acb6a2d..3691e90 100644 --- a/src/webmonchow/amq/services/pvsd.json +++ b/src/webmonchow/amq/services/pvsd.json @@ -18,5 +18,10 @@ {"frequency": 10, "message": {"src_name": "pvsd", "status": "0"}} + ], + "/topic/SNS.NOM.STATUS.PVSD": [ + {"frequency": 10, + "message": {"src_name": "pvsd", + "status": "0"}} ] } diff --git a/src/webmonchow/amq/services/translation.json b/src/webmonchow/amq/services/translation.json index 17fb198..0873b81 100644 --- a/src/webmonchow/amq/services/translation.json +++ b/src/webmonchow/amq/services/translation.json @@ -59,6 +59,12 @@ "ipts": "IPTS-33077", "run_number": "214747", "facility": "SNS", - "data_file": "/SNS/REF_L/IPTS-33077/nexus/REF_L_214747.nxs.h5"}} + "data_file": "/SNS/REF_L/IPTS-33077/nexus/REF_L_214747.nxs.h5"}}, + {"frequency": 0, + "message": {"instrument": "NOM", + "ipts": "IPTS-1001", + "run_number": "10002", + "facility": "SNS", + "data_file": "/SNS/NOM/IPTS-1001/nexus/NOM_10002.nxs.h5"}} ] }