Skip to content

Commit b4acdbd

Browse files
committed
[O2B-1533] Add rctDetectorsProvider and adjust models
Export a new rctDetectorsProvider (DetectorsProvider configured with DetectorOrders.RCT) and update RCT tables.
1 parent 335147f commit b4acdbd

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

lib/public/services/detectors/detectorsProvider.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,3 +178,4 @@ export class DetectorsProvider extends RemoteDataProvider {
178178
}
179179

180180
export const detectorsProvider = new DetectorsProvider();
181+
export const rctDetectorsProvider = new DetectorsProvider(DetectorOrders.RCT);

lib/public/views/Runs/RunPerDataPass/RunsPerDataPassOverviewModel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { buildUrl, RemoteData } from '/js/src/index.js';
1414
import { ObservableData } from '../../../utilities/ObservableData.js';
1515
import { getRemoteDataSlice } from '../../../utilities/fetch/getRemoteDataSlice.js';
1616
import { getRemoteData } from '../../../utilities/fetch/getRemoteData.js';
17-
import { detectorsProvider } from '../../../services/detectors/detectorsProvider.js';
17+
import { rctDetectorsProvider } from '../../../services/detectors/detectorsProvider.js';
1818
import { FixedPdpBeamTypeRunsOverviewModel } from '../Overview/FixedPdpBeamTypeRunsOverviewModel.js';
1919
import { jsonPatch } from '../../../utilities/fetch/jsonPatch.js';
2020
import { jsonPut } from '../../../utilities/fetch/jsonPut.js';
@@ -43,7 +43,7 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
4343

4444
this._detectors$ = ObservableData
4545
.builder()
46-
.sources([detectorsProvider.qc$, this._dataPass$])
46+
.sources([rctDetectorsProvider.qc$, this._dataPass$])
4747
.apply((remoteDataList) => mergeRemoteData(remoteDataList)
4848
.apply({ Success: ([detectors, dataPass]) => ALL_CPASS_PRODUCTIONS_REGEX.test(dataPass.name)
4949
? detectors.filter(({ name, type }) => type !== DetectorType.AOT_GLO || DETECTOR_NAMES_NOT_IN_CPASSES.includes(name))

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
import { buildUrl, RemoteData } from '/js/src/index.js';
1414
import { TabbedPanelModel } from '../../../components/TabbedPanel/TabbedPanelModel.js';
15-
import { detectorsProvider } from '../../../services/detectors/detectorsProvider.js';
15+
import { rctDetectorsProvider } from '../../../services/detectors/detectorsProvider.js';
1616
import { jsonFetch } from '../../../utilities/fetch/jsonFetch.js';
1717
import { DetectorType } from '../../../domain/enums/DetectorTypes.js';
1818
import { ObservableData } from '../../../utilities/ObservableData.js';
@@ -38,11 +38,11 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM
3838
this._lhcPeriodId = null;
3939
this._lhcPeriodStatistics$ = new ObservableData(RemoteData.notAsked());
4040

41-
this._onlineDetectors$ = detectorsProvider.physical$;
41+
this._onlineDetectors$ = rctDetectorsProvider.physical$;
4242

4343
this._syncDetectors$ = ObservableData
4444
.builder()
45-
.source(detectorsProvider.qc$)
45+
.source(rctDetectorsProvider.qc$)
4646
.apply((remoteDetectors) =>
4747
remoteDetectors.apply({
4848
Success: (detectors) => detectors.filter(({ type }) => [DetectorType.PHYSICAL, DetectorType.MUON_GLO].includes(type)),

lib/public/views/Runs/RunsPerSimulationPass/RunsPerSimulationPassOverviewModel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import { buildUrl, RemoteData } from '/js/src/index.js';
1414
import { ObservableData } from '../../../utilities/ObservableData.js';
1515
import { getRemoteData } from '../../../utilities/fetch/getRemoteData.js';
16-
import { detectorsProvider } from '../../../services/detectors/detectorsProvider.js';
16+
import { rctDetectorsProvider } from '../../../services/detectors/detectorsProvider.js';
1717
import { FixedPdpBeamTypeRunsOverviewModel } from '../Overview/FixedPdpBeamTypeRunsOverviewModel.js';
1818

1919
/**
@@ -29,7 +29,7 @@ export class RunsPerSimulationPassOverviewModel extends FixedPdpBeamTypeRunsOver
2929

3030
this._simulationPass$ = new ObservableData(RemoteData.notAsked());
3131

32-
this._detectors$ = detectorsProvider.qc$;
32+
this._detectors$ = rctDetectorsProvider.qc$;
3333

3434
this.registerObervablesQcSummaryDependesOn([this._detectors$]);
3535
this.registerDetectorsNotBadFractionFilterModels(this._detectors$);

0 commit comments

Comments
 (0)