Merge branch 'main' into mboulais/O2B-1435/rework-qc-flags-storage

Author: martinboulais

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.8.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.8.0)
+* Notable changes for users:
+  * Luminosity information has been added to run details page
+
 ## [1.7.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.7.0)
 * Notable changes for users:
   * Clicking on button to delete a flag actually mark it as deleted and remove its effective periods instead of removing it from database

database/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.8.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.8.0)
+* Changes made to the database
+  * Added default value of false to the deleted flag for QC flags, which avoids to rely only on sequelize model definition
+
 ## [1.7.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.7.0)
 * Changes made to the database
   * Added deleted flag to QC flags in database

lib/database/migrations/v1/20250318092409-mark-flags-as-non-deleted-by-default.js

@@ -0,0 +1,25 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+    up: async (queryInterface, Sequelize) => await queryInterface.changeColumn(
+        'quality_control_flags',
+        'deleted',
+        {
+            type: Sequelize.DataTypes.BOOLEAN,
+            allowNull: false,
+            defaultValue: false,
+            after: 'id',
+        },
+    ),
+
+    down: async (queryInterface, Sequelize) => await queryInterface.changeColumn(
+        'quality_control_flags',
+        'deleted',
+        {
+            type: Sequelize.DataTypes.BOOLEAN,
+            allowNull: false,
+            after: 'id',
+        },
+    ),
+};

lib/database/seeders/20200713103855-runs.js

@@ -1374,7 +1374,7 @@ module.exports = {
                     fill_number: 6,
                     pdp_beam_type: 'PbPb',
                     lhc_beam_energy: 23.21,
-                    lhc_beam_mode: 'STABLE',
+                    lhc_beam_mode: 'STABLE BEAMS',
                     lhc_beta_star: 321.1321,
                     alice_l3_current: 30002545.12,
                     alice_l3_polarity: 'POSITIVE',
@@ -1392,6 +1392,9 @@ module.exports = {
                     updated_at: '2019-08-08 17:00:00',
                     created_at: '2019-08-08 17:00:00',
                     lhc_period_id: 1,
+                    trigger_efficiency: 1,
+                    trigger_acceptance: 0.7569974555,
+                    cross_section: 78600,
 
                     inelastic_interaction_rate_avg: 20000,
                     inelastic_interaction_rate_at_start: 10000,
@@ -2671,7 +2674,7 @@ module.exports = {
                     dcs: false,
                     epn: true,
                     fill_number: 1,
-                    epn_topology: 'a quite long topology, which will for sure require a balloon to be displayed properly',
+                    epn_topology: 'quite a long topology, which will for sure require a balloon to be displayed properly',
                     concatenated_detectors: 'ACO, CPV, CTP, EMC, FIT, HMP, ITS, MCH, MFT, MID, PHS, TOF, TPC, TRD, ZDC',
                     lhc_period_id: 2,
                     lhc_beam_mode: 'STABLE BEAMS',
@@ -2710,7 +2713,7 @@ module.exports = {
                     dcs: false,
                     epn: true,
                     fill_number: 1,
-                    epn_topology: 'a quite long topology, which will for sure require a balloon to be displayed properly',
+                    epn_topology: 'quite a long topology, which will for sure require a balloon to be displayed properly',
                     concatenated_detectors: 'ACO, CPV, CTP, EMC, FIT, HMP, ITS, MCH, MFT, MID, PHS, TOF, TPC, TRD, ZDC',
                     trigger_value: 'OFF',
                     lhc_period_id: 2,
@@ -2750,7 +2753,7 @@ module.exports = {
                     dcs: false,
                     epn: true,
                     fill_number: 1,
-                    epn_topology: 'a quite long topology, which will for sure require a balloon to be displayed properly',
+                    epn_topology: 'quite a long topology, which will for sure require a balloon to be displayed properly',
                     concatenated_detectors: 'ACO, CPV, CTP, EMC, FIT, HMP, ITS, MCH, MFT, MID, PHS, TOF, TPC, TRD, ZDC',
                     lhc_period_id: 2,
                     lhc_beam_mode: 'STABLE BEAMS',
@@ -2767,6 +2770,10 @@ module.exports = {
                     other_file_count: 50,
                     other_file_size: '214920239535280',
                     definition: RunDefinition.PHYSICS,
+                    trigger_efficiency: 1,
+                    trigger_acceptance: 0.7569974555,
+                    cross_section: 78600,
+
                     updated_at: '2019-08-09 14:00:00',
                     created_at: '2019-08-09 14:00:00',
                 },

lib/database/seeders/20220503120937-lhc-fills.js

@@ -25,6 +25,7 @@ module.exports = {
                         filling_scheme_name: '25ns_2352b_2340_2004_2133_108bpi_24inj',
                         created_at: new Date('2019-08-09 16:00:00'),
                         updated_at: new Date('2019-08-09 16:00:00'),
+                        colliding_bunches_count: 1234,
                     },
                     {
                         fill_number: 2,
@@ -67,7 +68,7 @@ module.exports = {
                         stable_beams_end: '2019-08-08 23:00:00',
                         stable_beams_duration: 60 * 60 * 12,
                         filling_scheme_name: 'Single_12b_8_1024_8_2018',
-                        colliding_bunches_count: 123456789,
+                        colliding_bunches_count: 2345,
                         delivered_luminosity: 420,
                         created_at: new Date('2019-08-09 21:00:00'),
                         updated_at: new Date('2019-08-09 21:00:00'),

lib/database/seeders/20240603124221-add-trigger-counters.js

@@ -32,6 +32,34 @@ module.exports = {
                 created_at: '2024-06-03 14:46:27',
                 updated_at: '2024-06-03 14:49:44',
             },
+            {
+                id: 3,
+                timestamp: '2024-06-03 14:45:12',
+                run_number: 54,
+                class_name: 'C1ZNC-B-NOPF-CRU',
+                lmb: 5748831462n,
+                lma: 5748757057n,
+                l0b: 5748757057n,
+                l0a: 5748757056n,
+                l1b: 5748757056n,
+                l1a: 5748757056n,
+                created_at: '2024-06-03 14:48:01',
+                updated_at: '2024-06-03 14:50:48',
+            },
+            {
+                id: 4,
+                timestamp: '2024-06-03 14:45:12',
+                run_number: 108,
+                class_name: 'CMTVX-NONE-NOPF-CRU',
+                lmb: 61766221961n,
+                lma: 0,
+                l0b: 15944142517n,
+                l0a: 15942608365n,
+                l1b: 1141098293n,
+                l1a: 1141098293n,
+                created_at: '2024-06-03 14:48:01',
+                updated_at: '2024-06-03 14:50:48',
+            },
         ], { transaction }),
     ])),
 

lib/public/utilities/formatting/formatFloat.js

@@ -14,6 +14,7 @@
 /**
  * Format float number
  * @param {number} value number to be formatted
+ * @param {object} [options] eventual options for formatting
  * @param {number} [options.precision = 3] precision of displayed value
  * @return {string} formatted number
  */