Skip to content

Commit ed27155

Browse files
Merge branch 'main' into 20-feature-implement-tunemonitor
2 parents 4259572 + 1e52ca3 commit ed27155

File tree

15 files changed

+174
-28
lines changed

15 files changed

+174
-28
lines changed

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix: # only lowest supported Python on latest ubuntu
2121
os: [ubuntu-latest]
22-
python-version: [3.9]
22+
python-version: [3.14]
2323

2424
permissions:
2525
issues: write

docs/api.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
API
2+
===
3+
4+
.. autosummary::
5+
:toctree: generated
6+
:recursive:
7+
8+
pyaml

docs/conf.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# pyAML documentation build configuration file, originally created for pySC: https://github.com/lmalina/pySC/blob/master/doc/conf.py
3+
# pyAML documentation build configuration file,
44
#
55
# This file is execfile()d with the current directory set to its
66
# containing dir.
@@ -48,11 +48,12 @@
4848
'sphinx.ext.doctest',
4949
'sphinx.ext.todo',
5050
'sphinx.ext.coverage',
51-
'sphinx.ext.mathjax',
51+
# 'sphinx.ext.mathjax',
5252
'sphinx.ext.viewcode',
5353
'sphinx.ext.githubpages',
5454
'sphinx.ext.napoleon',
5555
'sphinx.ext.autosectionlabel',
56+
'sphinx.ext.autosummary',
5657
]
5758
autosectionlabel_prefix_document = True
5859
autosectionlabel_maxdepth = 2
@@ -92,7 +93,7 @@
9293
#
9394
# This is also used if you do content translation via gettext catalogs.
9495
# Usually you set "language" from the command line for these cases.
95-
language = None
96+
language = 'en'
9697

9798
# List of patterns, relative to source directory, that match files and
9899
# directories to ignore when looking for source files.
@@ -120,6 +121,8 @@
120121
'display_version': True,
121122
'logo_only': True,
122123
'navigation_depth': 2,
124+
"rightsidebar": "false",
125+
"relbarbgcolor": "black"
123126
}
124127

125128

docs/index.rst

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
pyAML documentation
2-
===================
2+
======================================
3+
4+
.. contents:: Table of Contents
5+
:depth: 3
36

47
Introduction
5-
------------
8+
------------------------
69

710
python Accelerator Middle Layer (pyAML) is a joint technology platform to develop common tools for control, tuning and development of storage rings, beam transport lines and linear accelerators.
811

@@ -17,25 +20,25 @@ With pyAML, it WILL be possible to (the software is at conceptualization stage):
1720
- many more features
1821

1922
Installation
20-
------------
23+
------------------------
2124
pip support will be provided later.
2225
for the time being:
2326

2427
git clone https://github.com/python-accelerator-middle-layer/pyaml.git
2528

2629

2730
Collaboration community
28-
------------
31+
------------------------
2932

3033
Discussion
31-
~~~~~~~~~~~~
34+
~~~~~~~~~~~~~~~~~~~~~~~~
3235

3336
`Mattermost <https://mattermost.hzdr.de/accelerator-middle-layer/channels/town-square>`_
3437

3538
(please log in using Helmoltz ID, you will be prompt to access with your own lab/university credentials)
3639

3740
Shared documents
38-
~~~~~~~~~~~~
41+
~~~~~~~~~~~~~~~~~~~~~~~~
3942

4043
to access the shared documents please ask S.Liuzzo for access rigths.
4144

@@ -45,12 +48,12 @@ https://www.overleaf.com/read/hnrqzhfpbvpp#ef8935
4548
to be added to editors list please write to S.Liuzzo
4649

4750
Mailing list:
48-
~~~~~~~~~~~~
51+
~~~~~~~~~~~~~~~~~~~~~~~~
4952
to be added to the pyAML mailing list please write to S.Liuzzo
5053

5154

52-
Package Reference
53-
=================
55+
Documentation
56+
----------------------
5457

5558
.. toctree::
5659
:caption: Modules
@@ -61,7 +64,7 @@ Package Reference
6164

6265

6366
Indices and tables
64-
==================
67+
====================================
6568

6669
* :ref:`genindex`
6770
* :ref:`modindex`

docs/modules/arrays.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ARRAYS
2+
********
3+
4+
.. automodule:: pyaml.arrays.array
5+
:members:
6+
7+
.. automodule:: pyaml.arrays.magnet
8+
:members:
9+
10+
.. automodule:: pyaml.arrays.magnet_array
11+
:members:

docs/modules/bpm.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
BPMS
2+
*****************
3+
4+
.. automodule:: pyaml.bpm.bpm
5+
:members:
6+
7+
.. automodule:: pyaml.bpm.bpm_model
8+
:members:
9+
10+
.. automodule:: pyaml.bpm.bpm_tilt_offset_model
11+
:members:
12+
13+
.. automodule:: pyaml.bpm.bpm_simple_model
14+
:members:

docs/modules/configuration.rst

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Configuration
2+
*****************
3+
4+
.. automodule:: pyaml.configuration.fileloader
5+
:members:
6+
7+
.. automodule:: pyaml.configuration.factory
8+
:members:
9+
10+
.. automodule:: pyaml.configuration.matrix
11+
:members:
12+
13+
.. automodule:: pyaml.configuration.curve
14+
:members:
15+
16+
.. automodule:: pyaml.configuration.csvcurve
17+
:members:
18+
19+
.. automodule:: pyaml.configuration.matrix
20+
:members:
21+
22+
.. automodule:: pyaml.configuration.csvmatrix
23+
:members:
24+
25+
.. automodule:: pyaml.configuration.models
26+
:members:
27+
28+
.. automodule:: pyaml.configuration.config_exception
29+
:members:

docs/modules/control.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Control
2+
*********
3+
4+
.. automodule:: pyaml.control.controlsystem
5+
:members:
6+
7+
.. automodule:: pyaml.control.device
8+
:members:
9+
10+
.. automodule:: pyaml.control.abstract_impl
11+
:members:
12+
13+
.. automodule:: pyaml.control.abstract
14+
:members:
15+
16+
.. automodule:: pyaml.control.deviceaccess
17+
:members:
18+
19+
.. automodule:: pyaml.control.deviceaccesslist
20+
:members:
21+
22+
.. automodule:: pyaml.control.readback_value
23+
:members:

docs/modules/core_functions.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

docs/modules/lattice.rst

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
lattice
2+
************
3+
4+
.. automodule:: pyaml.lattice.abstract_impl
5+
:members:
6+
7+
.. automodule:: pyaml.lattice.attribute_linker
8+
:members:
9+
10+
.. automodule:: pyaml.lattice.element_holder
11+
:members:
12+
13+
.. automodule:: pyaml.lattice.element
14+
:members:
15+
16+
.. automodule:: pyaml.lattice.lattice_element_linker
17+
:members:
18+
19+
.. automodule:: pyaml.lattice.polynom_info
20+
:members:
21+
22+
.. automodule:: pyaml.lattice.simulator
23+
:members:
24+
25+

0 commit comments

Comments
 (0)