Skip to content

Commit 832ed65

Browse files
committed
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.
1 parent 87f0609 commit 832ed65

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

core/environment/transition_startactivity.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ func (t StartActivityTransition) do(env *Environment) (err error) {
8585
"fill_info_fill_number",
8686
"fill_info_filling_scheme",
8787
"fill_info_beam_type",
88-
"fill_info_stable_beam_start_ms",
89-
"fill_info_stable_beam_end_ms",
88+
"fill_info_stable_beams_start_ms",
89+
"fill_info_stable_beams_end_ms",
9090
"run_type",
9191
"run_start_time_ms",
9292
"run_end_time_ms", // included to ensure that a cleared SOEOR timestamp is propagated to all tasks during START-STOP-START

core/integration/bookkeeping/plugin.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,10 +1446,10 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
14461446
parentRole.SetGlobalRuntimeVar("fill_info_filling_scheme", lhcInfo.FillingSchemeName)
14471447
parentRole.SetGlobalRuntimeVar("fill_info_beam_type", lhcInfo.BeamType)
14481448
if lhcInfo.StableBeamsStart != nil {
1449-
parentRole.SetGlobalRuntimeVar("fill_info_stable_beam_start_ms", strconv.FormatInt(*lhcInfo.StableBeamsStart, 10))
1449+
parentRole.SetGlobalRuntimeVar("fill_info_stable_beams_start_ms", strconv.FormatInt(*lhcInfo.StableBeamsStart, 10))
14501450
}
14511451
if lhcInfo.StableBeamsEnd != nil {
1452-
parentRole.SetGlobalRuntimeVar("fill_info_stable_beam_end_ms", strconv.FormatInt(*lhcInfo.StableBeamsEnd, 10))
1452+
parentRole.SetGlobalRuntimeVar("fill_info_stable_beams_end_ms", strconv.FormatInt(*lhcInfo.StableBeamsEnd, 10))
14531453
}
14541454
log.WithField("partition", envId).
14551455
WithField("level", infologger.IL_Devel).
@@ -1471,8 +1471,8 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
14711471
parentRole.DeleteGlobalRuntimeVar("fill_info_fill_number")
14721472
parentRole.DeleteGlobalRuntimeVar("fill_info_filling_scheme")
14731473
parentRole.DeleteGlobalRuntimeVar("fill_info_beam_type")
1474-
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_start_ms")
1475-
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_end_ms")
1474+
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_start_ms")
1475+
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_end_ms")
14761476
}
14771477

14781478
stack["RetrieveFillInfo"] = func() (out string) {

core/integration/lhc/plugin.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ func (p *Plugin) updateFillInfo(call *callable.Call) (out string) {
307307
parentRole.DeleteGlobalRuntimeVar("fill_info_fill_number")
308308
parentRole.DeleteGlobalRuntimeVar("fill_info_filling_scheme")
309309
parentRole.DeleteGlobalRuntimeVar("fill_info_beam_type")
310-
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_start_ms")
311-
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_end_ms")
310+
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_start_ms")
311+
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_end_ms")
312312

313313
log.WithField(infologger.Level, infologger.IL_Devel).
314314
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) {
320320
parentRole.SetGlobalRuntimeVar("fill_info_filling_scheme", state.FillingSchemeName)
321321
parentRole.SetGlobalRuntimeVar("fill_info_beam_type", state.BeamType)
322322
if state.StableBeamsStart > 0 {
323-
parentRole.SetGlobalRuntimeVar("fill_info_stable_beam_start_ms", strconv.FormatInt(state.StableBeamsStart, 10))
323+
parentRole.SetGlobalRuntimeVar("fill_info_stable_beams_start_ms", strconv.FormatInt(state.StableBeamsStart, 10))
324324
} else {
325-
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_start_ms")
325+
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_start_ms")
326326
}
327327
if state.StableBeamsEnd > 0 {
328-
parentRole.SetGlobalRuntimeVar("fill_info_stable_beam_end_ms", strconv.FormatInt(state.StableBeamsEnd, 10))
328+
parentRole.SetGlobalRuntimeVar("fill_info_stable_beams_end_ms", strconv.FormatInt(state.StableBeamsEnd, 10))
329329
} else {
330-
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beam_end_ms")
330+
parentRole.DeleteGlobalRuntimeVar("fill_info_stable_beams_end_ms")
331331
}
332332

333333
log.WithField("fillNumber", state.FillNumber).

docs/handbook/configuration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -428,16 +428,16 @@ In addition to the above, which varies depending on the configuration of the env
428428
* `fill_info_fill_number`
429429
* `fill_info_filling_scheme`
430430
* `fill_info_beam_type`
431-
* `fill_info_stable_beam_start_ms`
432-
* `fill_info_stable_beam_end_ms`
431+
* `fill_info_stable_beams_start_ms`
432+
* `fill_info_stable_beams_end_ms`
433433
* `run_type`
434434
* `run_start_time_ms`
435435
* `lhc_period`
436436
* `fillInfoFillNumber`
437437
* `fillInfoFillingScheme`
438438
* `fillInfoBeamType`
439-
* `fillInfoStableBeamStartMs`
440-
* `fillInfoStableBeamEndMs`
439+
* `fillInfoStableBeamsStartMs`
440+
* `fillInfoStableBeamsEndMs`
441441
* `runType`
442442
* `runStartTimeMs`
443443
* `lhcPeriod`

0 commit comments

Comments
 (0)