From a2ee3fe15ab0a704fb75f1d1fc062e50dae4a66a Mon Sep 17 00:00:00 2001
From: 29iduser <you@example.com>
Date: Tue, 18 Oct 2022 16:37:56 -0500
Subject: [PATCH] debug sotw
---
iexcode/IEX_dictionaries/Dict_IDCal.txt | 27 --
iexcode/IEX_dictionaries/Dict_IDCal_QP70.txt | 2 -
iexcode/IEX_dictionaries/Dict_M0.txt | 5 -
iexcode/IEX_dictionaries/Dict_M1.txt | 8 -
iexcode/IEX_dictionaries/Dict_M3.txt | 2 -
iexcode/IEX_dictionaries/Dict_Slit.txt | 181 --------
iexcode/IEX_dictionaries/Dict_TempDiode.txt | 1 -
.../IEX_dictionaries/DiodeResponsivityCurve | 200 ---------
.../IEX_dictionaries/DiodeResponsivityCurve_2 | 200 ---------
iexcode/IEX_dictionaries/Flux_Curves.txt | 420 ------------------
iexcode/IEX_dictionaries/Flux_Curves_QP70.txt | 42 --
iexcode/IEX_dictionaries/M0M1_positions.py | 3 -
iexcode/IEX_dictionaries/calibrationToFix.txt | 11 -
iexcode/IEX_dictionaries/mono_parameters.txt | 10 -
iexcode/instruments/ARPES.py | 1 +
iexcode/instruments/IEX_BL_config.py | 1 +
iexcode/instruments/IEX_VPU.py | 1 +
.../Keithley_current_amplifiers.py | 5 +-
iexcode/instruments/diagnostics.py | 26 +-
iexcode/instruments/scanRecord.py | 2 +-
iexcode/instruments/slits.py | 20 +-
iexcode/instruments/utilities.py | 28 +-
iexcode/instruments/xrays.py | 26 +-
iexcode/macros/Kappa_optimization.py | 14 +-
iexcode/macros/commissioning.py | 61 ++-
iexcode/macros/quick_plot.py | 188 ++++----
iexcode/macros/start_of_the_week.py | 86 ++--
27 files changed, 259 insertions(+), 1312 deletions(-)
delete mode 100644 iexcode/IEX_dictionaries/Dict_IDCal.txt
delete mode 100644 iexcode/IEX_dictionaries/Dict_IDCal_QP70.txt
delete mode 100644 iexcode/IEX_dictionaries/Dict_M0.txt
delete mode 100644 iexcode/IEX_dictionaries/Dict_M1.txt
delete mode 100644 iexcode/IEX_dictionaries/Dict_M3.txt
delete mode 100644 iexcode/IEX_dictionaries/Dict_Slit.txt
delete mode 100644 iexcode/IEX_dictionaries/Dict_TempDiode.txt
delete mode 100644 iexcode/IEX_dictionaries/DiodeResponsivityCurve
delete mode 100644 iexcode/IEX_dictionaries/DiodeResponsivityCurve_2
delete mode 100644 iexcode/IEX_dictionaries/Flux_Curves.txt
delete mode 100644 iexcode/IEX_dictionaries/Flux_Curves_QP70.txt
delete mode 100644 iexcode/IEX_dictionaries/M0M1_positions.py
delete mode 100644 iexcode/IEX_dictionaries/calibrationToFix.txt
delete mode 100644 iexcode/IEX_dictionaries/mono_parameters.txt
diff --git a/iexcode/IEX_dictionaries/Dict_IDCal.txt b/iexcode/IEX_dictionaries/Dict_IDCal.txt
deleted file mode 100644
index d3b7d34..0000000
--- a/iexcode/IEX_dictionaries/Dict_IDCal.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-======= 20210408:
-{'HEG': {0: [[600.0, [-6635.813431810828, 53.075898114105726, -0.15253171108859886, 0.00019792480095656869, -9.598209896301075e-08]], [1950.0, [46.600135556920925, 0.8412063733137993, 0.00023492720237763438, -1.2593652551917328e-07, 2.5435326557098538e-11]]], 3: [[400.0, [1051.452570904546, -13.099314837713008, 0.06939879665006896, -0.00014784669111041307, 1.155031075284652e-07]], [600.0, [2782.786054275039, -21.145755715684032, 0.06554921272398154, -8.534237586539917e-05, 4.134061079155964e-08]], [1950.0, [87.23060103156234, 0.7171860430279529, 0.0003793918782124725, -1.9605428816497513e-07, 3.6770897051532086e-11]]], 2: [[590.0, [-12422.076427583952, 100.54771064816772, -0.29845648627641835, 0.00039688772576782855, -1.97439876026206e-07]], [1940.0, [-33.02431482418943, 1.1302724323594304, -0.00013479679549416608, 7.22272393581498e-08, -1.373032035520199e-11]]], 1: [[600.0, [-4701.14124376318, 38.11250082824693, -0.10953080869095329, 0.00014349645302935956, -7.03019927601252e-08]], [1950.0, [84.53488099145231, 0.7066601865786498, 0.00043283422433330405, -2.2608518373215027e-07, 4.202604094132355e-11]]]}, 'MEG': {0: [[600.0, [-5.94257709e+03, 4.83142929e+01, -1.40776556e-01, 1.85809382e-04,-9.17570684e-08]], [1900.0, [120.48660483356667, 0.5730901209923781, 0.0005878274491379978, -3.237518769395626e-07, 6.578470645318609e-11]], [2450.0, [-861236.5488172219, 1692.5132268182851, -1.2423466873397095, 0.00040435487123940126, -4.9199035821220396e-08]]], 3: [[350.0, [ 1.29955075e+03, -1.51058939e+01, 7.30495977e-02, -1.42335671e-04,1.00248119e-07]], [600.0, [ 1.56157353e+02, 3.36244395e-01, 2.51121782e-04, 2.14546965e-06, -2.26975845e-09]], [1900.0, [182.12010345268018, 0.35919202965098807, 0.0008707482678487033, -4.856922998327794e-07, 9.884030291073737e-11]], [2450.0, [-679879.9418255178, 1343.4719860308003, -0.9910723460051563, 0.00032416433932345637, -3.962726476099227e-08]]], 2: [[590.0, [-5012.940342322967, 40.90754759075464, -0.11882247811910264, 0.0001569980318593441, -7.761119020096338e-08]], [1890.0, [91.60119828336364, 0.6656924204319927, 0.0004832519962652505, -2.757432638354398e-07, 5.703445281307984e-11]], [2440.0, [-714890.9962893045, 1416.2262295207256, -1.0473031488528242, 0.00034332048746509047, -4.205442003546835e-08]]], 1: [[600.0, [-8.23417867e+02, 5.78831891e+00, -9.17524831e-03, 5.90781467e-06]], [1900.0, [129.0956307507799, 0.5398695804747401, 0.0006597026712875963, -3.5782948211437904e-07, 6.972425989874214e-11]], [2450.0, [444764.6379492582, -918.182910481471, 0.7119893610136518, -0.0002449458846156531, 3.158154965241037e-08]]]}}
-
-======= 20210325:
-{'HEG': {0: [[600.0, [-6635.813431810828, 53.075898114105726, -0.15253171108859886, 0.00019792480095656869, -9.598209896301075e-08]], [1950.0, [46.600135556920925, 0.8412063733137993, 0.00023492720237763438, -1.2593652551917328e-07, 2.5435326557098538e-11]]], 3: [[400.0, [1051.452570904546, -13.099314837713008, 0.06939879665006896, -0.00014784669111041307, 1.155031075284652e-07]], [600.0, [2782.786054275039, -21.145755715684032, 0.06554921272398154, -8.534237586539917e-05, 4.134061079155964e-08]], [1950.0, [87.23060103156234, 0.7171860430279529, 0.0003793918782124725, -1.9605428816497513e-07, 3.6770897051532086e-11]]], 2: [[590.0, [-12422.076427583952, 100.54771064816772, -0.29845648627641835, 0.00039688772576782855, -1.97439876026206e-07]], [1940.0, [-33.02431482418943, 1.1302724323594304, -0.00013479679549416608, 7.22272393581498e-08, -1.373032035520199e-11]]], 1: [[600.0, [-4701.14124376318, 38.11250082824693, -0.10953080869095329, 0.00014349645302935956, -7.03019927601252e-08]], [1950.0, [84.53488099145231, 0.7066601865786498, 0.00043283422433330405, -2.2608518373215027e-07, 4.202604094132355e-11]]]}, 'MEG': {0: [[600.0, [-5.94257709e+03, 4.83142929e+01, -1.40776556e-01, 1.85809382e-04,-9.17570684e-08]], [1900.0, [120.48660483356667, 0.5730901209923781, 0.0005878274491379978, -3.237518769395626e-07, 6.578470645318609e-11]], [2450.0, [-861236.5488172219, 1692.5132268182851, -1.2423466873397095, 0.00040435487123940126, -4.9199035821220396e-08]]], 3: [[400.0, [2847.79940016946, -36.333603982010075, 0.18104460124913768, -0.0003840780707796322, 3.0129211549627434e-07]], [600.0, [5465.629361402122, -44.12377192190018, 0.13886417042191168, -0.0001885833582746921, 9.547898180355825e-08]], [1900.0, [182.12010345268018, 0.35919202965098807, 0.0008707482678487033, -4.856922998327794e-07, 9.884030291073737e-11]], [2450.0, [-679879.9418255178, 1343.4719860308003, -0.9910723460051563, 0.00032416433932345637, -3.962726476099227e-08]]], 2: [[590.0, [-5012.940342322967, 40.90754759075464, -0.11882247811910264, 0.0001569980318593441, -7.761119020096338e-08]], [1890.0, [91.60119828336364, 0.6656924204319927, 0.0004832519962652505, -2.757432638354398e-07, 5.703445281307984e-11]], [2440.0, [-714890.9962893045, 1416.2262295207256, -1.0473031488528242, 0.00034332048746509047, -4.205442003546835e-08]]], 1: [[600.0, [-8.23417867e+02, 5.78831891e+00, -9.17524831e-03, 5.90781467e-06]], [1900.0, [129.0956307507799, 0.5398695804747401, 0.0006597026712875963, -3.5782948211437904e-07, 6.972425989874214e-11]], [2450.0, [444764.6379492582, -918.182910481471, 0.7119893610136518, -0.0002449458846156531, 3.158154965241037e-08]]]}}
-
-======= 20200621:
-{'HEG': {0: [[600.0, [-6635.813431810828, 53.075898114105726, -0.15253171108859886, 0.00019792480095656869, -9.598209896301075e-08]], [1950.0, [46.600135556920925, 0.8412063733137993, 0.00023492720237763438, -1.2593652551917328e-07, 2.5435326557098538e-11]]], 3: [[400.0, [1051.452570904546, -13.099314837713008, 0.06939879665006896, -0.00014784669111041307, 1.155031075284652e-07]], [600.0, [2782.786054275039, -21.145755715684032, 0.06554921272398154, -8.534237586539917e-05, 4.134061079155964e-08]], [1950.0, [87.23060103156234, 0.7171860430279529, 0.0003793918782124725, -1.9605428816497513e-07, 3.6770897051532086e-11]]], 2: [[590.0, [-12422.076427583952, 100.54771064816772, -0.29845648627641835, 0.00039688772576782855, -1.97439876026206e-07]], [1940.0, [-33.02431482418943, 1.1302724323594304, -0.00013479679549416608, 7.22272393581498e-08, -1.373032035520199e-11]]], 1: [[600.0, [-4701.14124376318, 38.11250082824693, -0.10953080869095329, 0.00014349645302935956, -7.03019927601252e-08]], [1950.0, [84.53488099145231, 0.7066601865786498, 0.00043283422433330405, -2.2608518373215027e-07, 4.202604094132355e-11]]]}, 'MEG': {0: [[600.0, [-5436.760853858342, 43.96983227683935, -0.12687747514944603, 0.00016616428936737506, -8.139167807653272e-08]], [1900.0, [120.48660483356667, 0.5730901209923781, 0.0005878274491379978, -3.237518769395626e-07, 6.578470645318609e-11]], [2450.0, [-861236.5488172219, 1692.5132268182851, -1.2423466873397095, 0.00040435487123940126, -4.9199035821220396e-08]]], 3: [[400.0, [2847.79940016946, -36.333603982010075, 0.18104460124913768, -0.0003840780707796322, 3.0129211549627434e-07]], [600.0, [5465.629361402122, -44.12377192190018, 0.13886417042191168, -0.0001885833582746921, 9.547898180355825e-08]], [1900.0, [182.12010345268018, 0.35919202965098807, 0.0008707482678487033, -4.856922998327794e-07, 9.884030291073737e-11]], [2450.0, [-679879.9418255178, 1343.4719860308003, -0.9910723460051563, 0.00032416433932345637, -3.962726476099227e-08]]], 2: [[590.0, [-5012.940342322967, 40.90754759075464, -0.11882247811910264, 0.0001569980318593441, -7.761119020096338e-08]], [1890.0, [91.60119828336364, 0.6656924204319927, 0.0004832519962652505, -2.757432638354398e-07, 5.703445281307984e-11]], [2440.0, [-714890.9962893045, 1416.2262295207256, -1.0473031488528242, 0.00034332048746509047, -4.205442003546835e-08]]], 1: [[600.0, [-3621.195557803563, 29.38209496572412, -0.08337726780845282, 0.00010909919798197781, -5.3540413516786254e-08]], [1900.0, [129.0956307507799, 0.5398695804747401, 0.0006597026712875963, -3.5782948211437904e-07, 6.972425989874214e-11]], [2450.0, [444764.6379492582, -918.182910481471, 0.7119893610136518, -0.0002449458846156531, 3.158154965241037e-08]]]}}
-
-======= 20200622:
-{'HEG': {0: [[600.0, [-6635.813431810828, 53.075898114105726, -0.15253171108859886, 0.00019792480095656869, -9.598209896301075e-08]], [1950.0, [46.600135556920925, 0.8412063733137993, 0.00023492720237763438, -1.2593652551917328e-07, 2.5435326557098538e-11]]], 3: [[400.0, [1051.452570904546, -13.099314837713008, 0.06939879665006896, -0.00014784669111041307, 1.155031075284652e-07]], [600.0, [2782.786054275039, -21.145755715684032, 0.06554921272398154, -8.534237586539917e-05, 4.134061079155964e-08]], [1950.0, [87.23060103156234, 0.7171860430279529, 0.0003793918782124725, -1.9605428816497513e-07, 3.6770897051532086e-11]]], 2: [[590.0, [-12422.076427583952, 100.54771064816772, -0.29845648627641835, 0.00039688772576782855, -1.97439876026206e-07]], [1940.0, [-33.02431482418943, 1.1302724323594304, -0.00013479679549416608, 7.22272393581498e-08, -1.373032035520199e-11]]], 1: [[600.0, [-4701.14124376318, 38.11250082824693, -0.10953080869095329, 0.00014349645302935956, -7.03019927601252e-08]], [1950.0, [84.53488099145231, 0.7066601865786498, 0.00043283422433330405, -2.2608518373215027e-07, 4.202604094132355e-11]]]}, 'MEG': {0: [[600.0, [-5436.760853858342, 43.96983227683935, -0.12687747514944603, 0.00016616428936737506, -8.139167807653272e-08]], [1900.0, [120.48660483356667, 0.5730901209923781, 0.0005878274491379978, -3.237518769395626e-07, 6.578470645318609e-11]], [2200.0, [871551.4774974757, -1768.0310136624694, 1.3455105429844192, -0.0004544802466941742, 5.7523770112673466e-08]], [2450.0, [172814587.77370718, -314312.8362227405, 214.2281301218352, -0.06484750125371046, 7.355540503587943e-06]]], 3: [[400.0, [2847.79940016946, -36.333603982010075, 0.18104460124913768, -0.0003840780707796322, 3.0129211549627434e-07]], [600.0, [5465.629361402122, -44.12377192190018, 0.13886417042191168, -0.0001885833582746921, 9.547898180355825e-08]], [1900.0, [182.12010345268018, 0.35919202965098807, 0.0008707482678487033, -4.856922998327794e-07, 9.884030291073737e-11]], [2200.0, [362187.83689184266, -726.3913418571299, 0.54768053740453, -0.00018321591051596335, 2.2978901938142268e-08]], [2450.0, [163215386.96623987, -297217.6590198315, 202.81927145830707, -0.06146587413251898, 6.9799301086463304e-06]]], 2: [[590.0, [-5012.940342322967, 40.90754759075464, -0.11882247811910264, 0.0001569980318593441, -7.761119020096338e-08]], [1890.0, [91.60119828336364, 0.6656924204319927, 0.0004832519962652505, -2.757432638354398e-07, 5.703445281307984e-11]], [2190.0, [45693.94622214341, -75.57511935673534, 0.04636435676939522, -1.1778591339230115e-05, 1.017435459087865e-09]], [2440.0, [-192889190.47764766, 346563.0252901632, -233.37468139750922, 0.06980799193170947, -7.826020204253014e-06]]], 1: [[600.0, [-3621.195557803563, 29.38209496572412, -0.08337726780845282, 0.00010909919798197781, -5.3540413516786254e-08]], [1900.0, [129.0956307507799, 0.5398695804747401, 0.0006597026712875963, -3.5782948211437904e-07, 6.972425989874214e-11]], [2200.0, [-14542.156374389713, 38.281229302666205, -0.03424149697876769, 1.3575206568333219e-05, -1.972456982132864e-09]], [2450.0, [446086157.2495124, -829455.8119188424, 578.3010967459121, -0.17917865071552705, 2.081637200558685e-05]]]}}
-
-======= 20200706:
-{'HEG': {0: [[600, [-6635.813431810828, 53.075898114105726, -0.15253171108859886, 0.00019792480095656869, -9.598209896301075e-08]], [3000, [46.600135556920925, 0.8412063733137993, 0.00023492720237763438, -1.2593652551917328e-07, 2.5435326557098538e-11]]], 3: [[400, [1051.452570904546, -13.099314837713008, 0.06939879665006896, -0.00014784669111041307, 1.155031075284652e-07]], [600, [2782.786054275039, -21.145755715684032, 0.06554921272398154, -8.534237586539917e-05, 4.134061079155964e-08]], [3000, [87.23060103156234, 0.7171860430279529, 0.0003793918782124725, -1.9605428816497513e-07, 3.6770897051532086e-11]]], 2: [[590, [-12422.076427583952, 100.54771064816772, -0.29845648627641835, 0.00039688772576782855, -1.97439876026206e-07]], [3000, [-33.02431482418943, 1.1302724323594304, -0.00013479679549416608, 7.22272393581498e-08, -1.373032035520199e-11]]], 1: [[600, [-4701.14124376318, 38.11250082824693, -0.10953080869095329, 0.00014349645302935956, -7.03019927601252e-08]], [3000, [84.53488099145231, 0.7066601865786498, 0.00043283422433330405, -2.2608518373215027e-07, 4.202604094132355e-11]]]}, 'MEG': {0: [[600, [-5436.760853858342, 43.96983227683935, -0.12687747514944603, 0.00016616428936737506, -8.139167807653272e-08]], [2200, [56.06352322156944, 0.8254716336525104, 0.00023420268295012815, -1.1314108538379183e-07, 2.0621468462144593e-11]], [3000, [172814587.77370718, -314312.8362227405, 214.2281301218352, -0.06484750125371046, 7.355540503587943e-06]]], 3: [[400, [2847.79940016946, -36.333603982010075, 0.18104460124913768, -0.0003840780707796322, 3.0129211549627434e-07]], [600, [5465.629361402122, -44.12377192190018, 0.13886417042191168, -0.0001885833582746921, 9.547898180355825e-08]], [2200, [99.53668134362802, 0.6852352218453821, 0.00041049997712041544, -2.0966225686036783e-07, 3.9272109948245565e-11]], [3000, [163215386.96623987, -297217.6590198315, 202.81927145830707, -0.06146587413251898, 6.9799301086463304e-06]]], 2: [[590, [-5012.940342322967, 40.90754759075464, -0.11882247811910264, 0.0001569980318593441, -7.761119020096338e-08]], [2190, [45.055606320266705, 0.8510934669860255, 0.00021908816244155997, -1.1578973121798198e-07, 2.2181508654369528e-11]], [3000, [-192889190.47764766, 346563.0252901632, -233.37468139750922, 0.06980799193170947, -7.826020204253014e-06]]], 1: [[600, [-3621.195557803563, 29.38209496572412, -0.08337726780845282, 0.00010909919798197781, -5.3540413516786254e-08]], [2200, [98.2725122115956, 0.6600798933531754, 0.0004924159000925939, -2.5906403174375766e-07, 4.8760807025108714e-11]], [3000, [446086157.2495124, -829455.8119188424, 578.3010967459121, -0.17917865071552705, 2.081637200558685e-05]]]}}
-
-======= 20210614:
-{'HEG': {0: [[600, [-6635.813431810828, 53.075898114105726, -0.15253171108859886, 0.00019792480095656869, -9.598209896301075e-08]], [3000, [46.600135556920925, 0.8412063733137993, 0.00023492720237763438, -1.2593652551917328e-07, 2.5435326557098538e-11]]], 3: [[400, [1051.452570904546, -13.099314837713008, 0.06939879665006896, -0.00014784669111041307, 1.155031075284652e-07]], [600, [2782.786054275039, -21.145755715684032, 0.06554921272398154, -8.534237586539917e-05, 4.134061079155964e-08]], [3000, [87.23060103156234, 0.7171860430279529, 0.0003793918782124725, -1.9605428816497513e-07, 3.6770897051532086e-11]]], 2: [[590, [-12422.076427583952, 100.54771064816772, -0.29845648627641835, 0.00039688772576782855, -1.97439876026206e-07]], [3000, [-33.02431482418943, 1.1302724323594304, -0.00013479679549416608, 7.22272393581498e-08, -1.373032035520199e-11]]], 1: [[600.0,[-4765.159827798981,39.08508762376964,-0.11372474852884872,0.00015063687981483728,-7.456557379431018e-08]], [3000, [84.53488099145231, 0.7066601865786498, 0.00043283422433330405, -2.2608518373215027e-07, 4.202604094132355e-11]]]}, 'MEG': {0: [[600.0, [-5940.176848239725, 48.30636368582396, -0.14075467796987542, 0.00018579017325356665, -9.17653113254405e-08]], [2200.0, [20.344164869431648, 0.942351240250947, 0.00010121556917763097, -4.949527030585497e-08, 9.675448511744878e-12]], [3000.0, [-4404763.957023886, 8771.484099309775, -6.96403516159204, 0.0027567541197318075, -5.440997034278868e-07, 4.283864981515836e-11]]], 3: [[600.0, [-634.0261758446517, 7.262520018224911, -0.022419323576083252, 3.49681129089603e-05, -1.999932008653819e-08]], [2200.0, [58.93716149881088, 0.8198484295498225, 0.0002490011121555607, -1.2688431897796926e-07, 2.37752539333468e-11]], [3000.0, [-4631113.606305979, 9166.887699472501, -7.234158616723412, 0.002846359389924523, -5.583729142369206e-07, 4.369437481746841e-11]]], 2: [[600.0, [-604.5006436697821, 3.0530278050672597, 0.0006285185258970196, -7.876285868395855e-06, 6.618688516815772e-09]], [2200.0, [34.67137980324179, 0.8848938354598829, 0.00017775770898386393, -9.469862981232054e-08, 1.8324158207531115e-11]], [3000.0, [-2860246.725610371, 5647.919349714751, -4.443144683580959, 0.0017419171106990991, -3.403199365489676e-07, 2.651081000072826e-11]]], 1: [[600.0, [-3677.005333394253, 29.772255818860682, -0.0843978889369737, 0.00011023738262993015, -5.399238835077749e-08]], [2200.0, [46.243321909129264, 0.8454613578261618, 0.00024604317670495594, -1.1956387793694198e-07, 2.0350719268411266e-11]], [3000.0, [-3805516.9914133963, 7585.769563793042, -6.02924886735418, 0.0023897269861474146, -4.7232898993001013e-07, 3.724663288363978e-11]]]}}
-
-======= 20220209:
-{'HEG': {0: [[600, [-6635.813431810828, 53.075898114105726, -0.15253171108859886, 0.00019792480095656869, -9.598209896301075e-08]], [3000, [46.600135556920925, 0.8412063733137993, 0.00023492720237763438, -1.2593652551917328e-07, 2.5435326557098538e-11]]], 3: [[400, [1051.452570904546, -13.099314837713008, 0.06939879665006896, -0.00014784669111041307, 1.155031075284652e-07]], [600, [2782.786054275039, -21.145755715684032, 0.06554921272398154, -8.534237586539917e-05, 4.134061079155964e-08]], [3000, [87.23060103156234, 0.7171860430279529, 0.0003793918782124725, -1.9605428816497513e-07, 3.6770897051532086e-11]]], 2: [[590, [-12422.076427583952, 100.54771064816772, -0.29845648627641835, 0.00039688772576782855, -1.97439876026206e-07]], [3000, [-33.02431482418943, 1.1302724323594304, -0.00013479679549416608, 7.22272393581498e-08, -1.373032035520199e-11]]], 1: [[600.0, [-4765.159827798981, 39.08508762376964, -0.11372474852884872, 0.00015063687981483728, -7.456557379431018e-08]], [3000, [84.53488099145231, 0.7066601865786498, 0.00043283422433330405, -2.2608518373215027e-07, 4.202604094132355e-11]]]}, 'MEG': {0: [[600.0, [-3934.5121751152246, 33.06771682164138, -0.09748027014943843, 0.00013134538357912652, -6.6156258423234e-08]], [2200.0, [37.641114276917925, 0.8805247038981882, 0.000177319710501711, -8.681533726733966e-08, 1.637418437746742e-11]], [2475.0, [37283044.37499022, -66946.28212137106, 45.04278902689384, -0.013457675462255252, 1.506533154743431e-06]], [2975.0, [17.45662531316536, 0.9879977565183667, -1.4023065577422464e-05, 4.13598612141151e-08, -1.10678651468184e-11]]], 3: [[600.0, [-327.2776484031912, 4.250523583656505, -0.011420286241297649, 1.7377653116404346e-05, -9.625686600221612e-09]], [2200.0, [115.13378003090979, 0.62518020085401, 0.000493471405264986, -2.541590613504621e-07, 4.7566608931331754e-11]], [2475.0, [67723621.24081981, -121554.95831214589, 81.75236674834781, -0.02441691402082744, 2.7324624578449198e-06]], [2975.0, [282015.3094934323, -421.5392502375951, 0.2368599641813117, -5.886206039411446e-05, 5.4722692634234e-09]]], 2: [[600.0, [-604.5006436697821, 3.0530278050672597, 0.0006285185258970196, -7.876285868395855e-06, 6.618688516815772e-09]], [2200.0, [34.67137980324179, 0.8848938354598829, 0.00017775770898386393, -9.469862981232054e-08, 1.8324158207531115e-11]], [3000.0, [-2860246.725610371, 5647.919349714751, -4.443144683580959, 0.0017419171106990991, -3.403199365489676e-07, 2.651081000072826e-11]]], 1: [[600.0, [-5546.5982856048695, 45.335675108612506, -0.13258153746595475, 0.000176077206850398, -8.750569596947354e-08]], [2200.0, [92.51295555787782, 0.6803805602551622, 0.000465091752020332, -2.401401686918187e-07, 4.423893424043697e-11]], [2475.0, [3449361.27208402, -5801.739949520198, 3.631288689620224, -0.0010005763773733346, 1.0226450881073942e-07]], [2975.0, [3927.9644361329165, 2.1528284786200116, -0.004967658772507909, 2.429386882858212e-06, -3.4831847463365186e-10]]]}}
-
-======= 20220224:
-{'HEG': {0: [[600, [-6635.813431810828, 53.075898114105726, -0.15253171108859886, 0.00019792480095656869, -9.598209896301075e-08]], [3000, [46.600135556920925, 0.8412063733137993, 0.00023492720237763438, -1.2593652551917328e-07, 2.5435326557098538e-11]]], 3: [[400, [1051.452570904546, -13.099314837713008, 0.06939879665006896, -0.00014784669111041307, 1.155031075284652e-07]], [600, [2782.786054275039, -21.145755715684032, 0.06554921272398154, -8.534237586539917e-05, 4.134061079155964e-08]], [3000, [87.23060103156234, 0.7171860430279529, 0.0003793918782124725, -1.9605428816497513e-07, 3.6770897051532086e-11]]], 2: [[590, [-12422.076427583952, 100.54771064816772, -0.29845648627641835, 0.00039688772576782855, -1.97439876026206e-07]], [3000, [-33.02431482418943, 1.1302724323594304, -0.00013479679549416608, 7.22272393581498e-08, -1.373032035520199e-11]]], 1: [[600.0, [-4765.159827798981, 39.08508762376964, -0.11372474852884872, 0.00015063687981483728, -7.456557379431018e-08]], [3000, [84.53488099145231, 0.7066601865786498, 0.00043283422433330405, -2.2608518373215027e-07, 4.202604094132355e-11]]]}, 'MEG': {0: [[600.0, [-3934.5121751152246, 33.06771682164138, -0.09748027014943843, 0.00013134538357912652, -6.6156258423234e-08]], [2200.0, [37.641114276917925, 0.8805247038981882, 0.000177319710501711, -8.681533726733966e-08, 1.637418437746742e-11]], [2475.0, [37283044.37499022, -66946.28212137106, 45.04278902689384, -0.013457675462255252, 1.506533154743431e-06]], [3000.0, [17.45662531316536, 0.9879977565183667, -1.4023065577422464e-05, 4.13598612141151e-08, -1.10678651468184e-11]]], 3: [[600.0, [-327.2776484031912, 4.250523583656505, -0.011420286241297649, 1.7377653116404346e-05, -9.625686600221612e-09]], [2200.0, [115.13378003090979, 0.62518020085401, 0.000493471405264986, -2.541590613504621e-07, 4.7566608931331754e-11]], [2475.0, [67723621.24081981, -121554.95831214589, 81.75236674834781, -0.02441691402082744, 2.7324624578449198e-06]], [3000.0, [282015.3094934323, -421.5392502375951, 0.2368599641813117, -5.886206039411446e-05, 5.4722692634234e-09]]], 2: [[600.0, [-604.5006436697821, 3.0530278050672597, 0.0006285185258970196, -7.876285868395855e-06, 6.618688516815772e-09]], [2200.0, [34.67137980324179, 0.8848938354598829, 0.00017775770898386393, -9.469862981232054e-08, 1.8324158207531115e-11]], [3000.0, [-2860246.725610371, 5647.919349714751, -4.443144683580959, 0.0017419171106990991, -3.403199365489676e-07, 2.651081000072826e-11]]], 1: [[600.0, [-5546.5982856048695, 45.335675108612506, -0.13258153746595475, 0.000176077206850398, -8.750569596947354e-08]], [2200.0, [92.51295555787782, 0.6803805602551622, 0.000465091752020332, -2.401401686918187e-07, 4.423893424043697e-11]], [2475.0, [3449361.27208402, -5801.739949520198, 3.631288689620224, -0.0010005763773733346, 1.0226450881073942e-07]], [3000.0, [3927.9644361329165, 2.1528284786200116, -0.004967658772507909, 2.429386882858212e-06, -3.4831847463365186e-10]]]}}
-
-
-======= 20220302:
-{'HEG': {0: [[600.0, [-3934.5121751152246, 33.06771682164138, -0.09748027014943843, 0.00013134538357912652, -6.6156258423234e-08]], [2200.0, [37.641114276917925, 0.8805247038981882, 0.000177319710501711, -8.681533726733966e-08, 1.637418437746742e-11]], [2475.0, [37283044.37499022, -66946.28212137106, 45.04278902689384, -0.013457675462255252, 1.506533154743431e-06]], [3000.0, [17.45662531316536, 0.9879977565183667, -1.4023065577422464e-05, 4.13598612141151e-08, -1.10678651468184e-11]]], 3: [[600.0, [-327.2776484031912, 4.250523583656505, -0.011420286241297649, 1.7377653116404346e-05, -9.625686600221612e-09]], [2200.0, [115.13378003090979, 0.62518020085401, 0.000493471405264986, -2.541590613504621e-07, 4.7566608931331754e-11]], [2475.0, [67723621.24081981, -121554.95831214589, 81.75236674834781, -0.02441691402082744, 2.7324624578449198e-06]], [3000.0, [282015.3094934323, -421.5392502375951, 0.2368599641813117, -5.886206039411446e-05, 5.4722692634234e-09]]], 2: [[600.0, [-604.5006436697821, 3.0530278050672597, 0.0006285185258970196, -7.876285868395855e-06, 6.618688516815772e-09]], [2200.0, [34.67137980324179, 0.8848938354598829, 0.00017775770898386393, -9.469862981232054e-08, 1.8324158207531115e-11]], [3000.0, [-2860246.725610371, 5647.919349714751, -4.443144683580959, 0.0017419171106990991, -3.403199365489676e-07, 2.651081000072826e-11]]], 1: [[600.0, [-5546.5982856048695, 45.335675108612506, -0.13258153746595475, 0.000176077206850398, -8.750569596947354e-08]], [2200.0, [92.51295555787782, 0.6803805602551622, 0.000465091752020332, -2.401401686918187e-07, 4.423893424043697e-11]], [2475.0, [3449361.27208402, -5801.739949520198, 3.631288689620224, -0.0010005763773733346, 1.0226450881073942e-07]], [3000.0, [3927.9644361329165, 2.1528284786200116, -0.004967658772507909, 2.429386882858212e-06, -3.4831847463365186e-10]]]}, 'MEG': {0: [[600.0, [-3934.5121751152246, 33.06771682164138, -0.09748027014943843, 0.00013134538357912652, -6.6156258423234e-08]], [2200.0, [37.641114276917925, 0.8805247038981882, 0.000177319710501711, -8.681533726733966e-08, 1.637418437746742e-11]], [2475.0, [37283044.37499022, -66946.28212137106, 45.04278902689384, -0.013457675462255252, 1.506533154743431e-06]], [3000.0, [17.45662531316536, 0.9879977565183667, -1.4023065577422464e-05, 4.13598612141151e-08, -1.10678651468184e-11]]], 3: [[600.0, [-327.2776484031912, 4.250523583656505, -0.011420286241297649, 1.7377653116404346e-05, -9.625686600221612e-09]], [2200.0, [115.13378003090979, 0.62518020085401, 0.000493471405264986, -2.541590613504621e-07, 4.7566608931331754e-11]], [2475.0, [67723621.24081981, -121554.95831214589, 81.75236674834781, -0.02441691402082744, 2.7324624578449198e-06]], [3000.0, [282015.3094934323, -421.5392502375951, 0.2368599641813117, -5.886206039411446e-05, 5.4722692634234e-09]]], 2: [[600.0, [-604.5006436697821, 3.0530278050672597, 0.0006285185258970196, -7.876285868395855e-06, 6.618688516815772e-09]], [2200.0, [34.67137980324179, 0.8848938354598829, 0.00017775770898386393, -9.469862981232054e-08, 1.8324158207531115e-11]], [3000.0, [-2860246.725610371, 5647.919349714751, -4.443144683580959, 0.0017419171106990991, -3.403199365489676e-07, 2.651081000072826e-11]]], 1: [[600.0, [-5546.5982856048695, 45.335675108612506, -0.13258153746595475, 0.000176077206850398, -8.750569596947354e-08]], [2200.0, [92.51295555787782, 0.6803805602551622, 0.000465091752020332, -2.401401686918187e-07, 4.423893424043697e-11]], [2475.0, [3449361.27208402, -5801.739949520198, 3.631288689620224, -0.0010005763773733346, 1.0226450881073942e-07]], [3000.0, [3927.9644361329165, 2.1528284786200116, -0.004967658772507909, 2.429386882858212e-06, -3.4831847463365186e-10]]]}}
\ No newline at end of file
diff --git a/iexcode/IEX_dictionaries/Dict_IDCal_QP70.txt b/iexcode/IEX_dictionaries/Dict_IDCal_QP70.txt
deleted file mode 100644
index 8eca1ee..0000000
--- a/iexcode/IEX_dictionaries/Dict_IDCal_QP70.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-======= 20220720:
-{'HEG': {0: [[600.0, [-3934.5121751152246, 33.06771682164138, -0.09748027014943843, 0.00013134538357912652, -6.6156258423234e-08]], [2200.0, [37.641114276917925, 0.8805247038981882, 0.000177319710501711, -8.681533726733966e-08, 1.637418437746742e-11]], [2475.0, [37283044.37499022, -66946.28212137106, 45.04278902689384, -0.013457675462255252, 1.506533154743431e-06]], [3000.0, [17.45662531316536, 0.9879977565183667, -1.4023065577422464e-05, 4.13598612141151e-08, -1.10678651468184e-11]]], 3: [[600.0, [-327.2776484031912, 4.250523583656505, -0.011420286241297649, 1.7377653116404346e-05, -9.625686600221612e-09]], [2200.0, [115.13378003090979, 0.62518020085401, 0.000493471405264986, -2.541590613504621e-07, 4.7566608931331754e-11]], [2475.0, [67723621.24081981, -121554.95831214589, 81.75236674834781, -0.02441691402082744, 2.7324624578449198e-06]], [3000.0, [282015.3094934323, -421.5392502375951, 0.2368599641813117, -5.886206039411446e-05, 5.4722692634234e-09]]], 2: [[600.0, [-604.5006436697821, 3.0530278050672597, 0.0006285185258970196, -7.876285868395855e-06, 6.618688516815772e-09]], [2200.0, [34.67137980324179, 0.8848938354598829, 0.00017775770898386393, -9.469862981232054e-08, 1.8324158207531115e-11]], [3000.0, [-2860246.725610371, 5647.919349714751, -4.443144683580959, 0.0017419171106990991, -3.403199365489676e-07, 2.651081000072826e-11]]], 1: [[600.0, [-5546.5982856048695, 45.335675108612506, -0.13258153746595475, 0.000176077206850398, -8.750569596947354e-08]], [2200.0, [92.51295555787782, 0.6803805602551622, 0.000465091752020332, -2.401401686918187e-07, 4.423893424043697e-11]], [2475.0, [3449361.27208402, -5801.739949520198, 3.631288689620224, -0.0010005763773733346, 1.0226450881073942e-07]], [3000.0, [3927.9644361329165, 2.1528284786200116, -0.004967658772507909, 2.429386882858212e-06, -3.4831847463365186e-10]]]}, 'MEG': {0: [[600.0, [-3001.937193310452, 21.42281919811338, -0.05227046427223767, 5.905824890998193e-05, -2.4939838147750625e-08]], [2000.0, [313.0968883306113, -0.2938296061789439, 0.001699091022186045, -9.91811118699757e-07, 2.153713696737839e-10]]], 3: [[400.0, [316.61188617261655, -1.0928356160426151, 0.001606873234993028, 1.0630167423682258e-05, -1.7235785616953938e-08]], [600.0, [2151.088181587851, -14.957751114654686, 0.04372332202114167, -5.323639729278192e-05, 2.423772386377759e-08]], [2000.0, [71.32298980283552, 0.68449538511254, 0.0002902770466891661, -1.3380458329376547e-07, 2.74232295907911e-11]]], 2: [[600.0, [-256.95386250879153, 1.742041461292414, 0.0004447575432601805, -3.4622258899824124e-06, 2.763500097429317e-09]], [2000.0, [45.57685538381576, 0.724721099465095, 0.0003123695989474393, -1.839135169295821e-07, 4.415613512235391e-11]]], 1: [[600.0, [-10147.599023252156, 76.83462945874766, -0.21225269846559314, 0.000262824484491281, -1.214906763653339e-07]], [2000.0, [64.74418160981251, 0.7253703579324517, 0.00020677370737382257, -3.1583128363601195e-08, -8.981349903206108e-12]]]}}
diff --git a/iexcode/IEX_dictionaries/Dict_M0.txt b/iexcode/IEX_dictionaries/Dict_M0.txt
deleted file mode 100644
index 662b047..0000000
--- a/iexcode/IEX_dictionaries/Dict_M0.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-======= 20220913:
-{"TX":0,"TY":0, "TZ":0, "RX":0,"RY":0, "RZ":0}
-
-======= 20220914:
-{'TX': 0.301, 'TY': -22.5, 'TZ': 0.301, 'RX': -0.0, 'RY': -0.151, 'RZ': 0.039}
diff --git a/iexcode/IEX_dictionaries/Dict_M1.txt b/iexcode/IEX_dictionaries/Dict_M1.txt
deleted file mode 100644
index 95d9b39..0000000
--- a/iexcode/IEX_dictionaries/Dict_M1.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-======= 20220913:
-{"TX":0,"TY":0, "TZ":0, "RX":0,"RY":0, "RZ":0}
-
-======= 20220914:
-{'TX': 1.449, 'TY': -21.5, 'TZ': 1.449, 'RX': -0.0, 'RY': 8.439, 'RZ': 3.47}
-
-======= 20220914:
-{'TX': 1.449, 'TY': -21.5, 'TZ': 1.449, 'RX': -0.0, 'RY': 8.439, 'RZ': 3.47}
diff --git a/iexcode/IEX_dictionaries/Dict_M3.txt b/iexcode/IEX_dictionaries/Dict_M3.txt
deleted file mode 100644
index 76eac69..0000000
--- a/iexcode/IEX_dictionaries/Dict_M3.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-======= 20220614:
-{"TX":-2.5,"TY":0, "TZ":0, "RX":-13.955,"RY":-16.322, "RZ":-8.5}
diff --git a/iexcode/IEX_dictionaries/Dict_Slit.txt b/iexcode/IEX_dictionaries/Dict_Slit.txt
deleted file mode 100644
index 084d24d..0000000
--- a/iexcode/IEX_dictionaries/Dict_Slit.txt
+++ /dev/null
@@ -1,181 +0,0 @@
-======= 20201231:
-{'HEG':{'S1H':0,'S1V':0.25,'S2H':0,'S2V':-0.75},'MEG':{'S1H':0.25,'S1V':0.125,'S2H':-0.5,'S2V':0.5}}
-
-======= 20210101:
-{'HEG': {'S1H':0,'S1V':0.25,'S2H':0,'S2V':-0.75}, 'MEG': {'S1H':0.25,'S1V':0.125,'S2H':-0.5,'S2V':0.5}}
-
-======= 20210126:
-{'HEG': {'S1H': 0, 'S1V': 0.25, 'S2H': 0, 'S2V': -0.75}, 'MEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.25, 'S2V': 0.0}}
-
-======= 20210127:
-{'HEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}, 'MEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.25, 'S2V': 0.0}}
-
-======= 20210209:
-{'HEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}, 'MEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}}
-
-======= 20210316:
-{'HEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}, 'MEG': {'S1H': -0.125, 'S1V': 0.0, 'S2H': -0.325, 'S2V': -0.25}}
-
-======= 20210323:
-{'HEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}, 'MEG': {'S1H': -0.5, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}}
-
-======= 20210330:
-{'HEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}, 'MEG': {'S1H': -0.125, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}}
-
-======= 20210406:
-{'HEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}, 'MEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}}
-
-======= 20210408:
-{'HEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}, 'MEG': {'S1H': -0.125, 'S1V': -0.125, 'S2H': 0.0, 'S2V': -0.25}}
-
-======= 20210413:
-{'HEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}, 'MEG': {'S1H': -0.125, 'S1V': -0.1, 'S2H': -0.25, 'S2V': 0.0}}
-
-======= 20210413:
-{'HEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}, 'MEG': {'S1H': 0.125, 'S1V': -0.1, 'S2H': 0.25, 'S2V': -0.25}}
-
-======= 20210603:
-{'HEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': 0.5, 'S2V': 0.0}}
-
-======= 20210603:
-{'HEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': 0.75, 'S2V': -1.0}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': 0.5, 'S2V': 0.0}}
-
-======= 20210603:
-{'HEG': {'S1H': 0.125, 'S1V': -0.125, 'S2H': 0.75, 'S2V': -1.0}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': 0.5, 'S2V': 0.0}}
-
-======= 20210622:
-{'HEG': {'S1H': 0.125, 'S1V': -0.125, 'S2H': 0.75, 'S2V': -1.0}, 'MEG': {'S1H': 0.0, 'S1V': -0.125, 'S2H': -0.25, 'S2V': -0.25}}
-
-======= 20210629:
-{'HEG': {'S1H': 0.125, 'S1V': -0.125, 'S2H': 0.75, 'S2V': -1.0}, 'MEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': -0.5, 'S2V': 0.25}}
-
-======= 20210708:
-{'HEG': {'S1H': 0.125, 'S1V': -0.125, 'S2H': 0.75, 'S2V': -1.0}, 'MEG': {'S1H': 0.125, 'S1V': -0.125, 'S2H': -0.25, 'S2V': -0.25}}
-
-======= 20210714:
-{'HEG': {'S1H': 0.125, 'S1V': -0.125, 'S2H': 0.75, 'S2V': -1.0}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': -0.75, 'S2V': 0.0}}
-
-======= 20210727:
-{'HEG': {'S1H': 0.125, 'S1V': -0.125, 'S2H': 0.75, 'S2V': -1.0}, 'MEG': {'S1H': 0.125, 'S1V': -0.125, 'S2H': -0.25, 'S2V': -0.25}}
-
-======= 20210914:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}, 'MEG': {'S1H': 0.125, 'S1V': -0.125, 'S2H': -0.25, 'S2V': -0.25}}
-
-======= 20210914:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}}
-
-======= 20211004:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': -0.5, 'S2V': 0.0}}
-
-======= 20211019:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': -0.75, 'S2V': 0.0}}
-
-======= 20211103:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}, 'MEG': {'S1H': 0.0, 'S1V': -0.125, 'S2H': -0.75, 'S2V': 0.0}}
-
-======= 20211109:
-{'HEG': {'S1H': -0.125, 'S1V': 0.0, 'S2H': -0.25, 'S2V': -0.25}, 'MEG': {'S1H': 0.0, 'S1V': -0.125, 'S2H': -0.75, 'S2V': 0.0}}
-
-======= 20211117:
-{'HEG': {'S1H': -0.125, 'S1V': 0.0, 'S2H': -0.25, 'S2V': -0.25}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}}
-
-======= 20211117:
-{'HEG': {'S1H': -0.125, 'S1V': 0.0, 'S2H': -0.25, 'S2V': -0.25}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}}
-
-======= 20211214:
-{'HEG': {'S1H': -0.125, 'S1V': 0.0, 'S2H': -0.25, 'S2V': -0.25}, 'MEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': -0.75, 'S2V': 0.0}}
-
-======= 20220202:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': 0.25, 'S2V': 0.25}, 'MEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': -0.75, 'S2V': 0.0}}
-
-======= 20220202:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': 0.25, 'S2V': 0.25}, 'MEG': {'S1H': 0.0, 'S1V': 0.0, 'S2H': 0.0, 'S2V': 0.0}}
-
-======= 20220209:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': 0.25, 'S2V': 0.25}, 'MEG': {'S1H': 0.125, 'S1V': -0.125, 'S2H': -0.25, 'S2V': 0.0}}
-
-======= 20220215:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': 0.25, 'S2V': 0.25}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.125}}
-
-======= 20220215:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': 0.25, 'S2V': 0.25}, 'MEG': {'S1H': 0.125, 'S1V': 0.0, 'S2H': -0.25, 'S2V': 0.0}}
-
-======= 20220222:
-{'HEG': {'S1H': 0.25, 'S1V': 0.0, 'S2H': 0.25, 'S2V': 0.25}, 'MEG': {'S1H': 0.1, 'S1V': 0.0, 'S2H': 0.22, 'S2V': 0.0}}
-
-======= 20220228:
-{'HEG': {'S2V': 0.25, 'S2H': 0.25, 'S1V': 0.0,'S1H': 0.25 }, 'MEG': {'S2V': 0.0, 'S2H': 0.22, 'S1V': 0.0, 'S1H': 0.1}}
-
-======= 20220302:
-{'HEG': {'S2V': 0.25, 'S2H': 0.25, 'S1V': 0.0, 'S1H': 0.25}, 'MEG': {'S2V': 0.0, 'S2H': 0.352, 'S1V': -0.132, 'S1H': 0.12}}
-
-======= 20220302:
-{'HEG': {'S2V': -0.3, 'S2H': 0.2, 'S1V': 0.0, 'S1H': 0.0}, 'MEG': {'S2V': 0.0, 'S2H': 0.352, 'S1V': -0.132, 'S1H': 0.12}}
-
-======= 20220308:
-{'HEG': {'S2V': -0.3, 'S2H': 0.2, 'S1V': 0.0, 'S1H': 0.0}, 'MEG': {'S2V': 0.2, 'S2H': 0.2, 'S1V': -0.08, 'S1H': 0.16}}
-
-======= 20220310:
-{'HEG': {'S2V': -0.3, 'S2H': 0.2, 'S1V': 0.0, 'S1H': 0.0}, 'MEG': {'S2V': 0.133, 'S2H': 0.245, 'S1V': -0.105, 'S1H': 0.17}}
-
-======= 20220310:
-{'HEG': {'S2V': -0.3, 'S2H': 0.2, 'S1V': 0.0, 'S1H': 0.0}, 'MEG': {'S2V': 0.107, 'S2H': 0.109, 'S1V': -0.105, 'S1H': 0.166}}
-
-======= 20220316:
-{'HEG': {'S2V': -0.3, 'S2H': 0.2, 'S1V': 0.0, 'S1H': 0.0}, 'MEG': {'S2V': 0.0, 'S2H': 0.284, 'S1V': -0.055, 'S1H': 0.156}}
-
-======= 20220322:
-{'HEG': {'S2V': -0.244, 'S2H': -0.125, 'S1V': 0.0, 'S1H': 0.09}, 'MEG': {'S2V': 0.0, 'S2H': 0.284, 'S1V': -0.055, 'S1H': 0.156}}
-
-======= 20220322:
-{'HEG': {'S2V': -0.244, 'S2H': -0.125, 'S1V': 0.0, 'S1H': 0.09}, 'MEG': {'S2V': 0.0976, 'S2H': -0.002, 'S1V': -0.0353, 'S1H': 0.1558}}
-
-======= 20220329:
-{'HEG': {'S2V': -0.244, 'S2H': -0.125, 'S1V': 0.0, 'S1H': 0.09}, 'MEG': {'S2V': 0.05, 'S2H': -0.02, 'S1V': -0.05, 'S1H': 0.1}}
-
-======= 20220405:
-{'HEG': {'S2V': -0.015, 'S2H': -0.028, 'S1V': -0.041, 'S1H': 0.107}, 'MEG': {'S2V': 0.05, 'S2H': -0.02, 'S1V': -0.05, 'S1H': 0.1}}
-
-======= 20220405:
-{'HEG': {'S2V': -0.015, 'S2H': -0.028, 'S1V': -0.041, 'S1H': 0.107}, 'MEG': {'S2V': -0.0725, 'S2H': 0.1813, 'S1V': -0.0789, 'S1H': 0.1735}}
-
-======= 20220412:
-{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': -0.0725, 'S2H': 0.1813, 'S1V': -0.0789, 'S1H': 0.1735}}
-
-======= 20220412:
-{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': 0.2254, 'S2H': -0.0578, 'S1V': -0.0666, 'S1H': 0.1837}}
-
-======= 20220419:
-{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': -0.017, 'S2H': -0.1458, 'S1V': -0.02759, 'S1H': 0.198}}
-
-======= 20220531:
-{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': -0.002, 'S2H': 0.2313, 'S1V': -0.509, 'S1H': 0.1616}}
-
-======= 20220603:
-{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': -0.0049, 'S2H': 0.0096, 'S1V': -0.0544, 'S1H': 0.1711}}
-
-======= 20220607:
-{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': -0.0073, 'S2H': 0.1322, 'S1V': -0.0689, 'S1H': 0.139}}
-
-======= 20220614:
-{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': -0.0169, 'S2H': 0.231, 'S1V': -0.0, 'S1H': 0.1256}}
-======= 20220621:
-{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': 0.0028, 'S2H': -0.1809, 'S1V': -0.0472, 'S1H': 0.1476}}
-
-======= 20220629:
-{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': -0.0065, 'S2H': -0.3358, 'S1V': -0.1502, 'S1H': 0.2736}}
-
-======= 20220705:
-{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': -0.029, 'S2H': -0.3559, 'S1V': -0.0557, 'S1H': 0.1449}}
-
-======= 20220705:
-{'HEG': {'S2V': -0.5736, 'S2H': -0.312, 'S1V': -0.0121, 'S1H': 0.1182}, 'MEG': {'S2V': -0.029, 'S2H': -0.3559, 'S1V': -0.0557, 'S1H': 0.1449}}
-
-======= 20220713:
-{'HEG': {'S2V': -0.5736, 'S2H': -0.312, 'S1V': -0.0121, 'S1H': 0.1182}, 'MEG': {'S2V': -0.0047, 'S2H': -0.5352, 'S1V': -0.0441, 'S1H': 0.123}}
-
-======= 20220719:
-{'HEG': {'S2V': -0.5736, 'S2H': -0.312, 'S1V': -0.0121, 'S1H': 0.1182}, 'MEG': {'S2V': -0.0271, 'S2H': -0.3154, 'S1V': -0.0604, 'S1H': 0.113}}
-
-======= 20220726:
-{'HEG': {'S2V': -0.5736, 'S2H': -0.312, 'S1V': -0.0121, 'S1H': 0.1182}, 'MEG': {'S2V': -0.0489, 'S2H': -0.5032, 'S1V': -0.0115, 'S1H': 0.2177}}
diff --git a/iexcode/IEX_dictionaries/Dict_TempDiode.txt b/iexcode/IEX_dictionaries/Dict_TempDiode.txt
deleted file mode 100644
index 4e851f7..0000000
--- a/iexcode/IEX_dictionaries/Dict_TempDiode.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"SI435":[0.00000,1.66751,1.64531,1.61210,1.57373,1.53247,1.49094,1.45196,1.41723,1.38705,1.36089,1.33785,1.31699,1.29756,1.27912,1.26154,1.24489,1.22917,1.21406,1.19855,1.18193,1.16246,1.13841,1.12425,1.11828,1.11480,1.11217,1.10996,1.10828,1.10643,1.10465,1.10295,1.10124,1.09952,1.09791,1.09629,1.09468,1.09306,1.09145,1.08983,1.08821,1.08659,1.08497,1.08334,1.08171,1.08008,1.07844,1.07681,1.07517,1.07353,1.07188,1.07023,1.06858,1.06693,1.06528,1.06362,1.06196,1.06029,1.05863,1.05696,1.05528,1.05360,1.05192,1.05024,1.04856,1.04687,1.04518,1.04349,1.04179,1.04010,1.03839,1.03669,1.03498,1.03327,1.03156,1.02985,1.02814,1.02642,1.02471,1.02299,1.02127,1.01957,1.01785,1.01612,1.01439,1.01267,1.01093,1.00918,1.00744,1.00569,1.00393,1.00218,1.00042,0.99865,0.99687,0.99510,0.99332,0.99153,0.98975,0.98795,0.98615,0.98434,0.98254,0.98073,0.97891,0.97710,0.97527,0.97344,0.97161,0.96978,0.96794,0.96609,0.96424,0.96239,0.96053,0.95867,0.95680,0.95492,0.95304,0.95116,0.94927,0.94738,0.94549,0.94358,0.94167,0.93976,0.93785,0.93592,0.93398,0.93203,0.93008,0.92812,0.92616,0.92418,0.92221,0.92022,0.91823,0.91623,0.91423,0.91222,0.91021,0.90819,0.90617,0.90414,0.90212,0.90008,0.89805,0.89601,0.89397,0.89293,0.88988,0.88783,0.88578,0.88372,0.88166,0.87959,0.87752,0.87545,0.87337,0.87129,0.86921,0.86712,0.86503,0.86294,0.86084,0.85874,0.85664,0.85453,0.85242,0.85030,0.84818,0.84606,0.84393,0.84180,0.83967,0.83754,0.83540,0.83325,0.83111,0.82896,0.82680,0.82465,0.82249,0.82032,0.81816,0.81599,0.81381,0.81163,0.80945,0.80727,0.80508,0.80290,0.80071,0.79851,0.79632,0.79412,0.79192,0.78972,0.78752,0.78532,0.78311,0.78090,0.77869,0.77648,0.77426,0.77205,0.76983,0.76761,0.76539,0.76317,0.76094,0.75871,0.75648,0.75425,0.75202,0.74978,0.74755,0.74532,0.74308,0.74085,0.73861,0.73638,0.73414,0.73191,0.72967,0.72743,0.72520,0.72296,0.72072,0.71848,0.71624,0.71400,0.71176,0.70951,0.70727,0.70503,0.70278,0.70054,0.69829,0.69604,0.69379,0.69154,0.68929,0.68704,0.68479,0.68253,0.68028,0.67802,0.67576,0.67351,0.67124,0.66898,0.66672,0.66445,0.66219,0.65992,0.65765,0.65538,0.65310,0.65083,0.64855,0.64628,0.64400,0.64172,0.63944,0.63716,0.63487,0.63259,0.63030,0.62802,0.62573,0.62344,0.62115,0.61885,0.61656,0.61427,0.61197,0.60968,0.60738,0.60509,0.60279,0.60050,0.59820,0.59590,0.59360,0.59131,0.58901,0.58671,0.58441,0.58211,0.57980,0.57750,0.57520,0.57289,0.57059,0.56828,0.56598,0.56367,0.56136,0.55905,0.55674,0.55443,0.55211,0.54980,0.54748,0.54516,0.54285,0.54053,0.53820,0.53588,0.53356,0.53123,0.52891,0.52658,0.52425,0.52192,0.51958,0.51725,0.51492,0.51258,0.51024,0.50790,0.50556,0.50322,0.50088,0.49854,0.49620,0.49385,0.49151,0.48916,0.48681,0.48446,0.48212,0.47977,0.47741,0.47506,0.47271,0.47036,0.46801,0.46565,0.46330,0.46095,0.45860,0.45624,0.45389,0.45154,0.44918,0.44683,0.44447,0.44212,0.43976,0.43741,0.43505,0.43270,0.43034,0.42799,0.42563,0.42327,0.42092,0.41856,0.41620,0.41384,0.41149,0.40913,0.40677,0.40442,0.40206,0.39970,0.39735,0.39499,0.39263,0.39027,0.38792,0.38556,0.38320,0.38085,0.37849,0.37613,0.37378,0.37142,0.36906,0.36670,0.36435,0.36199,0.35963,0.35728,0.35492,0.35256,0.35021,0.34785,0.34549,0.34313,0.34078,0.33842,0.33606,0.33371,0.33135,0.32899,0.32667,0.32428,0.32192],"SI410":[0.0000,1.7191,1.7086,1.6852,1.6530,1.6124,1.5659,1.5179,1.4723,1.4309,1.3956,1.3656,1.3385,1.3142,1.2918,1.2712,1.2517,1.2333,1.2151,1.1963,1.1759,1.1524,1.1293,1.1192,1.1146,1.1114,1.1090,1.1069,1.1049,1.1031,1.1014,1.0997,1.0980,1.0964,1.0949,1.0933,1.0917,1.0902,1.0886,1.0871,1.0855,1.0839,1.0824,1.0808,1.0792,1.0776,1.0760,1.0744,1.0728,1.0712,1.0696,1.0679,1.0663,1.0646,1.0630,1.0613,1.0597,1.0580,1.0563,1.0547,1.0530,1.0513,1.0497,1.0480,1.0463,1.0446,1.0429,1.0412,1.0395,1.0378,1.0361,1.0344,1.0327,1.0310,1.0293,1.0276,1.0259,1.0242,1.0224,1.0207,1.0190,1.0172,1.0155,1.0137,1.0120,1.0102,1.0085,1.0067,1.0049,1.0032,1.0014,0.9996,0.9978,0.9960,0.9942,0.9924,0.9905,0.9887,0.9869,0.9851,0.9832,0.9814,0.9795,0.9777,0.9758,0.9740,0.9721,0.9703,0.9684,0.9665,0.9646,0.9628,0.9609,0.9590,0.9571,0.9552,0.9533,0.9514,0.9495,0.9476,0.9457,0.9437,0.9418,0.9398,0.9379,0.9359,0.9340,0.9320,0.9300,0.9281,0.9261,0.9241,0.9222,0.9202,0.9182,0.9162,0.9142,0.9122,0.9102,0.9082,0.9062,0.9042,0.9022,0.9002,0.8982,0.8962,0.8942,0.8921,0.8901,0.8881,0.8860,0.8840,0.8820,0.8799,0.8779,0.8758,0.8738,0.8717,0.8696,0.8676,0.8655,0.8634,0.8613,0.8593,0.8572,0.8551,0.8530,0.8509,0.8488,0.8467,0.8446,0.8425,0.8404,0.8383,0.8362,0.8341,0.8320,0.8299,0.8278,0.8257,0.8235,0.8214,0.8193,0.8171,0.8150,0.8129,0.8107,0.8086,0.8064,0.8043,0.8021,0.8000,0.7979,0.7957,0.7935,0.7914,0.7892,0.7871,0.7849,0.7828,0.7806,0.7784,0.7763,0.7741,0.7719,0.7698,0.7676,0.7654,0.7632,0.7610,0.7589,0.7567,0.7545,0.7523,0.7501,0.7479,0.7457,0.7435,0.7413,0.7391,0.7369,0.7347,0.7325,0.7303,0.7281,0.7259,0.7237,0.7215,0.7193,0.7170,0.7148,0.7126,0.7104,0.7082,0.7060,0.7037,0.7015,0.6993,0.6971,0.6948,0.6926,0.6904,0.6881,0.6859,0.6837,0.6814,0.6792,0.6770,0.6747,0.6725,0.6702,0.6680,0.6657,0.6635,0.6612,0.6590,0.6567,0.6545,0.6522,0.6500,0.6477,0.6455,0.6432,0.6410,0.6387,0.6365,0.6342,0.6319,0.6297,0.6274,0.6251,0.6229,0.6206,0.6183,0.6161,0.6138,0.6115,0.6092,0.6070,0.6047,0.6024,0.6001,0.5979,0.5956,0.5933,0.5910,0.5887,0.5865,0.5842,0.5819,0.5796,0.5773,0.5750,0.5727,0.5705,0.5682,0.5659,0.5636,0.5613,0.5590,0.5567,0.5544,0.5521,0.5498,0.5475,0.5452,0.5429,0.5406,0.5383,0.5360,0.5337,0.5314,0.5291,0.5268,0.5245,0.5222,0.5199,0.5176,0.5153,0.5130,0.5107,0.5084,0.5061,0.5038,0.5015,0.4992,0.4968,0.4945,0.4922,0.4899,0.4876,0.4853,0.4830,0.4806,0.4783,0.4760,0.4737,0.4714,0.4690,0.4667,0.4644,0.4621,0.4597,0.4574,0.4551,0.4528,0.4504,0.4481,0.4458,0.4435,0.4411,0.4388,0.4365,0.4341,0.4318,0.4295,0.4271,0.4248,0.4225,0.4201,0.4178,0.4154,0.4131,0.4108,0.4084,0.4061,0.4037,0.4014,0.3991,0.3967,0.3944,0.4154,0.4131,0.4108,0.4084,0.4061,0.4037,0.4014,0.3991,0.3967,0.3709,0.3685,0.3662,0.3638,0.3615,0.3591,0.3567,0.3544,0.3520,0.3497,0.3473,0.3449,0.3426,0.3402,0.3379,0.3355,0.3331,0.3308,0.3284,0.3260,0.3237,0.3213,0.3189,0.3165,0.3142,0.3118,0.3094,0.3071,0.3047,0.3023,0.2999,0.2976,0.2952,0.2928,0.2904,0.2880,0.2857,0.2833,0.2809,0.2785,0.2761,0.2738,0.2714,0.2690,0.2666,0.2642,0.2618,0.2594,0.2570,0.2547,0.2523,0.2499,0.2475,0.2451,0.2427,0.2403,0.2379,0.2355,0.2331,0.2307,0.2283,0.2259,0.2235,0.2211,0.2187,0.2163,0.2139,0.2115,0.2091,0.2067,0.2043]}
diff --git a/iexcode/IEX_dictionaries/DiodeResponsivityCurve b/iexcode/IEX_dictionaries/DiodeResponsivityCurve
deleted file mode 100644
index 0242917..0000000
--- a/iexcode/IEX_dictionaries/DiodeResponsivityCurve
+++ /dev/null
@@ -1,200 +0,0 @@
-Responsivity Energy
-0.109341 10.0752
-0.1075 10.168
-0.105579 10.2777
-0.103737 10.3979
-0.101656 10.5007
-0.099895 10.614
-0.0978137 10.719
-0.0959725 10.8153
-0.0943715 10.9124
-0.0926103 11.0203
-0.0910093 11.1193
-0.0896484 11.1792
-0.0880474 11.2695
-0.0864464 11.3809
-0.0847653 11.514
-0.0830042 11.6591
-0.0812431 11.8378
-0.0798822 11.9762
-0.0790816 12.2033
-0.0788414 12.457
-0.0790015 12.7502
-0.079882 12.992
-0.081403 13.2029
-0.083084 13.4172
-0.0842847 13.5257
-0.0866862 13.733
-0.0882072 13.844
-0.0898882 14.006
-0.0918894 14.1572
-0.0939708 14.3613
-0.0965323 14.5553
-0.0983735 14.6862
-0.100215 14.8049
-0.101976 14.9113
-0.103817 15.0453
-0.106058 15.2077
-0.107899 15.3169
-0.109981 15.4546
-0.112062 15.5796
-0.113983 15.7196
-0.115824 15.8325
-0.117585 15.9748
-0.119747 16.1328
-0.121588 16.2342
-0.123349 16.3654
-0.12535 16.5421
-0.127832 16.7207
-0.130233 16.9466
-0.132419 17.1223
-0.135033 17.342
-0.137321 17.5348
-0.139608 17.7901
-0.141896 18.0644
-0.144837 18.3742
-0.14756 18.6576
-0.149957 18.881
-0.152462 19.1722
-0.154532 19.4348
-0.157364 19.7345
-0.159325 20.0048
-0.161395 20.2615
-0.163356 20.5216
-0.165752 20.7673
-0.167822 21.016
-0.170545 21.3039
-0.172942 21.5957
-0.175774 21.9287
-0.178389 22.248
-0.180131 22.4379
-0.182419 22.7259
-0.184707 22.9981
-0.186667 23.2932
-0.188193 23.6323
-0.189718 24.0376
-0.191352 24.4498
-0.193203 24.975
-0.194837 25.4466
-0.196036 25.8609
-0.197016 26.3044
-0.198105 26.9839
-0.199086 27.5401
-0.19963 27.9886
-0.200284 28.5655
-0.201062 29.1788
-0.202043 29.8563
-0.202874 30.4717
-0.203931 31.2588
-0.204762 31.8625
-0.205385 32.3423
-0.205728 32.6468
-0.2059 33.0831
-0.205685 33.4729
-0.205685 33.9202
-0.205814 34.4273
-0.205942 34.8329
-0.206423 35.5101
-0.206929 36.335
-0.207582 37.2736
-0.208236 38.2689
-0.20878 39.2241
-0.209543 40.3401
-0.210196 41.4878
-0.211068 43.0324
-0.211721 44.1815
-0.212375 45.5159
-0.213029 46.8506
-0.213847 48.4147
-0.21499 51.095
-0.217278 56.3781
-0.220137 63.5332
-0.222901 71.5962
-0.225284 79.93
-0.227667 88.1947
-0.23024 98.0003
-0.232909 110.697
-0.235768 124.745
-0.238437 137.322
-0.240915 151.521
-0.24406 168.367
-0.24692 187.965
-0.25016 211.325
-0.252924 234.82
-0.256451 265.864
-0.259215 294.732
-0.26217 329.039
-0.263599 344.016
-0.26522 365.622
-0.266649 386.769
-0.267602 405.322
-0.268365 421.79
-0.269127 442.023
-0.270176 464.314
-0.271034 482.048
-0.271863 502.915
-0.272661 524.768
-0.273353 544.89
-0.273888 560.168
-0.274296 577.813
-0.274432 596.754
-0.274432 613.265
-0.274387 630.233
-0.274387 655.755
-0.274577 677.334
-0.274896 698.718
-0.275163 720.777
-0.275588 742.318
-0.275801 762.005
-0.275908 786.062
-0.275961 813.536
-0.275961 836.479
-0.275961 860.069
-0.275961 881.435
-0.275854 906.293
-0.275804 934.582
-0.275686 968.151
-0.27545 999.14
-0.275214 1031.12
-0.275095 1056.11
-0.274918 1083.07
-0.274682 1109.32
-0.274446 1141.94
-0.27421 1174.05
-0.273856 1210.1
-0.273561 1248.84
-0.273207 1287.19
-0.272819 1322.48
-0.272499 1357.16
-0.272086 1386.55
-0.271732 1413.01
-0.271437 1436.35
-0.271161 1464.13
-0.270905 1482.33
-0.270669 1501.13
-0.270374 1520.17
-0.269961 1543.33
-0.26943 1568.82
-0.268401 1596.21
-0.26707 1629.27
-0.265713 1664.55
-0.264474 1696.32
-0.26347 1724.34
-0.26228 1755.08
-0.261215 1786.94
-0.259937 1822.37
-0.259032 1849.4
-0.258155 1871.57
-0.257397 1894.63
-0.256576 1915.74
-0.255377 1947.28
-0.275058 1957.05
-0.275058 2160.44
-0.275058 2389.74
-0.275058 2507.09
-0.275058 2604.07
-0.275058 2715.63
-0.275058 2962.14
-0.275058 3276.53
-0.275058 3649.72
-0.275058 3981.03
diff --git a/iexcode/IEX_dictionaries/DiodeResponsivityCurve_2 b/iexcode/IEX_dictionaries/DiodeResponsivityCurve_2
deleted file mode 100644
index b51d96d..0000000
--- a/iexcode/IEX_dictionaries/DiodeResponsivityCurve_2
+++ /dev/null
@@ -1,200 +0,0 @@
-Responsivity Energy
-0.109341 10.0752
-0.1075 10.168
-0.105579 10.2777
-0.103737 10.3979
-0.101656 10.5007
-0.099895 10.614
-0.0978137 10.719
-0.0959725 10.8153
-0.0943715 10.9124
-0.0926103 11.0203
-0.0910093 11.1193
-0.0896484 11.1792
-0.0880474 11.2695
-0.0864464 11.3809
-0.0847653 11.514
-0.0830042 11.6591
-0.0812431 11.8378
-0.0798822 11.9762
-0.0790816 12.2033
-0.0788414 12.457
-0.0790015 12.7502
-0.079882 12.992
-0.081403 13.2029
-0.083084 13.4172
-0.0842847 13.5257
-0.0866862 13.733
-0.0882072 13.844
-0.0898882 14.006
-0.0918894 14.1572
-0.0939708 14.3613
-0.0965323 14.5553
-0.0983735 14.6862
-0.100215 14.8049
-0.101976 14.9113
-0.103817 15.0453
-0.106058 15.2077
-0.107899 15.3169
-0.109981 15.4546
-0.112062 15.5796
-0.113983 15.7196
-0.115824 15.8325
-0.117585 15.9748
-0.119747 16.1328
-0.121588 16.2342
-0.123349 16.3654
-0.12535 16.5421
-0.127832 16.7207
-0.130233 16.9466
-0.132419 17.1223
-0.135033 17.342
-0.137321 17.5348
-0.139608 17.7901
-0.141896 18.0644
-0.144837 18.3742
-0.14756 18.6576
-0.149957 18.881
-0.152462 19.1722
-0.154532 19.4348
-0.157364 19.7345
-0.159325 20.0048
-0.161395 20.2615
-0.163356 20.5216
-0.165752 20.7673
-0.167822 21.016
-0.170545 21.3039
-0.172942 21.5957
-0.175774 21.9287
-0.178389 22.248
-0.180131 22.4379
-0.182419 22.7259
-0.184707 22.9981
-0.186667 23.2932
-0.188193 23.6323
-0.189718 24.0376
-0.191352 24.4498
-0.193203 24.975
-0.194837 25.4466
-0.196036 25.8609
-0.197016 26.3044
-0.198105 26.9839
-0.199086 27.5401
-0.19963 27.9886
-0.200284 28.5655
-0.201062 29.1788
-0.202043 29.8563
-0.202874 30.4717
-0.203931 31.2588
-0.204762 31.8625
-0.205385 32.3423
-0.205728 32.6468
-0.2059 33.0831
-0.205685 33.4729
-0.205685 33.9202
-0.205814 34.4273
-0.205942 34.8329
-0.206423 35.5101
-0.206929 36.335
-0.207582 37.2736
-0.208236 38.2689
-0.20878 39.2241
-0.209543 40.3401
-0.210196 41.4878
-0.211068 43.0324
-0.211721 44.1815
-0.212375 45.5159
-0.213029 46.8506
-0.213847 48.4147
-0.21499 51.095
-0.217278 56.3781
-0.220137 63.5332
-0.222901 71.5962
-0.225284 79.93
-0.227667 88.1947
-0.23024 98.0003
-0.232909 110.697
-0.235768 124.745
-0.238437 137.322
-0.240915 151.521
-0.24406 168.367
-0.24692 187.965
-0.25016 211.325
-0.252924 234.82
-0.256451 265.864
-0.259215 294.732
-0.26217 329.039
-0.263599 344.016
-0.26522 365.622
-0.266649 386.769
-0.267602 405.322
-0.268365 421.79
-0.269127 442.023
-0.270176 464.314
-0.271034 482.048
-0.271863 502.915
-0.272661 524.768
-0.273353 544.89
-0.273888 560.168
-0.274296 577.813
-0.274432 596.754
-0.274432 613.265
-0.274387 630.233
-0.274387 655.755
-0.274577 677.334
-0.274896 698.718
-0.275163 720.777
-0.275588 742.318
-0.275801 762.005
-0.275908 786.062
-0.275961 813.536
-0.275961 836.479
-0.275961 860.069
-0.275961 881.435
-0.275854 906.293
-0.275804 934.582
-0.275686 968.151
-0.27545 999.14
-0.275214 1031.12
-0.275095 1056.11
-0.274918 1083.07
-0.274682 1109.32
-0.274446 1141.94
-0.27421 1174.05
-0.273856 1210.1
-0.273561 1248.84
-0.273207 1287.19
-0.272819 1322.48
-0.272499 1357.16
-0.272086 1386.55
-0.271732 1413.01
-0.271437 1436.35
-0.271161 1464.13
-0.270905 1482.33
-0.270669 1501.13
-0.270374 1520.17
-0.269961 1543.33
-0.26943 1568.82
-0.268401 1596.21
-0.26707 1629.27
-0.265713 1664.55
-0.264474 1696.32
-0.26347 1724.34
-0.26228 1755.08
-0.261215 1786.94
-0.259937 1822.37
-0.259032 1849.4
-0.258155 1871.57
-0.257397 1894.63
-0.256576 1915.74
-0.255377 1947.28
-0.275058 1957.05
-0.275058 2160.44
-0.275058 2389.74
-0.275058 2507.09
-0.275058 2604.07
-0.275058 2715.63
-0.275058 2962.14
-0.275058 3276.53
-0.275058 3649.72
-0.275058 3981.03
diff --git a/iexcode/IEX_dictionaries/Flux_Curves.txt b/iexcode/IEX_dictionaries/Flux_Curves.txt
deleted file mode 100644
index 44cd178..0000000
--- a/iexcode/IEX_dictionaries/Flux_Curves.txt
+++ /dev/null
@@ -1,420 +0,0 @@
-
-======= 20210614:
-
------ flux_x:
-{'MEG': {0: [[600.0, array([397.9252127 , 416.78300518, 438.75401384, 462.56121553,
- 487.33355277, 512.03992257, 536.47780752, 561.22181765,
- 587.97345224])], [2200.0, array([ 587.46430084, 612.03800702, 636.53676495, 661.0013687 ,
- 685.42558925, 709.81638238, 734.17842701, 758.50826907,
- 782.81254347, 807.1746918 , 831.42021454, 855.65315484,
- 879.96522503, 904.16448883, 928.3469178 , 952.59181238,
- 976.74554652, 1000.88329295, 1025.00777645, 1049.12246101,
- 1073.35612614, 1097.45284047, 1121.47889554, 1145.55371549,
- 1169.76864907, 1193.82702085, 1217.8791137 , 1242.00838726,
- 1266.04511137, 1290.0737721 , 1314.09595788, 1338.10961268,
- 1362.11333886, 1386.11416896, 1410.19201899, 1434.17382119,
- 1458.14541467, 1482.10703038, 1506.27933764, 1530.09117842,
- 1554.0208766 , 1578.17227423, 1602.08283189, 1625.97586073,
- 1649.85652425, 1673.71768583, 1697.65562303, 1721.48042527,
- 1745.28391005, 1769.06551088, 1793.13420224, 1816.65473024,
- 1840.68892848, 1864.02913999, 1887.67252086, 1911.65687838,
- 1935.2466612 , 1958.79315798, 1982.42605617, 2005.90605258,
- 2029.32530332, 2052.7073116 , 2076.03860369, 2099.44966785,
- 2123.21651619])], [3000.0, array([2118.88592738, 2094.67127337, 2097.87802688, 2109.77514789,
- 2130.39313876, 2163.66662705, 2189.35934478, 2221.72499406,
- 2248.20562552, 2256.84132602, 2359.40737965, 2392.34274277,
- 2423.07541114, 2450.14018859, 2476.00931755, 2499.40250005,
- 2520.86957515, 2541.04013424, 2560.9167578 , 2580.30105169,
- 2601.8955564 , 2621.08117798, 2644.24358248, 2667.75472794,
- 2692.77716544, 2719.36695553, 2744.92823708, 2776.4914143 ,
- 2803.31259197, 2828.10579807, 2846.61432704, 2864.71720116,
- 2879.30477412])]], 3: [[600.0, array([339.31458253, 364.54794409, 390.02020716, 415.15538078,
- 439.78196471, 463.86684938, 487.40141206, 510.82411214,
- 534.32704516, 558.5890677 , 584.4314343 ])], [2200.0, array([ 583.85491637, 608.81499149, 633.68951928, 658.48432773,
- 683.2045639 , 707.85662166, 732.4439953 , 756.97608323,
- 781.45489408, 805.88742599, 830.33418089, 854.68923824,
- 879.00889942, 903.29590914, 927.55871675, 951.8703746 ,
- 976.09296782, 1000.29845478, 1024.4904691 , 1048.67313555,
- 1072.96910378, 1097.14170657, 1121.2561395 , 1145.41952498,
- 1169.71715113, 1193.88290664, 1218.05387362, 1242.16170005,
- 1266.47759455, 1290.65910564, 1314.84857478, 1339.04363087,
- 1363.2430578 , 1387.45091073, 1411.73012516, 1435.94765377,
- 1460.16592507, 1484.39059798, 1508.61293853, 1532.90895389,
- 1557.13491617, 1581.35890457, 1605.57415237, 1629.78473372,
- 1653.98696636, 1678.17757444, 1702.42651407, 1726.5854458 ,
- 1750.7263016 , 1774.83965663, 1798.9234026 , 1823.06422641,
- 1847.58574689, 1871.06680127, 1895.00617073, 1918.88866696,
- 1943.04789622, 1966.84194618, 1990.6849626 , 2014.3510584 ,
- 2037.95499606, 2061.47241692, 2084.89921993, 2108.37921613,
- 2131.62724662])], [3000.0, array([2113.09739181, 2101.26248454, 2101.00201702, 2116.36481428,
- 2134.14351318, 2164.82867589, 2198.43413519, 2246.55922932,
- 2242.07828211, 2261.5552126 , 2358.47938377, 2396.94367111,
- 2429.21024934, 2457.21889939, 2484.25022238, 2508.55465704,
- 2530.64512258, 2551.15606066, 2571.22309682, 2592.63610493,
- 2610.32325931, 2631.02166373, 2654.026949 , 2677.31382516,
- 2702.18421301, 2728.00476115, 2758.33419361, 2787.24733677,
- 2814.29370729, 2840.93862939, 2862.5537757 , 2882.33819506,
- 2890.82626685])]], 2: [[600.0, array([515.7 , 540.03, 565.01, 590.04])], [2200.0, array([ 588.59207188, 613.29232402, 637.97110398, 662.57340343,
- 687.12474643, 711.68069367, 736.15669802, 760.59539356,
- 785.00374666, 809.45542616, 833.80369103, 858.13744719,
- 882.45492481, 906.75832891, 931.04756366, 955.30204659,
- 979.66597315, 1003.93097636, 1028.18914249, 1052.44888328,
- 1076.70535099, 1101.07613296, 1125.2948017 , 1149.5579364 ,
- 1173.82843999, 1198.22025055, 1222.50041089, 1246.7358534 ,
- 1271.02496099, 1295.44955514, 1319.75613835, 1344.07193302,
- 1368.39361843, 1392.72133011, 1417.11685819, 1441.45452985,
- 1465.79816705, 1490.14139828, 1514.4908973 , 1538.76153096,
- 1563.24358479, 1587.5878241 , 1611.92900804, 1636.2580953 ,
- 1660.58143526, 1684.89426205, 1709.26181957, 1733.54473844,
- 1757.80840349, 1782.04510776, 1806.26272635, 1830.52526946,
- 1855.11862401, 1878.80412994, 1902.89256794, 1926.92958315,
- 1950.91730234, 1974.85597288, 1998.83995273, 2022.67582641,
- 2046.79085718, 2070.50604723, 2094.15235072, 2117.83647278,
- 2141.33335819])], [3000.0, array([2068.39339727, 2077.8636703 , 2094.02808006, 2118.40161583,
- 2145.85806279, 2174.7344634 , 2212.52150526, 2225.6200711 ,
- 2251.56338273, 2266.84943568, 2384.79661648, 2416.55012196,
- 2445.06868447, 2473.34713435, 2499.22086174, 2523.07266553,
- 2545.28394299, 2566.32851269, 2587.11746746, 2607.28060474,
- 2629.28983705, 2648.85607613, 2671.91639575, 2694.99417755,
- 2719.1471953 , 2744.18930277, 2771.18896115, 2799.39175188,
- 2825.78922987, 2852.29306995, 2876.86567103, 2898.00801271,
- 2913.84002181])]], 1: [[600.0, array([399.12769577, 418.49469008, 439.93258901, 462.56063504,
- 486.01877885, 509.62295213, 533.37313034, 557.23457724,
- 581.99495154])], [2200.0, array([ 581.59355677, 605.89662183, 630.18496435, 654.32224083,
- 678.38395029, 702.37427034, 726.29886619, 750.28824129,
- 774.10677729, 797.87626071, 821.70681147, 845.39726538,
- 869.04951022, 892.84619441, 916.44653035, 939.94903762,
- 963.69659782, 987.24278657, 1010.76750368, 1034.29215874,
- 1058.03228309, 1081.54474546, 1105.17023542, 1128.69191982,
- 1152.20880076, 1175.73840477, 1199.26713083, 1222.92123452,
- 1246.47831526, 1270.04940305, 1293.63014763, 1317.4971171 ,
- 1341.11605231, 1364.75354241, 1388.23750626, 1412.17787973,
- 1435.87743969, 1459.58965134, 1483.32486716, 1507.17021884,
- 1530.94090009, 1554.7369362 , 1578.54733968, 1602.38124282,
- 1626.23286351, 1650.0974754 , 1674.0585297 , 1697.95071727,
- 1721.85985412, 1745.77791888, 1769.71195156, 1793.71858522,
- 1817.66125846, 1841.88300235, 1865.266227 , 1889.49356226,
- 1913.42993328, 1937.35252055, 1961.35057708, 1985.25116793,
- 2009.14175642, 2033.00113326, 2056.84517489, 2080.74275066,
- 2104.52957983])], [3000.0, array([2126.60650642, 2111.02986395, 2095.52361314, 2103.01317725,
- 2117.35653637, 2138.97846781, 2171.96811167, 2197.28539696,
- 2229.55355723, 2240.42411385, 2260.81739969, 2360.46405459,
- 2390.47745703, 2421.07073067, 2448.34628975, 2475.05294358,
- 2499.26962659, 2522.90806839, 2543.94307398, 2565.33881346,
- 2586.75485829, 2609.79309622, 2631.63670032, 2655.72130668,
- 2680.70358274, 2706.65302715, 2733.57080242, 2761.8581053 ,
- 2788.54893184, 2812.25398818, 2831.934257 , 2850.67753865,
- 2873.4360033 ])]]}}
------ flux_y:
-{'MEG': {0: [[600.0, array([1.05787759e+11, 1.17707922e+11, 1.35482529e+11, 1.52382368e+11,
- 1.67291686e+11, 1.80713800e+11, 1.82555545e+11, 2.03366402e+11,
- 2.12880296e+11])], [2200.0, array([2.12880296e+11, 2.37905861e+11, 2.50552640e+11, 2.66132706e+11,
- 2.79974677e+11, 2.93171490e+11, 3.09433493e+11, 3.21608032e+11,
- 3.40828814e+11, 3.60730671e+11, 3.75179629e+11, 3.88153187e+11,
- 4.00435048e+11, 4.10313396e+11, 4.16605767e+11, 4.18895964e+11,
- 4.21711594e+11, 4.22031212e+11, 4.19994750e+11, 4.15927026e+11,
- 4.12828899e+11, 4.08474706e+11, 4.00982666e+11, 3.91273735e+11,
- 3.82563920e+11, 3.73120381e+11, 3.62436303e+11, 3.48795347e+11,
- 3.38034718e+11, 3.24032282e+11, 3.12350710e+11, 2.99049488e+11,
- 2.87546355e+11, 2.74392320e+11, 2.64853782e+11, 2.53544384e+11,
- 2.43384146e+11, 2.31829509e+11, 2.24403448e+11, 2.15608729e+11,
- 2.07360940e+11, 2.01165608e+11, 1.94772927e+11, 1.88566115e+11,
- 1.82083994e+11, 1.75964346e+11, 1.71887478e+11, 1.66570026e+11,
- 1.61260525e+11, 1.55872471e+11, 1.50553701e+11, 1.45252365e+11,
- 1.38620052e+11, 1.11920197e+11, 1.12047697e+11, 1.07967716e+11,
- 1.05094052e+11, 9.42437887e+10, 8.94819732e+10, 8.48363550e+10,
- 7.95215214e+10, 7.36009644e+10, 6.72478081e+10, 6.04803020e+10,
- 5.34604689e+10])], [3000.0, array([5.34604689e+10, 4.52567478e+10, 3.61080071e+10, 2.67172138e+10,
- 1.81294146e+10, 1.33547019e+10, 1.00884235e+10, 7.95095235e+09,
- 6.42884437e+09, 4.67669952e+09, 2.77456794e+09, 3.14088543e+09,
- 3.57381686e+09, 3.94598123e+09, 4.07784528e+09, 4.33204318e+09,
- 4.52807170e+09, 4.51042435e+09, 4.76784357e+09, 4.75517272e+09,
- 4.64595426e+09, 4.60829652e+09, 4.50253010e+09, 4.33441779e+09,
- 3.90656852e+09, 3.57836039e+09, 2.99910776e+09, 3.03045417e+09,
- 3.19268453e+09, 3.34728938e+09, 3.33070342e+09, 3.36400361e+09,
- 5.73442182e+09])]], 3: [[600.0, array([4.26194666e+10, 5.02113296e+10, 6.28563167e+10, 7.40900175e+10,
- 8.52105930e+10, 9.53337973e+10, 1.04697260e+11, 1.13238554e+11,
- 1.16720766e+11, 1.26989816e+11, 1.36144750e+11])], [2200.0, array([1.36144750e+11, 1.45220456e+11, 1.52904435e+11, 1.62182699e+11,
- 1.70570931e+11, 1.79279242e+11, 1.88992187e+11, 1.97313348e+11,
- 2.12209239e+11, 2.25831745e+11, 2.36150779e+11, 2.48115866e+11,
- 2.57968789e+11, 2.65646727e+11, 2.70867390e+11, 2.75979131e+11,
- 2.79703808e+11, 2.81050361e+11, 2.79506556e+11, 2.77807800e+11,
- 2.77603719e+11, 2.75688858e+11, 2.72086850e+11, 2.66469488e+11,
- 2.60304120e+11, 2.55081867e+11, 2.49202286e+11, 2.40049376e+11,
- 2.33330590e+11, 2.25266925e+11, 2.17411366e+11, 2.09451238e+11,
- 2.01700613e+11, 1.94633671e+11, 1.87044546e+11, 1.80299832e+11,
- 1.74394448e+11, 1.67489714e+11, 1.61395156e+11, 1.56868308e+11,
- 1.51351214e+11, 1.46492178e+11, 1.41431542e+11, 1.37267000e+11,
- 1.33422085e+11, 1.29209158e+11, 1.26536206e+11, 1.22667178e+11,
- 1.19031164e+11, 1.15240656e+11, 1.12099739e+11, 1.08749902e+11,
- 9.68819456e+10, 8.74304458e+10, 8.48436203e+10, 8.19361749e+10,
- 7.94640394e+10, 7.13605866e+10, 6.82394353e+10, 6.47005439e+10,
- 6.05950413e+10, 5.59464191e+10, 5.10585121e+10, 4.57918481e+10,
- 3.96842463e+10])], [3000.0, array([3.96842463e+10, 3.34697346e+10, 2.61732973e+10, 1.82511792e+10,
- 1.20362878e+10, 8.88774761e+09, 6.55333746e+09, 5.07778735e+09,
- 3.92683060e+09, 2.93930526e+09, 2.31398666e+09, 2.59658141e+09,
- 3.15765631e+09, 3.26555055e+09, 3.50716754e+09, 3.74699133e+09,
- 3.77669439e+09, 3.90792502e+09, 4.05431641e+09, 3.96351040e+09,
- 3.89511096e+09, 3.85718009e+09, 3.72656893e+09, 3.56037390e+09,
- 3.27421252e+09, 2.95752202e+09, 2.42772309e+09, 2.73886766e+09,
- 2.85841927e+09, 2.92548929e+09, 3.00301704e+09, 3.01355902e+09,
- 2.97164566e+09])]], 2: [[600.0, array([1.10913268e+11, 1.09538115e+11, 1.23972721e+11, 1.36876724e+11])], [2200.0, array([1.36876724e+11, 1.43965903e+11, 1.50515394e+11, 1.59487447e+11,
- 1.66847090e+11, 1.76924734e+11, 1.87158862e+11, 1.96033976e+11,
- 2.09796344e+11, 2.23189756e+11, 2.34901279e+11, 2.46333705e+11,
- 2.55652870e+11, 2.63836494e+11, 2.69829576e+11, 2.70637860e+11,
- 2.76693732e+11, 2.78924982e+11, 2.79031200e+11, 2.78744482e+11,
- 2.76010786e+11, 2.73882177e+11, 2.71542981e+11, 2.66333325e+11,
- 2.59773806e+11, 2.54399855e+11, 2.48605481e+11, 2.40406280e+11,
- 2.32438797e+11, 2.23853775e+11, 2.17488890e+11, 2.09470494e+11,
- 2.01388563e+11, 1.94070216e+11, 1.85564867e+11, 1.79008230e+11,
- 1.73360450e+11, 1.67047019e+11, 1.61405923e+11, 1.55075556e+11,
- 1.49569456e+11, 1.45160841e+11, 1.41286583e+11, 1.37344916e+11,
- 1.33592076e+11, 1.30030726e+11, 1.26376530e+11, 1.23069119e+11,
- 1.19792566e+11, 1.16104036e+11, 1.12847429e+11, 1.09507179e+11,
- 8.88825407e+10, 8.89769598e+10, 8.52909380e+10, 8.33048431e+10,
- 7.66083439e+10, 7.15549682e+10, 6.84012663e+10, 6.40623751e+10,
- 5.97367788e+10, 5.51697965e+10, 5.00078783e+10, 4.44022059e+10,
- 3.77089629e+10])], [3000.0, array([3.77089629e+10, 3.04645147e+10, 2.28043971e+10, 1.59166460e+10,
- 1.23502577e+10, 9.53106453e+09, 8.03925388e+09, 6.48456194e+09,
- 5.18492746e+09, 3.91324899e+09, 2.63776009e+09, 3.11454045e+09,
- 3.34659497e+09, 3.43487179e+09, 3.77158730e+09, 3.92648793e+09,
- 4.03250148e+09, 4.03521484e+09, 4.09863656e+09, 4.02228363e+09,
- 4.00315181e+09, 3.87934578e+09, 3.69188021e+09, 3.41015992e+09,
- 3.06924870e+09, 2.53124188e+09, 2.66007286e+09, 2.87908337e+09,
- 2.94754668e+09, 3.08473120e+09, 3.03460642e+09, 2.99270106e+09,
- 3.00250068e+09])]], 1: [[600.0, array([1.05108554e+11, 1.18282887e+11, 1.35046175e+11, 1.51330849e+11,
- 1.66019972e+11, 1.78844074e+11, 1.82884495e+11, 1.97647863e+11,
- 2.15292313e+11])], [2200.0, array([2.15292313e+11, 2.26627262e+11, 2.40652409e+11, 2.54077210e+11,
- 2.65995101e+11, 2.77464072e+11, 2.87582490e+11, 3.00861181e+11,
- 3.16001893e+11, 3.35064937e+11, 3.50123125e+11, 3.67935776e+11,
- 3.77972277e+11, 3.85369064e+11, 3.95585942e+11, 4.01874169e+11,
- 4.08282206e+11, 4.11735896e+11, 4.11493161e+11, 4.07834385e+11,
- 4.06566207e+11, 4.04077640e+11, 3.97410693e+11, 3.93198360e+11,
- 3.86740051e+11, 3.77386633e+11, 3.65481439e+11, 3.54578045e+11,
- 3.43019805e+11, 3.30948944e+11, 3.16987988e+11, 3.05093096e+11,
- 2.93248244e+11, 2.80450123e+11, 2.67515364e+11, 2.58087230e+11,
- 2.48283481e+11, 2.38695133e+11, 2.29814484e+11, 2.19119621e+11,
- 2.11282903e+11, 2.04185516e+11, 1.96882906e+11, 1.90417358e+11,
- 1.84085098e+11, 1.78580043e+11, 1.73660460e+11, 1.68740021e+11,
- 1.63886087e+11, 1.58375206e+11, 1.53705220e+11, 1.49132098e+11,
- 1.44140123e+11, 1.34420868e+11, 1.11622798e+11, 1.12207795e+11,
- 1.07985457e+11, 1.05012207e+11, 9.40518882e+10, 8.94809007e+10,
- 8.45472561e+10, 7.91587350e+10, 7.36436119e+10, 6.70525115e+10,
- 5.99405928e+10])], [3000.0, array([5.99405928e+10, 5.24754540e+10, 4.42483842e+10, 3.49968960e+10,
- 2.54918765e+10, 1.72310971e+10, 1.30912461e+10, 9.77428545e+09,
- 7.74785109e+09, 5.74413495e+09, 3.24618508e+09, 2.86068986e+09,
- 3.22057452e+09, 3.80254059e+09, 4.03703779e+09, 4.17626111e+09,
- 4.51894980e+09, 4.68285098e+09, 4.69449299e+09, 4.84737016e+09,
- 4.86243638e+09, 4.66702393e+09, 4.60609696e+09, 4.51325777e+09,
- 4.31153332e+09, 3.92055690e+09, 3.48410919e+09, 2.91562362e+09,
- 3.14866374e+09, 3.29959429e+09, 3.42849443e+09, 3.38018130e+09,
- 5.81395146e+09])]]}}
-
-======= 20220209:
-
------ flux_x:
-{'MEG': {0: [[600.0, array([438.03258717, 462.65482499, 487.49723498, 512.05111655,
- 536.40666766, 561.20416681, 587.97340183])], [2200.0, array([ 586.99536661, 611.68381298, 636.28152766, 660.81802496,
- 685.29090924, 709.70701715, 734.074155 , 758.39043136,
- 782.7422201 , 806.98204823, 831.16625417, 855.42579805,
- 879.55969963, 903.66179552, 927.74094995, 951.88107715,
- 975.91650598, 999.92545458, 1024.06339466, 1048.04173213,
- 1072.01201878, 1095.96759787, 1120.00451662, 1143.9364645 ,
- 1167.86041953, 1191.77433917, 1215.68171887, 1239.67717505,
- 1263.56868552, 1287.45623736, 1311.33879109, 1335.42554192,
- 1359.29674203, 1383.16482553, 1407.12781317, 1430.9819778 ,
- 1454.83143035, 1478.67552902, 1502.5092139 , 1526.43368135,
- 1550.24720756, 1574.05040372, 1598.11278261, 1621.89355503,
- 1645.66295535, 1669.4127228 , 1693.24790282, 1716.95466147,
- 1740.64470489, 1764.29955372, 1787.94097196, 1811.66024097,
- 1835.21976439, 1858.7629108 , 1882.25216821, 1905.70556458,
- 1929.56026928, 1952.93666632, 1976.40697173, 1999.65629865,
- 2022.87196158, 2046.03425204, 2069.12895151, 2092.29392599,
- 2115.87973751])], [2475.0, array([2110.93931759, 2140.69411263, 2132.70556261, 2112.51253682,
- 2113.97429417, 2158.38716407, 2165.13279514, 2212.62413576,
- 2240.8055932 , 2227.21289605, 2204.3417601 , 2383.49982987])], [2975.0, array([2362.98040538, 2387.05467179, 2411.92362366, 2436.48350106,
- 2461.31328464, 2486.27851517, 2511.34192794, 2536.52974153,
- 2561.88784628, 2587.19615709, 2613.09428076, 2638.60317633,
- 2664.48386207, 2690.62824806, 2716.4206392 , 2742.25858016,
- 2771.70456178, 2797.94804267, 2825.20192574, 2852.46881938,
- 2880.15614113, 387.20987385, 412.32506828, 437.4288514 ,
- 462.50921593, 487.56030371, 512.57390995, 537.54910446,
- 562.48315077, 587.36387809, 612.22155922, 637.02297211,
- 661.77914357, 686.48492816, 711.14160104, 735.74865002,
- 760.30337698, 784.86205337, 809.32159808, 833.71561815,
- 858.14283389, 882.44634478, 906.69504152, 930.89123405,
- 955.11415883, 979.20950863, 1003.24604679, 1027.38129729,
- 1051.32155691, 1075.21391048, 1099.05619318, 1122.95176288,
- 1146.69237913, 1170.38717396, 1194.02855823, 1217.62457021,
- 1241.30307653, 1264.80965116, 1288.27027436, 1311.68686024,
- 1335.36651672, 1358.7142621 , 1382.02325857, 1405.45464926,
- 1428.68519327, 1451.89150841, 1475.07612402, 1498.22642364,
- 1521.5019886 , 1544.59786061, 1567.67349535, 1590.73145658,
- 1614.21216957, 1637.24261197, 1660.26935602, 1682.96669619,
- 1706.44504467, 1729.45245878, 1752.44828931, 1775.45694003,
- 1798.62773198, 1821.63450099, 1844.67272552, 1867.70576536,
- 1890.76620799, 1914.37851585, 1937.49431088, 1960.26812197,
- 1983.94858702, 2007.15748776, 2030.40789023, 2053.71712245,
- 2077.18979434, 2100.58320742, 2124.48973348, 2148.45680058,
- 2172.44839341, 2196.96232732, 2222.37518265, 2246.97861384,
- 2272.00306088, 2297.5229657 , 2321.68514377, 2345.4164492 ,
- 2362.77189191, 2387.05338354, 2411.92446697, 2436.48243546,
- 2461.31328464, 2486.27855268, 2511.30235281, 2536.53053247,
- 2561.8896297 , 2587.19991062, 2613.09270119, 2638.95488381,
- 2664.89337958, 2690.63836511, 2716.42008523, 2742.25737632,
- 2771.7004586 , 2798.82957193, 2825.19515638, 2852.46671038,
- 2880.15268441])]], 3: [[600.0, array([245.70314621, 266.39921187, 289.3296737 , 313.23069808,
- 337.90258326, 363.07926928, 388.4417711 , 413.6429634 ,
- 438.5033378 , 463.00701554, 487.16183932, 510.94478568,
- 534.575359 , 558.26215606, 582.40618968])], [2200.0, array([ 580.50747836, 605.94231918, 631.21214519, 656.32978201,
- 681.30553135, 706.15111963, 730.87774339, 755.49579839,
- 780.01620792, 804.44485061, 828.78032135, 853.05978114,
- 877.37072432, 901.54013397, 925.664198 , 949.71069691,
- 973.88429255, 997.91391215, 1021.92213646, 1045.91040778,
- 1069.8949488 , 1093.86984261, 1117.93880965, 1141.91647415,
- 1165.90376026, 1190.06451944, 1214.07750084, 1238.01360397,
- 1262.21716751, 1286.26685924, 1310.34012349, 1334.43254467,
- 1358.54397839, 1382.67074241, 1406.89280666, 1431.05042366,
- 1455.23150158, 1479.4260245 , 1503.63019466, 1527.91234504,
- 1552.13035559, 1576.35519517, 1600.57824787, 1624.79778207,
- 1649.0046293 , 1673.19749995, 1697.43743366, 1721.58823212,
- 1745.70366325, 1769.78117541, 1793.80729019, 1817.87643802,
- 1842.07650138, 1865.64629507, 1889.42026997, 1913.09966963,
- 1936.69647209, 1960.60278168, 1984.1432092 , 2007.43658114,
- 2030.57947312, 2053.5963034 , 2076.44649051, 2099.30289988,
- 2122.58135816])], [2475.0, array([2117.23123252, 2153.35413115, 2132.72115921, 2100.64603461,
- 2147.58222984, 2144.48831723, 2172.94627753, 2226.80679681,
- 2227.94892341, 2231.52546798, 2201.64583864, 2399.78359109])], [2975.0, array([2392.82575179, 2420.40214737, 2445.73677504, 2470.26216903,
- 2492.41943627, 2515.50644172, 2537.18640159, 2558.89268794,
- 2581.62113316, 2602.11377994, 2624.26342714, 2647.75215167,
- 2670.99902687, 2694.75994359, 2719.31453274, 2744.22211476,
- 2770.1757187 , 2796.82385546, 2822.08734838, 2848.73548372,
- 2874.31967313])]], 1: [[600.0, array([397.49928026, 416.59117797, 437.75502876, 460.7487904 ,
- 484.4873963 , 508.07696465, 531.54790849, 555.11326022,
- 580.14019296])], [2200.0, array([ 578.25702345, 602.92018229, 627.40834975, 651.74472795,
- 675.95777791, 700.05316719, 724.03617543, 748.04362601,
- 771.85774141, 795.58673806, 819.35097446, 842.9552623 ,
- 866.50136135, 890.18993581, 913.66040442, 937.00139197,
- 960.61919285, 984.00205324, 1007.37519525, 1030.73952254,
- 1054.09542433, 1077.7072342 , 1101.18936266, 1124.56235711,
- 1147.95153063, 1171.34424786, 1194.75748241, 1218.30297692,
- 1241.76209758, 1265.24046876, 1288.7441263 , 1312.54963551,
- 1336.10596743, 1359.6955962 , 1383.40040289, 1407.040665 ,
- 1430.70220955, 1454.39627623, 1478.11015008, 1501.93843833,
- 1525.69456023, 1549.47165445, 1573.26397076, 1597.07293224,
- 1620.89310585, 1644.7129421 , 1668.61906751, 1692.43957137,
- 1716.25300744, 1740.05868414, 1763.84315086, 1787.68906322,
- 1811.42593621, 1835.13191294, 1858.78189739, 1882.39425322,
- 1905.92968885, 1929.42329658, 1952.93377424, 1976.26197526,
- 1999.50004327, 2023.20284914, 2046.27157676, 2068.73173275,
- 2092.19189962])], [2475.0, array([2086.15797557, 2125.13190438, 2132.02677613, 2131.54510875,
- 2124.63957102, 2132.44303561, 2175.8953685 , 2185.44908901,
- 2229.38441511, 2223.55934688, 2198.54299606, 2375.02441307])], [2975.0, array([2366.8519058 , 2391.80737328, 2415.5657483 , 2440.2183244 ,
- 2463.01537074, 2485.96857319, 2509.55186283, 2531.34521011,
- 2553.76827074, 2577.17521781, 2599.67448478, 2621.48429069,
- 2645.38037613, 2668.63449885, 2692.36002612, 2716.65636879,
- 2741.59278361, 2768.0522457 , 2796.32904733, 2823.12118386,
- 2852.55683692])]]}}
------ flux_y:
-{'MEG': {0: [[600.0, array([3.01312333e+11, 3.40265766e+11, 3.70456821e+11, 3.93344627e+11,
- 3.97257930e+11, 4.37994557e+11, 4.58576447e+11])], [2200.0, array([4.58576447e+11, 5.12218889e+11, 5.42509990e+11, 5.77778252e+11,
- 6.05706695e+11, 6.36302486e+11, 6.68436411e+11, 6.83162188e+11,
- 7.28593213e+11, 7.64930485e+11, 7.90092679e+11, 8.23576866e+11,
- 8.49740651e+11, 8.65802625e+11, 8.74418092e+11, 8.86168311e+11,
- 8.91978426e+11, 8.84623409e+11, 8.80824228e+11, 8.77492591e+11,
- 8.67633235e+11, 8.49045478e+11, 8.33678648e+11, 8.15049828e+11,
- 7.92640615e+11, 7.71122498e+11, 7.43453155e+11, 7.17233599e+11,
- 6.94932438e+11, 6.68330486e+11, 6.41732849e+11, 6.19328298e+11,
- 5.97861798e+11, 5.76654342e+11, 5.54113369e+11, 5.34085931e+11,
- 5.15622021e+11, 4.96274742e+11, 4.78335925e+11, 4.62317413e+11,
- 4.48622747e+11, 4.32194157e+11, 4.16324281e+11, 4.07563322e+11,
- 3.96628060e+11, 3.86306341e+11, 3.74159451e+11, 3.65979513e+11,
- 3.57884262e+11, 3.47333117e+11, 3.37447501e+11, 3.26879714e+11,
- 3.17286175e+11, 2.90156947e+11, 2.84995734e+11, 2.74806075e+11,
- 2.69672510e+11, 2.50471919e+11, 2.29897265e+11, 2.19380047e+11,
- 2.06559210e+11, 1.94089222e+11, 1.78416211e+11, 1.62248648e+11,
- 1.45650327e+11])], [2475.0, array([1.45650327e+11, 1.26596016e+11, 1.04588347e+11, 8.20507981e+10,
- 6.12999037e+10, 4.71199361e+10, 3.50847953e+10, 2.67181351e+10,
- 2.08936638e+10, 1.57950091e+10, 9.05374714e+09, 6.08442340e+09])], [2975.0, array([6.08442340e+09, 7.19094527e+09, 8.25079545e+09, 8.44888698e+09,
- 9.06227825e+09, 9.58047092e+09, 9.40492498e+09, 9.80104019e+09,
- 9.88020032e+09, 9.61358007e+09, 9.48197037e+09, 9.19598506e+09,
- 8.81565454e+09, 8.19827176e+09, 7.37681248e+09, 6.37423327e+09,
- 5.59790936e+09, 6.07332980e+09, 6.28561669e+09, 6.40094099e+09,
- 6.56188801e+09, 2.48217214e+11, 2.72519725e+11, 3.03110560e+11,
- 3.43307210e+11, 3.72939665e+11, 3.97302077e+11, 4.02407311e+11,
- 4.43043354e+11, 4.64074444e+11, 5.15662388e+11, 5.44717227e+11,
- 5.79845473e+11, 6.10547654e+11, 6.39655097e+11, 6.72250363e+11,
- 6.89580944e+11, 7.28871205e+11, 7.69815849e+11, 7.95373701e+11,
- 8.25347411e+11, 8.52038472e+11, 8.68788178e+11, 8.73983420e+11,
- 8.86389619e+11, 8.96043849e+11, 8.89368539e+11, 8.85819238e+11,
- 8.77367740e+11, 8.66802781e+11, 8.54151237e+11, 8.37505446e+11,
- 8.18655876e+11, 7.96576542e+11, 7.69411253e+11, 7.40339386e+11,
- 7.21676288e+11, 6.97940919e+11, 6.69952441e+11, 6.42615931e+11,
- 6.19128245e+11, 5.95336912e+11, 5.74709809e+11, 5.51033742e+11,
- 5.33193028e+11, 5.13845211e+11, 4.95922432e+11, 4.74165934e+11,
- 4.61709216e+11, 4.45577308e+11, 4.34574818e+11, 4.19781277e+11,
- 4.06643837e+11, 3.96689089e+11, 3.85667240e+11, 3.73359110e+11,
- 3.66505278e+11, 3.58393329e+11, 3.47431594e+11, 3.36762283e+11,
- 3.28764936e+11, 3.17820695e+11, 2.90160125e+11, 2.84443582e+11,
- 2.75052596e+11, 2.67037537e+11, 2.49612014e+11, 2.29085024e+11,
- 2.20185106e+11, 2.06453663e+11, 1.94117024e+11, 1.77512282e+11,
- 1.62703700e+11, 1.45132937e+11, 1.26522769e+11, 1.04155499e+11,
- 8.17607509e+10, 6.06845730e+10, 4.64710516e+10, 3.52448589e+10,
- 2.64186929e+10, 2.09555761e+10, 1.57491587e+10, 8.99071215e+09,
- 6.23071224e+09, 7.20220380e+09, 8.07540715e+09, 8.42402104e+09,
- 8.83300710e+09, 9.62339407e+09, 9.35840347e+09, 9.72441179e+09,
- 9.78617741e+09, 9.61653958e+09, 9.43267558e+09, 9.17566396e+09,
- 8.81640062e+09, 8.16313522e+09, 7.37684408e+09, 6.40673297e+09,
- 5.68649187e+09, 6.09167694e+09, 6.57881056e+09, 6.50552088e+09,
- 6.52796413e+09])]], 3: [[600.0, array([5.04045805e+10, 6.37327482e+10, 7.29061901e+10, 8.79213815e+10,
- 9.75102433e+10, 1.15677518e+11, 1.45161063e+11, 1.70441397e+11,
- 1.91672934e+11, 2.14522180e+11, 2.33506935e+11, 2.50808705e+11,
- 2.56840532e+11, 2.76338369e+11, 3.02656912e+11])], [2200.0, array([3.02656912e+11, 3.24508283e+11, 3.44977530e+11, 3.68090355e+11,
- 3.85308995e+11, 4.06693086e+11, 4.26793834e+11, 4.43425099e+11,
- 4.68537526e+11, 4.93748570e+11, 5.18687448e+11, 5.37442575e+11,
- 5.56569323e+11, 5.70291251e+11, 5.80763008e+11, 5.84440453e+11,
- 5.94704040e+11, 5.97106493e+11, 5.97092917e+11, 5.91043542e+11,
- 5.84491305e+11, 5.74155847e+11, 5.73229164e+11, 5.60936405e+11,
- 5.44372600e+11, 5.31828291e+11, 5.19139629e+11, 5.04731449e+11,
- 4.87333329e+11, 4.72508262e+11, 4.55922248e+11, 4.43777636e+11,
- 4.28914096e+11, 4.11575500e+11, 3.97535587e+11, 3.84399175e+11,
- 3.72893795e+11, 3.61565749e+11, 3.49294136e+11, 3.39616970e+11,
- 3.29665305e+11, 3.19611471e+11, 3.10620812e+11, 3.04493608e+11,
- 2.96910245e+11, 2.87193997e+11, 2.82319388e+11, 2.76353431e+11,
- 2.69154055e+11, 2.62799191e+11, 2.54629528e+11, 2.48730719e+11,
- 2.40078361e+11, 2.23853895e+11, 2.18775319e+11, 2.13180629e+11,
- 2.06524468e+11, 1.86596635e+11, 1.80342113e+11, 1.72207080e+11,
- 1.62511611e+11, 1.51699296e+11, 1.39454880e+11, 1.27253952e+11,
- 1.13662818e+11])], [2475.0, array([1.13662818e+11, 9.72953942e+10, 7.96293347e+10, 6.07911131e+10,
- 4.46989036e+10, 3.41079804e+10, 2.53033491e+10, 1.89330278e+10,
- 1.46384848e+10, 1.09404385e+10, 6.08872756e+09, 5.46307689e+09])], [2975.0, array([5.46307689e+09, 6.56894775e+09, 1.34042406e+10, 7.43765864e+09,
- 7.72193414e+09, 8.13273587e+09, 8.01109589e+09, 8.36968615e+09,
- 8.38008114e+09, 8.16854565e+09, 8.17328864e+09, 7.85232015e+09,
- 7.51332936e+09, 6.83204168e+09, 6.10587790e+09, 5.12255216e+09,
- 5.26742499e+09, 5.58109741e+09, 5.63882089e+09, 5.78979138e+09,
- 5.72800860e+09])]], 1: [[600.0, array([2.48392273e+11, 2.76221468e+11, 3.10748237e+11, 3.46460102e+11,
- 3.78164129e+11, 4.00814031e+11, 4.13038975e+11, 4.36756596e+11,
- 4.74239690e+11])], [2200.0, array([4.74239690e+11, 5.12246740e+11, 5.42931191e+11, 5.71196646e+11,
- 5.96670690e+11, 6.22461576e+11, 6.49151746e+11, 6.73747513e+11,
- 6.95450639e+11, 7.37088595e+11, 7.69044892e+11, 8.02285698e+11,
- 8.24713276e+11, 8.44231600e+11, 8.56843291e+11, 8.63902338e+11,
- 8.74203971e+11, 8.80817347e+11, 8.79106614e+11, 8.73677011e+11,
- 8.63963273e+11, 8.55727882e+11, 8.40978085e+11, 8.28163750e+11,
- 8.13594557e+11, 7.93658203e+11, 7.69701292e+11, 7.46490133e+11,
- 7.21967341e+11, 6.93087889e+11, 6.67643362e+11, 6.48221689e+11,
- 6.21211923e+11, 5.96867648e+11, 5.75033489e+11, 5.54876514e+11,
- 5.33924161e+11, 5.14481283e+11, 4.93566915e+11, 4.75629654e+11,
- 4.59443303e+11, 4.45007280e+11, 4.31492869e+11, 4.19059182e+11,
- 4.06201734e+11, 3.95859290e+11, 3.83780492e+11, 3.77003970e+11,
- 3.68468308e+11, 3.57011143e+11, 3.48419887e+11, 3.39298361e+11,
- 3.30117801e+11, 3.21591557e+11, 2.93771520e+11, 2.86908482e+11,
- 2.78319927e+11, 2.70990918e+11, 2.50388292e+11, 2.34741083e+11,
- 2.22338719e+11, 2.10333511e+11, 1.96900035e+11, 1.80870211e+11,
- 1.65859923e+11])], [2475.0, array([1.65859923e+11, 1.47393577e+11, 1.27897707e+11, 1.05124520e+11,
- 8.29131224e+10, 6.11758992e+10, 4.70577255e+10, 3.52864162e+10,
- 2.66327994e+10, 2.00556481e+10, 1.17757043e+10, 5.47905131e+09])], [2975.0, array([5.47905131e+09, 6.36038874e+09, 7.30733041e+09, 8.27980811e+09,
- 8.61885535e+09, 9.04591445e+09, 9.61420872e+09, 9.48332641e+09,
- 9.83228526e+09, 9.92841482e+09, 9.55612221e+09, 9.43993368e+09,
- 9.16339293e+09, 8.72757672e+09, 8.04649052e+09, 7.35985215e+09,
- 6.08617376e+09, 5.94104124e+09, 6.37727729e+09, 6.47862907e+09,
- 6.51092118e+09])]]}}
diff --git a/iexcode/IEX_dictionaries/Flux_Curves_QP70.txt b/iexcode/IEX_dictionaries/Flux_Curves_QP70.txt
deleted file mode 100644
index 1ebdc1d..0000000
--- a/iexcode/IEX_dictionaries/Flux_Curves_QP70.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-
-======= 20220720:
-
------ flux_x:
-{'MEG': {0: [[600.0, array([439.52, 484.53, 536.53, 590.59, 644.02])], [1500.0, array([ 643.3150091 , 698.27638369, 751.92819053, 804.32851937,
- 855.85957584, 906.94762404, 957.62883976, 1008.16118875,
- 1058.61331684, 1109.08200868, 1159.60303415, 1210.18400879,
- 1260.80802369, 1311.41803046, 1361.97140942, 1412.24939421,
- 1462.16437202, 1511.52883401, 1560.18223664])]], 3: [[400.0, array([261.2 , 321.01, 372.41, 430.4 ])], [600.0, array([430.4 , 485.99, 538.17, 590.59, 641.97])], [1500.0, array([ 642.33414808, 696.40046444, 749.78523155, 802.70679918,
- 855.20268058, 907.36091505, 959.131399 , 1010.50673309,
- 1061.73799295, 1112.64806192, 1163.30746953, 1213.72542759,
- 1263.91577528, 1313.87611693, 1363.60216817, 1413.0934456 ,
- 1462.34136595, 1511.30391423, 1560.0098909 ])]], 2: [[600.0, array([484.52, 536.53, 590.58, 644.01])], [1500.0, array([ 643.67872489, 696.39449875, 748.68451943, 800.80899782,
- 852.69105756, 904.41720315, 955.93918876, 1007.30454524,
- 1058.50731464, 1109.59661276, 1160.54134668, 1211.33241352,
- 1261.95763777, 1312.42030824, 1362.61711289, 1412.55398924,
- 1462.19394606, 1511.47510981, 1560.37547278])]], 1: [[600.0, array([438.2 , 482.98, 534.78, 583.44, 636. ])], [1500.0, array([ 635.87569328, 688.63387248, 740.7642036 , 792.29704081,
- 843.29680358, 893.81787821, 943.94262125, 993.73556398,
- 1043.23173691, 1092.47885098, 1141.54069278, 1190.46375301,
- 1239.31206379, 1288.13945996, 1336.97448654, 1385.91496532,
- 1434.98992597, 1484.23051482, 1533.69987274])]]}}
------ flux_y:
-{'MEG': {0: [[600.0, array([1.69158915e+11, 2.08804750e+11, 2.31668324e+11, 3.34882933e+11,
- 3.80203782e+11])], [1500.0, array([3.80203782e+11, 4.46868047e+11, 4.99220650e+11, 5.68471098e+11,
- 6.19554944e+11, 6.64099063e+11, 6.86700841e+11, 6.94129493e+11,
- 6.92912470e+11, 6.76929478e+11, 6.52455412e+11, 6.10130165e+11,
- 5.82819364e+11, 5.44097059e+11, 5.00613963e+11, 4.73637865e+11,
- 4.42900806e+11, 4.08118044e+11, 3.86443758e+11])]], 3: [[400.0, array([2.07094724e+10, 4.91850743e+10, 6.83548158e+10, 1.00826960e+11])], [600.0, array([1.00826960e+11, 1.31386117e+11, 1.45302751e+11, 1.84401156e+11,
- 1.96547991e+11])], [1500.0, array([1.96547991e+11, 2.31426905e+11, 2.66511659e+11, 3.04558624e+11,
- 3.43008444e+11, 3.83114487e+11, 4.05307437e+11, 4.16801991e+11,
- 4.19203408e+11, 4.14410939e+11, 4.03083879e+11, 3.85122357e+11,
- 3.68233195e+11, 3.50341535e+11, 3.27304810e+11, 3.08285915e+11,
- 2.90908581e+11, 2.75272734e+11, 2.61154524e+11])]], 2: [[600.0, array([1.29798464e+11, 1.42975699e+11, 1.77491240e+11, 2.05858697e+11])], [1500.0, array([2.05858697e+11, 2.43589523e+11, 2.74930597e+11, 3.13778705e+11,
- 3.54132939e+11, 3.83672970e+11, 4.06461475e+11, 4.19266945e+11,
- 4.23430826e+11, 4.16245461e+11, 4.07779009e+11, 3.91378629e+11,
- 3.69973403e+11, 3.47417563e+11, 3.29959730e+11, 3.09206441e+11,
- 2.91825326e+11, 2.78247315e+11, 2.62472215e+11])]], 1: [[600.0, array([1.95443600e+11, 2.37980112e+11, 2.63344561e+11, 3.08919456e+11,
- 3.63863197e+11])], [1500.0, array([3.63863197e+11, 4.16045131e+11, 4.66471171e+11, 5.18255780e+11,
- 5.78827895e+11, 6.27713326e+11, 6.57194435e+11, 6.76568690e+11,
- 6.08682096e+11, 6.74642773e+11, 6.53995264e+11, 6.19850673e+11,
- 5.88794730e+11, 5.53449825e+11, 5.12839982e+11, 4.77251214e+11,
- 4.42649534e+11, 3.77680200e+11, 3.53648814e+11])]]}}
diff --git a/iexcode/IEX_dictionaries/M0M1_positions.py b/iexcode/IEX_dictionaries/M0M1_positions.py
deleted file mode 100644
index c00c6d4..0000000
--- a/iexcode/IEX_dictionaries/M0M1_positions.py
+++ /dev/null
@@ -1,3 +0,0 @@
-M0M1_Pos['default']={0:'-0.400/-22.5/0/0/0.000/0.0000',1:'0.400/-21.5/0/0/8.400/2.800'}
-M0M1_Pos['2019_1']= {0:'0.3010/-22.5/0/0/-0.151/0.0393',1:'1.449/-21.5/0/0/8.339/2.700'}
-M0M1_Pos['2019_2']= {0:'-0.400/-22.5/0/0/ 0.000/0.000',1:'0.400 /-21.5/0/0/8.436/3.000'}
\ No newline at end of file
diff --git a/iexcode/IEX_dictionaries/calibrationToFix.txt b/iexcode/IEX_dictionaries/calibrationToFix.txt
deleted file mode 100644
index 0dd6796..0000000
--- a/iexcode/IEX_dictionaries/calibrationToFix.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-======= 20211108:
-{'HEG': {0: [[600, [-6635.813431810828, 53.075898114105726, -0.15253171108859886, 0.00019792480095656869, -9.598209896301075e-08]], [3000, [46.600135556920925, 0.8412063733137993, 0.00023492720237763438, -1.2593652551917328e-07, 2.5435326557098538e-11]]], 3: [[400, [1051.452570904546, -13.099314837713008, 0.06939879665006896, -0.00014784669111041307, 1.155031075284652e-07]], [600, [2782.786054275039, -21.145755715684032, 0.06554921272398154, -8.534237586539917e-05, 4.134061079155964e-08]], [3000, [87.23060103156234, 0.7171860430279529, 0.0003793918782124725, -1.9605428816497513e-07, 3.6770897051532086e-11]]], 2: [[590, [-12422.076427583952, 100.54771064816772, -0.29845648627641835, 0.00039688772576782855, -1.97439876026206e-07]], [3000, [-33.02431482418943, 1.1302724323594304, -0.00013479679549416608, 7.22272393581498e-08, -1.373032035520199e-11]]], 1: [[600.0, [-4765.159827798981, 39.08508762376964, -0.11372474852884872, 0.00015063687981483728, -7.456557379431018e-08]], [3000, [84.53488099145231, 0.7066601865786498, 0.00043283422433330405, -2.2608518373215027e-07, 4.202604094132355e-11]]]},
-{'MEG': {
-0: [[600.0, [-5940.176848239725, 48.30636368582396, -0.14075467796987542, 0.00018579017325356665, -9.17653113254405e-08]], [2200.0, [20.344164869431648, 0.942351240250947, 0.00010121556917763097, -4.949527030585497e-08, 9.675448511744878e-12]], [3000.0, [365297.2627682823, -552.812440238765, 0.3141479258407871, -7.90104068928604e-05, 7.434922126836773e-09]]],
-
-3: [[600.0, [-634.0261758446517, 7.262520018224911, -0.022419323576083252, 3.49681129089603e-05, -1.999932008653819e-08]], [2200.0, [58.93716149881088, 0.8198484295498225, 0.0002490011121555607, -1.2688431897796926e-07, 2.37752539333468e-11]], [3000.0, [112089.95145715227, -159.53263761672966, 0.08554887203588527, -2.0076278347329386e-05, 1.749084702165079e-09]]],
-
-2: [[600.0, [-604.5006436697821, 3.0530278050672597, 0.0006285185258970196, -7.876285868395855e-06, 6.618688516815772e-09]], [2200.0, [34.67137980324179, 0.8848938354598829, 0.00017775770898386393, -9.469862981232054e-08, 1.8324158207531115e-11]], [3000.0, [409195.45122128195, -612.7658620540126, 0.3445915452908224, -8.582156181499232e-05, 8.000918394998031e-09]]],
-
-1: [[600.0, [-3677.005333394253, 29.772255818860682, -0.0843978889369737, 0.00011023738262993015, -5.399238835077749e-08]], [2200.0, [46.243321909129264, 0.8454613578261618, 0.00024604317670495594, -1.1956387793694198e-07, 2.0350719268411266e-11]], [3000.0, [-99353.40775512981, 160.7507495025834, -0.0962536588691068, 2.5766240641565706e-05, -2.583875704169572e-09]]]}
\ No newline at end of file
diff --git a/iexcode/IEX_dictionaries/mono_parameters.txt b/iexcode/IEX_dictionaries/mono_parameters.txt
deleted file mode 100644
index 4acfebd..0000000
--- a/iexcode/IEX_dictionaries/mono_parameters.txt
+++ /dev/null
@@ -1,10 +0,0 @@
- MonoParm["20160822"]={
- 'Au':[0.3237,-12.04],'Si':[0.3237,-2.04],'Carbon':[0.3237,7.96],
- 'MEG_Imp':[0.7290,4.872,1200.0,-7.34e-05],'HEG_JY':[0.7302,69.0,2400.0,-5.58e-05],'MEG_JY':[0.8,131.624,1200.0,0.0]}
- MonoParm["20190719_4"]={
- 'Au':[0.3266,-12.04],'Si':[0.3237,-2.04],'Carbon':[0.3237,7.96],
- 'MEG_Imp':[0.7306,4.872,1200.0,-7.15e-05],'HEG_JY':[0.7278,69.0,2400.0,-5.535e-05],'MEG_JY':[0.8,131.624,1200.0,0.0]}
- MonoParm['20191018']= {
- 'Au':[0.3203,-12.04],'Si':[0.3237,-2.04],'Carbon':[0.3237,7.96],
- 'MEG_Imp':[0.7306,4.872,1200.0,-7.15e-05],'HEG_JY':[0.7123,69.0,2400.0,-5.535e-05],'MEG_JY':[0.7306,131.624,1200.0,0.0],}
-
\ No newline at end of file
diff --git a/iexcode/instruments/ARPES.py b/iexcode/instruments/ARPES.py
index 0beb42f..306b7ec 100644
--- a/iexcode/instruments/ARPES.py
+++ b/iexcode/instruments/ARPES.py
@@ -82,6 +82,7 @@ def ARPES_init(*userName,**kwargs):
iex.BL = Beamline_Config('ARPES',kwargs['scan_ioc'],kwargs['xrays'],kwargs['mode'],ARPES_Motors,**BL_kwargs)
BLconfig_safe_state_set(ARPES_safe_state)
BLconfig_get_set(ARPES_get_all)
+ iex.BL.ca_list = _ARPES_ca_list()
#setting folders
if kwargs['set_folders']:
diff --git a/iexcode/instruments/IEX_BL_config.py b/iexcode/instruments/IEX_BL_config.py
index 8f18c7f..e61a8b7 100644
--- a/iexcode/instruments/IEX_BL_config.py
+++ b/iexcode/instruments/IEX_BL_config.py
@@ -134,6 +134,7 @@ class Beamline_Config:
self.safe_state = None
self.endstation_get = None
+ self.ca_list=[]
BL_mode_list = ['user','staff']
diff --git a/iexcode/instruments/IEX_VPU.py b/iexcode/instruments/IEX_VPU.py
index 489b9dd..f43b19e 100644
--- a/iexcode/instruments/IEX_VPU.py
+++ b/iexcode/instruments/IEX_VPU.py
@@ -337,6 +337,7 @@ def _ID_write_SP_proc(keV):
ID_start()
caput(ID_pvs()['energy_sp'],keV,wait=True,timeout=18000)
+ sleep(2)
caput(ID_pvs()['start_ramp'],1,wait=True,timeout=18000 )
#caput(ID_pvs()['scan_val'],keV,wait=True,timeout=18000)
diff --git a/iexcode/instruments/Keithley_current_amplifiers.py b/iexcode/instruments/Keithley_current_amplifiers.py
index 4c1c3c2..64ea780 100644
--- a/iexcode/instruments/Keithley_current_amplifiers.py
+++ b/iexcode/instruments/Keithley_current_amplifiers.py
@@ -1,3 +1,4 @@
+from iexcode.instruments.IEX_BL_config import BLconfig_branch
import numpy as np
from time import sleep
@@ -13,7 +14,7 @@ def ca_detector_list(branch):
returns the list of keithley current amplifiers based on key
key: 'ARPES' / 'Staff'
"""
- ca_list = iex.ca_list
+ ca_list = iex.BL.ca_list
return ca_list
@@ -253,7 +254,7 @@ def ca_average(avg_pts,**kwargs):
Previously: CA_average
"""
- kwargs.setdefault('ca_list',ca_detector_list(iex.BL.branch)),
+ kwargs.setdefault('ca_list',ca_detector_list(BLconfig_branch())),
kwargs.setdefault('rate',"Slow")
kwargs.setdefault('verbose',True)
ca_list = kwargs['ca_list']
diff --git a/iexcode/instruments/diagnostics.py b/iexcode/instruments/diagnostics.py
index 31ce74a..d422010 100644
--- a/iexcode/instruments/diagnostics.py
+++ b/iexcode/instruments/diagnostics.py
@@ -17,17 +17,17 @@ def diagnostics_presets():
{preset_name: ([presets_positions], motor_pv)}
"""
presets={
- 'H-wire':(['OUT','Start'],'29id:m1'),
- 'V-wire':(['OUT','Start'],'29id:m2'),
- 'H-Diagon':(['OUT','Si-2800','ML-400','ML-460'],'29id:m3'),
- 'V-Diagon':(['OUT','Si-2800','ML-400','ML-460'],'29id:m4'),
- 'D1A':(['OUT','Mesh'],'29id:m5'),
- 'D2B':(['OUT','Mesh','YAG'],'29id:m6'),
- 'D3B':(['OUT','YAG'],'29id:m7'),
- 'D4C':(['OUT','Mesh','YAG'],'29id:m17'),
- 'gas-cell':(['OUT','Diode1','Diode2'],'29id:m20'),
- 'D4D':(['OUT','Mesh','YAG'],'29id:m25'),
- 'D5D':(['OUT','Mesh','YAG','Diode'],'29id:m6')
+ 'H-wire':(['OUT','Start'],'29idb:m1'),
+ 'V-wire':(['OUT','Start'],'29idb:m2'),
+ 'H-Diagon':(['OUT','Si-2800','ML-400','ML-460'],'29idb:m3'),
+ 'V-Diagon':(['OUT','Si-2800','ML-400','ML-460'],'29idb:m4'),
+ 'D1A':(['OUT','Mesh'],'29idb:m5'),
+ 'D2B':(['OUT','Mesh','YAG'],'29idb:m6'),
+ 'D3B':(['OUT','YAG'],'29idb:m7'),
+ 'D4C':(['OUT','Mesh','YAG'],'29idb:m17'),
+ 'gas-cell':(['OUT','Diode1','Diode2'],'29idb:m20'),
+ 'D4D':(['OUT','Mesh','YAG'],'29idb:m25'),
+ 'D5D':(['OUT','Mesh','YAG','Diode'],'29idb:m6')
}
return presets
@@ -156,10 +156,12 @@ def diagnostics_all_out(diode_stay_in=False,mesh_stay_in=False):
if branch == 'c':
diode_stay_name = d_names['diode_c'][0]
message += '\ndiode_c => In'
+ diag_list.pop(diode_stay_name)
elif branch == 'd':
diode_stay_name = d_names['diode_d'][0]
message += '\ndiode_d => In'
- diag_list.pop(diode_stay_name)
+ diag_list.pop(diode_stay_name)
+
if mesh_stay_in:
branch = iex.BL.branch
diff --git a/iexcode/instruments/scanRecord.py b/iexcode/instruments/scanRecord.py
index 3c28c0a..99c084d 100644
--- a/iexcode/instruments/scanRecord.py
+++ b/iexcode/instruments/scanRecord.py
@@ -982,7 +982,7 @@ class ScanRecord:
print('Scan'+str(i)+': '+drive+'= '+str(start)+' / '+str(stop)+' / '+str(step))
try:
if iex.BL.xrays:
- shutter_check(verbose=True)
+ shutter_check(verbose=False)
except:
print_warning_message('no shutter check')
diff --git a/iexcode/instruments/slits.py b/iexcode/instruments/slits.py
index 6d961d1..41f2552 100644
--- a/iexcode/instruments/slits.py
+++ b/iexcode/instruments/slits.py
@@ -36,7 +36,7 @@ def slit_name_list():
message = message+", "+key
print(message)
-def _slits_wide_open_dictionary():
+def slits_wide_open_dictionary():
"""
wide open size for the slits
These are not the epics limits, but the physical extent of the beam
@@ -64,8 +64,8 @@ def slits_pvs(slit_name):
size_rbv = d[slit_name][0]+'RBV'
center_val = None
center_rbv = None
- size.append((size_rbv,size_val))
- center.append((center_rbv,center_val))
+ size.append((size_val,size_rbv))
+ center.append((center_val,center_rbv))
else:
for slit_HV in d[slit_name]:
size_val = slit_HV +'size.VAL'
@@ -132,7 +132,7 @@ def slits_set(slit_name,size,center,verbose=True,wait=True):
#syncing
slits_synch(slit_name)
- maxsize=_slits_wide_open_dictionary()[slit_name]
+ maxsize=slits_wide_open_dictionary()[slit_name]
size=list(size)
center=list(center)
for i,s in enumerate(size):
@@ -140,8 +140,8 @@ def slits_set(slit_name,size,center,verbose=True,wait=True):
size[i]=maxsize
#get pvnames
size_pvs,center_pvs = slits_pvs(slit_name)
- size_rbv, size_val, = size_pvs[i]
- center_rbv,center_val = center_pvs[i]
+ size_val,size_rbv = size_pvs[i]
+ center_val,center_rbv = center_pvs[i]
#check if there is a pv
if center_rbv != None:
@@ -225,10 +225,10 @@ def slits_scan_size(slit_name,direction,start,stop,step,**kwargs):
size,center = slits_pvs(slit_name)
if direction == 'H':
- size_rbv,size_val = size[0]
+ size_val,size_rbv = size[0]
center_rbv,center_val = center[0]
if direction == 'V':
- size_rbv,size_val = size[1]
+ size_val,size_rbv = size[1]
center_rbv,center_val = center[1]
#set slit center
@@ -252,10 +252,10 @@ def slits_scan_center(slit_name,direction,start,stop,step,**kwargs):
size,center = slits_pvs(slit_name)
if direction == 'H':
- size_rbv,size_val = size[0]
+ size_val,size_rbv = size[0]
center_rbv,center_val = center[0]
if direction == 'V':
- size_rbv,size_val = size[1]
+ size_val,size_rbv = size[1]
center_rbv,center_val = center[1]
#set slit center
diff --git a/iexcode/instruments/utilities.py b/iexcode/instruments/utilities.py
index d9b8b52..3e4c1ce 100644
--- a/iexcode/instruments/utilities.py
+++ b/iexcode/instruments/utilities.py
@@ -12,6 +12,9 @@ import numpy as np
from epics import caget, caput
+dictionary_path = '/home/beams/29IDUSER/Documents/User_Macros/Macros_29id/IEX_Dictionaries'
+sounds_path = '/home/beams/29IDUSER/Documents/User_Macros/Macros_29id/Sound_Files/'
+
def dateandtime():
return time.strftime("%a %d %b %Y %H:%M:%S",time.localtime())
@@ -68,18 +71,33 @@ def input_timeout(question,t):
print("You said nothing!")
def playsound(sound='FF'):
+ """
+ 'FF' Final Fantasy victory sound
+ 'ding' a subtle ding noise
+ 'hallelujah' hallelujah chorus
+ 'train' train whistle
+ 'drumroll'
+ 'beepboop
+ """
+ play_sound(sound)
+
+def play_sound(sound='train'):
"""
plays a sound when run
'FF' Final Fantasy victory sound
'ding' a subtle ding noise
'hallelujah' hallelujah chorus
+ 'train' train whistle
+ 'drumroll'
+ 'beepboop
"""
+ path = sounds_path
if sound == 'FF':
- sounds = '/home/beams/29IDUSER/Documents/User_Macros/Macros_29id/Sound_Files/VictoryFF.wav'
+ sounds = path+'VictoryFF.wav'
elif sound == 'ding':
- sounds = '/home/beams/29IDUSER/Documents/User_Macros/Macros_29id/Sound_Files/ding.wav'
+ sounds = path+'ding.wav'
elif sound == 'hallelujah':
- sounds = '/home/beams/29IDUSER/Documents/User_Macros/Macros_29id/Sound_Files/hallelujah.wav'
+ sounds = path+'hallelujah.wav'
os.system('aplay ' + sounds)
def range_up(start,end,step):
@@ -115,7 +133,7 @@ def read_dict(filename,**kwargs):
if 'path' in kwargs:
path = kwargs['path']
else:
- path = os.path.join(os.path.dirname(os.path.dirname(__file__)),'IEX_dictionaries')
+ path = dictionary_path
fpath = os.path.join(path,filename)
with open(fpath) as f:
for c,line in enumerate(f.readlines()):
@@ -135,7 +153,7 @@ def write_dict(filename,d,**kwargs):
if 'path' in kwargs:
path = kwargs['path']
else:
- path = os.path.join(os.path.dirname(os.path.dirname(__file__)),'IEX_dictionaries')
+ path = dictionary_path
fpath = os.path.join(path,filename)
with open(fpath,'a+') as f:
diff --git a/iexcode/instruments/xrays.py b/iexcode/instruments/xrays.py
index 3ebc2a9..9986639 100644
--- a/iexcode/instruments/xrays.py
+++ b/iexcode/instruments/xrays.py
@@ -312,7 +312,7 @@ def scan_ID(ID_sp_start,ID_sp_stop,ID_sp_step,**kwargs):
scan the ID set point
"""
val_pv,rbv_pv = ID_scan_pvs()
- iex.BL.mda.fillin(val_pv,rbv_pv,ID_sp_start,ID_sp_stop,ID_sp_step,**kwargs)
+ scan_fillin(val_pv,rbv_pv,ID_sp_start,ID_sp_stop,ID_sp_step,**kwargs)
def mvmono(val):
@@ -385,7 +385,10 @@ def scanmono(start,stop,step,average_pnts=1,**kwargs):
scans the mono at the current ID value
"""
- ca_average(average_pnts)
+ try:
+ ca_average(average_pnts)
+ except:
+ print('no ca averaging')
mono_scan(start,stop,step,**kwargs)
@@ -443,27 +446,27 @@ def scanXAS(hv_list,ID_tracking=False, **kwargs):
if 'average_pnts' in kwargs:
ca_average(kwargs['average_pnts'])
- if iex.BL.branch=="d":
+ if BLconfig_branch() == "d":
mesh_d("In")
#print_warning_message('MeshD is not automatically removed')
#mpa
- if iex.BL.endstation_name == "Kappa" and kwargs["mcp"]:
+ if BLconfig_endstation_name() == "Kappa" and kwargs["mcp"]:
mpa.HV_on()
#Scanning
if kwargs['execute']:
mono_energy_set(mono_array[0])
- iex.BL.mda.go(scan_dim)
+ scan_go(scan_dim)
#Setting everything back
mono_scan_after()
- iex.BL.mda.table_reset_after()
+ scan_after_table_reset()
- if iex.BL.endstation_name == "Kappa":
+ if BLconfig_endstation_name() == "Kappa":
if kwargs["mcp"]:
mpa.HV_off()
- print("WARNING: Mesh"+iex.BL.branch+" is still In")
+ print("WARNING: Mesh"+BLconfig_branch()+" is still In")
def BL_energy_tables(hv_lists,**kwargs):
@@ -546,23 +549,22 @@ def get_mirrors():
##############################################################################################################
def slit(size,verbose=True):
"""
- sets the exit slit based on iex.BL.endstation_name
+ sets the exit slit based on BLconfig_branch
ARPES = 0 < x < 300 um
Kappa = 0 < x < 1000 um
"""
- branch = iex.BL.branch
+ branch = BLconfig_branch()
exit_slit_set(branch,size,verbose=verbose)
def slit_get(verbose=True):
"""
- sets the exit slit based on iex.BL.endstation_name
+ sets the exit slit based on BLconfig_branch
ARPES = 0 < x < 300 um
Kappa = 0 < x < 1000 um
"""
- #branch = iex.BL.branch
branch = BLconfig_branch()
slit_size,slit_center = exit_slit_get(branch,verbose=verbose)
return slit_size,slit_center
diff --git a/iexcode/macros/Kappa_optimization.py b/iexcode/macros/Kappa_optimization.py
index fac1150..02612f3 100644
--- a/iexcode/macros/Kappa_optimization.py
+++ b/iexcode/macros/Kappa_optimization.py
@@ -37,7 +37,7 @@ def align_d4(z0,th):
fit_mda(n,25,0,'poly',graph=False)
tth0=fit_d4(n)
print('tth0 = '+str(round(tth0,3)))
- playsound()
+ play_sound()
return tth0
@@ -54,7 +54,7 @@ def align_z0_chi0(question=True):
fit_mda(n,25,0,'poly',graph=False)
z0=fit_z(n)
print('z0 = '+str(round(z0,0)))
- playsound()
+ play_sound()
return z0
else:
print('Canceling')
@@ -69,7 +69,7 @@ def align_z0_chi0(question=True):
fit_mda(n,25,0,'poly',graph=False)
z0=fit_z(n)
print('z0 = '+str(round(z0,0)))
- playsound()
+ play_sound()
return z0
def align_z0(omega):
@@ -82,7 +82,7 @@ def align_z0(omega):
#fit_mda(n,25,0,'poly',graph=False)
#z0=fit_z(n)
#print('z0 = '+str(round(z0,0)))
- playsound()
+ play_sound()
#return z0
@@ -96,7 +96,7 @@ def align_z180(omega):
#fit_mda(n,25,0,'poly',graph=False)
#z180=fit_z(n)
#print('z180 = '+str(round(z180,0)))
- playsound()
+ play_sound()
#return z180
def align_th0(omega,z):
@@ -115,7 +115,7 @@ def align_th0(omega,z):
tth=round(caget('29idKappa:m9.RBV'),3)
omega=th_spec-tth/2
print('omega = th-tth/2 = '+str(round(omega,3)))
- playsound()
+ play_sound()
return omega
@@ -134,7 +134,7 @@ def align_th180(omega,z):
tth=round(caget('29idKappa:m9.RBV'),3)
omega180=th_spec-tth/2-180
print('omega180 = th-tth/2-180 = '+str(round(omega180,3)))
- playsound()
+ play_sound()
return omega180
diff --git a/iexcode/macros/commissioning.py b/iexcode/macros/commissioning.py
index 7e9f22f..53376f8 100644
--- a/iexcode/macros/commissioning.py
+++ b/iexcode/macros/commissioning.py
@@ -13,7 +13,7 @@ from iexcode.instruments.IEX_VPU import *
from iexcode.instruments.SRS_current_amplifiers import *
from iexcode.instruments.diagnostics import diagnostics_all_out, diagnostics_all_in,diode_c,diode_d
from iexcode.instruments.m3r import *
-from iexcode.instruments.slits import _slits_wide_open_dictionary
+from iexcode.instruments.slits import slits_wide_open_dictionary
from iexcode.instruments.slits import *
from iexcode.instruments.utilities import *
from iexcode.instruments.electron_analyzer import scanEA
@@ -33,15 +33,17 @@ def check_flux_scan(hv=500,stay=False,**kwargs):
False => takes the diode out
"""
kwargs.setdefault('sound',True)
- diagnostics_all_out(diode_stay_in=True)
+ if stay == False:
+ diagnostics_all_out()
slit(50)
energy(hv)
hv_start = hv*.95
hv_stop = hv*1.05
hv_step = round(1.0*hv/500,0)
- scanmono(hv_start,hv_stop,hv_step,comment='Mono Scan @ '+str(hv)+' eV')
+ kwargs.update({'comment':'Mono Scan @ '+str(hv)+' eV'})
+ scanmono(hv_start,hv_stop,hv_step,**kwargs)
if kwargs['sound']:
- playsound()
+ play_sound()
def check_flux_read(hv=500,ID_mode='RCP',stay=False):
"""
@@ -96,17 +98,25 @@ def scan_wire(direction,all_diag=True,**kwargs):
if direction == 'H':
name = "H-wire"
+ start = -13
+ stop = -27
+ step = -0.25
+ det_name = 'CA2'
elif direction == 'V':
name = "V-wire"
+ start = -17
+ stop = -30
+ step = -0.25
+ det_name = 'CA2'
diagnostics_presets_go(name,'Start')
pv = diagnostics_presets()[name][1]
- print("\n================== "+name+" scan (29idb:ca2):")
- iex.BL.mda.fillin(pv+".VAL",pv+".RBV",1,-17,-30,-0.25,**kwargs)
+ print("\n================== "+name+" scan; det = "+det_name)
+ scan_fillin(pv+".VAL",pv+".RBV",start,stop,step,**kwargs)
if kwargs['execute']:
- iex.BL.mda.go(**kwargs)
+ scan_go(**kwargs)
if all_diag:
diagnostics_all_out()
@@ -157,7 +167,7 @@ def scan_narrow_slit(slit='2V',slit_parameters=[0.25,-2,2,0.5],**kwargs):
slits_scan_center(slit_name,direction,start,stop,step,**kwargs)
if kwargs['execute']:
- iex.BL.mda.go(kwargs['scan_dim'])
+ scan_go(kwargs['scan_dim'])
def scan_mono_vs_slit(slit='2V',slit_parameters=[0.25,-2,2,0.5],energy_parameters=[470,530,2],**kwargs):
@@ -216,7 +226,7 @@ def mono_MIR_GRT_find_offset(grt,slit_list,**kwargs):
sleep(1)
print("\r")
- grating_ang = fit_mda(iex.BL.mda.fileNum(),kwargs['detNum'],.1,'gauss')
+ grating_ang = fit_mda(mda_fileNum(),kwargs['detNum'],.1,'gauss')
print("Peak: ",grating_ang)
print("\r")
print("-------------------------")
@@ -355,7 +365,7 @@ def scan_pinhole(H_list,V_list,**kwargs):
+str(H_list[0])+"/"+str(H_list[1])+"/"+str(H_list[2])+"/"+str(H_list[3])+"/"
+str(V_list[0])+"/"+str(V_list[1])+"/"+str(V_list[2])+"/"+str(V_list[3]))
- iex.BL.mda.go(max(kwargs['H_scan_dim'],kwargs['V_scan_dim']))
+ scan_go(max(kwargs['H_scan_dim'],kwargs['V_scan_dim']))
print("\rNow setting the slits back to:")
apertures_set()
@@ -479,20 +489,23 @@ def ID_steering_scans(**kwargs):
start,stop = (-3,3)
slit_name = 'slit1A'
- H,V = _slits_wide_open_dictionary()[slit_name]
+ H,V = slits_wide_open_dictionary()[slit_name]
if kwargs['W_mesh_in']:
diagnostic('mesh_W','in')
print("\n================== Slit 1A scans: checking ID steering ================== ")
ID_set_eV(kwargs['ID_eV'])
- slits_scan_center('slit1A','H',start,stop,0.1,size=(0.25,V),comment='Slit center - 1H')
- slits_scan_center('slit1A','V',start,stop,0.1,size=(H,0.25),comment='Slit center - 1V')
+ #slits_scan_center(slit_name,'H',start,stop,0.1,size=(0.25,V),comment='Slit center - 1H')
+ #slits_scan_center(slit_name,'V',start,stop,0.1,size=(H,0.25),comment='Slit center - 1V')
+ #originally thought that it should be long and skinny; but original is .25 x .25
+ slits_scan_center(slit_name,'H',start,stop,0.1,size=(0.25,0.25),comment='Slit center - 1H')
+ slits_scan_center(slit_name,'V',start,stop,0.1,size=(0.25,0.25),comment='Slit center - 1V')
slits_set(slit_name,(H,V),(0,0),verbose=False)
if kwargs['sound']:
- playsound()
+ play_sound()
if kwargs['W_mesh_out']:
diagnostic('mesh_W','out')
@@ -532,7 +545,7 @@ def wire_scans(**kwargs):
scan_wire('V',comment='Wire scan - V',all_diag=False)
if kwargs['sound']:
- playsound()
+ play_sound()
def beamsteering_2V(v_position):
@@ -585,9 +598,9 @@ def M0M1_steering(h_position,v_position,verbose=False):
v_steering, roll_delta = beamsteering_2V(v_position)
h_steering, pitch_delta = beamsteering_2H(h_position)
- current_roll = FMB_mirror_get(1)[5]
+ current_roll = FMB_mirror_get(1,verbose=False)[5]
new_roll = current_roll+roll_delta
- current_pitch = FMB_mirror_get(1)[4]
+ current_pitch = FMB_mirror_get(1,verbose=False)[4]
new_pitch = current_pitch+pitch_delta
message = '\nSlit-2 slit: should always be centered vertically, adjust M1 roll, horizontally adjust pitch if too far off'
@@ -598,6 +611,7 @@ def M0M1_steering(h_position,v_position,verbose=False):
else:
message +=' - horizontal: reset slit 2H center to '+str(h_position)
+ print(message)
if verbose:
M0M1_steering_message()
return new_roll,new_pitch
@@ -622,9 +636,10 @@ def monoVslit_quick_scan(slit_name,**kwargs):
kwargs.setdefault('mono_energy',505)
energy(500)
+ print("\n")
mvmono(kwargs['mono_energy'])
- H,V = _slits_wide_open_dictionary()[slit_name]
+ H,V = slits_wide_open_dictionary()[slit_name]
c = mono_grating_density_get()/1200.0
slit_size = 300 if mono_grating_get()=='HEG' else 200
@@ -636,7 +651,7 @@ def monoVslit_quick_scan(slit_name,**kwargs):
sleep(1)
if kwargs['sound']:
- playsound()
+ play_sound()
def monoVslit_full_profile_scan(slit, **kwargs):
"""
@@ -735,8 +750,8 @@ def check_slit1A(step=0.1):
m=9
VAL='29idb:m'+str(m)+'.VAL'
RBV='29idb:m'+str(m)+'.RBV'
- iex.BL.mda.fillin(VAL,RBV,-4,4.0,step)
- FileNum1 = iex.BL.mda.lastFileNum()
+ scan_fillin(VAL,RBV,-4,4.0,step)
+ FileNum1 = mda_fileNum()
#scanning inboard-blade
slit1A_set(8,8,0,0) # aperture wide open
@@ -744,8 +759,8 @@ def check_slit1A(step=0.1):
m=10
VAL='29idb:m'+str(m)+'.VAL'
RBV='29idb:m'+str(m)+'.RBV'
- iex.BL.mda.fillin(VAL,RBV,-4,4.0,step)
- FileNum2 = iex.BL.mda.lastFileNum()
+ scan_fillin(VAL,RBV,-4,4.0,step)
+ FileNum2 = mda_fileNum()
return FileNum1, FileNum2
diff --git a/iexcode/macros/quick_plot.py b/iexcode/macros/quick_plot.py
index d1de5af..3963a66 100755
--- a/iexcode/macros/quick_plot.py
+++ b/iexcode/macros/quick_plot.py
@@ -1,6 +1,7 @@
from os import listdir
from os.path import join, isfile, dirname
+from iexcode.instruments.IEX_BL_config import BLconfig_endstation_name
### Data analysis:
from scipy.optimize import curve_fit
@@ -509,45 +510,40 @@ def plot_mda(*ScanDet,**kwArg):
prefix: by default, uses prefix as defined in ScanRecord ("mda_")
scanIOC: by default, uses the IOC for the current branch as define in BL_IOC()
"""
-
- args={
- 'marker':None,
- 'markersize':5,
- 'linewidth':1,
- 'linestyle':'-',
- 'color':None,
- 'nticks':None,
- 'sizeH':1,
- 'sizeV':1,
- 'title':'',
- 'filepath':None,
- 'prefix':None,
- 'norm':None,
- 'flux':None,
- 'NormDet':None,
- 'scanIOC':None,
- 'legend':None,
- 'vs_index':None,
- 'vs_det':None,
- 'xrange':[None,None],
- 'yrange':[None,None],
- 'save':True
- }
-
- args.update(kwArg)
+ kwArg.setdefault('marker',None)
+ kwArg.setdefault('markersize',5)
+ kwArg.setdefault('linewidth',1)
+ kwArg.setdefault('linestyle','-')
+ kwArg.setdefault('color',None)
+ kwArg.setdefault('nticks',None)
+ kwArg.setdefault('sizeH',1)
+ kwArg.setdefault('sizeV',1)
+ kwArg.setdefault('title','')
+ kwArg.setdefault('filepath',None)
+ kwArg.setdefault('prefix',None)
+ kwArg.setdefault('norm',None)
+ kwArg.setdefault('flux',None)
+ kwArg.setdefault('NormDet',None)
+ kwArg.setdefault('scanIOC',None)
+ kwArg.setdefault('legend',None)
+ kwArg.setdefault('vs_index',None)
+ kwArg.setdefault('vs_det',None)
+ kwArg.setdefault('xrange',[None,None])
+ kwArg.setdefault('yrange',[None,None])
+ kwArg.setdefault('save',True)
- mkr=args['marker']
- ms=args['markersize']
- lw=args['linewidth']
- ls=args['linestyle']
- c=args['color']
- path=args['filepath']
- prefix=args['prefix']
- scanIOC=args['scanIOC']
- save=args['save']
+ mkr=kwArg['marker']
+ ms=kwArg['markersize']
+ lw=kwArg['linewidth']
+ ls=kwArg['linestyle']
+ c=kwArg['color']
+ path=kwArg['filepath']
+ prefix=kwArg['prefix']
+ scanIOC=kwArg['scanIOC']
+ save=kwArg['save']
- if 'legend' in args:
- if args['legend'] == 'center left':
+ if 'legend' in kwArg:
+ if kwArg['legend'] == 'center left':
hsize=7
if type(ScanDet[0]) is not tuple:
@@ -555,19 +551,21 @@ def plot_mda(*ScanDet,**kwArg):
m=1
else: m= len(ScanDet)
- def SubplotsLayout(m):
+ def SubplotsLayout(m,sizeH,sizeV):
if m >1:
ncols=2
else:
ncols=1
nrows=max(sum(divmod(m,2)),1)
- hsize=ncols*5*args['sizeH']
- vsize=nrows*4*args['sizeV']
- if nrows==1: vsize=nrows*3.5*args['sizeV']
+ hsize=ncols*5*sizeH
+ vsize=nrows*4*sizeV
+ if nrows==1:
+ vsize=nrows*3.5*kwArg['sizeV']
return nrows,ncols,hsize,vsize
+
try:
- nrows,ncols,hsize,vsize=SubplotsLayout(m)
+ nrows,ncols,hsize,vsize=SubplotsLayout(m,kwArg['sizeH'],kwArg['sizeV'])
fig, axes = plt.subplots(nrows,ncols,figsize=(hsize,vsize)) # HxV
axes=np.array(axes)
@@ -577,54 +575,55 @@ def plot_mda(*ScanDet,**kwArg):
if type(j) is tuple:
p,k,l=j
x,y,x_name,y_name=mda_1D(i,p,k,l,path,prefix)
- elif args['flux'] is not None:
- x,y,x_name,y_name=mda_Flux(i,j,args['flux'],path,prefix,scanIOC)
- elif args['norm'] is not None:
+
+ elif kwArg['flux'] is not None:
+ x,y,x_name,y_name=mda_Flux(i,j,kwArg['flux'],path,prefix,scanIOC)
+ elif kwArg['norm'] is not None:
x,y,x_name,y_name=mda_1D_unscaled(i,j,path,prefix,scanIOC)
- elif args['NormDet'] is not None:
- x,y,x_name,y_name=mda_NormDet(i,j,args['NormDet'],1,0,path,prefix,scanIOC)
- elif args['vs_index'] is not None:
+ elif kwArg['NormDet'] is not None:
+ x,y,x_name,y_name=mda_NormDet(i,j,kwArg['NormDet'],1,0,path,prefix,scanIOC)
+ elif kwArg['vs_index'] is not None:
x,y,x_name,y_name=mda_1D_Xindex(i,j,1,0,path,prefix)
- elif args['vs_det'] is not None:
- x,y,x_name,y_name=mda_1D_vsDet(i,j,args['vs_det'],1,0,path,prefix)
+ elif kwArg['vs_det'] is not None:
+ x,y,x_name,y_name=mda_1D_vsDet(i,j,kwArg['vs_det'],1,0,path,prefix)
#elif DivScan is not None:
# x,y,x_name,y_name=mda_DivScan(i,j,DivScan,DivDet,1,0,path,prefix,scanIOC)
else:
- x,y,x_name,y_name=mda_1D(i,j,1,0,path,prefix,scanIOC)
+ x,y,x_name,y_name=mda_1D(i,j,1,0,path,prefix)
ax.plot(x,y,label="mda_"+str(i),color=c,marker=mkr,markersize=ms,linewidth=lw,linestyle=ls)
ax.grid(color='lightgray', linestyle='-', linewidth=0.5)
-
+
#modifying graph
- if args['legend'] != None:
- if args['legend'] == 'center left':
+ if kwArg['legend'] != None:
+ if kwArg['legend'] == 'center left':
box = ax.get_position()
ax.set_position([box.x0, box.y0, box.width * 0.6, box.height])
ax.legend(loc='center left', bbox_to_anchor=(1, 0.5))
myleft=0.1
myright=0.55
else:
- ax.legend(args['legend'], frameon=True)
- if 'ytickstyle' in args:
- ax.ticklabel_format(style=args['ytickstyle'], axis='y', scilimits=(0,0))
- if 'xtickstyle' in args:
- ax.ticklabel_format(style=args['xtickstyle'], axis='x', scilimits=(0,0))
- if 'log' in args:
+ ax.legend(kwArg['legend'], frameon=True)
+ if 'ytickstyle' in kwArg:
+ ax.ticklabel_format(style=kwArg['ytickstyle'], axis='y', scilimits=(0,0))
+ if 'xtickstyle' in kwArg:
+ ax.ticklabel_format(style=kwArg['xtickstyle'], axis='x', scilimits=(0,0))
+ if 'log' in kwArg:
ax.set_yscale('log')
- if args['xrange'] != [None,None]:
- ax.set_xlim(args['xrange'][0],args['xrange'][1])
- if args['yrange'] != [None,None]:
- ax.set_ylim(args['yrange'][0],args['yrange'][1])
- if 'xlabel' in args:
- x_name=args['xlabel']
- if 'ylabel' in args:
- y_name=args['ylabel']
- if args['nticks'] != None:
- tck=args['nticks']-1
+ if kwArg['xrange'] != [None,None]:
+ ax.set_xlim(kwArg['xrange'][0],kwArg['xrange'][1])
+ if kwArg['yrange'] != [None,None]:
+ ax.set_ylim(kwArg['yrange'][0],kwArg['yrange'][1])
+ if 'xlabel' in kwArg:
+ x_name=kwArg['xlabel']
+ if 'ylabel' in kwArg:
+ y_name=kwArg['ylabel']
+ if kwArg['nticks'] != None:
+ tck=kwArg['nticks']-1
ax.locator_params(tight=None,nbins=tck)
- if 'title' in args:
- mytitle=args['title']
+ if 'title' in kwArg:
+ mytitle=kwArg['title']
if type(mytitle) is not tuple:
ax.set(xlabel=x_name,ylabel=y_name,title=mytitle)
else:
@@ -635,7 +634,7 @@ def plot_mda(*ScanDet,**kwArg):
ax.set(xlabel=x_name,ylabel=y_name,title=mytitle[n])
# ax.text(0.5, 1.025,mytitle,horizontalalignment='center',fontsize=14,transform = ax.transAxes)
ax.grid(color='lightgray', linestyle='-', linewidth=0.5)
-
+
if ncols==1 and nrows==1 and kwArg.get('legend')!='center left':
fig.subplots_adjust(wspace=0.5,hspace=0.5,left=0.25,right=0.88,top=0.85,bottom=0.22)
elif ncols==1 and kwArg.get('legend')=='center left':
@@ -1211,21 +1210,29 @@ def plot_nc_Sum(first,last,**kwgraph):
###############################################################################################
-def fit_mda(scannum,det,FWHM_or_PolyOrder,fct,hkl_positionner=False,xrange=None,title='',marker='x',graph=True, filepath=None,prefix=None):
+def fit_mda(scannum,det,FWHM_or_PolyOrder,fct,**kwargs):
"""
fct= 'gauss','lorz','erf','poly','box'
hkl_positionner = 'H','K','L','tth','th','chi','phi'
"""
-
- if hkl_positionner == False:
- x,y,x_name,y_name=mda_1D(scannum,det,1,0,filepath,prefix)
- else:
+ kwargs.setdefault('hkl_positioner',False)
+ kwargs.setdefault('xrange',(None,None))
+ kwargs.setdefault('title','')
+ kwargs.setdefault('marker','x')
+ kwargs.setdefault('graph',True)
+ kwargs.setdefault('filepath',None)
+ kwargs.setdefault('prefix',None)
+ title=kwargs['title']
+
+
+ if kwargs['hkl_positioner']:
+ hkl_positioner=kwargs['hkl_positioner']
d={'h':46,'k':47,'l':48,'tth':54,'th':55,'chi':56,'phi':57}
- x,y,x_name,y_name=mda_1D_vsDet(scannum,det,d[hkl_positionner.lower()],1,0,filepath,prefix)
-
+ x,y,x_name,y_name=mda_1D_vsDet(scannum,det,d[hkl_positioner.lower()],1,0,kwargs['filepath'],kwargs['prefix'])
+ else:
+ x,y,x_name,y_name=mda_1D(scannum,det,1,0,kwargs['filepath'],kwargs['prefix'])
-
- if iex.BL.endstation_name == 'kappa' and fct != 'poly':
+ if BLconfig_endstation_name() == 'kappa' and fct != 'poly':
try:
title=title + ' centroid = '+str(centroid_avg(scannum))
except:
@@ -1250,10 +1257,11 @@ def fit_mda(scannum,det,FWHM_or_PolyOrder,fct,hkl_positionner=False,xrange=None,
return bkgd+height*(center-width/2 < x)*(x < center+width/2)
-
- if xrange is not None:
- x1=closest(x,xrange[0])
- x2=closest(x,xrange[1])
+ xdata = np.array(x)
+ ydata = np.array(y)
+ if None not in kwargs['xrange']:
+ x1=closest(x,kwargs['xrange'][0])
+ x2=closest(x,kwargs['xrange'][1])
xrange=[x.index(x1),x.index(x2)]
xmin=min(xrange)
xmax=max(xrange)
@@ -1261,9 +1269,7 @@ def fit_mda(scannum,det,FWHM_or_PolyOrder,fct,hkl_positionner=False,xrange=None,
ycrop=y[xmin:xmax]
xdata = np.array(xcrop)
ydata = np.array(ycrop)
- else:
- xdata = np.array(x)
- ydata = np.array(y)
+
Imax=np.max(ydata)
@@ -1329,11 +1335,11 @@ def fit_mda(scannum,det,FWHM_or_PolyOrder,fct,hkl_positionner=False,xrange=None,
print('\n')
- if graph == True:
+ if kwargs['graph'] == True:
center=round(center,4)
fig,(ax1)=plt.subplots(1,1)
fig.set_size_inches(5,4)
- ax1.plot(xdata,ydata,label='mda #'+str(scannum),marker=marker)
+ ax1.plot(xdata,ydata,label='mda #'+str(scannum),marker=kwargs['marker'])
ax1.plot(xfit,yfit,label='fit @ '+str(center)[0:6])
ax1.set(ylabel=y_name)
ax1.set(xlabel=x_name)
diff --git a/iexcode/macros/start_of_the_week.py b/iexcode/macros/start_of_the_week.py
index 3f8b6d8..5b06773 100644
--- a/iexcode/macros/start_of_the_week.py
+++ b/iexcode/macros/start_of_the_week.py
@@ -94,35 +94,40 @@ def interactive_fit_mda(val_name,scannum,det,FWHM_or_PolyOrder,fct,**kwargs):
**kwargs
xrange
"""
- kwargs.setdefault('xrange',None)
- fit_mda(scannum,det,FWHM_or_PolyOrder,fct,**kwargs)
-
- foo=input('\nare you happy with those values (y or n)? >')
- if foo.lower() == 'y' or foo.lower() == 'yes':
- print('\nresuming script...\n')
- flagfit=0
- else:
- options='0,1,2'
- print('''\nDo you want to:
- \t (0) continue anyway
- \t (1) enter values by hand
- \t (2) adjust range for fit
- ''')
- flagfit=input('\nType ('+options+'), or press ENTER to abort script >')
- if flagfit not in options.split(","):
- print('\ninvalid input; please try again...\n')
- flagfit=input('\nType ('+options+') >')
- if flagfit == '0':
+ kwargs.setdefault('xrange',[None,None])
+ position = fit_mda(scannum,det,FWHM_or_PolyOrder,fct,**kwargs)
+ plt.show()
+
+ flagfit=2
+ while flagfit>1:
+ foo=input('\nare you happy with those values (y or n)? >')
+ if foo.lower() == 'y' or foo.lower() == 'yes':
print('\nresuming script...\n')
flagfit=0
- if flagfit == '1':
- val=input2float(val_name+' =>')
- flagfit=1
- if flagfit == '2':
- x1,x2 = input_range(x1,x2)
- fit_mda(scannum,det,FWHM_or_PolyOrder,fct,xrange=(x1,x2))
- flagfit=2
- return flagfit,val
+ else:
+ options='0,1,2'
+ print('''\nDo you want to:
+ \t (0) continue anyway
+ \t (1) enter values by hand
+ \t (2) adjust range for fit
+ ''')
+ flagfit=input('\nType ('+options+'), or press ENTER to abort script >')
+ if flagfit not in options.split(","):
+ print('\ninvalid input; please try again...\n')
+ flagfit=input('\nType ('+options+') >')
+ if flagfit == '0':
+ print('\nresuming script...\n')
+ flagfit=0
+ if flagfit == '1':
+ position = input2float(val_name+' => ',x1)
+ flagfit=1
+ if flagfit == '2':
+ x1,x2 = input_range(kwargs['xrange'][0],kwargs['xrange'][0])
+ kwargs.update({'xrange':(x1,x2)})
+ position = fit_mda(scannum,det,FWHM_or_PolyOrder,fct,xrange=(x1,x2))
+ plt.show()
+ flagfit=2
+ return flagfit,position
def sotw_BLinit(branch):
"""
@@ -211,7 +216,7 @@ def sotw_ID_steering(detCA4,**kwargs):
if flagfit == '':
return
- flagfit, v = interactive_fit_mda('V_center',scanNum_v,detCA4,1,'gauss',xrange=[-1,1],val_name='V_center')
+ flagfit, v = interactive_fit_mda('V_center',scanNum_v,detCA4,1,'gauss',xrange=[-1,1])
if flagfit == '':
return
try:
@@ -234,27 +239,34 @@ def sotw_wire(detH,detV,**kwargs):
try:
scanNum_h = last_mda()-1
scanNum_v = last_mda()
- plot_mda(scanNum_h,detH,scanNum_v,detV,title='wire-H (blue) & wire-V (orange)');plt.show()
+ plot_mda(scanNum_h,detH,scanNum_v,detV,title='wire-H (blue) & wire-V (orange)')
+ plt.show()
except:
print('Unable to plot. Try:')
print("plot_mda("+str(scanNum_h)+","+str(detH)+","+str(scanNum_v)+","+str(detV)+",title='wire-H (blue) & wire-V (orange)');plt.show()")
flag = interactive_fct()
return flag
-def sotw_slit_vs_mono(grt,slit_name,detDiode,**kwargs):
+def sotw_slit_vs_mono(grt,**kwargs):
"""
+ need to specify detDiode
+ **kwargs
+ hv_list = [470,505]
"""
+ kwargs.setdefault('hv_list',[470,505])
+ detDiode= kwargs['detDiode']
for slit_name in ['slit2B','slit1A']:
message={'slit2B': 'M1 alignment and slit center','slit1A':'slit center'}
print('\n---------- Scanning '+slit_name+':\n')
message[slit_name]
- flag=2
list_position = [grt,0,0,0,0]
flag = 2
while flag>1:
#scanning
if kwargs['monoVslit_quick']:
- monoVslit_quick_scan(slit_name,**kwargs)
+ for hv in kwargs['hv_list']:
+ kwargs.update({'mono_energy':hv})
+ monoVslit_quick_scan(slit_name,**kwargs)
else:
monoVslit_full_profile_scan(slit_name,**kwargs)
#plotting
@@ -308,7 +320,7 @@ def sotw_slit_vs_mono(grt,slit_name,detDiode,**kwargs):
if flag == '':
return
- flag = 2
+ flag = 1
#update slit dictionary
print('\nBeam center fit @ ['+grt+',2V,2H,1V,1H]:'+str(list_position))
@@ -397,19 +409,19 @@ def StartOfTheWeek(grt,branch,wait=False,**kwargs):
print("\n\n================== Slit 1A scans:")
flag = sotw_wire(detH,detV,**kwargs)
if flag == '':
- return
+ return
###### Mono/slit scans:
if 'monoVslit' in kwargs['scanType']:
#checking that detDiode is in
- if not kwargs['detDiode']:
+ if kwargs['detDiode'] == None:
foo=input('What is the detector number for mono scans (make sure it is IN!)? >')
detDiode=int(foo)
+ kwargs.update({'detDiode':detDiode})
else:
foo=input('Is detector D'+str(kwargs['detDiode'])+' in direct beam (y or n)? >')
print("\n\n================== Mono/slit scans:")
- for slit_name in ['slit1A','slit2B']:
- sotw_slit_vs_mono(grt,slit_name,detDiode,**kwargs)
+ sotw_slit_vs_mono(grt,**kwargs)
###### Check flux:
--
GitLab