move SHAPE_MT_IDS to priortools.py

IAEA-NDS · Apr 7, 2022 · 2534993 · 2534993
1 parent e5fe533
commit 2534993
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/gmapi/data_management/uncfuns.py b/gmapi/data_management/uncfuns.py
@@ -2,7 +2,7 @@
 from scipy.sparse import block_diag, csr_matrix
 from collections import OrderedDict
 
-from ..mappings.helperfuns import SHAPE_MT_IDS
+from ..mappings.priortools import SHAPE_MT_IDS
 
 
 

diff --git a/gmapi/legacy/conversion_utils.py b/gmapi/legacy/conversion_utils.py
@@ -7,7 +7,7 @@
 from .data_management import init_datablock, init_fisdata, init_prior
 from .generic_utils import Bunch
 from .database_reading import read_gma_database
-from ..mappings.helperfuns import SHAPE_MT_IDS
+from ..mappings.priortools import SHAPE_MT_IDS
 
 
 

diff --git a/gmapi/mappings/helperfuns/__init__.py b/gmapi/mappings/helperfuns/__init__.py
@@ -1,4 +1,3 @@
-from .helperfuns import SHAPE_MT_IDS
 from .helperfuns import return_matrix
 from .numeric_jacobian import numeric_jacobian
 from .romberg_integration import compute_romberg_integral
diff --git a/gmapi/mappings/helperfuns/helperfuns.py b/gmapi/mappings/helperfuns/helperfuns.py
@@ -2,9 +2,6 @@
 from scipy.sparse import csr_matrix
 
 
-SHAPE_MT_IDS = (2,4,8,9)
-
-
 def return_matrix(idcs1, idcs2, vals, dims, how):
     """Return a matrix defined by triples in desired format."""
     Sdic = {'idcs1': np.array(idcs1, dtype=int),

diff --git a/gmapi/mappings/priortools.py b/gmapi/mappings/priortools.py
@@ -1,9 +1,10 @@
 import numpy as np
 import pandas as pd
 import re
-from .helperfuns import SHAPE_MT_IDS
 
 
+SHAPE_MT_IDS = (2,4,8,9)
+
 
 def attach_shape_prior(priortable, mapping, exptable, refvals=None, uncs=None):
     """Attach experimental normalization constants to prior."""