diff --git a/.gitea/workflows/deploy-pages.yaml b/.gitea/workflows/deploy-pages.yaml index 399b645..a1e0368 100644 --- a/.gitea/workflows/deploy-pages.yaml +++ b/.gitea/workflows/deploy-pages.yaml @@ -15,7 +15,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Install dependencies - run: /opt/python-env/bin/pip install mkdocs-material mkdocs-macros-plugin mkdocs-git-revision-date-localized-plugin tzdata pymdown-extensions Pygments + run: /opt/python-env/bin/pip install mkdocs-material mkdocs-macros-plugin mkdocs-git-revision-date-localized-plugin tzdata pymdown-extensions Pygments neoteroi-mkdocs - name: Build mkdocs run: | diff --git a/docs/beamlines/overview.md b/docs/beamlines/overview.md index 0cf7ba6..cd2a145 100644 --- a/docs/beamlines/overview.md +++ b/docs/beamlines/overview.md @@ -19,13 +19,15 @@ template: main.html | X05DA | [Bend BN] | OPTICS[^2] | tbd | | X06SA | Undulator U19 | PX-I | tbd | | X06DA | [Bend BS2] | PX-III | tbd | -| X07MA | Undulator UE38 | PHOENIX & X-Treme | tbd | +| X07MA | Undulator UE38 | X-Treme | tbd | +| X07MB | Undulator UE38 | PHOENIX | tbd | | X07DB | [Bend BN] | NanoXAS | tbd | | X07DA | [Bend BN] | PolLux | [5474](tel: +41 56 310 5474) | | X08SA | Undulator U17 | microXAS | tbd | | X08DA | [Bend BN] | -- | -- | | X08DB | [Bend BN] | DISCO | [5144](tel: +41 56 310 5144) | -| X09LA | Undulator U70 | XIL & PEARL | tbd | +| X09LA | Undulator U70 | PEARL | tbd | +| X09LB | Undulator U70 | XIL | tbd | | X09DA | [Bend BN] | NAPP | tbd | | X10SA | Undulator U19 | PX-II | tbd | | X10DA | [Bend BS2] | SuperXAS | tbd | diff --git a/docs/beamlines/sourcepoints.md b/docs/beamlines/sourcepoints.md index a0907e9..9507733 100644 --- a/docs/beamlines/sourcepoints.md +++ b/docs/beamlines/sourcepoints.md @@ -22,7 +22,6 @@ hide:
# BS5 - Longitudinal gradient super-bending super-conducting magnet of standard unit cell (3-5 T) diff --git a/docs/machine/data/duostats2025.png b/docs/machine/data/duostats2025.png new file mode 100644 index 0000000..a8fe6ef Binary files /dev/null and b/docs/machine/data/duostats2025.png differ diff --git a/docs/machine/data/duostats2026.png b/docs/machine/data/duostats2026.png new file mode 100644 index 0000000..c813bae Binary files /dev/null and b/docs/machine/data/duostats2026.png differ diff --git a/docs/machine/data/duostats2027.png b/docs/machine/data/duostats2027.png new file mode 100644 index 0000000..dfe402b Binary files /dev/null and b/docs/machine/data/duostats2027.png differ diff --git a/docs/machine/statistics.md b/docs/machine/statistics.md index 5730d71..8ee9013 100644 --- a/docs/machine/statistics.md +++ b/docs/machine/statistics.md @@ -85,4 +85,55 @@ MTBD: Mean Time Between Distortions = User Time / Number-of-distortion | Availability | 94.4 % | | Availability after compensation | 99.3 % | | MTBF | 19.2 hours | -| MTTR | 1.1 hours | \ No newline at end of file +| MTTR | 1.1 hours | + + +# DUO Statistics + + +## 2025 + +![Pie Chart DUO 2025](data/duostats2025.png){ style="height:400px;" align=left } + +| **Time** | **Hours** | **%** | +| :------------------------| :---------- | :-------- | +| {{shutdown}} | 2784 | 31.8 | +| {{machine}} | 3192 | 36.4 | +| {{beamline}} | 1824 | 20.8 | +| {{user}} | 960 | 11.0 | +| **Total** | **8760** | **100.0** | + +
+ + +## 2026 + +![Pie Chart DUO 2026](data/duostats2026.png){ style="height:400px;" align=left } + +| **Time** | **Hours** | **%** | +| :------------------------| :---------- | :-------- | +| {{shutdown}} | 4360 | 49.8 | +| {{machine}} | 1632 | 18.6 | +| {{beamline}} | 1032 | 11.8 | +| {{user}} | 1736 | 19.8 | +| **Total** | **8760** | **100.0** | + +
+ + +## 2027 + +![Pie Chart DUO 2027](data/duostats2027.png){ style="height:400px;" align=left } + +| **Time** | **Hours** | **%** | +| :------------------------| :---------- | :-------- | +| {{shutdown}} | 2304 | 26.3 | +| {{machine}} | 1904 | 21.7 | +| {{beamline}} | 960 | 11.0 | +| {{user}} | 3592 | 41.0 | +| **Total** | **8760** | **100.0** | + +
+ + +## Beam Delivery Statistics \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index 4007160..be038b4 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -8,6 +8,8 @@ repo_name: sls.psi.ch repo_url: https://gitea.psi.ch/sls/gitea-pages edit_uri: 'https://gitea.psi.ch/sls/gitea-pages/_edit/main/docs/' +# For tests: CI=true INSIDERS=true mkdocs build --site-dir test/ + markdown_extensions: - pymdownx.arithmatex - pymdownx.extra @@ -196,6 +198,13 @@ extra: Unstable : 'Unstable' x : ':material-checkbox-outline:' o : ':material-checkbox-blank-outline:' + i1 : '      ' + i2 : '            ' + shutdown : 'Shutdown' + machine : 'Machine development' + beamline : 'Beamline development' + user : 'User operation' + nav: - 'Home' :