Skip to content

Commit 40f97c3

Browse files
authored
Version and changelog bump (#513)
1 parent c5ad13c commit 40f97c3

File tree

3 files changed

+27
-13
lines changed

3 files changed

+27
-13
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# OMC3 Changelog
22

3+
#### 2025-04-28 - v0.24.4 - _wvangoet_
4+
5+
- Fixed:
6+
- Correct element regex and fixes for SuperKEKB.
7+
38
#### 2025-04-28 - v0.24.3 - _jdilly_
49

510
- Fixed:

README.md

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
This is the python-tool package of the Optics Measurements and Corrections team (OMC) at CERN.
1111

1212
Most of the codes are generic and not limited to CERN accelerators, and the package can easily be used for your favorite circular accelerator.
13-
To see how to adapt this for your machine, see our [documentation](https://pylhc.github.io/omc3/), `Model` section.
13+
To see how to adapt this for your machine, see our [documentation](https://pylhc.github.io/omc3/), `Model` section.
1414
To contribute, see [our guidelines](https://pylhc.github.io/packages/development/contributing/) on the OMC website.
1515

1616
## Documentation
@@ -20,26 +20,27 @@ To contribute, see [our guidelines](https://pylhc.github.io/packages/development
2020

2121
## Installing
2222

23-
Installation is easily done via `pip`:
23+
The package is deployed on `PyPI` and can easily be installed via `pip`:
2424

25-
```
26-
pip install omc3
25+
```bash
26+
python -m pip install omc3
2727
```
2828

29+
For development purposes, we recommend creating a new virtual environment and installing from VCS in editable mode with all extra dependencies (`cern` for packages only available in the CERN GPN, `test` for `pytest` and relevant plugins, and `doc` for packages needed to build documentation).
2930

30-
For development purposes, we recommend creating a new virtual environment and installing from VCS in editable mode with all extra dependencies (`cern` for packages only available in the CERN GPN, `test` for `pytest` and relevant plugins, and `doc` for packages needed to build documentation)
3131
```bash
3232
git clone https://github.com/pylhc/omc3
33-
pip install --editable "omc3[all]"
33+
python -m pip install --editable "omc3[all]"
3434
```
3535

36-
Codes can then be run with either `python -m omc3.SCRIPT --FLAG ARGUMENT` or calling the `.py` file directly.
37-
3836
## Functionality
3937

40-
#### Main Scripts
38+
Codes can then be run with either `python -m omc3.SCRIPT --FLAG ARGUMENT` or calling the `.py` file directly.
39+
40+
<details> <summary><b>Main Scripts</b></summary>
4141

4242
Main scripts to be executed lie in the [`/omc3`](omc3) directory. These include:
43+
4344
- `hole_in_one.py` to perform frequency analysis on turn by turn BPM data and infer optics (and more) for a given accelerator.
4445
- `kmod_importer.py` to average, import and calculate lumi-imbalace K-modulation results.
4546
- `knob_extractor.py` to extract from `NXCALS` the value of given knobs in the machine at a given time.
@@ -50,19 +51,25 @@ Main scripts to be executed lie in the [`/omc3`](omc3) directory. These include:
5051
- `amplitude_detuning_analysis.py` to perform amp. det. analysis on optics data with tune correction.
5152
- `madx_wrapper.py` to start a `MAD-X` run with a file or string as input.
5253

53-
#### Plotting Scripts
54+
</details>
55+
56+
<details> <summary><b>Plotting Scripts</b></summary>
5457

5558
Plotting scripts for analysis outputs can be found in [`/omc3/plotting`](omc3/plotting):
59+
5660
- `plot_spectrum.py` to generate plots from files generated by frequency analysis.
5761
- `plot_bbq.py` to generate plots from files generated by BBQ analysis.
5862
- `plot_amplitude_detuning.py` to generate plots from files generated by amplitude detuning analysis.
5963
- `plot_optics_measurements.py` to generate plots from files generated by optics_measurements.
6064
- `plot_tfs.py` all-purpose tfs-file plotter.
6165
- `plot_kmod_results.py` to plot the beta and waist of the K-modulation results.
6266

63-
#### Other Scripts
67+
</details>
68+
69+
<details> <summary><b>Other Scripts</b></summary>
6470

6571
Other general utility scripts are in [`/omc3/scripts`](omc3/scripts):
72+
6673
- `update_nattune_in_linfile.py` to update the natural tune columns in the lin files by finding the highest peak in the spectrum in a given interval.
6774
- `write_madx_macros.py` to generate `MAD-X` tracking macros with observation points from a TWISS file.
6875
- `merge_kmod_results.py` to merge LSA results files created by kmod, and add the luminosity imbalance if the 4 needed IP/Beam files combination are present.
@@ -77,6 +84,8 @@ Other general utility scripts are in [`/omc3/scripts`](omc3/scripts):
7784
Example use for these scripts can be found in the [`tests`](tests) files.
7885
Documentation including relevant flags and parameters can be found at <https://pylhc.github.io/omc3/>.
7986

87+
</details>
88+
8089
## License
8190

8291
This project is licensed under the `MIT License` - see the [LICENSE](LICENSE) file for details.

omc3/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
__title__ = "omc3"
1212
__description__ = "An accelerator physics tools package for the OMC team at CERN."
1313
__url__ = "https://github.com/pylhc/omc3"
14-
__version__ = "0.24.3"
14+
__version__ = "0.24.4"
1515
__author__ = "pylhc"
1616
__author_email__ = "[email protected]"
1717
__license__ = "MIT"
1818

19-
__all__ = [__version__]
19+
__all__ = []

0 commit comments

Comments
 (0)