Add referance data & x2s5829

This commit is contained in:
Cal Wing 2024-10-17 19:30:54 +10:00
parent 04baba4a30
commit feee9efa44
94 changed files with 88685 additions and 24 deletions

View File

@ -13,13 +13,15 @@ IEEE Transactions on pattern analysis and machine intelligence, (6), 679-698.
Chris James (c.james4@uq.edu.au) - 04/07/17 Chris James (c.james4@uq.edu.au) - 04/07/17
""" """
VERSION_STRING = "15-Oct-2024" # Amened by Cal Wing to make the function not print
VERSION_STRING = "17-Oct-2024"
def canny_shock_finder(time_list, pressure_list, sigma = 4, derivative_threshold = 0.001, auto_derivative = False, post_suppression_threshold = 0.05, def canny_shock_finder(time_list, pressure_list, sigma = 4, derivative_threshold = 0.001, auto_derivative = False, post_suppression_threshold = 0.05,
post_shock_pressure = None, start_time = None, find_second_peak = None, plot = True, plot_scale_factor = None, post_shock_pressure = None, start_time = None, find_second_peak = None, plot = True, plot_scale_factor = None,
amount_of_values_before_and_after = 100, time_unit = 's', y_label = 'Pressure (kPa)', plot_title = 'canny shock finding result', amount_of_values_before_and_after = 100, time_unit = 's', y_label = 'Pressure (kPa)', plot_title = 'canny shock finding result',
return_processing_lists = False, calculate_automatic_derivative_threshold = False, return_processing_lists = False, calculate_automatic_derivative_threshold = False,
check_canny_runtime = False, plot_time_unit = 's', plot_time_scale = 1.0): check_canny_runtime = False, plot_time_unit = 's', plot_time_scale = 1.0, print_func=print):
""" """
@ -116,6 +118,14 @@ def canny_shock_finder(time_list, pressure_list, sigma = 4, derivative_threshold
time units. Defaults to 1.0 (so no change if time units are seconds). time units. Defaults to 1.0 (so no change if time units are seconds).
""" """
# Make the function silent / have print overridable
if print_func is None:
def noop(*args, **kwargs):
pass
print = noop
else:
print = print_func
if check_canny_runtime: if check_canny_runtime:
import time import time

View File

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

View File

Before

Width:  |  Height:  |  Size: 116 KiB

After

Width:  |  Height:  |  Size: 116 KiB

View File

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 114 KiB

View File

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 140 KiB

View File

Before

Width:  |  Height:  |  Size: 121 KiB

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

View File

@ -0,0 +1,47 @@
# x2s5820 config file
# This files contains a text version of the National Instruments PXI unit configuration data.
# Channels are represented as one line per configured signal with tab-separated values.
#
# Line content and types of values (first item is item 0):
# i item type comments
# --------------------------------------------------------------------------------------------------------
# 0 signal name string
# 1 channel ID string legacy I/O channel designation
# 2 external gain float 1 if there is no external amplifier connected
# 3 sensitivity float volts per measured unit (of the transducer)
# 4 units string name of units for physical quantity (e.g. kPa)
# 5 position float position of transducer (in mm)
# 6 serial number string transducer identity
# 7 PXI channel ID string non-legacy channel ID and trigger source
#---------------------------------------------------------------------------------------------------------
sd1 2 0 9 1 9.500000E-4 kPa 0.000 112A24-9609 PXI1Slot2/ai0
sd2 2 1 9 1 9.500000E-4 kPa 0.000 113A22-9535 PXI1Slot2/ai1
sd3 2 3 9 1 6.820000E-4 kPa 0.000 112A24-2676 PXI1Slot2/ai3
st1 2 4 9 1 1.482000E-2 kPa 0.000 112A22-35071 PXI1Slot2/ai4
st2 5 4 9 1 1.168700E-2 kPa 0.000 112A22-35070 PXI1Slot5/ai4
st3 2 6 9 1 1.450000E-2 kPa 0.000 112A22-19126 PXI1Slot2/ai6
at1 3 0 9 1 1.443000E-2 kPa 0.000 112A22-35098 PXI1Slot3/ai0
at2 3 1 9 1 1.450000E-2 kPa 0.000 112A22-9050 PXI1Slot3/ai1
at3 3 2 9 1 1.447980E-2 kPa 0.000 112A22-19124 PXI1Slot3/ai2
at4 3 3 9 1 1.435000E-2 kPa 0.000 112A22-34424 PXI1Slot3/ai3
at5 3 4 9 1 1.447000E-2 kPa 0.000 112A22-34425 PXI1Slot3/ai4
at6 3 5 9 1 1.442000E-2 kPa 0.000 112A22-34426 PXI1Slot3/ai5
at7 2 7 9 1 1.451000E-2 kPa 0.000 112A22-35096 PXI1Slot2/ai7
at8 3 7 9 1 1.490000E-2 kPa 0.000 112A22-35079 PXI1Slot3/ai7
pimax4 5 1 9 1 1.000000E-3 mV 0.000 pimax4 PXI1Slot5/ai1
trigbox 5 7 9 1 1.000000E-3 mV 0.000 trigbox PXI1Slot5/ai7(Trigger)
trigbox_delay 5 5 9 1 1.000000E-3 mV 0.000 trigbox_delay PXI1Slot5/ai5
pt1 5 2 9 1 8.500000E-4 kPa 0.000 SN-22554 PXI1Slot5/ai2
irc800 8 4 9 1 1.000000E-3 mV 0.000 irc800 PXI1Slot8/ai4
shimadzu 8 6 9 1 1.000000E-3 mV 0.000 shimadzu PXI1Slot8/ai6
pimax3 8 7 9 1 1.000000E-3 mV 0.000 pimax3 PXI1Slot8/ai7
Phantom 8 2 9 1 1.000000E-3 mV 0.000 phantom PXI1Slot8/ai2
pt2 6 1 9 1 1.440000E-3 kPa 0.000 SN 22556 PXI1Slot6/ai1
pt3 6 2 9 1 1.810000E-3 kPa 0.000 SN 7446 PXI1Slot6/ai2
pt4 6 3 9 1 7.300000E-4 kPa 0.000 SN LW30649 PXI1Slot6/ai3
pt5 8 3 9 1 7.350000E-4 kPa 0.000 SN LW30651 PXI1Slot8/ai3
pt6 6 5 9 1 7.290000E-4 kPa 0.000 SN LW30652 PXI1Slot6/ai5
pt7 6 6 9 1 7.220000E-4 kPa 0.000 SN 22514 PXI1Slot6/ai6
pt8 3 6 9 1 1.430000E-3 kPa 0.000 SN 16785 PXI1Slot3/ai6
pt9 5 0 9 1 1.010000E-3 kPa 0.000 SN 7430 PXI1Slot5/ai0

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,136 @@
--------------------------------------------------------------------------------
Project.........................................Mars entry non-equilibrium expanding flows
Run number................................ x2s5820
Date............................................10/10/2024
Blame...........................................Mragank, Matt
Condition................................... Mars condition, high density, Mars mixture
Reservoir..................................... 6.75 MPa
Driver............................................83520 Pa 90% He, 92.8 kPa Argon
Primary diaphragm.................... 2 mm scored, cold rolled steel 6U374
Shock tube................................... 13000 Pa ( Mars mixture)
Secondary diaphragm................ 10 micron mylar
Acceleration tube....................... 650 Pa lab air (set on new gauge on the bottom of the dump tank)
Trig.............................................. Pt5 (changed as wedge is ahead of pitot probes) slot8ai3 on tee piece 8ai4 - cable pt5
Lab environment...................... N/A
Driver Condition........................x2-lwp-2.0-90-0
--------------------------------------------------------------------------------
EXPERIMENT SETUP
pitot rake
--------------------------------------------------------------------------------
EQUIPMENT
--------------------------------------------------------------------------------
1x photodiode (350 - 1100nm)
1xShimadzu -- in use
1xmini-spec (200-1000nm)
Phantom
-------------------------- SUSS Spectral Overview ----------------------------
--------------------------------------------------------------------------------
Dichroic 1 (UV/VIS): DMLP650L
Dichroic 2 (VIS/IR): DMLP900L
UV FOV: 8mm
VIS FOV: 8mm
IR FOV: 8mm
--------------------------------------------------------------------------------
---UV---
--------------------------------------------------------------------------------
Spectrometer: Acton Spectrapro 2300i
Centre Wavelength: 430
Grating: 150
Camera: PIMAX3
Gain: 60
Delay: 45 us
Exposure: 20 us
Trigger level: 1 V
Slit: 100 um
Filter: N/A
Trigger: A5 cable from trigger box port 0
Monitor: DB1 Cable
Phosphor decay delay: default
Phsophor decal resolution: default
Aperture::12.5 mm
--------------------------------------------------------------------------------
---Visible---
--------------------------------------------------------------------------------
Spectrometer: Acton Spectrapro 2300i
Centre Wavelength: 775
Grating: 150
Camera: PIMAX4
Gain: 50
Delay: 45 us
Exposure: 20 us
Trigger level: 1V
Slit: 100 um
Filter:
Trigger: A3 cable from trigger box port 0
Monitor: T1 Cable
Aperture: 12.5 mm
--------------------------------------------------------------------------------
---IR---
--------------------------------------------------------------------------------
Spectrometer: Acton Spectrapro 2500
Centre Wavelength: 1300
Grating: 75
Camera: IRC800
Delay: 105us setted in DAQ with 320 counts
Exposure: 20 us
Slit: 1000 um
Filter:
Trigger: T2 cable from trigger box port1
Monitor: PDTP1G Cable
Aperture: 12.5 mm
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Shimadzu
--------------------------------------------------------------------------------
Window : BK7 Diam 209mm top
Lens: Nikon AF Micro NIKKOR 200MM with 780-unknown? filter
Aperture-Number 16
Frame Rates 500.000 kFPS
Exposure: 1/2
Gain: x2(/x50)
Mode: External
Trigger @: 0/0 (0-99=100frames)
point: 10
Delay: 0 microseconds
Polarity: Pos
Monitor Expose: off
Filter:
Cables: Trigger: H6 cable from trigger box port 2
Monitor: H4 Cable
--------------------------------------------------------------------------------
PHOTODIODE
--------------------------------------------------------------------------------
N/A
--------------------------------------------------------------------------------
MINI-SPEC (200 - 1000nm)
--------------------------------------------------------------------------------
N/A
LOG
X2s5815
Bad shot - very messy - oring ruptured in the secondary may have over pressurised with additional LAB Air.
X2s5816
Fired at 1.32Pa instead of 13.2pa.....

Binary file not shown.

View File

@ -0,0 +1,48 @@
# x2s5821 config file
# This files contains a text version of the National Instruments PXI unit configuration data.
# Channels are represented as one line per configured signal with tab-separated values.
#
# Line content and types of values (first item is item 0):
# i item type comments
# --------------------------------------------------------------------------------------------------------
# 0 signal name string
# 1 channel ID string legacy I/O channel designation
# 2 external gain float 1 if there is no external amplifier connected
# 3 sensitivity float volts per measured unit (of the transducer)
# 4 units string name of units for physical quantity (e.g. kPa)
# 5 position float position of transducer (in mm)
# 6 serial number string transducer identity
# 7 PXI channel ID string non-legacy channel ID and trigger source
#---------------------------------------------------------------------------------------------------------
sd1 2 0 9 1 9.500000E-4 kPa 0.000 112A24-9609 PXI1Slot2/ai0
sd2 2 1 9 1 9.500000E-4 kPa 0.000 113A22-9535 PXI1Slot2/ai1
sd3 2 3 9 1 6.820000E-4 kPa 0.000 112A24-2676 PXI1Slot2/ai3
st1 2 4 9 1 1.482000E-2 kPa 0.000 112A22-35071 PXI1Slot2/ai4
st2 5 4 9 1 1.168700E-2 kPa 0.000 112A22-35070 PXI1Slot5/ai4
st3 2 6 9 1 1.450000E-2 kPa 0.000 112A22-19126 PXI1Slot2/ai6
at1 3 0 9 1 1.443000E-2 kPa 0.000 112A22-35098 PXI1Slot3/ai0
at2 3 1 9 1 1.450000E-2 kPa 0.000 112A22-9050 PXI1Slot3/ai1
at3 3 2 9 1 1.447980E-2 kPa 0.000 112A22-19124 PXI1Slot3/ai2
at4 3 3 9 1 1.435000E-2 kPa 0.000 112A22-34424 PXI1Slot3/ai3
at5 3 4 9 1 1.447000E-2 kPa 0.000 112A22-34425 PXI1Slot3/ai4
at6 3 5 9 1 1.442000E-2 kPa 0.000 112A22-34426 PXI1Slot3/ai5
at7 2 7 9 1 1.451000E-2 kPa 0.000 112A22-35096 PXI1Slot2/ai7
at8 3 7 9 1 1.490000E-2 kPa 0.000 112A22-35079 PXI1Slot3/ai7
pimax4 5 1 9 1 1.000000E-3 mV 0.000 pimax4 PXI1Slot5/ai1
trigbox 5 7 9 1 1.000000E-3 mV 0.000 trigbox PXI1Slot5/ai7(Trigger)
trigbox_delay 5 5 9 1 1.000000E-3 mV 0.000 trigbox_delay PXI1Slot5/ai5
pt1 5 2 9 1 8.500000E-4 kPa 0.000 SN-22554 PXI1Slot5/ai2
irc800 8 4 9 1 1.000000E-3 mV 0.000 irc800 PXI1Slot8/ai4
shimadzu 8 6 9 1 1.000000E-3 mV 0.000 shimadzu PXI1Slot8/ai6
pimax3 8 7 9 1 1.000000E-3 mV 0.000 pimax3 PXI1Slot8/ai7
Phantom 8 2 9 1 1.000000E-3 mV 0.000 phantom PXI1Slot8/ai2
pt2 6 1 9 1 1.440000E-3 kPa 0.000 SN 22556 PXI1Slot6/ai1
pt3 6 2 9 1 1.810000E-3 kPa 0.000 SN 7446 PXI1Slot6/ai2
pt4 6 3 9 1 7.300000E-4 kPa 0.000 SN LW30649 PXI1Slot6/ai3
pt5 8 3 9 1 7.350000E-4 kPa 0.000 SN LW30651 PXI1Slot8/ai3
pt6 6 5 9 1 7.290000E-4 kPa 0.000 SN LW30652 PXI1Slot6/ai5
pt7 6 6 9 1 7.220000E-4 kPa 0.000 SN 22514 PXI1Slot6/ai6
pt8 3 6 9 1 1.430000E-3 kPa 0.000 SN 16785 PXI1Slot3/ai6
pt9 5 0 9 1 1.010000E-3 kPa 0.000 SN 7430 PXI1Slot5/ai0
photodiode 8 0 9 1 1.000000E+0 mV 0.000 photodiode PXI1Slot8/ai0

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,169 @@
--------------------------------------------------------------------------------
Project.........................................Mars entry non-equilibrium expanding flows
Run number................................ x2s5820
Date............................................10/10/2024
Blame...........................................Mragank, Matt
Condition................................... Mars condition, high density, Mars mixture
Reservoir..................................... 6.75 MPa
Driver............................................83520 Pa 90% He, 92.8 kPa Argon
Primary diaphragm.................... 2 mm scored, cold rolled steel 6U374
Shock tube................................... 13000 Pa ( Mars mixture)
Secondary diaphragm................ 10 micron mylar
Acceleration tube....................... 650 Pa lab air (set on new gauge on the bottom of the dump tank)
Trig.............................................. Pt5 (changed as wedge is ahead of pitot probes) slot8ai3 on tee piece 8ai4 - cable pt5
Lab environment...................... N/A
Driver Condition........................x2-lwp-2.0-90-0
--------------------------------------------------------------------------------
EXPERIMENT SETUP
pitot rake
--------------------------------------------------------------------------------
EQUIPMENT
--------------------------------------------------------------------------------
1x photodiode (350 - 1100nm)
1xShimadzu -- in use
1xmini-spec (200-1000nm)
Phantom
-------------------------- SUSS Spectral Overview ----------------------------
--------------------------------------------------------------------------------
Dichroic 1 (UV/VIS): DMLP650L
Dichroic 2 (VIS/IR): DMLP900L
UV FOV: 8mm
VIS FOV: 8mm
IR FOV: 8mm
--------------------------------------------------------------------------------
---UV---
--------------------------------------------------------------------------------
Spectrometer: Acton Spectrapro 2300i
Centre Wavelength: 430
Grating: 150
Camera: PIMAX3
Gain: 60
Delay: 45 us
Exposure: 20 us
Trigger level: 1 V
Slit: 100 um
Filter: N/A
Trigger: A5 cable from trigger box port 0
Monitor: DB1 Cable
Phosphor decay delay: default
Phsophor decal resolution: default
Aperture::12.5 mm
--------------------------------------------------------------------------------
---Visible---
--------------------------------------------------------------------------------
Spectrometer: Acton Spectrapro 2300i
Centre Wavelength: 775
Grating: 150
Camera: PIMAX4
Gain: 50
Delay: 45 us
Exposure: 20 us
Trigger level: 1V
Slit: 100 um
Filter:
Trigger: A3 cable from trigger box port 0
Monitor: T1 Cable
Aperture: 12.5 mm
--------------------------------------------------------------------------------
---IR---
--------------------------------------------------------------------------------
Spectrometer: Acton Spectrapro 2500
Centre Wavelength: 1300
Grating: 75
Camera: IRC800
Delay: 105us setted in DAQ with 320 counts
Exposure: 20 us
Slit: 1000 um
Filter:
Trigger: T2 cable from trigger box port1
Monitor: PDTP1G Cable
Aperture: 12.5 mm
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Shimadzu
--------------------------------------------------------------------------------
Window : BK7 Diam 209mm top
Lens: Nikon AF Micro NIKKOR 200MM with 780-unknown? filter
Aperture-Number 16
Frame Rates 500.000 kFPS
Exposure: 1/2
Gain: x2(/x50)
Mode: External
Trigger @: 0/0 (0-99=100frames)
point: 10
Delay: 0 microseconds
Polarity: Pos
Monitor Expose: off
Filter:
Cables: Trigger: H6 cable from trigger box port 2
Monitor: H4 Cable
--------------------------------------------------------------------------------
PHOTODIODE
--------------------------------------------------------------------------------
Location: Circle around stagnation point.
Filter: 777nm hydrogen filter actually. not sure which one...
Model number: (350-1100)
Lens: Unknown
Gain: 10
Fibre optic cable: Red
Aperture: None
BNC: A4
--------------------------------------------------------------------------------
MINI-SPEC (200 - 1000nm)
--------------------------------------------------------------------------------
Location: Through-model looking out into the flow
Filter: none
Window: 3mm fused silica from OGP optics.
Cable: New red cable
Lens: N/A
Delay: 105us setted in DAQ with 320 counts + 8 us internal
Integration time: 20 us
H6 in port 1
Aperture: N/A
--------------------------------------------------------------------------------
Phantom
--------------------------------------------------------------------------------
Window : side
Lens: Nikon AF Micro NIKKOR 105 mm focus
Aperture-Number 18
Frame Rates 110000.000 FPS
Exposure: 1 us
Gain: N/A
Mode: External
Delay: 0 microseconds
Polarity: Pos
Monitor Expose: off
Filter:
Cables: Trigger: B3 cable from trigger box port 2
Monitor: H4 Cable
LOG
X2s5815
Bad shot - very messy - oring ruptured in the secondary may have over pressurised with additional LAB Air.
X2s5816
Fired at 1.32Pa instead of 13.2pa.....

Binary file not shown.

View File

@ -0,0 +1,48 @@
# x2s5822 config file
# This files contains a text version of the National Instruments PXI unit configuration data.
# Channels are represented as one line per configured signal with tab-separated values.
#
# Line content and types of values (first item is item 0):
# i item type comments
# --------------------------------------------------------------------------------------------------------
# 0 signal name string
# 1 channel ID string legacy I/O channel designation
# 2 external gain float 1 if there is no external amplifier connected
# 3 sensitivity float volts per measured unit (of the transducer)
# 4 units string name of units for physical quantity (e.g. kPa)
# 5 position float position of transducer (in mm)
# 6 serial number string transducer identity
# 7 PXI channel ID string non-legacy channel ID and trigger source
#---------------------------------------------------------------------------------------------------------
sd1 2 0 9 1 9.500000E-4 kPa 0.000 112A24-9609 PXI1Slot2/ai0
sd2 2 1 9 1 9.500000E-4 kPa 0.000 113A22-9535 PXI1Slot2/ai1
sd3 2 3 9 1 6.820000E-4 kPa 0.000 112A24-2676 PXI1Slot2/ai3
st1 2 4 9 1 1.482000E-2 kPa 0.000 112A22-35071 PXI1Slot2/ai4
st2 5 4 9 1 1.168700E-2 kPa 0.000 112A22-35070 PXI1Slot5/ai4
st3 2 6 9 1 1.450000E-2 kPa 0.000 112A22-19126 PXI1Slot2/ai6
at1 3 0 9 1 1.443000E-2 kPa 0.000 112A22-35098 PXI1Slot3/ai0
at2 3 1 9 1 1.450000E-2 kPa 0.000 112A22-9050 PXI1Slot3/ai1
at3 3 2 9 1 1.447980E-2 kPa 0.000 112A22-19124 PXI1Slot3/ai2
at4 3 3 9 1 1.435000E-2 kPa 0.000 112A22-34424 PXI1Slot3/ai3
at5 3 4 9 1 1.447000E-2 kPa 0.000 112A22-34425 PXI1Slot3/ai4
at6 3 5 9 1 1.442000E-2 kPa 0.000 112A22-34426 PXI1Slot3/ai5
at7 2 7 9 1 1.451000E-2 kPa 0.000 112A22-35096 PXI1Slot2/ai7
at8 3 7 9 1 1.490000E-2 kPa 0.000 112A22-35079 PXI1Slot3/ai7
pimax4 5 1 9 1 1.000000E-3 mV 0.000 pimax4 PXI1Slot5/ai1
trigbox 5 7 9 1 1.000000E-3 mV 0.000 trigbox PXI1Slot5/ai7(Trigger)
trigbox_delay 5 5 9 1 1.000000E-3 mV 0.000 trigbox_delay PXI1Slot5/ai5
pt1 5 2 9 1 8.500000E-4 kPa 0.000 SN-22554 PXI1Slot5/ai2
irc800 8 4 9 1 1.000000E-3 mV 0.000 irc800 PXI1Slot8/ai4
shimadzu 8 6 9 1 1.000000E-3 mV 0.000 shimadzu PXI1Slot8/ai6
pimax3 8 7 9 1 1.000000E-3 mV 0.000 pimax3 PXI1Slot8/ai7
Phantom 8 2 9 1 1.000000E-3 mV 0.000 phantom PXI1Slot8/ai2
pt2 6 1 9 1 1.440000E-3 kPa 0.000 SN 22556 PXI1Slot6/ai1
pt3 6 2 9 1 1.810000E-3 kPa 0.000 SN 7446 PXI1Slot6/ai2
pt4 6 3 9 1 7.300000E-4 kPa 0.000 SN LW30649 PXI1Slot6/ai3
pt5 8 3 9 1 7.350000E-4 kPa 0.000 SN LW30651 PXI1Slot8/ai3
pt6 6 5 9 1 7.290000E-4 kPa 0.000 SN LW30652 PXI1Slot6/ai5
pt7 6 6 9 1 7.220000E-4 kPa 0.000 SN 22514 PXI1Slot6/ai6
pt8 3 6 9 1 1.430000E-3 kPa 0.000 SN 16785 PXI1Slot3/ai6
pt9 5 0 9 1 1.010000E-3 kPa 0.000 SN 7430 PXI1Slot5/ai0
photodiode 8 0 9 1 1.000000E+0 mV 0.000 photodiode PXI1Slot8/ai0

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,157 @@
--------------------------------------------------------------------------------
Project.........................................Mars entry non-equilibrium expanding flows
Run number................................ x2s5822
Date............................................10/10/2024
Blame...........................................Mragank, Matt
Condition................................... Mars condition, high density, Mars mixture
Reservoir..................................... 6.75 MPa
Driver............................................83520 Pa 90% He, 92.8 kPa Argon
Primary diaphragm.................... 2 mm scored, cold rolled steel 6U374
Shock tube................................... 13000 Pa ( Mars mixture)
Secondary diaphragm................ 10 micron mylar
Acceleration tube....................... 650 Pa lab air (set on new gauge on the bottom of the dump tank)
Trig.............................................. Pt5 (changed as wedge is ahead of pitot probes) slot8ai3 on tee piece 8ai4 - cable pt5
Lab environment...................... N/A
Driver Condition........................x2-lwp-2.0-90-0
--------------------------------------------------------------------------------
EXPERIMENT SETUP
pitot rake
--------------------------------------------------------------------------------
EQUIPMENT
--------------------------------------------------------------------------------
1x photodiode (350 - 1100nm)
1xShimadzu -- in use
1xmini-spec (200-1000nm)
Phantom
-------------------------- SUSS Spectral Overview ----------------------------
--------------------------------------------------------------------------------
Dichroic 1 (UV/VIS): DMLP650L
Dichroic 2 (VIS/IR): DMLP900L
UV FOV: 8mm
VIS FOV: 8mm
IR FOV: 8mm
--------------------------------------------------------------------------------
---UV---
--------------------------------------------------------------------------------
N/A
--------------------------------------------------------------------------------
---Visible---
--------------------------------------------------------------------------------
Spectrometer: Acton Spectrapro 2300i
Centre Wavelength: 775
Grating: 150
Camera: PIMAX4
Gain: 50
Delay: 80 us
Exposure: 50 us
Trigger level: 1V
Slit: 100 um
Filter:
Trigger: A3 cable from trigger box port 0
Monitor: T1 Cable
Aperture: 12.5 mm
--------------------------------------------------------------------------------
---IR---
--------------------------------------------------------------------------------
Spectrometer: Acton Spectrapro 2500
Centre Wavelength: 1300
Grating: 75
Camera: IRC800
Delay: 105us setted in DAQ with 320 counts
Exposure: 20 us
Slit: 1000 um
Filter:
Trigger: T2 cable from trigger box port1
Monitor: PDTP1G Cable
Aperture: 12.5 mm
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Shimadzu
--------------------------------------------------------------------------------
Window : BK7 Diam 209mm top
Lens: Nikon AF Micro NIKKOR 200MM with 780-unknown? filter
Aperture-Number 16
Frame Rates 500.000 kFPS
Exposure: 1/2
Gain: x2(/x50)
Mode: External
Trigger @: 0/0 (0-99=100frames)
point: 10
Delay: 0 microseconds
Polarity: Pos
Monitor Expose: off
Filter:
Cables: Trigger: H6 cable from trigger box port 1
Monitor: H4 Cable
--------------------------------------------------------------------------------
PHOTODIODE
--------------------------------------------------------------------------------
Location: Circle around stagnation point, pt5.
Filter: 777nm hydrogen filter actually. not sure which one...
Model number: (350-1100)
Lens: Unknown
Gain: 70
Fibre optic cable: Red
Aperture: None
BNC: A4
--------------------------------------------------------------------------------
MINI-SPEC (200 - 1000nm)
--------------------------------------------------------------------------------
Location: Pt5 looking out into the flow
Filter: none
Window: 3mm fused silica from OGP optics.
Cable: New red cable
Lens: N/A
Delay: 80 us + 8 us internal
Integration time: 20 us
Aperture: N/A
Trigger level: 1 V
Filter: N/A
Trigger: A5 cable from trigger box port 0, with vis
--------------------------------------------------------------------------------
Phantom
--------------------------------------------------------------------------------
Window : side
Lens: Nikon AF Micro NIKKOR 105 mm focus
Aperture-Number 18
Frame Rates 110000.000 FPS
Exposure: 1 us
Gain: N/A
Mode: External
Delay: 0 microseconds
Polarity: Pos
Monitor Expose: off
Filter:
Cables: Trigger: B3 cable from trigger box port 2
Monitor: H4 Cable
LOG
X2s5815
Bad shot - very messy - oring ruptured in the secondary may have over pressurised with additional LAB Air.
X2s5816
Fired at 1.32Pa instead of 13.2pa.....

38
data/x2s5829/_info.yaml Normal file
View File

@ -0,0 +1,38 @@
# Data Info File
# Cal Wing - Oct 24
long_name: "Shot 4 (x2s5829) - Thin Probe Pair (ST2 & ST3) - 2024-10-17"
name: "Shot 4"
date: "2024-10-17"
time: "17:00"
shot-info:
name: "x2s5829"
tdms: "x2s5829.tdms"
config: "x2s5829.config"
info: "x2s5829.txt"
pcb-refs:
- "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-record:
type: "scope"
config: "eProbe-Scope.txt"
data: "eProbe-Scope.csv"
trigger: # Redundant?
type: "channel"
channel: 4
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,18 @@
ANALOG
Ch 1 Scale 500mV/, Pos 1.25000V, Coup DC, BW Limit Off, Inv Off, Imp 1M Ohm
Probe 10.000000 : 1, Skew 0.0s
Ch 2 Scale 500mV/, Pos 1.25000V, Coup DC, BW Limit Off, Inv Off, Imp 1M Ohm
Probe 10.000000 : 1, Skew 0.0s
Ch 4 Scale 1.00V/, Pos 2.85000V, Coup DC, BW Limit Off, Inv Off, Imp 1M Ohm
Probe 1.0000000 : 1, Skew 0.0s
TRIGGER
Sweep Mode Auto, Coup DC, Noise Rej Off, HF Rej Off, Holdoff 40.0ns
Mode Edge, Source Ch 4, Slope Rising, Level 1.00000V
HORIZONTAL
Mode Normal, Ref Center, Main Scale 500.0us/, Main Delay -100.000000us
ACQUISITION
Mode High Res, Realtime On, Vectors On, Persistence Off

BIN
data/x2s5829/x2s5829.cfg Normal file

Binary file not shown.

View File

@ -0,0 +1,49 @@
# x2s5829 config file
# This files contains a text version of the National Instruments PXI unit configuration data.
# Channels are represented as one line per configured signal with tab-separated values.
#
# Line content and types of values (first item is item 0):
# i item type comments
# --------------------------------------------------------------------------------------------------------
# 0 signal name string
# 1 channel ID string legacy I/O channel designation
# 2 external gain float 1 if there is no external amplifier connected
# 3 sensitivity float volts per measured unit (of the transducer)
# 4 units string name of units for physical quantity (e.g. kPa)
# 5 position float position of transducer (in mm)
# 6 serial number string transducer identity
# 7 PXI channel ID string non-legacy channel ID and trigger source
#---------------------------------------------------------------------------------------------------------
sd1 2 0 9 1 9.500000E-4 kPa 0.000 112A24-9609 PXI1Slot2/ai0
sd2 2 1 9 1 9.500000E-4 kPa 0.000 113A22-9535 PXI1Slot2/ai1
sd3 2 3 9 1 6.820000E-4 kPa 0.000 112A24-2676 PXI1Slot2/ai3
st1 2 4 9 1 1.482000E-2 kPa 0.000 112A22-35071 PXI1Slot2/ai4
st2 5 4 9 1 1.168700E-2 kPa 0.000 112A22-35070 PXI1Slot5/ai4
st3 2 6 9 1 1.450000E-2 kPa 0.000 112A22-19126 PXI1Slot2/ai6
at1 3 0 9 1 1.443000E-2 kPa 0.000 112A22-35098 PXI1Slot3/ai0
at2 3 1 9 1 1.450000E-2 kPa 0.000 112A22-9050 PXI1Slot3/ai1
at3 3 2 9 1 1.447980E-2 kPa 0.000 112A22-19124 PXI1Slot3/ai2
at4 3 3 9 1 1.435000E-2 kPa 0.000 112A22-34424 PXI1Slot3/ai3
at5 3 4 9 1 1.447000E-2 kPa 0.000 112A22-34425 PXI1Slot3/ai4
at6 3 5 9 1 1.442000E-2 kPa 0.000 112A22-34426 PXI1Slot3/ai5
at7 2 7 9 1 1.451000E-2 kPa 0.000 112A22-35096 PXI1Slot2/ai7
at8 3 7 9 1 1.490000E-2 kPa 0.000 112A22-35079 PXI1Slot3/ai7
pimax4 5 1 9 1 1.000000E-3 mV 0.000 pimax4 PXI1Slot5/ai1
trigbox 5 7 9 1 1.000000E-3 mV 0.000 trigbox PXI1Slot5/ai7(Trigger)
trigbox_delay 5 5 9 1 1.000000E-3 mV 0.000 trigbox_delay PXI1Slot5/ai5
pt1 5 2 9 1 8.500000E-4 kPa 0.000 SN-22554 PXI1Slot5/ai2
irc800 8 4 9 1 1.000000E-3 mV 0.000 irc800 PXI1Slot8/ai4
shimadzu 8 6 9 1 1.000000E-3 mV 0.000 shimadzu PXI1Slot8/ai6
pimax3 8 7 9 1 1.000000E-3 mV 0.000 pimax3 PXI1Slot8/ai7
Phantom 8 2 9 1 1.000000E-3 mV 0.000 phantom PXI1Slot8/ai2
pt2 6 1 9 1 1.440000E-3 kPa 0.000 SN 22556 PXI1Slot6/ai1
pt3 6 2 9 1 1.810000E-3 kPa 0.000 SN 7446 PXI1Slot6/ai2
pt4 6 3 9 1 7.300000E-4 kPa 0.000 SN LW30649 PXI1Slot6/ai3
pt5 8 3 9 1 7.350000E-4 kPa 0.000 SN LW30651 PXI1Slot8/ai3
pt6 6 5 9 1 7.290000E-4 kPa 0.000 SN LW30652 PXI1Slot6/ai5
pt7 6 6 9 1 7.220000E-4 kPa 0.000 SN 22514 PXI1Slot6/ai6
pt8 3 6 9 1 1.430000E-3 kPa 0.000 SN 16785 PXI1Slot3/ai6
pt9 5 0 9 1 1.010000E-3 kPa 0.000 SN 7430 PXI1Slot5/ai0
photodiode 8 0 9 1 1.000000E+0 mV 0.000 photodiode PXI1Slot8/ai0
phantom_aperture 4 4 9 1 1.000000E-3 mV 0.000 phantom_aperture PXI1Slot4/ai4

20024
data/x2s5829/x2s5829.lvm Normal file

File diff suppressed because it is too large Load Diff

BIN
data/x2s5829/x2s5829.tdms Normal file

Binary file not shown.

Binary file not shown.

161
data/x2s5829/x2s5829.txt Normal file
View File

@ -0,0 +1,161 @@
--------------------------------------------------------------------------------
Project.........................................Mars entry non-equilibrium expanding flows
Run number................................ x2s5828
Date............................................16/10/2024
Blame...........................................Mragank, James
Condition................................... Mars condition, high density, Mars mixture
Reservoir..................................... 6.75 MPa
Driver............................................83520 Pa 90% He, 92.8 kPa Argon
Primary diaphragm.................... 2 mm scored, cold rolled steel 6U374
Shock tube................................... 62308 Pa ( pure co2)
Secondary diaphragm................ 10 micron mylar
Acceleration tube....................... 250 Pa lab air (set on new gauge on the bottom of the dump tank)
Trig.............................................. Pt5 (changed as wedge is ahead of pitot probes) slot8ai3 on tee piece 8ai4 - cable pt5
Lab environment...................... N/A
Driver Condition........................x2-lwp-2.0-90-0
--------------------------------------------------------------------------------
EXPERIMENT SETUP
pitot rake
--------------------------------------------------------------------------------
EQUIPMENT
--------------------------------------------------------------------------------
1x photodiode (350 - 1100nm)
1xShimadzu -- in use
1xmini-spec (200-1000nm)
Phantom
-------------------------- SUSS Spectral Overview ----------------------------
--------------------------------------------------------------------------------
Dichroic 1 (UV/VIS): DMLP650L
Dichroic 2 (VIS/IR): DMLP900L
UV FOV: 8mm
VIS FOV: 8mm
IR FOV: 8mm
--------------------------------------------------------------------------------
---UV---
--------------------------------------------------------------------------------
N/A
--------------------------------------------------------------------------------
---Visible---
--------------------------------------------------------------------------------
Spectrometer: Acton Spectrapro 2300i
Centre Wavelength: 775
Grating: 150
Camera: PIMAX4
Gain: 50
Delay: 80 us
Exposure: 50 us
Trigger level: 1V
Slit: 100 um
Filter:
Trigger: A3 cable from trigger box port 0
Monitor: T1 Cable
Aperture: 12.5 mm
--------------------------------------------------------------------------------
---IR---
--------------------------------------------------------------------------------
Spectrometer: Acton Spectrapro 2500
Centre Wavelength: 1300
Grating: 75
Camera: IRC800
Delay: 100us setted in DAQ with 800 counts
Exposure: 20 us
Slit: 1000 um
Filter:
Trigger: T2 cable from trigger box port1
Monitor: PDTP1G Cable
Aperture: 12.5 mm
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Shimadzu
--------------------------------------------------------------------------------
Window : BK7 Diam 209mm top
Lens: Nikon AF Micro NIKKOR 200MM with 780-unknown? filter
Aperture-Number 16
Frame Rates 500.000 kFPS
Exposure: 1/2
Gain: x2(/x50)
Mode: External
Trigger @: 0/0 (0-99=100frames)
point: 10
Delay: 0 microseconds
Polarity: Pos
Monitor Expose: off
Filter:
Cables: Trigger: H6 cable from trigger box port 1
Monitor: H4 Cable
--------------------------------------------------------------------------------
PHOTODIODE
--------------------------------------------------------------------------------
Location: Circle around stagnation point, pt5.
Filter: 777nm hydrogen filter actually. not sure which one...
Model number: (350-1100)
Lens: Unknown
Gain: 70
Fibre optic cable: Red
Aperture: None
BNC: A4
--------------------------------------------------------------------------------
MINI-SPEC (200 - 1000nm)
--------------------------------------------------------------------------------
Location: Pt5 looking out into the flow
Filter: none
Window: 3mm fused silica from OGP optics.
Cable: New red cable
Lens: N/A
Delay: 80 us + 8 us internal
Integration time: 20 us
Aperture: N/A
Trigger level: 1 V
Filter: N/A
Trigger: A5 cable from trigger box port 0, with vis
--------------------------------------------------------------------------------
Phantom
--------------------------------------------------------------------------------
Window : side
Lens: Nikon AF Micro NIKKOR 105 mm focus
Aperture-Number 11
Frame Rates 110000.000 FPS
Exposure: 1 us
Gain: N/A
Mode: External
Delay: 0 microseconds
Polarity: Pos
Monitor Expose: off
Filter:
Cables: Trigger: B3 cable from trigger box port 2
Monitor: H4 Cable
UV phantom as well
LOG
X2s5815
Bad shot - very messy - oring ruptured in the secondary may have over pressurised with additional LAB Air.
X2s5816
Fired at 1.32Pa instead of 13.2pa.....
x2s5826
Phantom aperture was 18 in description for prev shot but was set to 22 for the prev shot
Phantom trig signal changed from falling to rising

46
main.py
View File

@ -31,7 +31,8 @@ with open(TUNNEL_INFO_FILE, 'r') as file:
data_to_load = [ data_to_load = [
"x2s5823", "x2s5823",
"x2s5824", "x2s5824",
"x2s5827" "x2s5827",
"x2s5829",
] ]
# ==== Data Loading & Processing ==== # ==== Data Loading & Processing ====
@ -181,7 +182,7 @@ def load_data(data_to_load: list[str]) -> dict:
data[x2_shot]["shock-point"] = {} data[x2_shot]["shock-point"] = {}
for ref in dataInfo["pcb-refs"]: for ref in dataInfo["pcb-refs"]:
refData = data[x2_shot]["data"]["x2"][ref] refData = data[x2_shot]["data"]["x2"][ref]
first_value, first_value_uncertainty, _, _ = canny_shock_finder(x2_time_us, refData, plot=False) first_value, first_value_uncertainty, _, _ = canny_shock_finder(x2_time_us, refData, plot=False, print_func=None)
shock_point = np.where(x2_time_us >= first_value)[0][0] # [BUG] Seems to give n+1 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 data[x2_shot]["shock-point"][ref] = shock_point, first_value
@ -200,7 +201,7 @@ def load_data(data_to_load: list[str]) -> dict:
shock_point = np.where(probeCh1[offset:] >= 0.3)[0] + offset shock_point = np.where(probeCh1[offset:] >= 0.3)[0] + offset
first_value = scope_time[shock_point] first_value = scope_time[shock_point]
first_value, first_value_uncertainty, _, _ = canny_shock_finder(scope_time[offset:], probeCh1[offset:], plot=False, sigma=2, post_shock_pressure=0.02) first_value, first_value_uncertainty, _, _ = canny_shock_finder(scope_time[offset:], probeCh1[offset:], plot=False, sigma=2, post_shock_pressure=0.02, print_func=None)
shock_point = np.where(scope_time[offset:] >= first_value)[0][0] + offset # [BUG] Seems to give n+1 shock_point = np.where(scope_time[offset:] >= first_value)[0][0] + offset # [BUG] Seems to give n+1
data[x2_shot]["shock-point"][f"{probe}-g1"] = shock_point, first_value data[x2_shot]["shock-point"][f"{probe}-g1"] = shock_point, first_value
@ -215,12 +216,12 @@ def load_data(data_to_load: list[str]) -> dict:
shock_point = np.where(probeCh2[offset:] >= 0.3)[0] + offset shock_point = np.where(probeCh2[offset:] >= 0.3)[0] + offset
first_value = scope_time[shock_point] first_value = scope_time[shock_point]
first_value, first_value_uncertainty, _, _ = canny_shock_finder(scope_time[offset:], probeCh2[offset:], plot=False, sigma=2, post_shock_pressure=0.02) first_value, first_value_uncertainty, _, _ = canny_shock_finder(scope_time[offset:], probeCh2[offset:], plot=False, sigma=2, post_shock_pressure=0.02, print_func=None)
shock_point = np.where(scope_time[offset:] >= first_value)[0][0] + offset # [BUG] Seems to give n+1 shock_point = np.where(scope_time[offset:] >= first_value)[0][0] + offset # [BUG] Seems to give n+1
data[x2_shot]["shock-point"][f"{probe}-g2"] = shock_point, first_value data[x2_shot]["shock-point"][f"{probe}-g2"] = shock_point, first_value
# Calculate Shock Speeds # Calculate Shock Speeds
print("-"*10, '\n') print("="*25, x2_shot, "="*25)
for probe in dataInfo["probe-info"]["locations"]: for probe in dataInfo["probe-info"]["locations"]:
g1_time = data[x2_shot]["shock-point"][f"{probe}-g1"][1] / 1e6 # Convert to seconds 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 g2_time = data[x2_shot]["shock-point"][f"{probe}-g2"][1] / 1e6 # Convert to seconds
@ -231,21 +232,22 @@ def load_data(data_to_load: list[str]) -> dict:
print(f"{probe} Measured a shock speed of {probe_velocity:.2f} m/s ({probe_velocity/1000:.2f} km/s)") print(f"{probe} Measured a shock speed of {probe_velocity:.2f} m/s ({probe_velocity/1000:.2f} km/s)")
if len(dataInfo["probe-info"]["locations"]) > 1: if len(dataInfo["probe-info"]["locations"]) > 1:
foo = dataInfo["probe-info"]["locations"] for i in range(len(dataInfo["probe-info"]["locations"]) - 1):
p1_g1_time = data[x2_shot]["shock-point"][f"{foo[0]}-g1"][1] / 1e6 # Convert to seconds probe_locs = dataInfo["probe-info"]["locations"]
p1_g2_time = data[x2_shot]["shock-point"][f"{foo[0]}-g2"][1] / 1e6 # Convert to seconds 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"{foo[1]}-g1"][1] / 1e6 # Convert to seconds
p2_g2_time = data[x2_shot]["shock-point"][f"{foo[1]}-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"][foo[1]] - TUNNEL_INFO["distance"][foo[0]]) / 1000 # convert to m
p2p = (TUNNEL_INFO["distance"][probe_locs[1]] - TUNNEL_INFO["distance"][probe_locs[0]]) / 1000 # convert to m
p2p_1 = p2p / abs(p2_g1_time - p1_g1_time) # m/s
p2p_2 = p2p / abs(p2_g2_time - p1_g2_time) # m/s 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"{foo[0]}-{foo[1]} - G1 - Measured a shock speed of {p2p_1:.2f} m/s ({p2p_1/1000:.2f} km/s)")
print(f"{foo[0]}-{foo[1]} - G2 - Measured a shock speed of {p2p_2:.2f} m/s ({p2p_2/1000:.2f} km/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)")
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)")
print()
# Return the data & the successfully loaded data keys # Return the data & the successfully loaded data keys
return data, tuple(data.keys()) return data, tuple(data.keys())
@ -309,9 +311,9 @@ def genGraph(gData: dict, showPlot: bool = True):
print("Graphing Data") print("Graphing Data")
genGraph(data[loaded_data[0]], showPlot=False) for shot in loaded_data:
genGraph(data[loaded_data[1]], showPlot=False) if shot != loaded_data[-1]: continue
genGraph(data[loaded_data[2]], 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
pltKeyClose() pltKeyClose()