156 only add "report" section to results when requested

hazenlib/tasks/acr_geometric_accuracy.py

@@ -62,13 +62,16 @@ def run(self) -> dict:
 
                 results[self.key(dcm)] = result5
 
-        results['reports'] = {'images': self.report_files}
-
         L = result1 + result5
         mean_err, max_err, cov_l = self.distortion_metric(L)
         print(f"Mean relative measurement error is equal to {np.round(mean_err, 2)}mm")
         print(f"Maximum absolute measurement error is equal to {np.round(max_err, 2)}mm")
         print(f"Coefficient of variation of measurements is equal to {np.round(cov_l, 2)}%")
+
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
+
         return results
 
     def centroid_com(self, dcm):

hazenlib/tasks/acr_ghosting.py

@@ -48,7 +48,9 @@ def run(self) -> dict:
 
                 results[self.key(dcm)] = result
 
-        results['reports'] = {'images': self.report_files}
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/acr_slice_position.py

@@ -69,7 +69,9 @@ def run(self) -> dict:
 
                 results[self.key(dcm)] = result
 
-        results['reports'] = {'images': self.report_files}
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/acr_slice_thickness.py

@@ -55,7 +55,9 @@ def run(self) -> dict:
 
                 results[self.key(dcm)] = result
 
-        results['reports'] = {'images': self.report_files}
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/acr_snr.py

@@ -66,7 +66,11 @@ def run(self, measured_slice_width=None, subtract=None) -> dict:
                       f"{self.key(self.data2)} because of : {e}")
                 traceback.print_exc(file=sys.stdout)
 
-        results = {self.key(self.data[0]): snr_results, 'reports': {'images': self.report_files}}
+        results = {self.key(self.data[0]): snr_results}
+
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/acr_spatial_resolution.py

@@ -81,7 +81,11 @@ def run(self) -> dict:
                     traceback.print_exc(file=sys.stdout)
                     continue
 
-        results = {self.key(self.data[0]): mtf_results, 'reports': {'images': self.report_files}}
+        results = {self.key(self.data[0]): mtf_results}
+
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/acr_uniformity.py

@@ -49,7 +49,9 @@ def run(self) -> dict:
 
                 results[self.key(dcm)] = result
 
-        results['reports'] = {'images': self.report_files}
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/ghosting.py

@@ -26,8 +26,11 @@ def run(self) -> dict:
                 traceback.print_exc(file=sys.stdout)
                 continue
 
-        results = {'ghosting_results': ghosting_results,
-                   'reports': self.report_files}
+        results = {'ghosting_results': ghosting_results}
+
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/slice_position.py

@@ -45,8 +45,11 @@ def run(self) -> dict:
         result = [str(abs(decimal.Decimal(i) * 1)) for i in result]
         del decimal
 
-        results = {self.key(self.data[0]): {'slice_positions': result},
-                   'reports': {'images': self.report_files}}
+        results = {self.key(self.data[0]): {'slice_positions': result}}
+
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/slice_width.py

@@ -36,7 +36,9 @@ def run(self):
                 traceback.print_exc(file=sys.stdout)
                 continue
 
-        results['reports'] = {'images': self.report_files}
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/snr.py

@@ -42,7 +42,11 @@ def run(self, measured_slice_width=None) -> dict:
             snr_results[f"snr_smoothing_measured_{self.key(dcm)}"] = round(snr, 2)
             snr_results[f"snr_smoothing_normalised_{self.key(dcm)}"] = round(normalised_snr, 2)
 
-        results = {self.key(self.data[0]): snr_results, 'reports': {'images': self.report_files}}
+        results = {self.key(self.data[0]): snr_results}
+
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/snr_map.py

@@ -261,9 +261,6 @@ def run(self):
         # * Pass kernel_len and roi_size parameters from command line.
 
         results = {}
-        if self.report:
-            # Create nested report folder and ignore if already exists
-            pathlib.Path.mkdir(pathlib.Path(self.report_path), parents=True, exist_ok=True)
 
         for self.current_dcm in self.data:
 

hazenlib/tasks/spatial_resolution.py

@@ -38,7 +38,9 @@ def run(self) -> dict:
                 traceback.print_exc(file=sys.stdout)
                 continue
 
-        results['reports'] = {'images': self.report_files}
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results
 

hazenlib/tasks/uniformity.py

@@ -46,7 +46,9 @@ def run(self) -> dict:
 
             results[self.key(dcm)] = result
 
-        results['reports'] = {'images': self.report_files}
+        # only return reports if requested
+        if self.report:
+            results['reports'] = {'images': self.report_files}
 
         return results