Skip to content

Commit 2b0a0d3

Browse files
xsalonxxsalonx
committed
cleanup
1 parent b3c7e02 commit 2b0a0d3

3 files changed

Lines changed: 29 additions & 37 deletions

File tree

‎lib/database/repositories/QcFlagRepository.js‎

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ const Repository = require('./Repository');
3232
* @property {number} mcReproducibleCoverage
3333
* @property {number} goodCoverage
3434
* @property {number} totalCoverage
35-
* @property {number} undefinedQualityPeriodsCount
3635
* @property {number[]} flagsIds
3736
* @property {number[]} verifiedFlagsIds
3837
*/
@@ -58,31 +57,31 @@ class QcFlagRepository extends Repository {
5857
async findGaqPeriods(dataPassId, runNumber) {
5958
const query = `
6059
SELECT
61-
gp.data_pass_id AS dataPassId,
62-
gp.run_number AS runNumber,
63-
gp.\`from\` AS \`from\`,
64-
gp.\`to\` AS \`to\`,
60+
gaq_periods.data_pass_id AS dataPassId,
61+
gaq_periods.run_number AS runNumber,
62+
gaq_periods.\`from\` AS \`from\`,
63+
gaq_periods.\`to\` AS \`to\`,
6564
group_concat(qcf.id) AS contributingFlagIds
6665
6766
FROM quality_control_flags AS qcf
6867
INNER JOIN quality_control_flag_effective_periods AS qcfep ON qcf.id = qcfep.flag_id
6968
INNER JOIN data_pass_quality_control_flag AS dpqcf ON dpqcf.quality_control_flag_id = qcf.id
70-
INNER JOIN gaq_periods AS gp ON gp.data_pass_id = dpqcf.data_pass_id
69+
INNER JOIN gaq_periods ON gaq_periods.data_pass_id = dpqcf.data_pass_id
7170
INNER JOIN global_aggregated_quality_detectors AS gaqd
72-
ON gaqd.data_pass_id = gp.data_pass_id
73-
AND gaqd.run_number = gp.run_number
71+
ON gaqd.data_pass_id = gaq_periods.data_pass_id
72+
AND gaqd.run_number = gaq_periods.run_number
7473
AND gaqd.detector_id = qcf.detector_id
75-
AND gp.run_number = qcf.run_number
76-
AND (qcfep.\`from\` IS NULL OR qcfep.\`from\` <= gp.\`from\`)
77-
AND (qcfep.\`to\` IS NULL OR gp.\`to\` <= qcfep.\`to\`)
74+
AND gaq_periods.run_number = qcf.run_number
75+
AND (qcfep.\`from\` IS NULL OR qcfep.\`from\` <= gaq_periods.\`from\`)
76+
AND (qcfep.\`to\` IS NULL OR gaq_periods.\`to\` <= qcfep.\`to\`)
7877
79-
WHERE gp.data_pass_id = ${dataPassId}
80-
${runNumber ? `AND gp.run_number = ${runNumber}` : ''}
78+
WHERE gaq_periods.data_pass_id = ${dataPassId}
79+
${runNumber ? `AND gaq_periods.run_number = ${runNumber}` : ''}
8180
82-
GROUP BY gp.run_number,
83-
gp.data_pass_id,
84-
gp.\`from\`,
85-
gp.\`to\`;
81+
GROUP BY gaq_periods.run_number,
82+
gaq_periods.data_pass_id,
83+
gaq_periods.\`from\`,
84+
gaq_periods.\`to\`;
8685
`;
8786

8887
const [rows] = await this.model.sequelize.query(query);
@@ -111,19 +110,18 @@ class QcFlagRepository extends Repository {
111110
async getGaqCoverages(dataPassId) {
112111
const blockAggregationQuery = `
113112
SELECT
114-
gp.data_pass_id,
115-
gp.run_number,
116-
gp.coverage_ratio,
113+
gaq_periods.data_pass_id,
114+
gaq_periods.run_number,
115+
gaq_periods.coverage_ratio,
117116
IF(COUNT(DISTINCT qcf.id) > 0, qc_flag_block_significance(qcft.bad, qcft.monte_carlo_reproducible), NULL) AS significance,
118-
COUNT(DISTINCT gaqd.detector_id) - COUNT(DISTINCT qcf.id) AS undefined_quality_periods_count,
119117
GROUP_CONCAT( DISTINCT qcfv.flag_id ) AS verified_flags_list,
120118
GROUP_CONCAT( DISTINCT qcfep.flag_id ) AS flags_list
121119
122-
FROM gaq_periods AS gp
120+
FROM gaq_periods
123121
124122
INNER JOIN global_aggregated_quality_detectors AS gaqd
125-
ON gaqd.data_pass_id = gp.data_pass_id
126-
AND gaqd.run_number = gp.run_number
123+
ON gaqd.data_pass_id = gaq_periods.data_pass_id
124+
AND gaqd.run_number = gaq_periods.run_number
127125
128126
LEFT JOIN (
129127
data_pass_quality_control_flag AS dpqcf
@@ -132,15 +130,15 @@ class QcFlagRepository extends Repository {
132130
INNER JOIN quality_control_flag_effective_periods AS qcfep ON qcf.id = qcfep.flag_id
133131
LEFT JOIN quality_control_flag_verifications AS qcfv ON qcfv.flag_id = qcf.id
134132
)
135-
ON gp.data_pass_id = dpqcf.data_pass_id
136-
AND qcf.run_number = gp.run_number
133+
ON gaq_periods.data_pass_id = dpqcf.data_pass_id
134+
AND qcf.run_number = gaq_periods.run_number
137135
AND gaqd.detector_id = qcf.detector_id
138-
AND gp.run_number = qcf.run_number
139-
AND (qcfep.from IS NULL OR qcfep.\`from\` < gp.\`to\`)
140-
AND (qcfep.to IS NULL OR qcfep.\`to\` > gp.\`from\`)
136+
AND gaq_periods.run_number = qcf.run_number
137+
AND (qcfep.from IS NULL OR qcfep.\`from\` < gaq_periods.\`to\`)
138+
AND (qcfep.to IS NULL OR qcfep.\`to\` > gaq_periods.\`from\`)
141139
142-
WHERE gp.data_pass_id = :dataPassId
143-
GROUP BY gp.data_pass_id, gp.run_number, gp.\`from\`, gp.to
140+
WHERE gaq_periods.data_pass_id = :dataPassId
141+
GROUP BY gaq_periods.data_pass_id, gaq_periods.run_number, gaq_periods.\`from\`, gaq_periods.to
144142
`;
145143

146144
const summaryQuery = `
@@ -151,7 +149,6 @@ class QcFlagRepository extends Repository {
151149
qc_flag_block_significance_coverage(gaq.significance, coverage_ratio, 'mcr') AS mcr_coverage,
152150
qc_flag_block_significance_coverage(gaq.significance, coverage_ratio, 'good') AS good_coverage,
153151
SUM(IF(gaq.significance IS NOT NULL, coverage_ratio, 0)) AS total_coverage,
154-
SUM(undefined_quality_periods_count) AS undefined_quality_periods_count,
155152
GROUP_CONCAT(verified_flags_list) AS verified_flags_list,
156153
GROUP_CONCAT(flags_list) AS flags_list
157154
@@ -166,7 +163,6 @@ class QcFlagRepository extends Repository {
166163
mcr_coverage,
167164
good_coverage,
168165
total_coverage,
169-
undefined_quality_periods_count,
170166
flags_list,
171167
verifiedd_flags_list,
172168
}) => [
@@ -176,7 +172,6 @@ class QcFlagRepository extends Repository {
176172
mcReproducibleCoverage: parseFloat(mcr_coverage ?? '0'),
177173
goodCoverage: parseFloat(good_coverage ?? '0'),
178174
totalCoverage: parseFloat(total_coverage ?? '0'),
179-
undefinedQualityPeriodsCount: parseInt(undefined_quality_periods_count ?? '0', 10),
180175
flagsIds: [...new Set(flags_list?.split(','))],
181176
verifiedFlagsIds: [...new Set(verifiedd_flags_list?.split(','))],
182177
},

‎lib/domain/entities/QcSummary.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* @property {number} explicitlyNotBadEffectiveRunCoverage - fraction of run's data, marked explicitly with good QC flag
66
* @property {boolean} mcReproducible - if true states that some Limited Acceptance MC Reproducible flag was assigned
77
* @property {number} missingVerificationsCount - number of QC flags that are unverified and have not been discarded
8-
* @property {number|null} undefinedQualityPeriodsCount - number of periods which a flag is not assigned for
98
*/
109

1110
/**
@@ -25,7 +24,6 @@
2524
* @property {number} explicitlyNotBadEffectiveRunCoverage - fraction of run's aggregated quality interpreted as not-bad
2625
* @property {boolean} mcReproducible - if true states that some of periods have aggregated quality 'Mc Reproducible'
2726
* @property {number} missingVerificationsCount - number of QC flags that are unverified and have not been discarded
28-
* @property {number} undefinedQualityPeriodsCount - number of periods without assigned flag
2927
*/
3028

3129
/**

‎lib/domain/enums/QcSummaryProperties.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@ exports.QcSummarProperties = {
1616
explicitlyNotBadEffectiveRunCoverage: 'explicitlyNotBadEffectiveRunCoverage',
1717
missingVerificationsCount: 'missingVerificationsCount',
1818
mcReproducible: 'mcReproducible',
19-
undefinedQualityPeriodsCount: 'undefinedQualityPeriodsCount',
2019
};

0 commit comments

Comments
 (0)