add

Author: xsalonx

lib/database/migrations/v1/20250901153000-add-aot-and-muons-qc-detectors.js

@@ -0,0 +1,41 @@
+/*
+ *  @license
+ *  Copyright CERN and copyright holders of ALICE O2. This software is
+ *  distributed under the terms of the GNU General Public License v3 (GPL
+ *  Version 3), copied verbatim in the file "COPYING".
+ *
+ *  See http://alice-o2.web.cern.ch/license for full licensing information.
+ *
+ *  In applying this license CERN does not waive the privileges and immunities
+ *  granted to it by virtue of its status as an Intergovernmental Organization
+ *  or submit itself to any jurisdiction.
+ */
+
+'use strict';
+
+const { Op } = require('sequelize');
+const { DetectorType } = require('../../../domain/enums/DetectorTypes.js');
+
+const NEW_QC_DETECTORS = [
+    'VTX',
+    'MTE',
+    'AOT-GLO',
+    'EVS',
+    'CEN',
+    'EVP',
+    'AOT-Event',
+    'MUD',
+    'GMU',
+    'MUON-GLO',
+];
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+    up: async (queryInterface) => queryInterface.sequelize.transaction(async () => {
+        await queryInterface.bulkInsert('detectors', NEW_QC_DETECTORS.map((name) => ({ name, type: DetectorType.QC_ONLY })));
+    }),
+
+    down: async (queryInterface) => queryInterface.sequelize.transaction(async () => {
+        await queryInterface.bulkDelete('detectors', { name: { [Op.in]: NEW_QC_DETECTORS } });
+    }),
+};

lib/public/services/detectors/detectorsProvider.js

@@ -11,6 +11,7 @@
  * or submit itself to any jurisdiction.
  */
 
+import { switchCase } from '/js/src/index.js';
 import { getRemoteData } from '../../utilities/fetch/getRemoteData.js';
 import { ObservableData } from '../../utilities/ObservableData.js';
 import { DetectorType, DATA_TAKING_DETECTOR_TYPES } from '../../domain/enums/DetectorTypes.js';
@@ -32,10 +33,10 @@ const getPhysicalDetectorsFromAllDetectors = (allDetectors) => allDetectors.filt
  * Return the QC detectors from a list of detectors
  *
  * @param {Detector[]} allDetectors the list of all detectors
- * @return {Detector[]} physical detectors
+ * @return {Detector[]} QC detectors
  */
 const getQcDetectorsFromAllDetectors = (allDetectors) => allDetectors
-    .filter(({ type, name }) => [DetectorType.PHYSICAL, DetectorType.QC].includes(type) && !DETECTORS_EXCLUDED_FROM_QC.includes(name));
+    .filter(({ type, name }) => [DetectorType.PHYSICAL, DetectorType.QC_ONLY].includes(type) && !DETECTORS_EXCLUDED_FROM_QC.includes(name));
 
 /**
  * Service class to fetch detectors from the backend
@@ -73,7 +74,14 @@ export class DetectorsProvider extends RemoteDataProvider {
      */
     async getRemoteData() {
         const { data } = await getRemoteData('/api/detectors');
-        data.sort(({ name: name1 }, { name: name2 }) => name1.localeCompare(name2));
+        const typeToOrderingKey = (type) => switchCase(type, {
+            [DetectorType.OTHER]: 0,
+            [DetectorType.VIRTUAL]: 1,
+            [DetectorType.PHYSICAL]: 2,
+            [DetectorType.QC_ONLY]: 3,
+        });
+        data.sort(({ name: name1, type: type1 }, { name: name2, type: type2 }) =>
+            -(typeToOrderingKey(type1) - typeToOrderingKey(type2)) * 10 + name1.localeCompare(name2));
         return data;
     }
 
@@ -142,3 +150,5 @@ export class DetectorsProvider extends RemoteDataProvider {
 }
 
 export const detectorsProvider = new DetectorsProvider();
+
+window.d = detectorsProvider;