reconcile rebase

garrettwrong · garrettwrong · commit bbaf65e9a3a1 · 2023-09-05T16:31:50.000-04:00
diff --git a/src/aspire/source/micrograph.py b/src/aspire/source/micrograph.py
@@ -317,7 +317,7 @@ def __init__(
         super().__init__(
             micrograph_count=micrograph_count,
             micrograph_size=micrograph_size,
-            dtype=simulation.dtype,
+            dtype=self.volume.dtype,
         )
 
         self.particle_box_size = volume.resolution  # L

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ def __init__(`
`317`	`317`	`super().__init__(`
`318`	`318`	`micrograph_count=micrograph_count,`
`319`	`319`	`micrograph_size=micrograph_size,`
`320`		`- dtype=simulation.dtype,`
	`320`	`+ dtype=self.volume.dtype,`
`321`	`321`	`)`
`322`	`322`
`323`	`323`	`self.particle_box_size = volume.resolution # L`