Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add instrument NOM for time limit test #15

Merged
merged 3 commits into from
Feb 18, 2025
Merged

Add instrument NOM for time limit test #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c87d0dd
add instrument NOM
backmari Feb 17, 2025
e86a199
upgrade miniconda version
backmari Feb 17, 2025
0c5ea02
add release note
backmari Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docs/releases.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:**

Expand Down
24 changes: 24 additions & 0 deletions src/webmonchow/amq/services/dasmon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down Expand Up @@ -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
}
}
]
}
5 changes: 5 additions & 0 deletions src/webmonchow/amq/services/pvsd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
]
}
8 changes: 7 additions & 1 deletion src/webmonchow/amq/services/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
]
}
Loading