Finalise README

README.md

@@ -0,0 +1,39 @@
+# Ionization Probe Analysis Code
+
+> Written by Cal Wing (<c.wing@uq.net.au> - 45811953) in 2024 for his Thesis
+
+## Installation
+
+Run `pip install -r requirements.txt` or equivilient for your envoroment.
+
+## Running
+
+Run `main.py` it will then generate all the output graphs and put them in (a git untracked) folder called `./images`.
+
+By default all data graphs will be generated - you need to change the functions called at the end in the `if '__name__ == '__main__':` section.
+
+## `./data` Explanation
+
+I like YAML files to store information. All the data shot folders have a file call `_info.yaml` this file contained all the info about the shot so that when it would load & be graphed it would be correct.
+
+I hope the values are self explanatory but they may not - sorry
+
+## Changes to [canny_shock_finder.py](./canny_shock_finder.py)
+
+Basically I hacked in an extra argument `print_func`, that is used to override the `print` function in the file. It assumes its either a callable reference (like print, the default) or None (it then uses a no-operation function to silence all output)
+
+I also removed the error catching around lines ~497 so the function blindly continues if it can't graph.
+
+I also enabled grid lines on the graphs.
+
+The UQ colours being used on the graphs is due to some funky ~~abuse~~ *utlitly* I built into my [`makeGraph`](#makegraph) library.
+
+## MakeGraph
+
+> This refers to the [makeGraph.py](./makeGraph.py) file/version *in this code base*, I would not trust the exact specifics for versions found elsewhere, but the general gist is the same.
+
+A *long* time ago I wrote a wrapper for matplotlib that has expanded into a formatting tool. The crux of it is that I can throw a dictionary at the `makeGraph` function and it will do all the hard work for me.
+
+There are a few fun things that loading the lib will do - like overriding the default colour cyclers to use only the UQ colours - so if your going to liberate / adapt it be wary.
+
+All the graphing done in the [`main.py`](./main.py) uses makeGraph, its not the most scary thing in the world as its basically ~~AI~~ *a big if conditional*.

canny_shock_finder.py

@@ -15,7 +15,7 @@ Chris James (c.james4@uq.edu.au) - 04/07/17
 
 # Amened by Cal Wing to make the function not print
 
-VERSION_STRING = "17-Oct-2024"
+VERSION_STRING = "20-Oct-2024"
 
 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,
@@ -116,6 +116,8 @@ def canny_shock_finder(time_list, pressure_list, sigma = 4, derivative_threshold
     :param plot_time_scale: See plot_time_unit above. These two inputs allow the results plot to be in a different
         time unit to the original data. The user must specify this scale to connect the original and plotted
         time units. Defaults to 1.0 (so no change if time units are seconds).
+    :param print_func: Callable Reference to call when print is called in this function. Defaults to 'print' but if 'None' 
+        is passed it uses a no-operation function to silence all output.     
     """
 
     # Make the function silent / have print overridable 
@@ -360,6 +362,9 @@ def canny_shock_finder(time_list, pressure_list, sigma = 4, derivative_threshold
 
             data_ax.plot(time_list*plot_time_scale, pressure_list, '-o', label = 'original data')
 
+            data_ax.grid(True)
+            convolution_ax.grid(True)
+
             convolution_ax.plot(time_list*plot_time_scale, first_order_data, '-o', label='first order gaussian (sigma = {0})'.format(sigma))
             convolution_ax.plot(time_list*plot_time_scale, second_order_data, '-o', label='second order gaussian (sigma = {0})'.format(sigma))
             convolution_ax.plot(time_list*plot_time_scale, suppressed_data, '-o', label='first order with non-max suppression')

data/x2s5823/_info.yaml

@@ -1,7 +1,7 @@
 # Data Info File
 # 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"
 date: "2024-10-15"
 time: "13:02"
@@ -12,31 +12,60 @@ 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"
-    config: "eProbe-Scope.txt"
-    data: "eProbe-Scope.csv"
+  dist-uncert: 3.05 #mm
 
-    trigger:
-      type: "channel"
-      channel: 4
-      alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
-      delay: 100 # us
+  gauges:
+    - 1
+    - 2
+  locations: # In order of pulse
+    - "st2"
+
+  data-records:
+    - type: "scope"
+      config: "eProbe-Scope.txt"
+      data: "eProbe-Scope.csv"
+      time-uncert: 0.00000001428571428571 # s
+    
+      trigger: # Redundant?
+        type: "channel"
+        channel: 4
+        alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
+        delay: 100 # us
 

data/x2s5824/_info.yaml

@@ -1,7 +1,7 @@
 # Data Info File
 # 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"
 date: "2024-10-15"
 time: "17:18"
@@ -12,32 +12,62 @@ 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:
   - "st1"
   - "st3"
   
+  - "at1"
+  - "at2"
+  - "at3"
+  
+  - "at4"
+  - "at5"
+  - "at6"
+
 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
-  data-record:
-    type: "scope"
-    config: "eProbe-Scope.txt"
-    data: "eProbe-Scope.csv"
+  dist-uncert: 0.8 #mm
 
-    trigger: # Redundant?
-      type: "channel"
-      channel: 4
-      alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
-      delay: 100 # us
+  gauges:
+    - 1
+    - 2
+  locations: # In order of pulse
+    - "st2"
+  #  - "st3"
+
+  data-records:
+    - type: "scope"
+      config: "eProbe-Scope.txt"
+      data: "eProbe-Scope.csv"
+      time-uncert: 0.00000001428571428571 # s
+    
+      trigger: # Redundant?
+        type: "channel"
+        channel: 4
+        alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
+        delay: 100 # us
 
 

data/x2s5827/_info.yaml

@@ -1,7 +1,7 @@
 # Data Info File
 # 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"
 date: "2024-10-16"
 time: "18:40"
@@ -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,27 +24,52 @@ canny-args:
   - sigma: 0.75
     post_pres: 0.1
 
+no-graph:
+  - "None"
+  - "at1"
+  - "at2"
+  - "at3"
+
+  - "at4"
+  - "at5"
+  - "at6"
+
 pcb-refs:
   - "st1"
   
+  - "at1"
+  - "at2"
+  - "at3"
+  
+  - "at4"
+  - "at5"
+  - "at6"
+
+
 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"
+  dist-uncert: 0.8 #mm
 
-    trigger: # Redundant?
-      type: "channel"
-      channel: 4
-      alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
-      delay: 100 # us
+  gauges:
+    - 1
+    - 2
+  locations: # In order of pulse
+    - "st2"
+    - "st3"
 
+  data-records:
+    - type: "scope"
+      config: "eProbe-Scope.txt"
+      data: "eProbe-Scope.csv"
+      time-uncert: 0.00000001428571428571 # s
+    
+      trigger: # Redundant?
+        type: "channel"
+        channel: 4
+        alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
+        delay: 100 # us
 

data/x2s5829/_info.yaml

@@ -1,7 +1,7 @@
 # Data Info File
 # 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"
 date: "2024-10-17"
 time: "17:00"
@@ -22,28 +22,55 @@ canny-args:
   - sigma: 1
     post_pres: 0.2
 
+pcb-canny:
+  - sigma: 4
+    post_pres: 0.05
+
+no-graph:
+  - "None"
+  - "at1"
+  - "at2"
+  - "at3"
+
+  - "at4"
+  - "at5"
+  - "at6"
+
 pcb-refs:
   - "st1"
   
+  - "at1"
+  - "at2"
+  - "at3"
+  
+  - "at4"
+  - "at5"
+  - "at6"
+
+
 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
+  dist-uncert: 0.8 #mm
+
+  gauges:
+    - 1
+    - 2
+  locations: # In order of pulse
+    - "st2"
+    - "st3"
 
   data-records:
     - type: "scope"
       config: "eProbe-Scope.txt"
       data: "eProbe-Scope.csv"
+      time-uncert: 0.00000001428571428571 # s
     
       trigger: # Redundant?
         type: "channel"
         channel: 4
         alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
         delay: 100 # us
-
-

data/x2s5830/_info.yaml

@@ -1,7 +1,7 @@
 # Data Info File
 # Cal Wing - Oct 24
 
-long_name: "Shot 5 (x2s5829) - Thin Probe Pair (ST2 & ST3) - 2024-10-17"
+long_name: "Shot 5 (x2s5830) - Thin Probe Pair (ST2 & ST3) - 2024-10-17\nProtruding ST2 & ST3 - Mars Entry Conditions"
 name: "Shot 5"
 date: "2024-10-18"
 time: "08:51"
@@ -20,28 +20,55 @@ canny-args:
   - sigma: 1
     post_pres: 0.2
 
+pcb-canny:
+  - sigma: 4
+    post_pres: 0.05
+
+no-graph:
+  - "None"
+  - "at1"
+  - "at2"
+  - "at3"
+
+  - "at4"
+  - "at5"
+  - "at6"
+
 pcb-refs:
   - "st1"
 
+  - "at1"
+  - "at2"
+  - "at3"
+  
+  - "at4"
+  - "at5"
+  - "at6"
+
+
 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
+  dist-uncert: 0.8 #mm
+
+  gauges:
+    - 1
+    - 2
+  locations: # In order of pulse
+    - "st2"
+    - "st3"
 
   data-records:
     - type: "scope"
       config: "eProbe-Scope.txt"
       data: "eProbe-Scope.csv"
+      time-uncert: 0.00000001428571428571 # s
     
       trigger: # Redundant?
         type: "channel"
         channel: 4
         alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
         delay: 100 # us
-
-

data/x2s5830/eProbe-Scope.csv

@@ -7678,5 +7678,3 @@ second,Volt,Volt,Volt
 +2.3967448E-03,-23.8331536E-03,+2.5518350E-03,+5.0098743077E+00
 +2.3973958E-03,-24.8335489E-03,+2.5518350E-03,+5.0073617445E+00
 +2.3980469E-03,-23.5772673E-03,+2.5518350E-03,+5.0048491813E+00
-+2.3986979E-03,,,
-+2.3993490E-03,,,

data/x2s5831/_info.yaml

@@ -0,0 +1,97 @@
+# Data Info File
+# Cal Wing - Oct 24
+
+long_name: "Shot 6 (x2s5831) - 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"
+name: "Shot 6"
+date: "2024-10-18"
+time: "14:00"
+
+shot-info: 
+  name: "x2s5831"
+  tdms: "{0}.tdms"
+  config: "{0}.config"
+  info: "{0}.txt"
+
+pcb-canny:
+  - sigma: 4
+    post_pres: 0.05
+
+# Canny Args
+canny-args:
+  - sigma: 2
+    post_pres: 0.03
+  
+  - sigma: 1
+    post_pres: 0.05
+
+  
+x2-canny:
+  - sigma: 1
+    post_pres: 0.02
+  
+  - sigma: 0.5
+    post_pres: 0.01
+
+no-graph:
+  - "at1"
+  - "at2"
+  - "at3"
+
+  - "at4"
+  - "at5"
+  - "at6"
+
+pcb-refs:
+  - "at1"
+  - "at2"
+  - "at3"
+
+  - "at4"
+  - "at5"
+  - "at6"
+
+probe-info:
+  type: "Thin"
+  gauges:
+    - 1
+  locations: # In order of pulse
+    - "st1"
+    - "st2"
+    - "st3"
+  overhang: 1 # mm
+  c2c: 5.6 # mm
+  gauge-diam: 0.8 # mm
+  gauge-c2c: 1.8 #mm
+  dist-uncert: 0.8 #mm
+  
+  data-records:
+    - type: "scope"
+      config: "eProbe-Scope.txt"
+      data: "eProbe-Scope.csv"
+      time-uncert: 0.00000001428571428571 # s
+    
+      trigger: # Redundant?
+        type: "channel"
+        channel: 4
+        alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
+        delay: 100 # us
+
+    - type: "x2"
+      channels: # Gauge Channel Name
+        - "st1"
+        - "st3"
+
+      scaler:
+        st1: 1
+        st3: 10
+      
+      trigger:
+        type: "x2"
+        # Info isn't really needed
+        channel: "trigbox"
+        alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
+        delay: 0 # us
+
+
+

data/x2s5831/eProbe-Scope-Noise.txt

@@ -0,0 +1,18 @@
+ANALOG
+Ch 1 Scale 500mV/, Pos 1.25000V, Coup DC, BW Limit Off, Inv Off, Imp 1M Ohm
+     Probe 1.0000000 : 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 -1.500000000ms
+
+ACQUISITION
+Mode High Res, Realtime On, Vectors On, Persistence Off
+

data/x2s5831/eProbe-Scope.txt

@@ -0,0 +1,18 @@
+ANALOG
+Ch 1 Scale 500mV/, Pos 1.25000V, Coup DC, BW Limit Off, Inv Off, Imp 1M Ohm
+     Probe 1.0000000 : 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 -1.500000000ms
+
+ACQUISITION
+Mode High Res, Realtime On, Vectors On, Persistence Off
+

data/x2s5831/x2s5831.config

@@ -0,0 +1,49 @@
+# x2s5831 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.000000E+0	V	0.000	gauge-set-1    	PXI1Slot2/ai4	
+st2            	5 4 9	     1	1.168700E-2	kPa	0.000	112A22-35070   	PXI1Slot5/ai4	
+st3            	2 6 9	     1	1.000000E+1	V	0.000	gauge-set-2    	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	

data/x2s5831/x2s5831.txt

@@ -0,0 +1,161 @@
+--------------------------------------------------------------------------------
+Project.........................................Mars entry non-equilibrium expanding flows
+Run number................................ x2s5830
+Date............................................18/10/2024
+Blame...........................................Mragank, Aaron 
+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
+

data/x2s5832/_info.yaml

@@ -0,0 +1,102 @@
+# Data Info File
+# Cal Wing - Oct 24
+
+long_name: "Shot 7 (x2s5832) - Thin Probe Set (ST1, ST2 & ST3) - 2024-10-18\nProtruding ST1 & ST1, Flush ST3 (Only Gauge 1) - Low Pressure, 'Pure' Air Conditions"
+name: "Shot 7"
+date: "2024-10-18"
+time: "15:58"
+
+shot-info: 
+  name: "x2s5832"
+  tdms: "{0}.tdms"
+  config: "{0}.config"
+  info: "{0}.txt"
+
+pcb-canny:
+  - sigma: 4
+    post_pres: 0.05
+
+# Canny Args
+canny-args:
+  - sigma: 2
+    post_pres: 0.03
+  
+  - sigma: 1
+    post_pres: 0.2
+  
+  - sigma: 1
+    post_pres: 0.05
+
+x2-canny:
+  - sigma: 2
+    post_pres: 0.03
+  
+  - sigma: 1
+    post_pres: 0.2
+  
+  - sigma: 1
+    post_pres: 0.05
+
+no-graph:
+  - "None"
+  - "at1"
+  - "at2"
+  - "at3"
+
+  - "at4"
+  - "at5"
+  - "at6"
+
+pcb-refs:
+  - "at1"
+  - "at2"
+  - "at3"
+
+  - "at4"
+  - "at5"
+  - "at6"
+
+probe-info:
+  type: "Thin"
+  gauges:
+    - 1
+  locations: # In order of pulse
+    - "st1"
+    - "st2"
+    - "st3"
+  overhang: 1 # mm
+  c2c: 5.6 # mm
+  gauge-diam: 0.8 # mm
+  gauge-c2c: 1.8 #mm
+  dist-uncert: 0.8 #mm
+  
+  data-records:
+    - type: "scope"
+      config: "eProbe-Scope.txt"
+      data: "eProbe-Scope.csv"
+      time-uncert: 0.00000001428571428571 # s
+    
+      trigger: # Redundant?
+        type: "channel"
+        channel: 4
+        alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
+        delay: 100 # us
+
+    - type: "x2"
+      channels: # Gauge Channel Name
+        - "st1"
+        - "st3"
+      
+      scaler:
+        st1: 1
+        st3: 10
+      
+      trigger:
+        type: "x2"
+        # Info isn't really needed
+        channel: "trigbox"
+        alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
+        delay: 0 # us
+
+
+

data/x2s5832/eProbe-Scope.txt

@@ -0,0 +1,18 @@
+ANALOG
+Ch 1 Scale 500mV/, Pos 862.50mV, Coup DC, BW Limit Off, Inv Off, Imp 1M Ohm
+     Probe 1.0000000 : 1, Skew 0.0s
+Ch 2 Scale 500mV/, Pos 1.00000V, 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 -1.500000000ms
+
+ACQUISITION
+Mode High Res, Realtime On, Vectors On, Persistence Off
+

data/x2s5832/x2s5832.config

@@ -0,0 +1,49 @@
+# x2s5832 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.000000E+0	V	0.000	gauge-set-1    	PXI1Slot2/ai4	
+st2            	5 4 9	     1	1.168700E-2	kPa	0.000	112A22-35070   	PXI1Slot5/ai4	
+st3            	2 6 9	     1	1.000000E+1	V	0.000	gauge-set-2    	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	

data/x2s5832/x2s5832.txt

@@ -0,0 +1,161 @@
+--------------------------------------------------------------------------------
+Project.........................................steve apirana air condiion for Cal Wing
+Run number................................ x2s5832
+Date............................................18/10/2024
+Blame...........................................Mragank, Aaron 
+Condition................................... Mars condition, high density, Mars mixture
+Reservoir.....................................  6.75 MPa
+Driver............................................74240 Pa 80% He, 92.8 kPa Argon
+Primary diaphragm.................... 2 mm scored, cold rolled steel 6U374
+Shock tube...................................  Pa aero air
+Secondary diaphragm................  2 micron mylar
+Acceleration tube....................... 2 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
+

tunnel-info.yaml

@@ -35,3 +35,37 @@ volt-scale:
 
   trigbox: 0.001 #V / mV
   trigbox_delay: 0.001 #V / mV
+
+
+uncertainties:
+  probe-dist:
+    sd1: 0.002 # +/- m
+    sd2: 0.002 # +/- m
+    sd3: 0.002 # +/- m
+    
+    st1: 0.002 # +/- m
+    st2: 0.002 # +/- m
+    st3: 0.002 # +/- m
+    
+    at1: 0.002 # +/- m
+    at2: 0.002 # +/- m
+    at3: 0.002 # +/- m
+    
+    at4: 0.002 # +/- m
+    at5: 0.002 # +/- m
+    at6: 0.002 # +/- m
+
+    # [TODO] This could be better
+    st1-g1: 0.002 # +/- m
+    st1-g2: 0.002 # +/- m
+    
+    st2-g1: 0.002 # +/- m
+    st2-g2: 0.002 # +/- m
+    
+    st3-g1: 0.002 # +/- m
+    st3-g2: 0.002 # +/- m
+
+  
+  time:
+    x2-daq: 0.00000039999999999996 # 30MHz ?
+