Add HiKe graph

Images/Datavis/generate_plot.py

@@ -260,6 +260,25 @@ def plot_lt_sweep(fig, plot_config, plot_data):
 
     decorate_ax(ax, plot_config);
 
+def perform_x_adjustment(plot_data, plot_config):
+    if(not ('x_key' in plot_config)):
+        return;
+    
+    print("Adjusting X scaling // offset");
+
+    x_rescale = plot_config.get('xrescale', 1);
+    x_shift   = plot_config.get('xshift', 0);
+
+    for step in plot_data['steps']:
+        x_data = step[plot_config['x_key']]
+
+        new_x_data = []
+
+        for datapoint in x_data:
+            new_x_data.append(datapoint*x_rescale + x_shift)
+
+        step[plot_config['x_key']] = new_x_data
+
 def perform_bandwidth_normalization(plot_data, plot_config):
     print("Normalizing bandwidth for all steps...")
 
@@ -285,7 +304,7 @@ def perform_peak_normalization(plot_data, plot_config):
         y_max = max(y_data)
         y_min = min(y_data)
 
-        scaling_factor = 0.1 + 0.9*(y_max if (y_max > (-y_min)) else y_min)
+        scaling_factor = 0.05 + 0.95*(y_max if (y_max > (-y_min)) else y_min)
 
         for datapoint in y_data:
             new_y_data.append(datapoint / scaling_factor)
@@ -299,7 +318,7 @@ def perform_offset_removal(plot_data, plot_config):
         y_data = step[plot_config['y_key']]
         new_y_data = []
 
-        offset_value = np.percentile(y_data, 30) * 0.8
+        offset_value = np.percentile(y_data, 30) * 0.9
 
         for datapoint in y_data:
             new_y_data.append(datapoint - offset_value)
@@ -308,6 +327,8 @@ def perform_offset_removal(plot_data, plot_config):
 
 
 def perform_processing_step(data_process_step, plot_data, plot_config):
+    perform_x_adjustment(plot_data, plot_config);
+    
     if(data_process_step == 'normalize_bandwidth'):
         perform_bandwidth_normalization(plot_data, plot_config)
     if(data_process_step == 'remove_offset'):
@@ -335,7 +356,7 @@ def generate_plot(plot_config):
     for data_process_step in plot_config.get('data_processing_steps', []):
         perform_processing_step(data_process_step, plot_data, plot_config)
 
-    fig = plt.figure(figsize=(10, 3.5));
+    fig = plt.figure(figsize=(4, 2.8)) #figsize=(10, 3.5));
 
     if(plot_config['type'] == 'lt_sweep'):
         plot_lt_sweep(fig, plot_config, plot_data);
@@ -343,7 +364,7 @@ def generate_plot(plot_config):
     if(plot_config['type'] == 'single'):
         plot_single_graph(fig, plot_config, plot_data);
 
-    fig.subplots_adjust(0.15, 0.12, 0.96, 0.9)
+    fig.subplots_adjust(0.19, 0.18, 0.96, 0.9)
 
     fig.savefig(os.path.join(YAML_DIR, plot_config['ofile']), dpi=plot_config.get('dpi', 300));
 
@@ -364,4 +385,4 @@ with open(INPUT_YAML_FILE, "r") as file:
 for plot in PLOT_CONFIG['plots']:
     plot = {**PLOT_CONFIG['defaults'], **plot};
 
-    generate_plot(plot);
+    generate_plot(plot);

Images/Datavis/plots.yml

@@ -1,5 +1,5 @@
 defaults:
-  xlabel: Frequenz (Hz)
+  xlabel: Frequency (Hz)
   legend_replace:
     Rf: $R_f$
     Cfp: $C_{fp}$
@@ -66,8 +66,8 @@ plots:
 
     xscale: linear
 
-    xlabel: Zeit (s)
-    ylabel: Normalisierter Messwert (a.u.)
+    xlabel: Time (s)
+    ylabel: Normalized voltage (a.u.)
     legend_title: TIV
 
     linewidth: 1
@@ -92,19 +92,49 @@ plots:
 
     xscale: linear
 
-    xlabel: Zeit (s)
-    ylabel: Normalisierter Messwert (a.u.)
+    xlabel: Time (s)
+    ylabel: Normalized voltage (a.u.)
     legend_title: TIV
 
     linewidth: 0.8
 
     ofile: IMS Measurements/raw_compare.png
+  - loadtype: multicsv
+    load:
+      GemiTIV:  V1_Measurements/V1.1-a1/2M4/HiKe_GemiTIV_DR55_RR65.csv
+      HighTIME: V1_Measurements/V1.1-a1/2M4/HiKe_HighTIME_DR55_RR65.csv
+
+    load_values: ["drift_time", "amplitude"]
+
+    type: lt_sweep
+
+    data_processing_steps:
+      - normalize_peak
+      - remove_offset
+      - normalize_peak
+
+    y_key: amplitude
+    x_key: drift_time
+
+    xscale: linear
+    #xmin: 0.0001
+    #xmax: 0.001
+
+    xrescale: 0.1
+
+    xlabel: Time (s)
+    ylabel: Normalized voltage (a.u.)
+    legend_title: TIV
+
+    linewidth: 0.8
+
+    ofile: IMS Measurements/hike_raw_compare.png
   - load: Parasitics/SingleStage_noise_example.txt
     loadtype: ltspice
     type: single
 
     xlabel: Frequenz (Hz)
-    ylabel: Rauschlevel ($V/\sqrt{Hz}$)
+    ylabel: Noise ($V/\sqrt{Hz}$)
 
     xformatter: engineering
     xplaces: 0
@@ -122,9 +152,9 @@ plots:
     xscale: log
 
     ofile: Parasitics/SingleStage_noise_example.png
-  - load: 
-      47M N.1: V1_Measurements/V1.1-a1/47M_cap/linearity_1.csv
-      47M N.2: V1_Measurements/V1.1-a1/47M_cap/linearity_2.csv
+  - load:
+      47M: V1_Measurements/V1.1-a1/47M_cap/linearity_1.csv
+  #    47M N.2: V1_Measurements/V1.1-a1/47M_cap/linearity_2.csv
     loadtype: multicsv
 
     load_values: ["Setpoint", "Measurement", "Error"]
@@ -136,19 +166,21 @@ plots:
 
     xscale: linear
     yformatter: engineering
-    yplaces: 1
+    yplaces: 0
+
+    colourmap: default
 
     ymax: 0.0025
     ymin: -0.0025
 
-    xlabel: Eingangsstrom (nA)
-    ylabel: Ausgansspannungsfehler (V)
+    xlabel: Input current (nA)
+    ylabel: Output voltage error (V)
     legend_title: TIV
 
     ofile: V1_Measurements/V1.1-a1/47M_cap/linearity_error.png
   - load: 
-      47M N.1: V1_Measurements/V1.1-a1/47M_cap/linearity_1.csv
-      47M N.2: V1_Measurements/V1.1-a1/47M_cap/linearity_2.csv
+      47M: V1_Measurements/V1.1-a1/47M_cap/linearity_1.csv
+  #    47M N.2: V1_Measurements/V1.1-a1/47M_cap/linearity_2.csv
     loadtype: multicsv
 
     load_values: ["Setpoint", "Measurement"]
@@ -158,10 +190,12 @@ plots:
     y_key: Measurement
     x_key: Setpoint
 
+    colourmap: default
+
     xscale: linear
 
-    xlabel: Eingangsstrom (nA)
-    ylabel: Ausgangsspannung (V)
+    xlabel: Input current (nA)
+    ylabel: Output voltage (V)
     legend_title: TIV
 
     ofile: V1_Measurements/V1.1-a1/47M_cap/linearity.png
@@ -173,8 +207,8 @@ plots:
       x20: V1_Measurements/V1.1-a1/CascadeSeries/noise_47M_x20.csv
       x50: V1_Measurements/V1.1-a1/CascadeSeries/noise_47M_x50.csv
 
-    ylabel: Rauschlevel ($V/\sqrt{Hz}$)
-    legend_title: U2A-Verstärkung
+    ylabel: Noise ($V/\sqrt{Hz}$)
+    legend_title: U2A-Gain
 
     load_values: ["Frequency (Hz)","Trace 1 (VHz)"]
 
@@ -193,11 +227,11 @@ plots:
     ofile: V1_Measurements/V1.1-a1/CascadeSeries/noises.png
   - loadtype: multicsv
     load:
-      Ungefiltert: V1_Measurements/V1.1-a1/2M4/noise.csv
-      Gefiltert: V1_Measurements/V1.1-a1/2M4/noise_filt.csv
+      Unfiltered: V1_Measurements/V1.1-a1/2M4/noise.csv
+      Filtered: V1_Measurements/V1.1-a1/2M4/noise_filt.csv
 
-    ylabel: Rauschlevel ($V/\sqrt{Hz}$)
-    legend_title: Ausgang
+    ylabel: Noise ($V/\sqrt{Hz}$)
+    legend_title: Output
 
     load_values: ["Frequency (Hz)","Trace 1 (VHz)"]
 
@@ -215,15 +249,15 @@ plots:
     ofile: V1_Measurements/V1.1-a1/2M4/noises.png
   - loadtype: multicsv
     load:
-      Ungefiltert: V1_Measurements/V1.1-a1/2M4/bandwith.csv
-      Gefiltert:   V1_Measurements/V1.1-a1/2M4/bandwith_filt.csv
+      Unfiltered: V1_Measurements/V1.1-a1/2M4/bandwith.csv
+      Filtered:   V1_Measurements/V1.1-a1/2M4/bandwith_filt.csv
 
     data_processing_steps:
       - normalize_bandwidth
     bandwidth_zero: 160
 
-    ylabel: Verstärkung ($dB\Omega$)
-    legend_title: Ausgang
+    ylabel: Gain ($dB\Omega$)
+    legend_title: Output
 
     load_values: ["Frequency (Hz)","Channel 1 Magnitude (dB)"]
 
@@ -249,8 +283,8 @@ plots:
       - normalize_bandwidth
     bandwidth_zero: 180
 
-    ylabel: Verstärkung ($dB\Omega$)
-    legend_title: U2A-Verstärkung
+    ylabel: Gain ($dB\Omega$)
+    legend_title: U2A-Gain
 
     load_values: ["Frequency (Hz)","Channel 1 Magnitude (dB)"]
 
@@ -272,7 +306,7 @@ plots:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
     legend_title: U2A-Filterkapazität
 
@@ -299,7 +333,7 @@ plots:
     legend_title: TIV
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
     load_values: ["Frequency (Hz)","Channel 1 Magnitude (dB)"]
 
@@ -325,7 +359,7 @@ plots:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
     load_values: ["Frequency (Hz)","Channel 1 Magnitude (dB)"]
 
@@ -361,7 +395,7 @@ plots:
     ymax: 0.02
     ymin: -0.02
 
-    xlabel: Eingangsstrom (nA)
+    xlabel: Input Current (nA)
     ylabel: Ausgansspannungsfehler (V)
 
     ofile: V1_Measurements/revision_compare_linearity_error.png
@@ -371,7 +405,7 @@ plots:
       47M V.1: V1_Measurements/noise_47M.csv
       47M V.2: V1_Measurements/V1.1-a1/47M_dupes/noise_4K7_nocap.csv
 
-    ylabel: Rauschlevel ($V/\sqrt{Hz}$)
+    ylabel: Noise ($V/\sqrt{Hz}$)
     legend_title: TIV
 
     load_values: ["Frequency (Hz)","Trace 1 (VHz)"]
@@ -393,7 +427,7 @@ plots:
   - load: V1_Measurements/V1.1-a1/47M_cap/noise.csv
     loadtype: simplecsv
 
-    ylabel: Rauschlevel ($V/\sqrt{Hz}$)
+    ylabel: Noise ($V/\sqrt{Hz}$)
 
     load_values: ["Frequency (Hz)","Trace 1 (VHz)"]
 
@@ -422,7 +456,7 @@ plots:
       82M: V1_Measurements/V1.1-a1/82M/noise.csv
       120M: V1_Measurements/V1.1-a1/120M/noise.csv
 
-    ylabel: Rauschlevel ($V/\sqrt{Hz}$)
+    ylabel: Noise ($V/\sqrt{Hz}$)
     legend_title: $R_f$
 
     load_values: ["Frequency (Hz)","Trace 1 (VHz)"]
@@ -446,7 +480,7 @@ plots:
       33pF: V1_Measurements/V1.1-a1/47M_cap/noise.csv
       0pF: V1_Measurements/V1.1-a1/47M_dupes/noise_4K7_nocap.csv
 
-    ylabel: Rauschlevel ($V/\sqrt{Hz}$)
+    ylabel: Noise ($V/\sqrt{Hz}$)
     legend_title: U2B-Filterkapazität
 
     load_values: ["Frequency (Hz)","Trace 1 (VHz)"]
@@ -472,7 +506,7 @@ plots:
       82M: V1_Measurements/V1.1-a1/82M/noise.csv
       120M: V1_Measurements/V1.1-a1/120M/noise.csv
 
-    ylabel: Rauschlevel ($V/\sqrt{Hz}$)
+    ylabel: Noise ($V/\sqrt{Hz}$)
     legend_title: $R_f$
 
     load_values: ["Frequency (Hz)","Trace 2 (VHz)"]
@@ -503,7 +537,7 @@ plots:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
     load_values: ["Frequency (Hz)","Channel 1 Magnitude (dB)"]
 
@@ -529,7 +563,7 @@ plots:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
     load_values: ["Frequency (Hz)","Channel 2 Magnitude (dB)"]
 
@@ -550,7 +584,7 @@ plots:
       "120M": V1_Measurements/noise_120M.csv
     legend_title: $R_f$
     
-    ylabel: Rauschlevel ($V/\sqrt{Hz}$)
+    ylabel: Noise ($V/\sqrt{Hz}$)
 
     load_values: ["Frequency (Hz)","Trace 1 (VHz)"]
 
@@ -576,7 +610,7 @@ plots:
       "120M": V1_Measurements/noise_120M.csv
     legend_title: $R_f$
     
-    ylabel: Rauschlevel ($V/\sqrt{Hz}$)
+    ylabel: Noise ($V/\sqrt{Hz}$)
 
     load_values: ["Frequency (Hz)","Trace 2 (VHz)"]
 
@@ -606,7 +640,7 @@ plots:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
     load_values: ["Frequency (Hz)","Channel 1 Magnitude (dB)"]
 
@@ -628,7 +662,7 @@ plots:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
     load_values: ["Frequency (Hz)","Channel 1 Magnitude (dB)"]
 
@@ -654,7 +688,7 @@ plots:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
     load_values: ["Frequency (Hz)","Channel 2 Magnitude (dB)"]
 
@@ -670,15 +704,15 @@ plots:
     ofile: V1_Measurements/bandwidth_ch2.png
   - loadtype: multicsv
     load:
-      Ungefiltert: V1_Measurements/bandwidth_47M.csv
-      Gefiltert: V1_Measurements/bandwidth_47M_filter.csv
-    legend_title: Ausgang
+      Unfiltered: V1_Measurements/bandwidth_47M.csv
+      Filtered: V1_Measurements/bandwidth_47M_filter.csv
+    legend_title: Output
 
     data_processing_steps:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
     load_values: ["Frequency (Hz)","Channel 1 Magnitude (dB)"]
 
@@ -710,7 +744,7 @@ plots:
     xmax: 0.001
 
 
-    ylabel: Ausgangsspannung (V)
+    ylabel: Output voltage (V)
 
     ofile: V1_Measurements/unshielded_47M.png
 
@@ -731,7 +765,7 @@ plots:
     xmax: 0.00025
 
 
-    ylabel: Ausgangsspannung (V)
+    ylabel: Output voltage (V)
 
     ofile: V1_Measurements/V1.0-a1/Instability.png
 
@@ -745,8 +779,8 @@ plots:
     y_key: Error
     x_key: Setpoint
 
-    xlabel: Eingangsstrom (nA)
-    ylabel: Ausgangsspannungsfehler (V)
+    xlabel: Input Current (nA)
+    ylabel: Output voltagesfehler (V)
 
     yformatter: engineering
     yplaces: 1
@@ -765,8 +799,8 @@ plots:
     y_key: Measurement
     x_key: Setpoint
 
-    xlabel: Eingangsstrom (nA)
-    ylabel: Ausgangsspannung (V)
+    xlabel: Input Current (nA)
+    ylabel: Output voltage (V)
 
     ofile: V1_Measurements/1G_47M_Linearity.png
 
@@ -789,7 +823,7 @@ plots:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
   - load: Parasitics/Rf_series_shielded.txt
     loadtype: ltspice
@@ -806,7 +840,7 @@ plots:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
   - load: Parasitics/Examples_R_Cp_RSweep.txt
     loadtype: ltspice
     legend_title: $R$
@@ -829,12 +863,12 @@ plots:
     type: lt_sweep
     y_key: V(n002) dB
 
-    title: Verstärkung bei konstantem $R_f = 1G\Omega$ und varriertem $C_{f}$
+    title: Gain bei konstantem $R_f = 1G\Omega$ und varriertem $C_{f}$
     data_processing_steps:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
   - load: Parasitics/SingleStage_Rf_Sweep.txt
     loadtype: ltspice
     step_unit: $\Omega$
@@ -846,12 +880,12 @@ plots:
     type: lt_sweep
     y_key: V(n002) dB
 
-    title: Verstärkung bei konstantem $C_{f} = 100fF$ und varriertem $R_{f}$
+    title: Gain bei konstantem $C_{f} = 100fF$ und varriertem $R_{f}$
     data_processing_steps:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
   - load: Parasitics/SingleStage_Aol_Sweep.txt
     loadtype: ltspice
     step_unit: " "
@@ -862,12 +896,12 @@ plots:
     type: lt_sweep
     y_key: V(n002) dB
 
-    title: Verstärkung bei $C_{f} = 3fF$, $C_\mathrm{in} = 10~\mathrm{pF}$ und variieter Verstärkung
+    title: Gain bei $C_{f} = 3fF$, $C_\mathrm{in} = 10~\mathrm{pF}$ und variieter Gain
     data_processing_steps:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
   - load: Parasitics/SingleStage_Rf_Sweep_Noise.txt
     loadtype: ltspice
     step_unit: $\Omega$
@@ -940,14 +974,14 @@ plots:
     type: lt_sweep
     y_key: V(n002) dB
 
-    title: Verstärkung bei variiertem GBWP
+    title: Gain bei variiertem GBWP
     legend_title: GBWP
 
     data_processing_steps:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
   - load: DesignEstimate/CompositeStage_ADA4817_StageAmpSweep_bandwidth.txt
     loadtype: ltspice
@@ -960,12 +994,12 @@ plots:
     type: lt_sweep
     y_key: V(n002) dB
 
-    title: Verstärkung bei variiertem GBWP
+    title: Gain bei variiertem GBWP
     data_processing_steps:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
 
   - load: DesignEstimate/OpAmp_GBWP_Sweep.txt
     loadtype: ltspice
@@ -978,12 +1012,12 @@ plots:
     type: lt_sweep
     y_key: V(n002) dB
 
-    title: Verstärkung bei variiertem GBWP
+    title: Gain bei variiertem GBWP
     data_processing_steps:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)
   - load: Parasitics/SingleStage_Cin_Sweep.txt
     loadtype: ltspice
     step_unit: F
@@ -997,9 +1031,9 @@ plots:
     type: lt_sweep
     y_key: V(vout) dB
 
-    title: Verstärkung bei variierter Eingangskapazität
+    title: Gain bei variierter Eingangskapazität
     data_processing_steps:
       - normalize_bandwidth
 
     bandwidth_zero: 180
-    ylabel: Verstärkung ($dB\Omega$)
+    ylabel: Gain ($dB\Omega$)