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

Update info.yaml and quick refactor

Browse Source
This commit is contained in:
Cal Wing
2024-10-22 14:04:36 +10:00
parent c5f24cb0bf
commit 8e04b9a759
8 changed files with 250 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
data/x2s5823/_info.yaml
View File

@@ -12,29 +12,56 @@ shot-info:
config: "x2s5823.config"
info: "x2s5823.txt"
pcb-canny:
- sigma: 4
post_pres: 0.05
# Canny Args
canny-args:
- sigma: 2
post_pres: 0.03
no-graph:
- "None"
# - "at1"
# - "at2"
# - "at3"
# - "at4"
# - "at5"
# - "at6"
pcb-refs:
#- "at1"
#- "at2"
#- "at3"
#
#- "at4"
#- "at5"
#- "at6"
- "st1"
- "st3"
probe-info:
type: "Fat"
locations: # In order of pulse
- "st2"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 3.05 # mm
gauge-c2c: 4 #mm
data-record:
type: "scope"
gauges:
- 1
- 2
locations: # In order of pulse
- "st2"
data-records:
- type: "scope"
config: "eProbe-Scope.txt"
data: "eProbe-Scope.csv"
trigger:
trigger: # Redundant?
type: "channel"
channel: 4
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic

32
data/x2s5824/_info.yaml
View File

@@ -12,23 +12,51 @@ shot-info:
config: "x2s5824.config"
info: "x2s5824.txt"
pcb-canny:
- sigma: 4
post_pres: 0.05
# Canny Args
canny-args:
- sigma: 2
post_pres: 0.03
no-graph:
- "None"
# - "at1"
# - "at2"
# - "at3"
# - "at4"
# - "at5"
# - "at6"
pcb-refs:
#- "at1"
#- "at2"
#- "at3"
#
#- "at4"
#- "at5"
#- "at6"
- "st1"
- "st3"
probe-info:
type: "Thin"
locations: # In order of pulse
- "st2"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 0.8 # mm
gauge-c2c: 1.8 #mm
gauges:
- 1
- 2
locations: # In order of pulse
- "st2"
- "st3"
data-record:
type: "scope"
config: "eProbe-Scope.txt"

33
data/x2s5827/_info.yaml
View File

@@ -12,6 +12,10 @@ shot-info:
config: "x2s5827.config"
info: "x2s5827.txt"
pcb-canny:
- sigma: 4
post_pres: 0.05
# Canny Args
canny-args:
- sigma: 2
@@ -20,18 +24,41 @@ canny-args:
- sigma: 0.75
post_pres: 0.1
no-graph:
- "None"
# - "at1"
# - "at2"
# - "at3"
# - "at4"
# - "at5"
# - "at6"
pcb-refs:
#- "at1"
#- "at2"
#- "at3"
#
#- "at4"
#- "at5"
#- "at6"
- "st1"
probe-info:
type: "Thin"
locations: # In order of pulse
- "st2"
- "st3"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 0.8 # mm
gauge-c2c: 1.8 #mm
gauges:
- 1
- 2
locations: # In order of pulse
- "st2"
- "st3"
data-record:
type: "scope"
config: "eProbe-Scope.txt"

39
data/x2s5829/_info.yaml
View File

@@ -22,24 +22,47 @@ canny-args:
- sigma: 1
post_pres: 0.2
pcb-refs:
- "st1"
pcb-canny:
- sigma: 4
post_pres: 0.05
no-graph:
- "None"
# - "at1"
# - "at2"
# - "at3"
# - "at4"
# - "at5"
# - "at6"
pcb-refs:
#- "at1"
#- "at2"
#- "at3"
#
#- "at4"
#- "at5"
#- "at6"
- "st1"
probe-info:
type: "Thin"
locations: # In order of pulse
- "st2"
- "st3"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 0.8 # mm
gauge-c2c: 1.8 #mm
data-records:
- type: "scope"
gauges:
- 1
- 2
locations: # In order of pulse
- "st2"
- "st3"
data-record:
type: "scope"
config: "eProbe-Scope.txt"
data: "eProbe-Scope.csv"
@@ -48,5 +71,3 @@ probe-info:
channel: 4
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us

24
data/x2s5830/_info.yaml
View File

@@ -20,7 +20,12 @@ canny-args:
- sigma: 1
post_pres: 0.2
pcb-canny:
- sigma: 4
post_pres: 0.05
no-graph:
- "None"
- "at1"
- "at2"
- "at3"
@@ -30,8 +35,6 @@ no-graph:
- "at6"
pcb-refs:
- "st1"
- "at1"
- "at2"
- "at3"
@@ -40,21 +43,24 @@ pcb-refs:
- "at5"
- "at6"
- "st1"
probe-info:
type: "Thin"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 0.8 # mm
gauge-c2c: 1.8 #mm
gauges:
- 1
- 2
locations: # In order of pulse
- "st2"
- "st3"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 0.8 # mm
gauge-c2c: 1.8 #mm
data-records:
- type: "scope"
data-record:
type: "scope"
config: "eProbe-Scope.txt"
data: "eProbe-Scope.csv"
@@ -63,5 +69,3 @@ probe-info:
channel: 4
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us

14
data/x2s5831/_info.yaml
View File

@@ -2,6 +2,7 @@
# Cal Wing - Oct 24
long_name: "Shot 6 (x2s5829) - Thin Probe (ST1, ST2 & ST3) - 2024-10-18 - Flush ST2"
comments: "G2 Pointless, Wasn't attached"
name: "Shot 6"
date: "2024-10-18"
time: "14:00"
@@ -62,4 +63,17 @@ probe-info:
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us
- type: "x2"
channels: # Gauge Channel Name
- "st2"
- "st3"
trigger:
type: "x2"
# Info isn't really needed
channel: "trigbox"
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 0 # us

17
data/x2s5832/_info.yaml
View File

@@ -12,6 +12,10 @@ shot-info:
config: "{0}.config"
info: "{0}.txt"
pcb-canny:
- sigma: 4
post_pres: 0.05
# Canny Args
canny-args:
- sigma: 2
@@ -66,4 +70,17 @@ probe-info:
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us
- type: "x2"
channels: # Gauge Channel Name
- "st2"
- "st3"
trigger:
type: "x2"
# Info isn't really needed
channel: "trigbox"
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 0 # us

46
main.py
View File

@@ -30,11 +30,11 @@ with open(TUNNEL_INFO_FILE, 'r') as file:
TUNNEL_INFO = yaml.safe_load(file)
data_to_load = [
#"x2s5823",
#"x2s5824",
#"x2s5827",
"x2s5823",
"x2s5824",
"x2s5827",
"x2s5829",
#"x2s5830",
"x2s5830",
"x2s5831",
"x2s5832"
]
@@ -201,13 +201,25 @@ def load_data(data_path: str, data={}) -> dict:
# Find Shock Times
# X2 - Canning Edge
data[x2_shot]["shock-point"] = {}
for ref in dataInfo["pcb-refs"]:
cArgs = dataInfo["pcb-canny"]
for i, ref in enumerate(dataInfo["pcb-refs"]):
refData = data[x2_shot]["data"]["x2"][ref]
first_value, first_value_uncertainty, _, _ = canny_shock_finder(x2_time_us, refData, plot=False, print_func=None)
if i in range(len(cArgs)):
sigma = cArgs[i]["sigma"]
post_sup_thresh = cArgs[i]["post_pres"]
else:
sigma = cArgs[-1]["sigma"]
post_sup_thresh = cArgs[-1]["post_pres"]
first_value, first_value_uncertainty, _, _ = canny_shock_finder(x2_time_us, refData, sigma=sigma, post_suppression_threshold=post_sup_thresh, plot=False, print_func=None)
shock_point = np.where(x2_time_us >= first_value)[0][0] # [BUG] Seems to give n+1
data[x2_shot]["shock-point"][ref] = shock_point, first_value
# ---- Gauge Canning Edge ----
for i, probe in enumerate(dataInfo["probe-info"]["locations"]):
probeCh1 = data[x2_shot]["data"]["probes"][0]
probeCh2 = data[x2_shot]["data"]["probes"][1]
@@ -230,6 +242,7 @@ def load_data(data_path: str, data={}) -> dict:
time_offset = None
# Find G1 Shock Time
if 1 in dataInfo["probe-info"]["gauges"]:
first_value, first_value_uncertainty, _, _ = canny_shock_finder(scope_time, probeCh1, sigma=sigma, post_suppression_threshold=post_sup_thresh, plot=doCannyPlot, start_time=time_offset, print_func=None)
if first_value is None:
print(f"[ERROR] {x2_shot} - {probe}-g1 could not be detected using: Sigma = {sigma}, post_suppression_threshold = {post_sup_thresh}")
@@ -239,6 +252,7 @@ def load_data(data_path: str, data={}) -> dict:
data[x2_shot]["shock-point"][f"{probe}-g1"] = shock_point, first_value
if 2 in dataInfo["probe-info"]["gauges"]:
# Do the same for G2
if i > 0:
time_offset = data[x2_shot]["shock-point"][f"{privPoint}-g2"][1] + CANNY_TIME_OFFSET
@@ -268,6 +282,7 @@ def load_data(data_path: str, data={}) -> dict:
print()
for probe in dataInfo["probe-info"]["locations"]:
if f"{probe}-g1" in data[x2_shot]["shock-point"] and f"{probe}-g2" in data[x2_shot]["shock-point"]:
g1_time = data[x2_shot]["shock-point"][f"{probe}-g1"][1] / 1e6 # Convert to seconds
g2_time = data[x2_shot]["shock-point"][f"{probe}-g2"][1] / 1e6 # Convert to seconds
c2c_dist = dataInfo["probe-info"]["c2c"] / 1000 # convert to m
@@ -276,25 +291,28 @@ def load_data(data_path: str, data={}) -> dict:
print(f"{probe} Measured a shock speed of {probe_velocity:.2f} m/s ({probe_velocity/1000:.2f} km/s)")
data[x2_shot]["shock-speed"][probe] = probe_velocity # m/s
else:
print(f"Unable to calculate probe velocity, only have one probe: {f"{probe}-g2" if f"{probe}-g2" in data[x2_shot]["shock-point"] else f"{probe}-g1"}")
if len(dataInfo["probe-info"]["locations"]) > 1:
for i in range(len(dataInfo["probe-info"]["locations"]) - 1):
probe_locs = dataInfo["probe-info"]["locations"]
p1_g1_time = data[x2_shot]["shock-point"][f"{probe_locs[i]}-g1"][1] / 1e6 # Convert to seconds
p1_g2_time = data[x2_shot]["shock-point"][f"{probe_locs[i]}-g2"][1] / 1e6 # Convert to seconds
p2_g1_time = data[x2_shot]["shock-point"][f"{probe_locs[i+1]}-g1"][1] / 1e6 # Convert to seconds
p2_g2_time = data[x2_shot]["shock-point"][f"{probe_locs[i+1]}-g2"][1] / 1e6 # Convert to seconds
p2p = (TUNNEL_INFO["distance"][probe_locs[1]] - TUNNEL_INFO["distance"][probe_locs[0]]) / 1000 # convert to m
if f"{probe_locs[i]}-g1" in data[x2_shot]["shock-point"] and f"{probe_locs[i+1]}-g1" in data[x2_shot]["shock-point"]:
p1_g1_time = data[x2_shot]["shock-point"][f"{probe_locs[i]}-g1"][1] / 1e6 # Convert to seconds
p2_g1_time = data[x2_shot]["shock-point"][f"{probe_locs[i+1]}-g1"][1] / 1e6 # Convert to seconds
p2p_1 = p2p / abs(p2_g1_time - p1_g1_time) # m/s
p2p_2 = p2p / abs(p2_g2_time - p1_g2_time) # m/s
print(f"{probe_locs[i]}-{probe_locs[i + 1]} - G1 - Measured a shock speed of {p2p_1:.2f} m/s ({p2p_1/1000:.2f} km/s)")
data[x2_shot]["shock-speed"][f"{probe_locs[i]}-{probe_locs[i + 1]}-g2"] = p2p_2
if f"{probe_locs[i]}-g2" in data[x2_shot]["shock-point"] and f"{probe_locs[i+1]}-g2" in data[x2_shot]["shock-point"]:
p1_g2_time = data[x2_shot]["shock-point"][f"{probe_locs[i]}-g2"][1] / 1e6 # Convert to seconds
p2_g2_time = data[x2_shot]["shock-point"][f"{probe_locs[i+1]}-g2"][1] / 1e6 # Convert to seconds
p2p_2 = p2p / abs(p2_g2_time - p1_g2_time) # m/s
print(f"{probe_locs[i]}-{probe_locs[i + 1]} - G2 - Measured a shock speed of {p2p_2:.2f} m/s ({p2p_2/1000:.2f} km/s)")
data[x2_shot]["shock-speed"][f"{probe_locs[i]}-{probe_locs[i + 1]}-g1"] = p2p_1
data[x2_shot]["shock-speed"][f"{probe_locs[i]}-{probe_locs[i + 1]}-g2"] = p2p_2
print()