cal/Thesis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finalise Thesis Codebase

Browse Source
This commit is contained in:
Cal Wing 2024-10-25 15:55:16 +10:00
parent 1b66ac1f24
commit 3398414b55
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/x2s5824/_info.yaml
View File

@ -56,7 +56,7 @@ probe-info:
- 2 - 2
locations: # In order of pulse locations: # In order of pulse
- "st2" - "st2"
- "st3" # - "st3"
data-records: data-records:
- type: "scope" - type: "scope"

6
main.py
View File

@ -319,7 +319,7 @@ def load_data(data_path: str, data={}) -> dict:
for i, probe in enumerate(dataInfo["probe-info"]["locations"]): for i, probe in enumerate(dataInfo["probe-info"]["locations"]):
# Get the canny-args # Get the canny-args
cArgs = dataInfo["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 = { plotValues = {
"plot_title": f"Canny Shock Finding Result for {x2_shot} - ST2 Gauge 1", "plot_title": f"Canny Shock Finding Result for {x2_shot} - ST2 Gauge 1",
"plot_time_unit": "$\\mu$s", "plot_time_unit": "$\\mu$s",
@ -1082,7 +1082,7 @@ def genX2CompGraphs(gData: dict, showPlot: bool = True):
graphData["plots"].append({ graphData["plots"].append({
"type": "axvLine", "type": "axvLine",
"x": gData["shock-point"]["x2"][f"{probe}-g1"][1],#[i], "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"], "colour": UQC["dark_grey"],
"args":{"zorder":2, "linestyle":"--", "alpha":0.5} "args":{"zorder":2, "linestyle":"--", "alpha":0.5}
}) })
@ -1092,7 +1092,7 @@ def genX2CompGraphs(gData: dict, showPlot: bool = True):
graphData["plots"].append({ graphData["plots"].append({
"type": "axvLine", "type": "axvLine",
"x": gData["shock-point"]["x2"][f"{probe}-g2"][1],#[i], "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"], "colour": UQC["dark_grey"],
"args":{"zorder":2, "linestyle":":", "alpha":0.5} "args":{"zorder":2, "linestyle":":", "alpha":0.5}
}) })