small up

Author: harnessa

plot_results.py

@@ -6,7 +6,7 @@
 
 data_run = 'run__6_01_21__data_1s_bin1__spiders__median'
 
-model = 'Newest'
+model = 'Newest_orig'
 
 ext = ''
 

quadrature_code/generate_images.py

@@ -126,10 +126,6 @@
     #Build steps
     steps = np.linspace(-grid_width_lab/2, grid_width_lab/2, num=nsteps)
 
-    #Containers
-    images = np.empty((0, sim.num_pts, sim.num_pts))
-    positions = np.empty((0, 2))
-
     #Create new csv file
     csv_file = os.path.join(save_dir, base_name + '.csv')
     with open(csv_file, 'w') as f:

quadrature_code/noise_maker.py

@@ -83,7 +83,7 @@ def set_parameters(self, params):
         #Get calibration value
         if not self.is_test:
             cal_img = np.load(os.path.join(self.load_dir, 'calibration.npy'))
-            self.suppression_norm = cal_img[cal_img > 0].mean()
+            self.set_suppression_norm(cal_img)
 
 ############################################
 ############################################
@@ -166,7 +166,7 @@ def run_multiple_snr_script(self):
                 img = self.add_noise_to_image(img, peak_cnts)
 
                 #Convert to suppression
-                img *= self.diff_peak / (self.count_rate * exp_time * self.suppression_norm)
+                img = self.convert_to_suppression(img, exp_time)
 
                 #Save
                 if self.do_save:
@@ -318,3 +318,17 @@ def check_snr(self, img, texp):
 
 ############################################
 ############################################
+
+############################################
+####    Suppresion ####
+############################################
+
+    def set_suppression_norm(self, cal_img):
+        self.suppression_norm = cal_img[cal_img > 0].mean()
+
+    def convert_to_suppression(self, img, exp_time):
+        img *= self.diff_peak / (self.count_rate * exp_time * self.suppression_norm)
+        return img
+
+############################################
+############################################