Skip to content

Commit 35818ed

Browse files
authored
Merge branch 'master' into user_guide_updates_contacts
2 parents 0a1a54c + b50e0c2 commit 35818ed

File tree

4 files changed

+149
-10
lines changed

4 files changed

+149
-10
lines changed

docs/logbook/LHC/2025_lhc.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ The tables below can be sorted by clicking next to the column headers.
4040
| 2025-06-22 15:40 | 2025-06-22 20:40 | 0.5H | MD14963 | MO detuning | [Shift Start](logbook://2025-06-22,1081,4322659) / [Summary](logbook://2025-06-22,1081,4322924) |
4141
| 2025-06-28 08:30 | 2025-06-28 12:00 | 0.3H | Commissioning | RDT vs phase knob | [Shift Start](logbook://2025-06-28,1081,4327972) / [Summary](logbook://2025-06-28,1081,4328352) ([OP][op_rdt_vs_phase_knob]{.cern_login target=_blank}) |
4242
| 2025-06-28 12:00 | 2025-06-29 05:00 | 0.5H 1HN | Commissioning | OO Commissioning | [Shift Start](logbook://2025-06-28,1081,4328097) / [Summary](logbook://2025-06-29,1081,4328684) ([OP][op_oo_commissioning]{.cern_login target=_blank}) |
43+
| 2025-09-03 00:00 | 2025-09-03 04:00 | 0.5WN | MD15003 | Valiation of combined ramp/squeeze/rotate | [Shift Start](logbook://2025-09-03,1081,4377865) / [Summary](logbook://2025-09-03,1081,4378088) ([OP][op_MD15003]{.cern_login target=_blank}) |
44+
| 2025-09-04 23:00 | 2025-09-05 07:45 | 1.1WN | MD15464 | Refining optics corrections at top energy | [Shift Start](logbook://2025-09-04,1081,4380286) / [Summary](logbook://2025-09-05,1081,4384687) ([OP][op_MD15464]{.cern_login target=_blank}) |
45+
| 2025-09-08 04:00 | 2025-09-08 08:30 | 0.2HN | Commissioning | Pb Ion Optics Part 3 | [Shift Start](logbook://2025-09-08,1081,4382873) |
46+
| 2025-10-06 08:00 | 2025-10-06 18:15 | 1.2W | MD16203 | LRBB Beta-beat compensation with flat-optics | [Shift Start](logbook://2025-10-06,1081,4401590) / [Summary](logbook://2025-10-06,1081,4402045) ([OP][op_MD16203]{.cern_login target=_blank}) |
4347
<!-- Logbook Links: [LINK_NAME](logbook://date, logbook_id, event_id) -->
4448

4549
<!-- OP logbook links below -->
@@ -61,6 +65,9 @@ The tables below can be sorted by clicking next to the column headers.
6165
[op_rematched_ir7]: https://be-op-logbook.web.cern.ch/elogbook-server/GET/showEventInLogbook/4322475
6266
[op_rdt_vs_phase_knob]: https://be-op-logbook.web.cern.ch/elogbook-server/GET/showEventInLogbook/4328444
6367
[op_oo_commissioning]: https://be-op-logbook.web.cern.ch/elogbook-server/GET/showEventInLogbook/4328594
68+
[op_MD15003]: https://be-op-logbook.web.cern.ch/elogbook-server/GET/showEventInLogbook/4378082
69+
[op_MD15464]: https://be-op-logbook.web.cern.ch/elogbook-server/GET/showEventInLogbook/4380521
70+
[op_MD16203]: https://be-op-logbook.web.cern.ch/elogbook-server/GET/showEventInLogbook/4402046
6471

6572
<!-- Tooltips -->
6673

@@ -83,4 +90,9 @@ The tables below can be sorted by clicking next to the column headers.
8390
*[MO detuning]: Measurements of amplitude detuning with several settings of the MO, as input to Massimo/Dora's cleaning MD.
8491
*[RDT vs phase knob]: Checked MO RDTs response to phase knob at injection for pp optics, seem to observe improvements with a stronger setting of the phase knob. Difficult measurements due to high losses on kicks.
8592
*[OO Commissioning]: Measured optics in the OO cycle, with PbPb corrections. Optics in ramp were ok, with a match point showing a peak of 17%. At FT the beta-beat and dispersion show a similar quality to that of ions in 2024 and of the 2025 PbPb optics at 1.2m, but large dispersion error on left side of IP6. With PbPb corrections through the squeeze optics are fairly consistent but we see a peak beta-beating of 17% at EoS. SbS hints at large local errors in the IRs at this lower energy. The beta-star-beating at IR2 was very bad at EoS, especially B1. Computed and tested some global corrections which were beneficial to beta-beating, dispersion and beta-star, would need waist knobs to do better. To be decided if these are to be used for the OO run.
93+
*[Valiation of combined ramp/squeeze/rotate]: Measurements during the ramp for combined ramp/squeeze/rotate MD. Standard validation at various points. Optics found to be good throughout the ramp, in line with regular 1.2 and 2m.
94+
*[Refining optics corrections at top energy]: Local chroma at injection wihtout QFB (last point with QFB). ADT-ACD settup in optics mode at injection, 10mm kicks. ADT-ACD at FT, large enough kick to measure linear optics. At FT had problem with BPM concentrator for B1. Local chroma of B2 at 18cm. Kmod at 160 and 120 urad for effect of crossing-scheme on lumi imbalance. Kmod at 120urad with Felix waist knob. Kmod and ACD with 28april waist knob. ACDkicks and xing scan for b6 feed-down to f0140 RDT.
95+
*[Pb Ion Optics Part 3]: Attempted to validate Pb optics with enf of squeeze corrections from last time, as filler during validation of loss maps during vaccuum issue. Quick measurement at injection to check BPMs, but then OP were unable to get cycle to ramp due to inconsistency in ADT settings. Gave up after several hours as LHC switching back to lumi production. Includes summary of previous ion fill results.
96+
*[LRBB Beta-beat compensation with flat-optics]: Tried for the first time to take measurements of the LRBB-optics in both beam-1 and beam-2, using 2 separate fills. No issues encountered when switching the role of weak/strong beams between beam1/2. In Beam1 there was no visible effect on the lifetime. In beam2 however the lifetime appeared to degrade slightly as the MO were removed.
97+
8698
--8<-- "docs/logbook/footer_shifts"

docs/logbook/PS/2025_ps.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@
66
Tooltips: *[SHIFT PURPOSE TEXT]: Text inside the tooltip
77
-->
88

9-
| Start Date | End Date | Shifts | Type | Contact | Shift Purpose | Logbook Link |
10-
|:----------------:|:----------------:|:------:|:-------:|:--------:|:----------------------------------------------------------:|:-------------------------------------------------:|
11-
<!-- | 2025-03-21 13:44 | 2025-03-21 13:44 | 0.0W | DUMMY | Ewen | dummy entry to settup elog | [Start](logbook://2025-03-21,2621,4220229) | -->
9+
| Start Date | End Date | Shifts | Type | Contact | Shift Purpose | Logbook Link |
10+
|:----------------:|:----------------:|:------:|:-------:|:---------------:|:----------------------------------------------------------:|:-------------------------------------------------:|
11+
| 2025-08-26 09:00 | 2025-08-26 12:00 | 0.5W | MD | Mattia | Testing ACD kicks for local chroma | [Start](logbook://2025-08-26,2621,4371069) |
12+
| 2025-09-03 09:00 | 2025-09-03 17:30 | 1.0W | MD | Wietse/Mattia | Data to test numerical deconvolution with various bunches | [Start](logbook://2025-09-03,2621,4378461) |
13+
| 2025-09-15 14:00 | 2025-09-15 17:00 | 0.5W | MD | Wietse | Data to test numerical deconvolution with various bunches | [Start](logbook://2025-09-15,2621,4387601) |
14+
| 2025-09-19 12:00 | 2025-09-19 18:00 | 0.5W | MD | Katriya | Testing measurement of F8L response with LHC PFW | [Start](logbook://2025-09-19,2621,4390954) |
15+
1216

1317
<!-- Tooltips -->
1418

1519
--8<-- "docs/logbook/footer_shifts"
20+

docs/logbook/SPS/2025_sps.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,16 @@
99
| Start Date | End Date | Shifts | Type | Contact | Shift Purpose | Logbook Link |
1010
|:----------------:|:----------------:|:------:|:-------------:|:-----------------------:|:----------------------------------------:|:-------------------------------------------------------------------------------------------:|
1111
| 2025-03-18 14:00 | 2025-03-18 18:00 | 0.5W | Commissioning | Panos/Ewen/Josch/Mattia | optics commissioning - weird total phase | [Start](logbook://2025-03-18,2621,4216861) |
12-
| 2025-03-19 16:00 | 2025-03-19 19:00 | 0.5W | Commissioning | Panos/Ewen | optics commissioning - weird total phase | [Start](logbook://2025-03-19,2621,4218656) / [Summary](logbook://2025-03-19, 2621, 4219471) |
12+
| 2025-03-19 16:00 | 2025-03-19 19:00 | 0.5W | Commissioning | Panos/Ewen | optics commissioning - weird total phase | [Start](logbook://2025-03-19,2621,4218656) / [Summary](logbook://2025-03-19, 2621, 4219471) |
13+
| 2025-03-26 12:00 | 2025-03-26 15:00 | 0.5W | MD | Panos | ACD with fixed BPM issues | [Start](logbook://2025-03-26,2621,4223348) |
14+
| 2025-07-25 14:00 | 2025-07-25 19:00 | 0.5W | MD | Panos/Ewen | optics measurement tests with kicks | [Start](logbook://2025-07-25,2621,4351594) |
15+
| 2025-07-29 09:00 | 2025-07-29 12:00 | 0.5W | MD | Panos | optics measurement tests with kicks | [Start](logbook://2025-07-29,2621,4353589) |
16+
| 2025-08-05 14:00 | 2025-08-05 20:00 | 0.5W | MD | Panos | optics measurement tests with kicks | [Start](logbook://2025-08-05,2621,4358217) |
17+
| 2025-09-09 22:00 | 2025-09-10 01:00 | 0.5WN | MD | Panos/Ewen/Rogelio | CrabCavity optics measurements | [Start](logbook://2025-09-09,2621,4384258) |
18+
| 2025-09-17 15:00 | 2025-09-17 18:00 | 0.5W | MD | Panos/Ewen | Tests of CC measurement procedures | [Start](logbook://2025-09-17,2621,4389546) |
19+
| 2025-09-19 09:00 | 2025-09-19 13:00 | 0.5W | MD | Panos | Tests of CC measurement procedures | [Start](logbook://2025-09-19,2621,4390955) |
20+
| 2025-09-23 09:00 | 2025-09-23 13:00 | 0.5W | MD | Panos/Mattia | Tests of CC measurement procedures | [Start](logbook://2025-09-23,2621,4393166) |
21+
1322
<!-- Tooltips -->
1423

1524
--8<-- "docs/logbook/footer_shifts"

docs/resources/git_setup.md

Lines changed: 119 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,120 @@
11
# Git
22

3-
How to's concerning `git` in general, [`gitlab`][cern_gitlab], [`github`][github] and CI.
3+
How to's concerning `git` in general, [`gitlab`][cern_gitlab], [`GitHub`][github] and CI.
4+
5+
## Github Commandline Access Quickstart
6+
7+
This section explains the basic steps to get started with GitHub.
8+
Since HTTP access via password only has been disabled by GitHub for security reasons, it is necessary to activate a secure method.
9+
10+
This aims to be as short and concise as possible, for more extensive information, [see the GitHub security documentation][github_security]{target=_blank}.
11+
12+
### Setup SSH Access
13+
14+
An easy way to access GitHub securely is to use SSH.
15+
This guides you through the basic steps, but [details can be found in the GitHub documentation][github_ssh].
16+
17+
#### Create SSH Key
18+
19+
For this, create an SSH key pair locally using the email address associated with your GitHub account:
20+
21+
```bash
22+
ssh-keygen -t ed25519 -C "[email protected]"
23+
```
24+
25+
When asked for a location, it makes sense to give it an easily identifiable name, to remember what the key is for.
26+
The file should be placed in `~/.ssh/`, unless you are on `afs`, in which case the `~/private/` directory should be used.
27+
28+
```text
29+
~/.ssh/github_authenticate
30+
```
31+
32+
!!! tip "Passphrase"
33+
You can optionally provide a passphrase for the key, which will make it more secure.
34+
This way, even if someone else gets a hold of the private key file, they will not be able to access it.
35+
On the downside, you will be asked to enter the passphrase every time you want to use the key.
36+
**It is recommended, to use a passphrase** but as it is just an extra layer of security, you can keep it short and simple.
37+
38+
This will create two files: `github_authenticate` and `github_authenticate.pub`.
39+
The `.pub` is your public key that you can share with others,
40+
while the other file is your private key and **should never be shared with anyone!**
41+
42+
!!! quote "Keep it secret, keep it safe!"
43+
_Gandalf_, about private SSH keys (probably).
44+
45+
#### Add the Public SSH Key to GitHub
46+
47+
After creating the key, you need to add it to your GitHub account.
48+
Log into your GitHub account, click on your avatar and go to `Settings` &rarr; `SSH and GPG keys`.
49+
Then click on [++"New SSH key"++{.green-gui-button}][github_new_ssh_key]{target=_blank} and paste the contents of the `.pub` file into the `Key` field.
50+
51+
Give it a resonable name in the `Title` field (which it will appear as in the GitHub interface) and leave the `Key type` as `Authentication key`.
52+
Then click on `Add SSH key` and you are done.
53+
54+
#### Configure SSH to use the key
55+
56+
Next, you need to tell your local SSH client to use the key you created to connect to GitHub.
57+
For that, add the following lines to your `ssh` configuration file (typically at `~/.ssh/config` on UNIX systems):
58+
59+
```bash
60+
Host github.com
61+
HostName github.com
62+
User git
63+
IdentityFile ~/.ssh/github_authenticate
64+
```
65+
66+
or use for the `IdentityFile` field the path you chose earlier for the ssh key file.
67+
68+
!!! warning "Username"
69+
It is important that the `User` is `git` and **not your git-username**!
70+
GitHub will identify you automatically based on the email address you used to create the SSH key.
71+
72+
#### Test Access
73+
74+
Now you can test that everything works by running the following command:
75+
76+
```bash
77+
ssh -T github.com
78+
```
79+
80+
which should then display
81+
82+
```text
83+
Hi <Username>! You've successfully authenticated, but GitHub does not provide shell access.
84+
```
85+
86+
#### Clone Repository
87+
88+
When you clone a new repository, always use the SSH url
89+
90+
```text
91+
git clone [email protected]:pylhc/omc3.git
92+
```
93+
94+
which you can find from the ++"Clone"++{.green-gui-button} button of the repository page on GitHub.
95+
96+
97+
!!! tip "Changing a Repository URL"
98+
In case you already have a repository cloned with the wrong URL, you can change it with `git remote set-url`, e.g.:
99+
100+
```bash
101+
git remote set-url origin [email protected]:pylhc/omc3.git
102+
```
103+
104+
If you are not sure which url is currently set, you can always check it with
105+
106+
```bash
107+
git remote -v
108+
```
109+
110+
### Setup HTTPS Access
111+
112+
You can setup https access by creating and using a personal access token or a password manager.
113+
114+
!!! note "Not yet documented"
115+
As we use SSH access, this section not yet written.
116+
Refer to the [GitHub documentation][github_https] for more information and maybe write up a quick howto.
117+
4118

5119
## Configuring Gitlab CI to Automatically Pull into AFS
6120

@@ -120,12 +234,11 @@ Whenever you are pushing now any commits to the `master` branch, the CI/CD will
120234
*[CD]: Continuous Delivery
121235
*[lxplus]: Linux Public Login User Service
122236

123-
[sshuttle]: https://sshuttle.readthedocs.io/en/stable/
124237
[new_account]: https://account.cern.ch/account/Management/NewAccount.aspx
125238
[afs_services]: https://resources.web.cern.ch/resources/Manage/AFS/Default.aspx
126239
[github]: https://github.com/
127240
[cern_gitlab]: https://gitlab.cern.ch/
128-
[cern_linux]: https://linux.web.cern.ch/dockerimages/
129-
[acc_models_repo]: https://gitlab.cern.ch/acc-models/acc-models-lhc/
130-
[acc_models_yml]: https://gitlab.cern.ch/acc-models/acc-models-lhc/-/blob/2018/.gitlab-ci.yml
131-
[acc_models_docker]: https://gitlab.cern.ch/acc-models/acc-models-www/-/blob/master/_docker/Dockerfile_cern_cc7_base
241+
[github_security]: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure
242+
[github_https]: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/about-authentication-to-github#https
243+
[github_ssh]: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/about-ssh
244+
[github_new_ssh_key]: https://github.com/settings/ssh/new

0 commit comments

Comments
 (0)