Commit 021527ac authored by Thibaud Marie Eric Buffet's avatar Thibaud Marie Eric Buffet
Browse files

Merge branch 'dev' into 'master'

Dev

See merge request !16
parents 96f12e76 0c42d998
Pipeline #2571021 passed with stage
in 13 seconds
__version__ = "1.5.60"
__version__ = "1.5.61"
......@@ -567,7 +567,7 @@
"outputs": [],
"source": [
"if u_hds_dfs:\n",
" ipq_analysis.analyze_qh(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)\n",
" ipq_analysis.analyze_single_qh_voltage_with_ref(circuit_name, timestamp_qds, u_hds_dfs, u_hds_ref_dfs)\n",
"else:\n",
" print('No Quench Heater discharges!')"
]
......
......@@ -877,7 +877,7 @@
"source": [
"%matplotlib inline\n",
"if u_hds_dfs:\n",
" 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)\n",
" rb_analysis.analyze_multi_qh_voltage_current_with_ref(source_timestamp_qh_df, u_hds_dfs, i_hds_dfs, u_hds_ref_dfs, i_hds_ref_dfs, current_offset=0.085)\n",
" 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']]\n",
"else:\n",
" print('No Quench Heater discharges!')"
......
......@@ -821,7 +821,7 @@
"outputs": [],
"source": [
"if u_hds_dfs:\n",
" 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)\n",
" rb_analysis.analyze_multi_qh_voltage_current_with_ref(source_timestamp_qh_df, u_hds_dfs, i_hds_dfs, u_hds_ref_dfs, i_hds_ref_dfs, current_offset=0.085)\n",
" rb_analysis.results_table[['Circuit Name', 'Position', 'Delta_t(iQPS-PIC)','I_Q_circ', 'Delta_t(nQPS-PIC)', 'QDS trigger origin', 'QH analysis']]\n",
"else:\n",
" print(f\"No quench heater discharges!\")"
......
......@@ -832,7 +832,7 @@
"if u_hds_rq_dfs:\n",
" if Time.to_unix_timestamp(timestamp_fgc_rqd) > 1577833200000000000:\n",
" from lhcsmapi.analysis.qh.QuenchHeaterAnalysis import QuenchHeaterRbAnalysis\n",
" 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)\n",
" QuenchHeaterRbAnalysis(circuit_type, rq_analysis.results_table).analyze_multi_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, current_offset=0.085)\n",
" else:\n",
" rq_analysis.analyze_single_qh_voltage_with_ref(source_timestamp_qh_rq_df, circuit_type, u_hds_rq_dfs, u_hds_rq_ref_dfs)\n",
"\n",
......
......@@ -839,7 +839,7 @@
"%matplotlib inline\n",
"if u_hds_rq_dfs:\n",
" if Time.to_unix_timestamp(timestamp_fgc_rqd) > 1577833200000000000:\n",
" 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)\n",
" rq_analysis.analyze_multi_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, current_offset=0.085)\n",
" else:\n",
" rq_analysis.analyze_single_qh_voltage_with_ref(source_timestamp_qds_rq_df, circuit_type, u_hds_rq_dfs, u_hds_rq_ref_dfs)\n",
"\n",
......
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