From f375a44d8777b21ee2bc3d247744b39026f5bf66 Mon Sep 17 00:00:00 2001
From: "Wheeler, Dylan" <dylan.wheeler@ukaea.uk>
Date: Wed, 21 Feb 2024 13:44:49 +0000
Subject: [PATCH] Sphere SDDR atlas repaired, needs testing for materials
 outputs

---
 jade/sphereoutput.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/jade/sphereoutput.py b/jade/sphereoutput.py
index f3efa7f1..cd1d0b98 100644
--- a/jade/sphereoutput.py
+++ b/jade/sphereoutput.py
@@ -1489,7 +1489,6 @@ def _get_organized_output(self):
         """
         zaids = []
         for code, library_outputs in self.outputs.items():
-            print(library_outputs)
             for (zaidnum, mt, lib), outputslib in library_outputs.items():
                 zaids.append((zaidnum, mt))
 
@@ -1497,10 +1496,10 @@ def _get_organized_output(self):
         libs = []  # Not used
         outputs = []  # Not used
 
-        return zaids, libs, outputs
+        return libs, zaids, outputs
 
     def _generate_single_plots(self, outpath):
-        allzaids, libs, outputs = self._get_organized_output()
+        libs, allzaids, outputs = self._get_organized_output()
         globalname = self.lib
         self._generate_plots(libs, allzaids, outputs, globalname, outpath)
 
@@ -1543,6 +1542,7 @@ def _generate_plots(self, libraries, allzaids, outputs, globalname, outpath):
         fluxquantity = "Photon Flux"
         fluxunit = r"$p/(cm^2\cdot\#_S)$"
         allzaids.sort()
+        print(allzaids)
         # --- Binned plots of the gamma flux ---
         for zaidnum, mt in tqdm(allzaids, desc=" Binned flux plots"):
             # Get everything for the title of the zaid
@@ -1559,6 +1559,8 @@ def _generate_plots(self, libraries, allzaids, outputs, globalname, outpath):
                 times = self.times
             atlas.doc.add_heading(title, level=2)
 
+            print(times)
+            
             for time in times:
                 atlas.doc.add_heading("Cooldown time = {}".format(time), level=3)
                 title = "Gamma Leakage flux after a {} cooldown".format(time)
@@ -1849,8 +1851,7 @@ def _compute_compare_result(self, reflib, tarlib):
             error_dfs.append(error_df)
             lib_dics.append(outputs)
         for dic in lib_dics:
-            code_outputs.update(dic)
-        print(code_outputs)
+            code_outputs.update(dic)        
         self.outputs["d1s"] = code_outputs
         # Consider only common zaids
         idx1 = comp_dfs[0].index