From 74506bf547a056c12599f7bdcb289b4a9a12b13c Mon Sep 17 00:00:00 2001 From: George Raduta Date: Mon, 17 Nov 2025 15:38:21 +0100 Subject: [PATCH 1/2] Improve docs on colliding bunches --- lib/database/adapters/RunAdapter.js | 6 ++++++ lib/database/models/typedefs/SequelizeLhcFill.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/database/adapters/RunAdapter.js b/lib/database/adapters/RunAdapter.js index 0211f7bbef..31c891dbf3 100644 --- a/lib/database/adapters/RunAdapter.js +++ b/lib/database/adapters/RunAdapter.js @@ -15,6 +15,12 @@ const { PhysicalConstant } = require('../../domain/enums/PhysicalConstant'); /** * Extract number of colliding LHC bunch crossing (for ALICE) from LHC fill schema + * Normally this information should be retrieved from LHC Interface, + * but in case it is not available we try to extract it from the filling schema name + * using the convention, where we are interested in the AliceBunches: + * @example + * {a}_{totalBunches}_{CMS&AtlasBunches}_{AliceBunches}_{...} + * Example: "100ns_432b_374_250_181_28bpi_27inj_VdMPbPb" => 250 colliding bunch crossings for ALICE * @param {string} fillingSchema filling schema * @return {number} number of colliding LHC bunch crossing */ diff --git a/lib/database/models/typedefs/SequelizeLhcFill.js b/lib/database/models/typedefs/SequelizeLhcFill.js index b6de3e6cbd..80f44d8f68 100644 --- a/lib/database/models/typedefs/SequelizeLhcFill.js +++ b/lib/database/models/typedefs/SequelizeLhcFill.js @@ -20,7 +20,7 @@ * @property {number|null} stableBeamsDuration * @property {string|null} beamType * @property {string|null} fillingSchemeName - * @property {number|null} collidingBunchesCount + * @property {number|null} collidingBunchesCount - property sent by LHC Interface * @property {number|null} deliveredLuminosity * @property {string} createdAt * @property {string} updatedAt From 8067652c4982c1d7e187cada2998c5600e6fcb1b Mon Sep 17 00:00:00 2001 From: George Raduta Date: Mon, 17 Nov 2025 15:40:16 +0100 Subject: [PATCH 2/2] Add source of deliveredLumi --- lib/database/models/typedefs/SequelizeLhcFill.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/database/models/typedefs/SequelizeLhcFill.js b/lib/database/models/typedefs/SequelizeLhcFill.js index 80f44d8f68..49f013d1ea 100644 --- a/lib/database/models/typedefs/SequelizeLhcFill.js +++ b/lib/database/models/typedefs/SequelizeLhcFill.js @@ -21,7 +21,7 @@ * @property {string|null} beamType * @property {string|null} fillingSchemeName * @property {number|null} collidingBunchesCount - property sent by LHC Interface - * @property {number|null} deliveredLuminosity + * @property {number|null} deliveredLuminosity - property sent by LHC Interface * @property {string} createdAt * @property {string} updatedAt * @property {SequelizeLhcFillStatistics|null} statistics