fig updates

wahabk · Jan 30, 2025 · a1402fc · a1402fc
1 parent d559e8e
commit a1402fc
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 23 deletions.
diff --git a/output/Paper/figSNR.png b/output/Paper/figSNR.png
diff --git a/output/Paper/figSNR.svg b/output/Paper/figSNR.svg
diff --git a/output/Paper/real.png b/output/Paper/real.png
diff --git a/output/figs/real_data/real_cnr.png b/output/figs/real_data/real_cnr.png
diff --git a/scripts/Paper/real_cnr.py b/scripts/Paper/real_cnr.py
@@ -29,22 +29,22 @@ def plot_with_side_view(scan, path):
 def read_real_examples():
 	d = {}
 
-	d["A - Silica (560nm 0.55Φ)"] = {}
-	d["A - Silica (560nm 0.55Φ)"]['diameter'] = [17,15,15]
-	d["A - Silica (560nm 0.55Φ)"]['volfrac'] = 0.55
-	d["A - Silica (560nm 0.55Φ)"]['array'] = io.imread('examples/Data/james.tiff')
-	d["B - Silica Decon. (560nm 0.55Φ)"] = {}
-	d["B - Silica Decon. (560nm 0.55Φ)"]['diameter'] = [17,15,15]
-	d["B - Silica Decon. (560nm 0.55Φ)"]['volfrac'] = 0.55
-	d["B - Silica Decon. (560nm 0.55Φ)"]['array'] = io.imread('examples/Data/jamesdecon.tiff')
-	d["C - PMMA (315nm 0.58Φ)"] = {}
-	d["C - PMMA (315nm 0.58Φ)"]['diameter'] = [15,11,11]
-	d["C - PMMA (315nm 0.58Φ)"]['volfrac'] = 0.58
-	d["C - PMMA (315nm 0.58Φ)"]['array'] = io.imread('examples/Data/levke.tiff')
-	d["D - Silica (1.2μm 0.2Φ)"] = {}
-	d["D - Silica (1.2μm 0.2Φ)"]['diameter'] = 15
-	d["D - Silica (1.2μm 0.2Φ)"]['volfrac'] = 0.2
-	d["D - Silica (1.2μm 0.2Φ)"]['array'] = ndimage.zoom(io.imread('examples/Data/katherine.tiff'), 2)
+	d["A - Silica (560nm, Φ = 0.55)"] = {}
+	d["A - Silica (560nm, Φ = 0.55)"]['diameter'] = [17,15,15]
+	d["A - Silica (560nm, Φ = 0.55)"]['volfrac'] = 0.55
+	d["A - Silica (560nm, Φ = 0.55)"]['array'] = io.imread('examples/Data/james.tiff')
+	d["B - Silica Decon. (560nm, Φ = 0.55)"] = {}
+	d["B - Silica Decon. (560nm, Φ = 0.55)"]['diameter'] = [17,15,15]
+	d["B - Silica Decon. (560nm, Φ = 0.55)"]['volfrac'] = 0.55
+	d["B - Silica Decon. (560nm, Φ = 0.55)"]['array'] = io.imread('examples/Data/jamesdecon.tiff')
+	d["C - PMMA (315nm, Φ = 0.58)"] = {}
+	d["C - PMMA (315nm, Φ = 0.58)"]['diameter'] = [15,11,11]
+	d["C - PMMA (315nm, Φ = 0.58)"]['volfrac'] = 0.58
+	d["C - PMMA (315nm, Φ = 0.58)"]['array'] = io.imread('examples/Data/levke.tiff')
+	d["D - Silica (1.2μm, Φ = 0.2)"] = {}
+	d["D - Silica (1.2μm, Φ = 0.2)"]['diameter'] = 15
+	d["D - Silica (1.2μm, Φ = 0.2)"]['volfrac'] = 0.2
+	d["D - Silica (1.2μm, Φ = 0.2)"]['array'] = ndimage.zoom(io.imread('examples/Data/katherine.tiff'), 2)
 
 	return d
 

diff --git a/scripts/figs/ap_on_sim.py b/scripts/figs/ap_on_sim.py
@@ -36,6 +36,9 @@
 
 	true_positions, diameters = convert_hoomd_positions(hoomd_positions, canvas_size=canvas_size, diameters=diameters, diameter=diameter)
 
+	print(true_positions.shape)
+	import pdb; pdb.set_trace()
+
 	fig, axs = plt.subplots(2,4,  sharey='row')
 	plt.tight_layout()