Commit 1c403608 authored by Thibaud Marie Eric Buffet's avatar Thibaud Marie Eric Buffet
Browse files

Merge branch 'dev' into 'master'

SIGMON-53 adapt all notebooks to refactoring

See merge request !14
parents 7df89bc0 a4990ea7
Pipeline #2570494 passed with stage
in 13 seconds
__version__ = "1.5.58"
__version__ = "1.5.59"
......@@ -345,11 +345,11 @@
%% Cell type:code id: tags:
``` python
if u_hds_dfs:
analysis.analyze_qh(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
analysis.analyze_single_qh_voltage_with_ref(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
else:
print('No Quench Heater discharges!')
```
%% Cell type:markdown id: tags:
......
......@@ -310,11 +310,11 @@
%% Cell type:code id: tags:
``` python
if u_hds_dfs:
analysis.analyze_qh(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
analysis.analyze_single_qh_voltage_with_ref(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
else:
print('No Quench Heater discharges!')
```
%% Cell type:markdown id: tags:
......
......@@ -388,11 +388,11 @@
%% Cell type:code id: tags:
``` python
if u_hds_dfs:
analysis.analyze_qh(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
analysis.analyze_single_qh_voltage_with_ref(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
else:
print('No Quench Heater discharges!')
```
%% Cell type:code id: tags:
......
......@@ -344,11 +344,11 @@
%% Cell type:code id: tags:
``` python
if u_hds_dfs:
analysis.analyze_qh(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
analysis.analyze_single_qh_voltage_with_ref(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
else:
print('No Quench Heater discharges!')
```
%% Cell type:markdown id: tags:
......
......@@ -311,11 +311,11 @@
%% Cell type:code id: tags:
``` python
if u_hds_dfs:
ipq_analysis.analyze_qh(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
ipq_analysis.analyze_single_qh_voltage_with_ref(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
else:
print('No Quench Heater discharges!')
```
%% Cell type:markdown id: tags:
......
......@@ -443,11 +443,11 @@
%% Cell type:code id: tags:
``` python
if u_hds_dfs:
ipq_analysis.analyze_qh(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
ipq_analysis.analyze_single_qh_voltage_with_ref(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
else:
print('No Quench Heater discharges!')
```
%% Cell type:markdown id: tags:
......
......@@ -395,11 +395,11 @@
%% Cell type:code id: tags:
``` python
if u_hds_dfs:
it_analysis.analyze_qh(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
it_analysis.analyze_single_qh_voltage_with_ref(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
else:
print('No Quench Heater discharges!')
```
%% Cell type:markdown id: tags:
......
......@@ -441,11 +441,11 @@
%% Cell type:code id: tags:
``` python
if u_hds_dfs:
it_analysis.analyze_qh(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
it_analysis.analyze_single_qh_voltage_with_ref(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
else:
print('No Quench Heater discharges!')
```
%% Cell type:markdown id: tags:
......
......@@ -488,11 +488,11 @@
%% Cell type:code id: tags:
``` python
if u_hds_dfs:
it_analysis.analyze_qh(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
it_analysis.analyze_single_qh_voltage_with_ref(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)
else:
print('No Quench Heater discharges!')
```
%% Cell type:markdown id: tags:
......
......@@ -77,11 +77,14 @@
``` python
index = 0
for u_hds_dfs, u_hds_ref_dfs in zip(u_hds_dfss, u_hds_ref_dfss):
print(index, qh_pm_search.source_timestamp_df.loc[index, 'timestamp'])
ipd_analysis.analyze_qh(qh_pm_search.get_circuit_name(), qh_pm_search.source_timestamp_df.loc[index, 'timestamp'], u_hds_dfs, u_hds_ref_dfs, nominal_voltage=qh_pm_search.get_discharge_level())
if u_hds_dfs:
ipd_analysis.analyze_single_qh_voltage_with_ref(qh_pm_search.get_circuit_name(), qh_pm_search.source_timestamp_df.loc[index, 'timestamp'], u_hds_dfs, u_hds_ref_dfs, nominal_voltage=qh_pm_search.get_discharge_level())
else:
print(f"No Quench Heater Discharges !")
index += 1
```
%% Cell type:markdown id: tags:
......
......@@ -78,11 +78,14 @@
``` python
index = 0
for u_hds_dfs, u_hds_ref_dfs in zip(u_hds_dfss, u_hds_ref_dfss):
print(index, qh_pm_search.source_timestamp_df.loc[index, 'timestamp'])
ipq_analysis.analyze_qh(qh_pm_search.get_circuit_name(), qh_pm_search.source_timestamp_df.loc[index, 'timestamp'], u_hds_dfs, u_hds_ref_dfs, nominal_voltage=qh_pm_search.get_discharge_level())
if u_hds_dfs:
ipq_analysis.analyze_single_qh_voltage_with_ref(qh_pm_search.get_circuit_name(), qh_pm_search.source_timestamp_df.loc[index, 'timestamp'], u_hds_dfs, u_hds_ref_dfs, nominal_voltage=qh_pm_search.get_discharge_level())
else:
print(f"No Quench Heater Discharges!")
index += 1
```
%% Cell type:markdown id: tags:
......
......@@ -77,12 +77,15 @@
%% Cell type:code id: tags:
``` python
index = 0
for u_hds_dfs, u_hds_ref_dfs in zip(u_hds_dfss, u_hds_ref_dfss):
print(index, qh_pm_search.source_timestamp_df.loc[index, 'timestamp'])
it_analysis.analyze_qh(qh_pm_search.get_circuit_name(), qh_pm_search.source_timestamp_df.loc[index, 'timestamp'], u_hds_dfs, u_hds_ref_dfs, nominal_voltage=qh_pm_search.get_discharge_level())
if u_hds_dfs:
print(index, qh_pm_search.source_timestamp_df.loc[index, 'timestamp'])
it_analysis.analyze_single_qh_voltage_with_ref(qh_pm_search.get_circuit_name(), qh_pm_search.source_timestamp_df.loc[index, 'timestamp'], u_hds_dfs, u_hds_ref_dfs, nominal_voltage=qh_pm_search.get_discharge_level())
else:
print(f"No Quench Heater discharges for {qh_pm_search.get_circuit_name()} on time {qh_pm_search.source_timestamp_df.loc[index, 'timestamp']}!")
index += 1
```
%% Cell type:markdown id: tags:
......
......@@ -54,7 +54,7 @@
"cell_type": "code",
"execution_count": null,
"metadata": {
"scrolled": false
"scrolled": true
},
"outputs": [],
"source": [
......
......@@ -627,12 +627,15 @@
%% Cell type:code id: tags:
``` python
%matplotlib inline
rb_analysis.analyze_qh(source_timestamp_qh_df, u_hds_dfs, i_hds_dfs, u_hds_ref_dfs, i_hds_ref_dfs)
rb_analysis.results_table[['Circuit Name', 'Position', 'Delta_t(iQPS-PIC)', 'I_Q_circ', 'I_Q_M', 'Delta_t(nQPS-PIC)', 'QDS trigger origin', 'QH analysis']]
if u_hds_dfs:
rb_analysis.analyze_single_qh_voltage_current_with_ref(source_timestamp_qh_df, u_hds_dfs, i_hds_dfs, u_hds_ref_dfs, i_hds_ref_dfs)
rb_analysis.results_table[['Circuit Name', 'Position', 'Delta_t(iQPS-PIC)', 'I_Q_circ', 'I_Q_M', 'Delta_t(nQPS-PIC)', 'QDS trigger origin', 'QH analysis']]
else:
print('No Quench Heater discharges!')
```
%% Cell type:markdown id: tags:
## 8.5. Evaluation of Diode Leads Resistance
......
......@@ -612,13 +612,15 @@
%% Cell type:code id: tags:
``` python
rb_analysis.analyze_qh(source_timestamp_qh_df, u_hds_dfs, i_hds_dfs, u_hds_ref_dfs, i_hds_ref_dfs)
rb_analysis.results_table[['Circuit Name', 'Position', 'Delta_t(iQPS-PIC)','I_Q_circ', 'Delta_t(nQPS-PIC)', 'QDS trigger origin', 'QH analysis']]
if u_hds_dfs:
rb_analysis.analyze_single_qh_voltage_current_with_ref(source_timestamp_qh_df, u_hds_dfs, i_hds_dfs, u_hds_ref_dfs, i_hds_ref_dfs)
rb_analysis.results_table[['Circuit Name', 'Position', 'Delta_t(iQPS-PIC)','I_Q_circ', 'Delta_t(nQPS-PIC)', 'QDS trigger origin', 'QH analysis']]
else:
print(f"No quench heater discharges!")
```
%% Cell type:markdown id: tags:
## 8.5. Analysis of Diode Lead Resistance
......
This diff is collapsed.
......@@ -586,17 +586,20 @@
%% Cell type:code id: tags:
``` python
%matplotlib inline
if Time.to_unix_timestamp(timestamp_fgc_rqd) > 1577833200000000000:
from lhcsmapi.analysis.qh.QuenchHeaterAnalysis import QuenchHeaterRbAnalysis
QuenchHeaterRbAnalysis(circuit_type, rq_analysis.results_table).analyze_qh(source_timestamp_qh_rq_df, u_hds_rq_dfs, i_hds_rq_dfs, u_hds_rq_ref_dfs, i_hds_rq_ref_dfs)
else:
rq_analysis.analyze_qh(source_timestamp_qh_rq_df, circuit_type, u_hds_rq_dfs, u_hds_rq_ref_dfs)
if u_hds_rq_dfs:
if Time.to_unix_timestamp(timestamp_fgc_rqd) > 1577833200000000000:
from lhcsmapi.analysis.qh.QuenchHeaterAnalysis import QuenchHeaterRbAnalysis
QuenchHeaterRbAnalysis(circuit_type, rq_analysis.results_table).analyze_single_qh_voltage_current_with_ref(source_timestamp_qh_rq_df, u_hds_rq_dfs, i_hds_rq_dfs, u_hds_rq_ref_dfs, i_hds_rq_ref_dfs)
else:
rq_analysis.analyze_single_qh_voltage_with_ref(source_timestamp_qh_rq_df, circuit_type, u_hds_rq_dfs, u_hds_rq_ref_dfs)
rq_analysis.results_table[['Circuit Name', 'Position', 'Delta_t(iQPS-PIC)','I_Q_RQD', 'I_Q_RQF', 'QH analysis']]
rq_analysis.results_table[['Circuit Name', 'Position', 'Delta_t(iQPS-PIC)','I_Q_RQD', 'I_Q_RQF', 'QH analysis']]
else:
print(f"No Quench heater Discharges!")
```
%% Cell type:markdown id: tags:
## 8.5. Analysis of Diode Lead Resistance
......
......@@ -605,16 +605,19 @@
%% Cell type:code id: tags:
``` python
%matplotlib inline
if Time.to_unix_timestamp(timestamp_fgc_rqd) > 1577833200000000000:
rq_analysis.analyze_qh_voltage_current(source_timestamp_qh_rq_df, u_hds_rq_dfs, i_hds_rq_dfs, u_hds_rq_ref_dfs, i_hds_rq_ref_dfs)
else:
rq_analysis.analyze_qh(source_timestamp_qds_rq_df, circuit_type, u_hds_rq_dfs, u_hds_rq_ref_dfs)
if u_hds_rq_dfs:
if Time.to_unix_timestamp(timestamp_fgc_rqd) > 1577833200000000000:
rq_analysis.analyze_single_qh_voltage_current_with_ref(source_timestamp_qh_rq_df, u_hds_rq_dfs, i_hds_rq_dfs, u_hds_rq_ref_dfs, i_hds_rq_ref_dfs)
else:
rq_analysis.analyze_single_qh_voltage_with_ref(source_timestamp_qds_rq_df, circuit_type, u_hds_rq_dfs, u_hds_rq_ref_dfs)
rq_analysis.results_table[['Circuit Name', 'Position', 'Date (FGC)', 'Time (FGC)', 'I_Q_MQD', 'I_Q_MQF', 'QH analysis']]
rq_analysis.results_table[['Circuit Name', 'Position', 'Date (FGC)', 'Time (FGC)', 'I_Q_MQD', 'I_Q_MQF', 'QH analysis']]
else:
print(f"No Quench Heater Discharges!")
```
%% Cell type:markdown id: tags:
## 8.5. Analysis of Diode Lead Resistance
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment