Skip to content

Commit 2ce5269

Browse files
committed
defaults
1 parent 935d55b commit 2ce5269

File tree

3 files changed

+48
-49
lines changed

3 files changed

+48
-49
lines changed

docs/guis/betabeat/bpm_panel.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ It can load data files for all supported beams, mostly binary SDDS files or file
88

99
## Opening Files and Applying SVD Cleaning
1010

11+
### Opening Files
12+
13+
- Each tab has now an <span style="color:green;">Open Files</span> button, which opens only the files specific to this tab.
14+
- The magic <span style="color:green">**+**</span> button is gone, as its functionality was confusing (and there were different stories about its workings).
15+
1116
### Automatic BPM removal
1217

1318
First, BPMs are removed based on the following criteria:
@@ -21,9 +26,9 @@ First, BPMs are removed based on the following criteria:
2126
### SVD-cleaning
2227

2328
Secondly, SVD cleaning is performed.
24-
SVD modes with localized spikes in their spatial vectors indicate faulty BPMs using `Sum square` setting to find such spikes.
29+
SVD modes with localized spikes in their spatial vectors indicate faulty BPMs using `Sum square` setting to find such spikes.
2530
To globally reduce the noise on all BPM readings, only a predefined number of strongest singular modes (`Sing val cut`) remain in the turn-by-turn data.
26-
While the `Sum square` setting has a direct influence on the number of BPMs identified as faulty, the number of modes affects the overall noise level in turn-by-turn signal.
31+
While the `Sum square` setting has a direct influence on the number of BPMs identified as faulty, the number of modes affects the overall noise level in turn-by-turn signal.
2732
The original application of SVD on BPMs data cleaning can be found [in this publication][svd_clean_rhic].
2833

2934
If SVD is enabled in the settings, the external SVD cleaning python script will be called for the current file during the loading process.
@@ -37,12 +42,12 @@ All the settings mentioned above can be changed in the global settings panel:
3742
</center>
3843
</figure>
3944

40-
Turn-by-turn data cleaning is summarized in the output file which can be found at:
45+
Turn-by-turn data cleaning is summarized in the output file which can be found at:
4146
`Measurements/[email protected]/[email protected]_bpms_{x,y}.`
4247

4348
It contains BPM names and corresponding threshold which identified a BPM as faulty.
4449

45-
!!! note
50+
!!! note
4651
A single BPM can appear twice (for each threshold separately), e.g. in the case of exact zero flat signal.
4752

4853
The content of the loaded files will be displayed in two charts:
@@ -66,7 +71,7 @@ The charts can display either the measured amplitude values over turns for every
6671

6772
The buttons on the top left side of the pane provide useful features to handle the BPM data.
6873

69-
- `Remove Turns` can be used to cut turns from the start or the end, to focus on a specified range of the data.
74+
- `Remove Turns` can be used to cut turns from the start or the end, to focus on a specified range of the data.
7075

7176
!!! todo
7277
Include a screenshot of before-after comparison for `Remove Turns`.
@@ -79,12 +84,12 @@ The buttons on the top left side of the pane provide useful features to handle t
7984
- `Do Analysis` spawns the configuration dialogue for the external analysis.
8085
This will call an external program to perform harmonic analysis of the BPM data, in order to compute tunes and similar beam properties.
8186
The results from the analysis can be seen in the [Analysis Panel](analysis_panel.md).
82-
87+
8388
!!! todo
8489
Include of screenshot of `Do Analysis` dialogue window.
8590

8691
!!! note
8792
The `Create Average` option requires synchronized data from withing the same bounds, otherwise the results will be meaningless.
8893
The figure below shows three runs from LHC beam one with synchronized peaks for every turn and their corresponding averages.
89-
94+
9095
[svd_clean_rhic]: https://journals.aps.org/prab/abstract/10.1103/PhysRevSTAB.7.042801

docs/guis/betabeat/defaults.md

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,61 @@
11
# Defaults
22

3-
## Beam Selection Defaults
3+
Defaults can be set by a file named `bbgui_user.properties` (with the above syntax) in either the **current working directory** (from where you run the GUI), or in **your home folder**.
4+
The latter is only used if there is no such file in the current working directory.
45

5-
(For details see the [Beam Selection](beam_selection.md) page)
6+
If you want to use a specific file named anything and located anywhere, you can also **give the path to this file as the first and only argument** when starting the GUI.
7+
It is also possible to set each of these default values by passing them as flag arguments to the GUI call, e.g:
8+
9+
```bash
10+
--beam LHCB1 --inputPath /some/afs/location/with/your/data/
11+
```
12+
13+
## Beam Selection Defaults
614

715
The GUI defaults to specific locations for which `python` binary to use, the input path of you data, etc.
816
Different key-value pairs can be set inside for the desired defaults, for example:
917

10-
```bash
11-
beam = LHCB1
18+
```ini
19+
beam = LHCB2
1220
inputPath = /some/afs/location/with/your/data/
1321
outputPath = /some/afs/location/with/your/results/
1422
pythonPath = /some/afs/location/with/your/python-env/bin/python
15-
loadData=False # True: Load already existing data in the outputPath into the GUI
16-
oldFolderStructure=False # True: Put `models` folder at top level instead of the current machine folder (BBS legacy)
23+
loadData=False # Load already existing data in the outputPath into the GUI
24+
oldFolderStructure=False # Put `models` folder at top level (BBS legacy)
1725
```
18-
These values can be set by a file named `bbgui_user.properties` (with the above syntax) in either the **current working directory** (from where you run the GUI), or in **your home folder**.
19-
The latter is only used if there is no such file in the current working directory.
20-
21-
If you want to use a specific file located anywhere, you can also give the path to this file as the first and only argument when starting the GUI.
22-
It is also possible to set each of these default values by passing them as flag arguments to the GUI call, e.g:
2326

24-
```
25-
--beam LHCB1 --inputPath /some/afs/location/with/your/data/
26-
```
27+
For details see the [Beam Selection](beam_selection.md) page.
2728

2829
## Additional GUI Defaults
2930

3031
Additionally, there are some GUI settings that can either only be set via arguments or
31-
modify the default value in the GUI:
32+
modify/set the default value in the GUI fields:
3233

33-
```bash
34-
consoleLogging=True # activate additional logging into the terminal (only visible if started from terminal)
35-
checkFreeSpace=True # check fee space at GUI start (only visible if started from terminal)
34+
```ini
35+
consoleLogging=False # activate additional logging (visible if started from terminal)
36+
checkFreeSpace=False # check fee space at GUI start (visible if started from terminal)
3637

3738
# BPM-Panel
38-
runOptics=True # set the tickbox next to the `Analyse` button to also run the optics analysis by default
39+
runOptics=False # set the tickbox next to the `Analyse` button
3940

4041
# Analysis-Panel
41-
autoclean.limit=0.1 # set the autoclean limit
42-
clean.sigmas=2 # set the number of sigmas for the autoclean
43-
clean.bounds=0.7 # when cleaning, this ratio needs to remain otherwise the cleaning is aborted
44-
45-
# Amplitude-Detuning-Window
46-
ampdet.tunecut=0.05 # limit around the given tune to exclude from the natural tune when fitting
47-
ampdet.window=100 # length of the moving average window for the natural tune
48-
ampdet.outlierLimit=0.0002 # Cut on outliears around the mean
49-
ampdet.usePreviousBBQ=True # Do not extract BBQ data if there is already data present
42+
autoclean.limit=0.1 # set the autoclean limit
43+
clean.sigmas=2 # set the number of sigmas for the autoclean
44+
clean.bounds=0.7 # this ratio of points needs to remain otherwise cleaning aborts
45+
46+
# Amplitude-Detuning-Window
47+
ampdet.tunecut=0.05 # limit around the given tune to exclude from the BBQ tune
48+
ampdet.window=100 # length of the moving average window for the BBQ tune
49+
ampdet.outlierLimit=0.0002 # Cut on outliears around the mean
50+
ampdet.usePreviousBBQ=False # Use previously extraced BBQ data if present
5051
```
5152

5253
For more details about these functions see the [BPM-Panel](bpm_panel.md), [Analysis-Panel](analysis_panel.md) and [Amplitude-Detuning](ampdet.md) pages.
5354

5455
## Default Settings
5556

56-
(For details see the [Settings](settings.md) page)
57-
5857
When saving the GUI settings, a similar file `settings_xxx.properties` is created.
59-
Instead of loading these settings manually, you can also copy all or a selection of these settings
60-
from the output file into the `bbgui_user.properties` and they will be set automatically when the GUI is started.
58+
Instead of loading these settings manually, you can also copy all or a selection of the entries
59+
from the output file into your `bbgui_user.properties` and they will be set automatically when the GUI is started.
60+
61+
For details see the [Settings](settings.md) page.

docs/guis/betabeat/gui.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ The GUI can be ran locally, provided you have access to `afs`, but most importan
55
This section provides a short overview for the main features.
66

77
!!! info
8-
The code documentation of the Beta-Beat GUI can be found on CERN's gitlab pages.
9-
10-
* [Master branch][bbgui_doc_bbsrc]{target=_blank}
8+
The gitlab CI automatically generates an [API documentation page][bbgui_doc_omc3]{target=_blank} based on the source code.
119

10+
(A legacy version for the `BetaBeat.src` branch is [also available][bbgui_doc_bbsrc]{target=_blank}.)
1211

1312
The GUI provides several panels, each for a defined use and with a set of options and results:
1413

@@ -23,12 +22,6 @@ For starters, check out [the basics of running the GUI](../about.md).
2322
!!! warning "Bug Reporting"
2423
If you find bugs, please create [issues][betabeat_gui_gitlab_issues]{target=_blank} with the `OMC3-GUI` label.
2524

26-
## General Notes
27-
28-
### Opening Files
29-
30-
* Each tab has now an <span style="color:green;">Open Files</span> button, which opens only the files specific to this tab.
31-
* The magic <span style="color:green">**+**</span> button is gone, as its functionality was confusing (and there were different stories about its workings).
32-
25+
[bbgui_doc_omc3]: https://lhc-app-beta-beating.docs.cern.ch/omc3/
3326
[bbgui_doc_bbsrc]: https://lhc-app-beta-beating.docs.cern.ch/master/
3427
[betabeat_gui_gitlab_issues]: https://gitlab.cern.ch/acc-co/lhc/lhc-app-beta-beating/-/issues

0 commit comments

Comments
 (0)