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

Compare commits

base: cal:9c8c01f866435d9faa50210280e359491fdb3daf
Branches Tags
cal:main
..
compare: cal:67f4872e2b365dbb6519708e8d30f8b1db34f5a5
Branches Tags
cal:main

No commits in common. "9c8c01f866435d9faa50210280e359491fdb3daf" and "67f4872e2b365dbb6519708e8d30f8b1db34f5a5" have entirely different histories.
9c8c01f866 ... 67f4872e2b

1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
main.py
View File

@ -282,7 +282,7 @@ def genGraph(gData: dict, showPlot: bool = True):
lims = [] lims = []
for label in gData["info"]["pcb-refs"]: # + ["trigbox"]: for label in gData["info"]["pcb-refs"] + ["trigbox"]:
graphData["plots"].append({ graphData["plots"].append({
"x": gData["time"]["x2"], "x": gData["time"]["x2"],
"y": gData["data"]["x2"][label], "y": gData["data"]["x2"][label],
@ -300,7 +300,7 @@ def genGraph(gData: dict, showPlot: bool = True):
lims.append(gData["shock-point"][label][1]) # [TODO this but better] lims.append(gData["shock-point"][label][1]) # [TODO this but better]
for label, d in [("1 [V]", "G1"),("2 [V]", "G2")]: #, ("4 [V]", "Gauge Trigger")]: for label, d in [("1 [V]", "G1"),("2 [V]", "G2"), ("4 [V]", "Gauge Trigger")]:
graphData["plots"].append({ graphData["plots"].append({
"x": gData["time"]["scope"], "x": gData["time"]["scope"],
"y": gData["data"]["scope"][label], "y": gData["data"]["scope"][label],
@ -348,7 +348,7 @@ def genGraph(gData: dict, showPlot: bool = True):
print("Graphing Data") print("Graphing Data")
for shot in loaded_data: for shot in loaded_data:
#if shot != loaded_data[-2]: continue if shot != loaded_data[-2]: continue
genGraph(data[shot], showPlot=False) genGraph(data[shot], showPlot=False)
# 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