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

Finalise Graphing Steps

Browse Source
This commit is contained in:
Cal Wing 2024-10-22 21:37:28 +10:00
parent 02fc4bb079
commit 2e5dc27055
8 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/x2s5823/_info.yaml
View File

@ -1,7 +1,7 @@
# Data Info File # Data Info File
# Cal Wing - Oct 24 # Cal Wing - Oct 24
long_name: "Shot 1 (x2s5823) - Fat Probe - 2024-10-15" long_name: "Shot 1 (x2s5823) - Thick Probe (ST2) - 2024-10-15\nProtruding ST1 - Mars Entry Conditions"
name: "Shot 1" name: "Shot 1"
date: "2024-10-15" date: "2024-10-15"
time: "13:02" time: "13:02"

2
data/x2s5824/_info.yaml
View File

@ -1,7 +1,7 @@
# Data Info File # Data Info File
# Cal Wing - Oct 24 # Cal Wing - Oct 24
long_name: "Shot 2 (x2s5824) - Thin Probe - 2024-10-15" long_name: "Shot 2 (x2s5824) - Thin Probe (ST2) - 2024-10-15\nProtruding ST2 - Mars Entry Conditions"
name: "Shot 2" name: "Shot 2"
date: "2024-10-15" date: "2024-10-15"
time: "17:18" time: "17:18"

2
data/x2s5827/_info.yaml
View File

@ -1,7 +1,7 @@
# Data Info File # Data Info File
# Cal Wing - Oct 24 # Cal Wing - Oct 24
long_name: "Shot 2 (x2s5827) - Thin Probe Pair (ST2 & ST3) - 2024-10-16" long_name: "Shot 2 (x2s5827) - Thin Probe Pair (ST2 & ST3) - 2024-10-16\nProtruding ST2 & ST3 - Mars Entry Conditions"
name: "Shot 3" name: "Shot 3"
date: "2024-10-16" date: "2024-10-16"
time: "18:40" time: "18:40"

2
data/x2s5829/_info.yaml
View File

@ -1,7 +1,7 @@
# Data Info File # Data Info File
# Cal Wing - Oct 24 # Cal Wing - Oct 24
long_name: "Shot 4 (x2s5829) - Thin Probe Pair (ST2 & ST3) - 2024-10-17" long_name: "Shot 4 (x2s5829) - Thin Probe Pair (ST2 & ST3) - 2024-10-17\nProtruding ST2 & ST3 - Mars Entry Conditions"
name: "Shot 4" name: "Shot 4"
date: "2024-10-17" date: "2024-10-17"
time: "17:00" time: "17:00"

2
data/x2s5830/_info.yaml
View File

@ -1,7 +1,7 @@
# Data Info File # Data Info File
# Cal Wing - Oct 24 # Cal Wing - Oct 24
long_name: "Shot 5 (x2s5829) - Thin Probe Pair (ST2 & ST3) - 2024-10-17" long_name: "Shot 5 (x2s5829) - Thin Probe Pair (ST2 & ST3) - 2024-10-17\nProtruding ST2 & ST3 - Mars Entry Conditions"
name: "Shot 5" name: "Shot 5"
date: "2024-10-18" date: "2024-10-18"
time: "08:51" time: "08:51"

2
data/x2s5831/_info.yaml
View File

@ -1,7 +1,7 @@
# Data Info File # Data Info File
# Cal Wing - Oct 24 # Cal Wing - Oct 24
long_name: "Shot 6 (x2s5829) - Thin Probe (ST1, ST2 & ST3) - 2024-10-18 - Flush ST2" long_name: "Shot 6 (x2s5829) - Thin Probe Set (ST1, ST2 & ST3) - 2024-10-18\nProtruding ST1 & ST3, Flush ST2 (Only Gauge 1) - Mars Entry Conditions"
comments: "G2 Pointless, Wasn't attached" comments: "G2 Pointless, Wasn't attached"
name: "Shot 6" name: "Shot 6"
date: "2024-10-18" date: "2024-10-18"

2
data/x2s5832/_info.yaml
View File

@ -1,7 +1,7 @@
# Data Info File # Data Info File
# Cal Wing - Oct 24 # Cal Wing - Oct 24
long_name: "Shot 7 (x2s5829) - Thin Probe Set (ST1, ST2 & ST3) - 2024-10-18\nFlush ST3 - Low Pressure, 'Pure' Air" long_name: "Shot 7 (x2s5829) - Thin Probe Set (ST1, ST2 & ST3) - 2024-10-18\nProtruding ST1 & ST1, Flush ST3 (Only Gauge 1) - Low Pressure, 'Pure' Air Conditions"
name: "Shot 6" name: "Shot 6"
date: "2024-10-18" date: "2024-10-18"
time: "15:58" time: "15:58"

13
main.py
View File

@ -380,12 +380,13 @@ print("Loaded Data")
#[TODO] Refactor #[TODO] Refactor
def genGraph(gData: dict, showPlot: bool = True, doLimits: bool = True, forcePlots: bool = False, addShockInfo: bool = True): def genGraph(gData: dict, showPlot: bool = True, doLimits: bool = True, forcePlots: bool = False, addShockInfo: bool = True):
graphData = { graphData = {
"title": f"Shock response Time\nFor {gData['info']['long_name']}", "title": f"Shock Response Time\nFor {gData['info']['long_name']}",
"xLabel": "Time ($\\mu$s)", "xLabel": "Time ($\\mu$s)",
"yLabel": "Voltage Reading (V)", "yLabel": "Voltage Reading (V)",
"grid": True, "grid": True,
"figSize": (8,6.5), "figSize": (9, 6.8), #(8,6.5),
"ledgLoc": 'upper left', "ledgLoc": 'upper left',
"yLim": (-1.5, 11 if addShockInfo else 4),
"plots": [] "plots": []
} }
@ -463,7 +464,7 @@ def genGraph(gData: dict, showPlot: bool = True, doLimits: bool = True, forcePlo
"text": f"Measured Shock Speeds {probeText}", "text": f"Measured Shock Speeds {probeText}",
"align": ("top", "right"), "align": ("top", "right"),
"alpha": 0.75, "alpha": 0.75,
"x": 0.94 if len(gData["info"]["probe-info"]["locations"]) < 3 else 0.885, "x": 0.94, #if len(gData["info"]["probe-info"]["locations"]) < 3 else 0.885,
"y": 0.94 "y": 0.94
}) })
@ -476,12 +477,14 @@ def genGraph(gData: dict, showPlot: bool = True, doLimits: bool = True, forcePlo
print("Graphing Data") #print("Graphing Data")
for shot in loaded_data: for shot in loaded_data:
#if shot != loaded_data[-2]: continue #print(data[shot]['info']['long_name'].rsplit("\n", 1)[-1])
genGraph(data[shot], showPlot=False, addShockInfo=False) genGraph(data[shot], showPlot=False, addShockInfo=False)
genGraph(data[shot], showPlot=False, forcePlots=True) genGraph(data[shot], showPlot=False, forcePlots=True)
# This forces matplotlib to hang until I tell it to close all windows # This forces matplotlib to hang until I tell it to close all windows
pltKeyClose() pltKeyClose()