diff --git a/data/x2s5824/_info.yaml b/data/x2s5824/_info.yaml index 7391b0b..178896a 100644 --- a/data/x2s5824/_info.yaml +++ b/data/x2s5824/_info.yaml @@ -56,7 +56,7 @@ probe-info: - 2 locations: # In order of pulse - "st2" - - "st3" + # - "st3" data-records: - type: "scope" diff --git a/main.py b/main.py index f2423e0..9d65dc9 100644 --- a/main.py +++ b/main.py @@ -319,7 +319,7 @@ def load_data(data_path: str, data={}) -> dict: for i, probe in enumerate(dataInfo["probe-info"]["locations"]): # Get the canny-args cArgs = dataInfo["canny-args"] - doCannyPlot = x2_shot == "x2s5829" and probe == "st2" and False + doCannyPlot = False # x2_shot == "x2s5829" and probe == "st2" # This condition was used to generate some graphs plotValues = { "plot_title": f"Canny Shock Finding Result for {x2_shot} - ST2 Gauge 1", "plot_time_unit": "$\\mu$s", @@ -1082,7 +1082,7 @@ def genX2CompGraphs(gData: dict, showPlot: bool = True): graphData["plots"].append({ "type": "axvLine", "x": gData["shock-point"]["x2"][f"{probe}-g1"][1],#[i], - "label": f"{probe}-Gauge 1 - X2 DAQ - Shock Point {gData['shock-point'][f'{probe}-g1'][1]:.2f}$\\mu$s", + "label": f"{probe}-Gauge 1 - X2 DAQ - Shock Point {gData['shock-point']["x2"][f'{probe}-g1'][1]:.2f}$\\mu$s", "colour": UQC["dark_grey"], "args":{"zorder":2, "linestyle":"--", "alpha":0.5} }) @@ -1092,7 +1092,7 @@ def genX2CompGraphs(gData: dict, showPlot: bool = True): graphData["plots"].append({ "type": "axvLine", "x": gData["shock-point"]["x2"][f"{probe}-g2"][1],#[i], - "label": f"{probe}-Gauge 2 - X2 DAQ - Shock Point {gData['shock-point'][f'{probe}-g2'][1]:.2f}$\\mu$s", + "label": f"{probe}-Gauge 2 - X2 DAQ - Shock Point {gData['shock-point']["x2"][f'{probe}-g2'][1]:.2f}$\\mu$s", "colour": UQC["dark_grey"], "args":{"zorder":2, "linestyle":":", "alpha":0.5} })