merge upstream

This commit is contained in:
2026-07-03 16:01:02 +02:00
4 changed files with 54 additions and 1 deletions
+5 -1
View File
@@ -50,7 +50,11 @@ jobs:
uses: actions/checkout@v4
with:
repository: bec/csaxs_bec
ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}"
# For pull_request events github.sha is the test-merge commit, which
# lives in the base repo, so this works for fork PRs too. Using
# github.head_ref here would try to fetch the fork's branch name from
# bec/csaxs_bec, where it does not exist -> checkout fails (exit 1).
ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.sha }}"
path: ./csaxs_bec
- name: Lint for merge conflicts from template updates
Binary file not shown.
+1
View File
@@ -44,6 +44,7 @@ hidden: true
---
introduction/introduction
safety/safety
user/user
developer/developer
api_reference/api_reference
+48
View File
@@ -0,0 +1,48 @@
(safety)=
# Safety at cSAXS
Working safely at the beamline is everyone's responsibility. All activities must
be conducted such that they are safe for anyone present — even people not familiar
with the ongoing work. Please read this page and the full checklist before
starting your experiment, and discuss any safety-related question with your local
contact.
```{important}
**No experiment may be conducted before the signed Safety Declaration form has
been handed to your local contact.** Every person working at the beamline must be
named on that form. Violations result in the immediate termination of the
experiment.
📄 **[Open the Safety Declaration form (PDF)](https://www.psi.ch/en/media/58834/download)**
```
```{admonition} In an emergency
:class: danger
- **Call 3333** — be ready to state *Who? What? When? Where?*
- Know the location of the nearest **emergency exit**, **fire extinguisher**,
**emergency shower / eye wash**, and **first-aid kit**.
- Never hesitate to ask your local contact for advice or help.
```
## Safety checklist (printable PDF)
Your local contact will go through the *Safety at cSAXS* checklist with you, covering emergencies, general behaviour,
working inside the hutch, and experiment safety. It is available as a printable PDF.
{download}`⬇ Download the "Safety at cSAXS" checklist (PDF) <../assets/safety-at-csaxs.pdf>`
## Key safety links
Note that some of the links below point to the PSI **intranet** and are only reachable from within the PSI network or via your local contact.
| Resource | Link |
| --- | --- |
| **Safety Declaration form** (sign and return before the experiment) | <https://www.psi.ch/en/media/58834/download> |
| User Office — Safety Guidelines | <https://www.psi.ch/en/useroffice/safety-at-psi> |
| Safety@PSI portal *(intranet)* | <https://intranet.psi.ch/Safety/WebHome> |
| PSI Safety Specialists — contact via your local contact *(intranet)* | <https://intranet.psi.ch/Safety/SafetyContactsENCategory> |
| Behaviour during a gas / fire alarm *(intranet)* | <https://intranet.psi.ch/pub/Safety/GasMonitoringCategory/Merkblatt_Verhalten_bei_Gas-Brandalarm_.pdf> |
If anything is unclear, discuss it with your local contact, who can in turn seek advice from the PSI safety specialists.