Merge branch 'main' into xsalonx/O2B-1240/display-only-physical-productions

Author: xsalonx

lib/database/adapters/RunAdapter.js

@@ -273,9 +273,9 @@ class RunAdapter {
         entityObject.inelasticInteractionRateAtMid = inelasticInteractionRateAtMid;
         entityObject.inelasticInteractionRateAtEnd = inelasticInteractionRateAtEnd;
         if (lhcFill && inelasticInteractionRateAvg !== null) {
-            const numberOfCollidingLhcBunchCrossings = extractNumberOfCollidingLhcBunchCrossings(lhcFill.fillingSchemeName);
-            entityObject.muInelasticInteractionRate = numberOfCollidingLhcBunchCrossings
-                ? inelasticInteractionRateAvg / (numberOfCollidingLhcBunchCrossings * PhysicalConstant.LHC_REVOLUTION_FREQUENCY_HZ)
+            const collidingBunchesCount = lhcFill.collidingBunchesCount ?? extractNumberOfCollidingLhcBunchCrossings(lhcFill.fillingSchemeName);
+            entityObject.muInelasticInteractionRate = collidingBunchesCount
+                ? inelasticInteractionRateAvg / (collidingBunchesCount * PhysicalConstant.LHC_REVOLUTION_FREQUENCY_HZ)
                 : null;
         } else {
             entityObject.muInelasticInteractionRate = null;

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

@@ -68,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: 2345,
+                        colliding_bunches_count: 1024,
                         delivered_luminosity: 420,
                         created_at: new Date('2019-08-09 21:00:00'),
                         updated_at: new Date('2019-08-09 21:00:00'),

lib/public/components/common/table/table.js

@@ -92,6 +92,8 @@ const parseColumnsConfiguration = (columns, currentProfile) => {
  * @property {boolean} verticallScrollEnabled if true, enable vertical (table internal) scroll in case of overflow,
  * whole page vertical scroll otherwise. Note that for this option to work,
  * all predecesors of the node returned by this function must have display property column-flex and height: 100%
+ * @property {boolean} singleWrapper have effect only when some scroll is enabled.
+ * If true all divs wrapping table element are merged to single on.
  */
 
 /**
@@ -134,6 +136,7 @@ export const table = (
         horizontalScrollEnabled = false,
         freezeFirstColumn = false,
         verticalScrollEnabled = false,
+        singleWrapper = false,
     } = tableConfiguration || {};
     const { idKey, displayedColumns } = parseColumnsConfiguration(columns, currentProfile);
 
@@ -147,12 +150,14 @@ export const table = (
     }
 
     const scrollEnabled = horizontalScrollEnabled || verticalScrollEnabled;
-    const wrapperClassesExpression = scrollEnabled ? '.sticky-table-wrapper.scroll-auto' : '';
-
     const optionalTableClassesExpression = freezeFirstColumn && horizontalScrollEnabled ? '.freeze-first-column' : '';
 
-    const wrappedTableNode = h(
-        wrapperClassesExpression,
+    const firstLevelWrapperClasses =
+        (verticalScrollEnabled ? '.sticky-table-wrapper' : '') +
+        (singleWrapper && scrollEnabled ? '.scroll-auto' : '');
+
+    let wrappedTableNode = h(
+        firstLevelWrapperClasses,
         h(
             `table.table.table-hover.shadow-level1${optionalTableClassesExpression}`,
             {
@@ -168,6 +173,11 @@ export const table = (
             ],
         ),
     );
+
+    if (scrollEnabled && !singleWrapper) {
+        wrappedTableNode = h('.scroll-auto', wrappedTableNode);
+    }
+
     return scrollEnabled && !verticalScrollEnabled
         ? h('', wrappedTableNode) // Disable y-scroll
         : wrappedTableNode;

lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewPage.js

@@ -98,6 +98,7 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
             {
                 profile: 'runsPerLhcPeriod',
                 ...displayOptions,
+                singleWrapper: true,
             },
             { sort: sortModel },
         );
@@ -130,7 +131,7 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
                     )),
             },
             {
-                panelClass: ['p2', 'scroll-auto'],
+                panelClass: ['scroll-auto'],
             },
         ),
         paginationComponent(perLhcPeriodOverviewModel.pagination),

test/public/lhcFills/detail.test.js

@@ -45,7 +45,7 @@ module.exports = () => {
 
         await expectInnerText(page, '#lhc-fill-beamType', 'Beam type:\nPROTON-PROTON');
         await expectInnerText(page, '#lhc-fill-fillingSchemeName', 'Scheme name:\nSingle_12b_8_1024_8_2018');
-        await expectInnerText(page, '#lhc-fill-collidingBunchesCount', 'Colliding bunches:\n2,345');
+        await expectInnerText(page, '#lhc-fill-collidingBunchesCount', 'Colliding bunches:\n1,024');
         await expectInnerText(page, '#lhc-fill-deliveredLuminosity', 'Delivered lumi:\n420 nb-1');
     });
 

test/public/runs/detail.test.js

@@ -282,8 +282,8 @@ module.exports = () => {
 
     it('should successfully show luminosity information of PbPb run', async () => {
         await goToRunDetails(page, 54);
-        await expectInnerText(page, '#luminosity div:nth-child(2) div:nth-child(1) div:nth-child(2)', '98,110.716\nµb\n-1');
-        await expectInnerText(page, '#luminosity div:nth-child(2) div:nth-child(2) div:nth-child(2)', '0.031');
+        await expectInnerText(page, '#luminosity div:nth-child(2) div:nth-child(1) div:nth-child(2)', '100,130.863\nµb\n-1');
+        await expectInnerText(page, '#luminosity div:nth-child(2) div:nth-child(2) div:nth-child(2)', '0.072');
         await expectInnerText(page, '#luminosity div:nth-child(2) div:nth-child(3) div:nth-child(2)', '78,600 µb');
         await expectInnerText(page, '#luminosity div:nth-child(2) div:nth-child(4) div:nth-child(2)', '1');
         await expectInnerText(page, '#luminosity div:nth-child(2) div:nth-child(5) div:nth-child(2)', '0.757');