Skip to content

Rename stable_beam to stable_beams #775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knopers8 merged 1 commit into from
Nov 21, 2025
Merged

Rename stable_beam to stable_beams #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/environment/transition_startactivity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ func (t StartActivityTransition) do(env *Environment) (err error) {
"fill_info_fill_number",
"fill_info_filling_scheme",
"fill_info_beam_type",
"fill_info_stable_beam_start_ms",
"fill_info_stable_beam_end_ms",
"fill_info_stable_beams_start_ms",
"fill_info_stable_beams_end_ms",
"run_type",
"run_start_time_ms",
"run_end_time_ms", // included to ensure that a cleared SOEOR timestamp is propagated to all tasks during START-STOP-START
Expand Down
8 changes: 4 additions & 4 deletions core/integration/bookkeeping/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,10 +1446,10 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
parentRole.SetGlobalRuntimeVar("fill_info_filling_scheme", lhcInfo.FillingSchemeName)
parentRole.SetGlobalRuntimeVar("fill_info_beam_type", lhcInfo.BeamType)
if lhcInfo.StableBeamsStart != nil {
parentRole.SetGlobalRuntimeVar("fill_info_stable_beam_start_ms", strconv.FormatInt(*lhcInfo.StableBeamsStart, 10))
parentRole.SetGlobalRuntimeVar("fill_info_stable_beams_start_ms", strconv.FormatInt(*lhcInfo.StableBeamsStart, 10))
}
if lhcInfo.StableBeamsEnd != nil {
parentRole.SetGlobalRuntimeVar("fill_info_stable_beam_end_ms", strconv.FormatInt(*lhcInfo.StableBeamsEnd, 10))
parentRole.SetGlobalRuntimeVar("fill_info_stable_beams_end_ms", strconv.FormatInt(*lhcInfo.StableBeamsEnd, 10))
}
log.WithField("partition", envId).
WithField("level", infologger.IL_Devel).
Expand All @@ -1471,8 +1471,8 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
parentRole.DeleteGlobalRuntimeVar("fill_info_fill_number")
parentRole.DeleteGlobalRuntimeVar("fill_info_filling_scheme")
parentRole.DeleteGlobalRuntimeVar("fill_info_beam_type")
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_start_ms")
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_end_ms")
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_start_ms")
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_end_ms")
}

stack["RetrieveFillInfo"] = func() (out string) {
Expand Down
12 changes: 6 additions & 6 deletions core/integration/lhc/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ func (p *Plugin) updateFillInfo(call *callable.Call) (out string) {
parentRole.DeleteGlobalRuntimeVar("fill_info_fill_number")
parentRole.DeleteGlobalRuntimeVar("fill_info_filling_scheme")
parentRole.DeleteGlobalRuntimeVar("fill_info_beam_type")
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_start_ms")
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_end_ms")
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_start_ms")
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_end_ms")

log.WithField(infologger.Level, infologger.IL_Devel).
Debug("NO_BEAM — cleared fill info vars and set beam mode only")
Expand All @@ -320,14 +320,14 @@ func (p *Plugin) updateFillInfo(call *callable.Call) (out string) {
parentRole.SetGlobalRuntimeVar("fill_info_filling_scheme", state.FillingSchemeName)
parentRole.SetGlobalRuntimeVar("fill_info_beam_type", state.BeamType)
if state.StableBeamsStart > 0 {
parentRole.SetGlobalRuntimeVar("fill_info_stable_beam_start_ms", strconv.FormatInt(state.StableBeamsStart, 10))
parentRole.SetGlobalRuntimeVar("fill_info_stable_beams_start_ms", strconv.FormatInt(state.StableBeamsStart, 10))
} else {
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_start_ms")
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_start_ms")
}
if state.StableBeamsEnd > 0 {
parentRole.SetGlobalRuntimeVar("fill_info_stable_beam_end_ms", strconv.FormatInt(state.StableBeamsEnd, 10))
parentRole.SetGlobalRuntimeVar("fill_info_stable_beams_end_ms", strconv.FormatInt(state.StableBeamsEnd, 10))
} else {
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_end_ms")
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_end_ms")
}

log.WithField("fillNumber", state.FillNumber).
Expand Down
8 changes: 4 additions & 4 deletions docs/handbook/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,16 +428,16 @@ In addition to the above, which varies depending on the configuration of the env
* `fill_info_fill_number`
* `fill_info_filling_scheme`
* `fill_info_beam_type`
* `fill_info_stable_beam_start_ms`
* `fill_info_stable_beam_end_ms`
* `fill_info_stable_beams_start_ms`
* `fill_info_stable_beams_end_ms`
* `run_type`
* `run_start_time_ms`
* `lhc_period`
* `fillInfoFillNumber`
* `fillInfoFillingScheme`
* `fillInfoBeamType`
* `fillInfoStableBeamStartMs`
* `fillInfoStableBeamEndMs`
* `fillInfoStableBeamsStartMs`
* `fillInfoStableBeamsEndMs`
* `runType`
* `runStartTimeMs`
* `lhcPeriod`
Expand Down