From 98d2930bcdf648f8754d62181a60b65ffda1a2fe Mon Sep 17 00:00:00 2001 From: Piotr Konopka Date: Thu, 20 Nov 2025 16:48:09 +0100 Subject: [PATCH] Rename stable_beam to stable_beams Initially, we followed some naming convention from BKP, keeping the singular "beam". Luckily, we moved to more conventional "beams" upstream and luckily no device is using yet the SB timestamp variables, so we are good to rename them. --- core/environment/transition_startactivity.go | 4 ++-- core/integration/bookkeeping/plugin.go | 8 ++++---- core/integration/lhc/plugin.go | 12 ++++++------ docs/handbook/configuration.md | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/environment/transition_startactivity.go b/core/environment/transition_startactivity.go index 21c6ec9e..8361bed2 100644 --- a/core/environment/transition_startactivity.go +++ b/core/environment/transition_startactivity.go @@ -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 diff --git a/core/integration/bookkeeping/plugin.go b/core/integration/bookkeeping/plugin.go index 476fdb1b..49344a7a 100644 --- a/core/integration/bookkeeping/plugin.go +++ b/core/integration/bookkeeping/plugin.go @@ -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). @@ -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) { diff --git a/core/integration/lhc/plugin.go b/core/integration/lhc/plugin.go index ed9f01e2..d29177c6 100644 --- a/core/integration/lhc/plugin.go +++ b/core/integration/lhc/plugin.go @@ -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") @@ -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). diff --git a/docs/handbook/configuration.md b/docs/handbook/configuration.md index 637fb59a..9cf18ee5 100644 --- a/docs/handbook/configuration.md +++ b/docs/handbook/configuration.md @@ -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`