Skip to content
Snippets Groups Projects
Commit 89994ea7 authored by Aleksandra Mnich's avatar Aleksandra Mnich
Browse files

Merge branch 'dev' into 'master'

Release 1.6.3

See merge request !223
parents 87611a6e 0c4534f4
No related branches found
Tags 1.6.3
1 merge request!223Release 1.6.3
Pipeline #5031404 passed with warnings
RELEASE NOTES
=============
Version: 1.6.3
- new references (past successful tests) updated: [SIGMON-419](https://its.cern.ch/jira/browse/SIGMON-419)
- variable query used for the PC analysis: [SIGMON-441](https://its.cern.ch/jira/browse/SIGMON-441)
- scaling/offset bug fixed in the `analyze_ee_temp`: [SIGMON-448](https://its.cern.ch/jira/browse/SIGMON-448)
- do not expect any order in `HWC_Summary.csv` file: [SIGMON-463](https://its.cern.ch/jira/browse/SIGMON-463)
- depend on `scikit-learn` not `sklearn` (deprecation fix)
Version: 1.6.2
- the default PM REST API hostname set to the real one, not '': [SIGMON-388](https://its.cern.ch/jira/browse/SIGMON-388)
- warnings about the np.float misuse removed: [SIGMON-388](https://its.cern.ch/jira/browse/SIGMON-388)
......
......@@ -2,7 +2,7 @@ from pathlib import Path
from typing import Union
name = "lhcsmapi"
__version__ = "1.6.2"
__version__ = "1.6.3"
nb_version_env = "NOTEBOOKS_VERSION"
......
......@@ -210,10 +210,10 @@ class Ee13kAAnalysis(CircuitAnalysis):
:return: None
"""
t_res_act_dfs = [t_res_act_df - t_res_act_dfs[0].values[0] + 20 for t_res_act_df in t_res_act_dfs]
t_res_ref_dfs = [t_res_ref_df - t_res_ref_dfs[0].values[0] + 20 for t_res_ref_df in t_res_ref_dfs]
t_res_ref_dfs = [t_res_ref_df - t_res_ref_dfs[0].values[0] * scaling + 20 for t_res_ref_df in t_res_ref_dfs]
title = create_title(circuit_name, timestamp_ee, 'T_RES_BODY [compensated to 20 degC]')
AssertionBuilder().with_signal(t_res_act_dfs) \
.compare_to_reference(signal_ref_dfs=t_res_ref_dfs, abs_margin=abs_margin, scaling=scaling) \
.compare_to_reference(signal_ref_dfs=t_res_ref_dfs, abs_margin=abs_margin) \
.show_plot(ylabel='T_RES_BODY, [degC]', title=title)
def analyze_ee_temp_and_cooling(self, t_res_body_long_dfs: List[pd.DataFrame],
......
......@@ -19,7 +19,7 @@ class HwcSearchModuleMediator(ModuleMediator):
self.hwc_test = hwc_test
columns = ['systemName', 'campaign', 'testName', 'executionStartTime', 'executionEndTime', 'executedTestStatus']
# the reason for `low_memory=False` is explained in https://its.cern.ch/jira/browse/SIGMON-232
self.hwc_summary = pd.read_csv(hwc_summary_path, low_memory=False)[columns]
self.hwc_summary = pd.read_csv(hwc_summary_path, low_memory=False)[columns].sort_values('executionStartTime')
self.hwc_summary_circuit = self.hwc_summary
# First row
circuit_names = get_circuit_names_or_prefixes_to_display(
......@@ -171,7 +171,8 @@ class HwcSearchModuleMediator(ModuleMediator):
relevant_tests_df = hwc_summary_df[(hwc_summary_df['systemName'].str.contains(circuit_name))
& (hwc_summary_df['testName'].str.contains(hwc_test)) &
(hwc_summary_df['executedTestStatus'] == 'SUCCESSFUL') &
(hwc_summary_df['executionStartTime'] < t_start)]
(hwc_summary_df['executionStartTime'] < t_start)]\
.sort_values('executionStartTime')
if relevant_tests_df.empty:
raise KeyError('No previous successful test for given circuit name %s, hwc test %s and start time %s' %
......
......@@ -678,7 +678,7 @@
"device": "%PC%",
"property": "SUB",
"I_MEAS": "I_MEAS",
"I_EARTH_PCNT": "I_EARTH_PCNT",
"I_EARTH_CPCNT": "I_EARTH_CPCNT",
"I_REF": "I_REF",
"I_ERR_MA": "I_ERR_MA",
"V_MEAS": "V_MEAS",
......
......@@ -12,4 +12,12 @@ RB.A34,2021-05-08 17:34:15,2021-05-08 22:07:54,2021-05-08 21:57:08.260,2021-05-0
RB.A45,2021-06-08 17:01:00,2021-06-08 21:52:02,2021-06-08 21:44:57.600,2021-06-08 21:44:57.623,2021-06-08 21:44:58.206
RB.A56,2021-07-07 17:53:53,2021-07-07 22:31:39,2021-07-07 22:19:39.960,2021-07-07 22:19:41.251,2021-07-07 22:19:39.942
RB.A67,2021-08-25 16:41:00,2021-08-25 21:17:16,2021-08-25 21:10:34.040,2021-08-25 21:10:35.292,2021-08-25 21:10:34.009
RB.A81,2021-08-30 16:58:21,2021-08-30 21:31:07,2021-08-30 21:24:42.340,2021-08-30 21:24:43.565,2021-08-30 21:24:42.412
\ No newline at end of file
RB.A81,2021-08-30 16:58:21,2021-08-30 21:31:07,2021-08-30 21:24:42.340,2021-08-30 21:24:43.565,2021-08-30 21:24:42.412
RB.A12,2022-02-28 17:52:18,2022-02-28 22:24:28,2022-02-28 22:17:26.880,2022-02-28 22:17:27.446,2022-02-28 22:17:26.950
RB.A23,2022-04-12 06:47:25,2022-04-12 11:16:03,2022-04-12 11:09:41.500,2022-04-12 11:09:42.077,2022-04-12 11:09:41.574
RB.A34,2022-02-25 17:26:49,2022-02-25 21:56:55,2022-02-25 21:50:44.820,2022-02-25 21:50:45.386,2022-02-25 21:50:44.887
RB.A45,2022-02-18 17:50:46,2022-02-18 22:45:50,2022-02-18 22:36:32.600,2022-02-18 22:36:33.162,2022-02-18 22:36:32.667
RB.A56,2022-02-25 17:21:41,2022-02-25 21:51:34,2022-02-25 21:45:01.800,2022-02-25 21:45:02.366,2022-02-25 21:45:01.867
RB.A67,2022-03-04 17:28:54,2022-03-04 22:08:31,2022-03-04 21:55:30.760,2022-03-04 21:55:31.336,2022-03-04 21:55:30.830
RB.A78,2022-03-03 17:25:47,2022-03-03 18:03:46,2022-03-03 17:56:26.420,2022-03-03 17:56:26.985,2022-03-03 17:56:26.487
RB.A81,2022-03-02 18:10:15,2022-03-02 22:45:34,2022-03-02 22:37:17.900,2022-03-02 22:37:18.460,2022-03-02 22:37:17.961
\ No newline at end of file
......@@ -30,4 +30,20 @@ RQF.A67,2021-08-08 10:45:45,2021-08-08 15:26:35,2021-08-08 15:23:11.720,2021-08-
RQD.A78,2021-04-23 15:04:08,2021-04-23 19:45:45,2021-04-23 19:42:06.360,2021-04-23 19:42:06.446
RQF.A78,2021-04-23 15:04:08,2021-04-23 19:45:46,2021-04-23 19:42:06.360,2021-04-23 19:42:06.446
RQD.A81,2021-05-31 18:07:50,2021-05-31 22:52:26,2021-05-31 22:48:51.820,2021-05-31 22:48:51.898
RQF.A81,2021-05-31 18:07:50,2021-05-31 22:52:27,2021-05-31 22:48:51.820,2021-05-31 22:48:51.897
\ No newline at end of file
RQF.A81,2021-05-31 18:07:50,2021-05-31 22:52:27,2021-05-31 22:48:51.820,2021-05-31 22:48:51.897
RQD.A12,2022-02-25 17:29:55,2022-02-25 22:09:13,2022-02-25 22:05:52.620,2022-02-25 22:05:52.695
RQF.A12,2022-02-25 17:29:55,2022-02-25 22:09:15,2022-02-25 22:05:52.620,2022-02-25 22:05:52.695
RQD.A23,2022-04-12 13:43:23,2022-04-12 18:22:47,2022-04-12 18:19:35.240,2022-04-12 18:19:35.324
RQF.A23,2022-04-12 13:43:23,2022-04-12 18:22:48,2022-04-12 18:19:35.240,2022-04-12 18:19:35.325
RQD.A34,2022-02-18 17:32:17,2022-02-18 22:36:33,2022-02-18 22:11:45.080,2022-02-18 22:11:45.161
RQF.A34,2022-02-18 17:32:17,2022-02-18 22:36:32,2022-02-18 22:11:45.080,2022-02-18 22:11:45.160
RQF.A45,2022-02-22 17:24:51,2022-02-22 22:40:48,2022-02-22 22:24:24.100,2022-02-22 22:24:24.178
RQD.A45,2022-02-22 17:24:51,2022-02-22 22:40:47,2022-02-22 22:24:24.100,2022-02-22 22:24:24.179
RQD.A56,2022-03-03 17:49:07,2022-03-03 22:29:26,2022-03-03 22:24:30.920,2022-03-03 22:24:31.004
RQF.A56,2022-03-03 17:49:07,2022-03-03 22:29:26,2022-03-03 22:24:30.920,2022-03-03 22:24:31.004
RQD.A67,2022-02-25 17:43:53,2022-02-25 22:25:00,2022-02-25 22:20:44.160,2022-02-25 22:20:44.243
RQF.A67,2022-02-25 17:43:53,2022-02-25 22:25:01,2022-02-25 22:20:44.160,2022-02-25 22:20:44.243
RQD.A78,2022-02-24 17:41:19,2022-02-24 22:21:39,2022-02-24 22:18:00.300,2022-02-24 22:18:00.374
RQF.A78,2022-02-24 17:41:19,2022-02-24 22:21:40,2022-02-24 22:18:00.300,2022-02-24 22:18:00.374
RQF.A81,2022-02-25 17:41:31,2022-02-25 22:22:50,2022-02-25 22:19:07.160,2022-02-25 22:19:07.249
RQD.A81,2022-02-25 17:41:31,2022-02-25 22:22:49,2022-02-25 22:19:07.160,2022-02-25 22:19:07.249
\ No newline at end of file
......@@ -15,7 +15,7 @@ REQUIREMENTS: dict = {
'pandas',
'scipy',
'matplotlib',
'sklearn',
'scikit-learn',
'display',
'IPython',
'ipywidgets',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment