fix new configuration yaml

JADE-V-V · Nov 6, 2024 · 4402703 · 4402703
1 parent 64f5eb6
commit 4402703
Show file tree

Hide file tree

Showing 14 changed files with 388 additions and 187 deletions.
diff --git a/jade/configuration.py b/jade/configuration.py
@@ -29,15 +29,30 @@
 import os
 import sys
 from dataclasses import dataclass
+from enum import Enum
 
 import pandas as pd
 import yaml
 
 from jade.exceptions import fatal_exception
-from jade.output import BinningType
 from jade.plotter import PlotType
 
 
+class BinningType(Enum):
+    ENERGY = "Energy"
+    CELLS = "Cells"
+    TIME = "Time"
+    TALLY = "tally"
+    DIR = "Dir"
+    USER = "User"
+    SEGMENTS = "Segments"
+    MULTIPLIER = "Multiplier"
+    COSINE = "Cosine"
+    CORA = "Cor A"
+    CORB = "Cor B"
+    CORC = "Cor C"
+
+
 class Configuration:
     def __init__(self, conf_file):
         """

diff --git a/jade/default_settings/Benchmarks_Configuration/C_Model.yaml b/jade/default_settings/Benchmarks_Configuration/C_Model.yaml
@@ -41,7 +41,6 @@ Atlas:
     unit: '#/cm^2/s'
   36:
     identifier: 36
-    plot_type: Grouped bars
     quantity: Nuclear Heating
     unit: W
   41:
@@ -56,7 +55,6 @@ Atlas:
     unit: '#/cm^2/s'
   46:
     identifier: 46
-    plot_type: Grouped bars
     quantity: Nuclear Heating
     unit: W
   51:
@@ -116,7 +114,6 @@ Atlas:
     unit: '#/cm^2/s'
   86:
     identifier: 86
-    plot_type: Grouped bars
     quantity: Nuclear Heating
     unit: W
   91:
@@ -131,7 +128,6 @@ Atlas:
     unit: '#/cm^2/s'
   96:
     identifier: 96
-    plot_type: Grouped bars
     quantity: Nuclear Heating
     unit: W
   101:

diff --git a/jade/default_settings/Benchmarks_Configuration/HCPB_TBM_1D.yaml b/jade/default_settings/Benchmarks_Configuration/HCPB_TBM_1D.yaml
@@ -1,22 +1,4 @@
 Atlas:
-  54:
-    identifier: 54
-    plot_type: Ratio graph
-  94:
-    identifier: 94
-    plot_type: Ratio graph
-  134:
-    identifier: 134
-    plot_type: Ratio graph
-  164:
-    identifier: 164
-    plot_type: Ratio graph
-  184:
-    identifier: 184
-    plot_type: Ratio graph
-  194:
-    identifier: 194
-    plot_type: Ratio graph
   204:
     identifier: 204
     plot_type: Ratio graph

diff --git a/jade/default_settings/Benchmarks_Configuration/ITER_1D.yaml b/jade/default_settings/Benchmarks_Configuration/ITER_1D.yaml
@@ -1,7 +1,7 @@
 Atlas:
   4:
     identifier: 4
-    plot_type: Ratio graph
+    plot_type: Binned graph
     quantity: Neutron Flux
     unit: '#/cm^2'
   6:
@@ -11,77 +11,14 @@ Atlas:
     unit: W/g
   14:
     identifier: 14
-    plot_type: Ratio graph
+    plot_type: Binned graph
     quantity: Photon Flux
     unit: '#/cm^2'
   16:
     identifier: 16
     plot_type: Ratio graph
     quantity: Neutron Heating
     unit: W/g
-  24:
-    identifier: 24
-    plot_type: Ratio graph
-    quantity: DPA in Fe
-    unit: dpa/FPY
-  26:
-    identifier: 26
-    plot_type: Ratio graph
-    quantity: Photon Heating
-    unit: W/g
-  34:
-    identifier: 34
-    plot_type: Ratio graph
-    quantity: Helium production in SS316
-    unit: appm/FPY
-  44:
-    identifier: 44
-    plot_type: Ratio graph
-    quantity: Hydrogen production in SS316
-    unit: appm/FPY
-  54:
-    identifier: 54
-    plot_type: Ratio graph
-    quantity: Tritium production in SS316
-    unit: appm/FPY
-  64:
-    identifier: 64
-    plot_type: Ratio graph
-    quantity: DPA in Cu
-    unit: dpa/FPY
-  74:
-    identifier: 74
-    plot_type: Ratio graph
-  84:
-    identifier: 84
-    plot_type: Ratio graph
-  94:
-    identifier: 94
-    plot_type: Ratio graph
-  104:
-    identifier: 104
-    plot_type: Ratio graph
-  114:
-    identifier: 114
-    plot_type: Ratio graph
-  124:
-    identifier: 124
-    plot_type: Ratio graph
-  134:
-    identifier: 134
-    plot_type: Ratio graph
-  144:
-    identifier: 144
-    plot_type: Ratio graph
-  154:
-    identifier: 154
-    plot_type: Ratio graph
-  164:
-    identifier: 164
-    plot_type: Ratio graph
-  174:
-    identifier: 174
-    plot_type: Ratio graph
   204:
     identifier: 204
     plot_type: Ratio graph

diff --git a/jade/default_settings/Benchmarks_Configuration/ITER_Cyl_SDDR.yaml b/jade/default_settings/Benchmarks_Configuration/ITER_Cyl_SDDR.yaml
@@ -1,22 +1,22 @@
 Atlas:
   14:
     identifier: 14
-    plot_type: Grouped bars
+    plot_type: Binned graph
     quantity: Gamma Flux
     unit: '#/cm^2/s'
   34:
     identifier: 34
-    plot_type: Grouped bars
+    plot_type: Binned graph
     quantity: Gamma Flux
     unit: '#/cm^2/s'
   44:
     identifier: 44
-    plot_type: Grouped bars
+    plot_type: Binned graph
     quantity: Gamma Flux
     unit: '#/cm^2/s'
   54:
     identifier: 54
-    plot_type: Grouped bars
+    plot_type: Binned graph
     quantity: Gamma Flux
     unit: '#/cm^2/s'
   74:
@@ -31,7 +31,7 @@ Atlas:
     unit: Sv/h
   202:
     identifier: 202
-    plot_type: Grouped bars
+    plot_type: Binned graph
     quantity: Neutron Flux
     unit: '#/cm^2/s'
   242:

diff --git a/jade/default_settings/Benchmarks_Configuration/WCLL_TBM_1D.yaml b/jade/default_settings/Benchmarks_Configuration/WCLL_TBM_1D.yaml
@@ -1,25 +1,4 @@
 Atlas:
-  54:
-    identifier: 54
-    plot_type: Ratio graph
-  94:
-    identifier: 94
-    plot_type: Ratio graph
-  134:
-    identifier: 134
-    plot_type: Ratio graph
-  164:
-    identifier: 164
-    plot_type: Ratio graph
-  184:
-    identifier: 184
-    plot_type: Ratio graph
-  194:
-    identifier: 194
-    plot_type: Ratio graph
-  204:
-    identifier: 204
-    plot_type: Ratio graph
   214:
     identifier: 214
     plot_type: Ratio graph

diff --git a/jade/expoutput.py b/jade/expoutput.py
@@ -626,7 +626,7 @@ def _build_atlas(self, tmp_path, atlas):
             plot = Plotter(
                 data, title, tmp_path, outname, quantity, unit, xlabel, self.testname
             )
-            img_path = plot.plot("Discreet Experimental points")
+            img_path = plot.plot("Discrete Experimental points")
             # Insert the image in the atlas
             atlas.insert_img(img_path)