From 23abc1e05a230b297e40a5e3280803402a0e012a Mon Sep 17 00:00:00 2001 From: gschnabel <40870991+gschnabel@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:33:11 +0200 Subject: [PATCH] rename gmapi to gmapy --- examples/example-001-run-gmap.py | 2 +- examples/example-002-chisquare-calc.ipynb | 4 +-- .../example-003-plot-evaluation-results.ipynb | 4 +-- ...ample-004-python-versus-fortran-gmap.ipynb | 2 +- .../example-005-compute-sacs-results.ipynb | 4 +-- .../example-006-gmap-with-ratio-of-sacs.py | 10 +++--- .../analysis_001/analysis_after_2017.py | 6 ++-- .../analysis_after_2017_mannhart_sacs.py | 6 ++-- .../analysis_after_2017_no_sacs.py | 6 ++-- .../analysis_standard_2017_no_sacs.py | 6 ++-- .../analysis_001/analysis_standards_2017.py | 6 ++-- .../analysis_standards_2017_mannhart_sacs.py | 6 ++-- .../analysis_002/gmap_fit_2017.py | 6 ++-- .../analysis_002/gmap_fit_latest.py | 6 ++-- .../analysis_002/gmap_fit_modified.py | 6 ++-- .../utils/convenience_funs.py | 8 ++--- examples/standard_studies/utils/r_adapter.py | 2 +- {gmapi => gmapy}/__init__.py | 0 {gmapi => gmapy}/data_management/__init__.py | 0 .../data_management/database_IO.py | 0 {gmapi => gmapy}/data_management/datablock.py | 0 .../data_management/datablock_list.py | 0 {gmapi => gmapy}/data_management/dataset.py | 0 .../specialized_uncertainty_funs/__init__.py | 0 .../legacy_uncertainty_funs.py | 0 .../simple_uncertainty_funs.py | 0 {gmapi => gmapy}/data_management/tablefuns.py | 0 {gmapi => gmapy}/data_management/unc_utils.py | 0 {gmapi => gmapy}/data_management/uncfuns.py | 0 {gmapi => gmapy}/gma_database_class.py | 0 {gmapi => gmapy}/gma_database_usu_class.py | 0 {gmapi => gmapy}/gmap.py | 0 {gmapi => gmapy}/inference.py | 0 {gmapi => gmapy}/legacy/__init__.py | 0 {gmapi => gmapy}/legacy/conversion_utils.py | 0 .../legacy/data_extraction_functions.py | 0 {gmapi => gmapy}/legacy/data_management.py | 0 {gmapi => gmapy}/legacy/database_reading.py | 0 .../legacy/database_reading_utils.py | 0 {gmapi => gmapy}/legacy/fortran_utils.py | 0 {gmapi => gmapy}/legacy/generic_utils.py | 0 {gmapi => gmapy}/legacy/gmap_functions.py | 0 {gmapi => gmapy}/legacy/gmap_snippets.py | 0 {gmapi => gmapy}/legacy/inference.py | 0 {gmapi => gmapy}/legacy/legacy_gmap.py | 0 {gmapi => gmapy}/legacy/legacy_maps.py | 0 {gmapi => gmapy}/legacy/linpack_utils.py | 0 {gmapi => gmapy}/legacy/output_management.py | 0 {gmapi => gmapy}/mappings/__init__.py | 0 .../mappings/basic_integral_maps.py | 0 {gmapi => gmapy}/mappings/basic_maps.py | 0 {gmapi => gmapy}/mappings/compound_map.py | 0 .../cross_section_absolute_ratio_map.py | 0 .../cross_section_fission_average_map.py | 0 .../mappings/cross_section_map.py | 0 .../mappings/cross_section_ratio_map.py | 0 .../cross_section_ratio_of_sacs_map.py | 0 .../mappings/cross_section_ratio_shape_map.py | 0 .../mappings/cross_section_shape_map.py | 0 .../cross_section_shape_of_ratio_map.py | 0 .../cross_section_shape_of_sum_map.py | 0 .../mappings/cross_section_total_map.py | 0 .../mappings/helperfuns/__init__.py | 0 .../mappings/helperfuns/helperfuns.py | 0 .../mappings/helperfuns/numeric_jacobian.py | 0 .../helperfuns/romberg_integration.py | 0 {gmapi => gmapy}/mappings/priortools.py | 0 {gmapi => gmapy}/mappings/usu_error_map.py | 0 {gmapi => gmapy}/optimization_auxfuns.py | 0 legacy-tests/test_001/run_test.sh | 2 +- legacy-tests/test_002/run_test.sh | 2 +- legacy-tests/test_003/run_test.sh | 2 +- legacy-tests/test_004/run_test.sh | 2 +- legacy-tests/test_005/run_test.sh | 2 +- pyproject.toml | 3 +- tests/test_basic_integral_mappings.py | 4 +-- ...test_basic_integral_of_product_mappings.py | 6 ++-- tests/test_basic_mappings.py | 4 +-- tests/test_basic_product_mapping.py | 4 +-- tests/test_conversions.py | 6 ++-- tests/test_gma_database_class.py | 2 +- tests/test_gma_database_usu_class.py | 6 ++-- tests/test_gmap_simplified.py | 4 +-- tests/test_inference.py | 14 ++++---- tests/test_legacy_divergence.py | 2 +- tests/test_lm_update.py | 16 ++++----- tests/test_mapping_jacobians.py | 34 +++++++++---------- tests/test_new_mapping_jacobians.py | 14 ++++---- tests/test_romberg_integral_mapping.py | 4 +-- tests/test_usu_error_mapping.py | 12 +++---- 90 files changed, 117 insertions(+), 118 deletions(-) rename {gmapi => gmapy}/__init__.py (100%) rename {gmapi => gmapy}/data_management/__init__.py (100%) rename {gmapi => gmapy}/data_management/database_IO.py (100%) rename {gmapi => gmapy}/data_management/datablock.py (100%) rename {gmapi => gmapy}/data_management/datablock_list.py (100%) rename {gmapi => gmapy}/data_management/dataset.py (100%) rename {gmapi => gmapy}/data_management/specialized_uncertainty_funs/__init__.py (100%) rename {gmapi => gmapy}/data_management/specialized_uncertainty_funs/legacy_uncertainty_funs.py (100%) rename {gmapi => gmapy}/data_management/specialized_uncertainty_funs/simple_uncertainty_funs.py (100%) rename {gmapi => gmapy}/data_management/tablefuns.py (100%) rename {gmapi => gmapy}/data_management/unc_utils.py (100%) rename {gmapi => gmapy}/data_management/uncfuns.py (100%) rename {gmapi => gmapy}/gma_database_class.py (100%) rename {gmapi => gmapy}/gma_database_usu_class.py (100%) rename {gmapi => gmapy}/gmap.py (100%) rename {gmapi => gmapy}/inference.py (100%) rename {gmapi => gmapy}/legacy/__init__.py (100%) rename {gmapi => gmapy}/legacy/conversion_utils.py (100%) rename {gmapi => gmapy}/legacy/data_extraction_functions.py (100%) rename {gmapi => gmapy}/legacy/data_management.py (100%) rename {gmapi => gmapy}/legacy/database_reading.py (100%) rename {gmapi => gmapy}/legacy/database_reading_utils.py (100%) rename {gmapi => gmapy}/legacy/fortran_utils.py (100%) rename {gmapi => gmapy}/legacy/generic_utils.py (100%) rename {gmapi => gmapy}/legacy/gmap_functions.py (100%) rename {gmapi => gmapy}/legacy/gmap_snippets.py (100%) rename {gmapi => gmapy}/legacy/inference.py (100%) rename {gmapi => gmapy}/legacy/legacy_gmap.py (100%) rename {gmapi => gmapy}/legacy/legacy_maps.py (100%) rename {gmapi => gmapy}/legacy/linpack_utils.py (100%) rename {gmapi => gmapy}/legacy/output_management.py (100%) rename {gmapi => gmapy}/mappings/__init__.py (100%) rename {gmapi => gmapy}/mappings/basic_integral_maps.py (100%) rename {gmapi => gmapy}/mappings/basic_maps.py (100%) rename {gmapi => gmapy}/mappings/compound_map.py (100%) rename {gmapi => gmapy}/mappings/cross_section_absolute_ratio_map.py (100%) rename {gmapi => gmapy}/mappings/cross_section_fission_average_map.py (100%) rename {gmapi => gmapy}/mappings/cross_section_map.py (100%) rename {gmapi => gmapy}/mappings/cross_section_ratio_map.py (100%) rename {gmapi => gmapy}/mappings/cross_section_ratio_of_sacs_map.py (100%) rename {gmapi => gmapy}/mappings/cross_section_ratio_shape_map.py (100%) rename {gmapi => gmapy}/mappings/cross_section_shape_map.py (100%) rename {gmapi => gmapy}/mappings/cross_section_shape_of_ratio_map.py (100%) rename {gmapi => gmapy}/mappings/cross_section_shape_of_sum_map.py (100%) rename {gmapi => gmapy}/mappings/cross_section_total_map.py (100%) rename {gmapi => gmapy}/mappings/helperfuns/__init__.py (100%) rename {gmapi => gmapy}/mappings/helperfuns/helperfuns.py (100%) rename {gmapi => gmapy}/mappings/helperfuns/numeric_jacobian.py (100%) rename {gmapi => gmapy}/mappings/helperfuns/romberg_integration.py (100%) rename {gmapi => gmapy}/mappings/priortools.py (100%) rename {gmapi => gmapy}/mappings/usu_error_map.py (100%) rename {gmapi => gmapy}/optimization_auxfuns.py (100%) diff --git a/examples/example-001-run-gmap.py b/examples/example-001-run-gmap.py index 3f8e4032..f9e26282 100644 --- a/examples/example-001-run-gmap.py +++ b/examples/example-001-run-gmap.py @@ -20,7 +20,7 @@ ############################################################ import argparse -from gmapi.legacy.legacy_gmap import run_gmap +from gmapy.legacy.legacy_gmap import run_gmap if __name__ == '__main__': diff --git a/examples/example-002-chisquare-calc.ipynb b/examples/example-002-chisquare-calc.ipynb index 6f8b646c..ee48a2a7 100644 --- a/examples/example-002-chisquare-calc.ipynb +++ b/examples/example-002-chisquare-calc.ipynb @@ -22,8 +22,8 @@ "source": [ "import numpy as np\n", "from scipy.sparse.linalg import spsolve\n", - "from gmapi.legacy.legacy_gmap import run_gmap\n", - "from gmapi.mappings.compound_map import CompoundMap\n", + from gmapy.legacy.legacy_gmap import run_gmap\n", + from gmapy.mappings.compound_map import CompoundMap\n", "dbfile = '../tests/testdata/data-2017-07-26.gma'" ] }, diff --git a/examples/example-003-plot-evaluation-results.ipynb b/examples/example-003-plot-evaluation-results.ipynb index 0bb0dc89..a146c984 100644 --- a/examples/example-003-plot-evaluation-results.ipynb +++ b/examples/example-003-plot-evaluation-results.ipynb @@ -24,8 +24,8 @@ "import pandas as pd\n", "from numpy.random import default_rng\n", "import matplotlib.pyplot as plt\n", - "from gmapi.legacy.legacy_gmap import run_gmap\n", - "from gmapi.mappings.compound_map import CompoundMap\n", + from gmapy.legacy.legacy_gmap import run_gmap\n", + from gmapy.mappings.compound_map import CompoundMap\n", "dbfile = '../tests/testdata/data-2017-07-26.gma'" ] }, diff --git a/examples/example-004-python-versus-fortran-gmap.ipynb b/examples/example-004-python-versus-fortran-gmap.ipynb index 9486df31..8a17f274 100644 --- a/examples/example-004-python-versus-fortran-gmap.ipynb +++ b/examples/example-004-python-versus-fortran-gmap.ipynb @@ -21,7 +21,7 @@ "source": [ "import numpy as np\n", "import pandas as pd\n", - "from gmapi.legacy.legacy_gmap import run_gmap" + from gmapy.legacy.legacy_gmap import run_gmap" ] }, { diff --git a/examples/example-005-compute-sacs-results.ipynb b/examples/example-005-compute-sacs-results.ipynb index 9059dee2..593ea4a2 100644 --- a/examples/example-005-compute-sacs-results.ipynb +++ b/examples/example-005-compute-sacs-results.ipynb @@ -21,7 +21,7 @@ "source": [ "import numpy as np\n", "import pandas as pd\n", - "from gmapi.legacy.legacy_gmap import run_gmap" + from gmapy.legacy.legacy_gmap import run_gmap" ] }, { @@ -584,7 +584,7 @@ } ], "source": [ - "from gmapi.mappings.compound_map import CompoundMap\n", + from gmapy.mappings.compound_map import CompoundMap\n", "compmap = CompoundMap(fix_sacs_jacobian=True)\n", "predvals1 = compmap.propagate(syntable1, syntable1.POST.to_numpy())\n", "predvals2 = compmap.propagate(syntable2, syntable2.POST.to_numpy())\n", diff --git a/examples/example-006-gmap-with-ratio-of-sacs.py b/examples/example-006-gmap-with-ratio-of-sacs.py index e9aadc26..29a01fac 100644 --- a/examples/example-006-gmap-with-ratio-of-sacs.py +++ b/examples/example-006-gmap-with-ratio-of-sacs.py @@ -1,11 +1,11 @@ import sys sys.path.append('..') -from gmapi.data_management.dataset import Dataset -from gmapi.data_management.datablock import Datablock -from gmapi.data_management.datablock_list import DatablockList +from gmapy.data_management.dataset import Dataset +from gmapy.data_management.datablock import Datablock +from gmapy.data_management.datablock_list import DatablockList import numpy as np -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.database_IO import (read_json_gma_database, +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.database_IO import (read_json_gma_database, read_legacy_gma_database) # read the database of standards 2017 and perform the gls fitting diff --git a/examples/standard_studies/analysis_001/analysis_after_2017.py b/examples/standard_studies/analysis_001/analysis_after_2017.py index bf69e0d2..ed705598 100644 --- a/examples/standard_studies/analysis_001/analysis_after_2017.py +++ b/examples/standard_studies/analysis_001/analysis_after_2017.py @@ -3,9 +3,9 @@ sys.path.append('../..') sys.path.append('../../..') from copy import deepcopy -from gmapi.data_management.datablock_list import DatablockList -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.database_IO import (read_json_gma_database, +from gmapy.data_management.datablock_list import DatablockList +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.database_IO import (read_json_gma_database, read_legacy_gma_database) from utils.convenience_funs import (get_sacs_predictions, diff --git a/examples/standard_studies/analysis_001/analysis_after_2017_mannhart_sacs.py b/examples/standard_studies/analysis_001/analysis_after_2017_mannhart_sacs.py index 5b76de96..f9e3b40e 100644 --- a/examples/standard_studies/analysis_001/analysis_after_2017_mannhart_sacs.py +++ b/examples/standard_studies/analysis_001/analysis_after_2017_mannhart_sacs.py @@ -3,9 +3,9 @@ sys.path.append('../..') sys.path.append('../../..') from copy import deepcopy -from gmapi.data_management.datablock_list import DatablockList -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.database_IO import (read_json_gma_database, +from gmapy.data_management.datablock_list import DatablockList +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.database_IO import (read_json_gma_database, read_legacy_gma_database) from utils.convenience_funs import (get_sacs_predictions, diff --git a/examples/standard_studies/analysis_001/analysis_after_2017_no_sacs.py b/examples/standard_studies/analysis_001/analysis_after_2017_no_sacs.py index b1d0c886..aac87c89 100644 --- a/examples/standard_studies/analysis_001/analysis_after_2017_no_sacs.py +++ b/examples/standard_studies/analysis_001/analysis_after_2017_no_sacs.py @@ -3,9 +3,9 @@ sys.path.append('../..') sys.path.append('../../..') from copy import deepcopy -from gmapi.data_management.datablock_list import DatablockList -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.database_IO import (read_json_gma_database, +from gmapy.data_management.datablock_list import DatablockList +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.database_IO import (read_json_gma_database, read_legacy_gma_database) from utils.convenience_funs import (get_sacs_predictions, diff --git a/examples/standard_studies/analysis_001/analysis_standard_2017_no_sacs.py b/examples/standard_studies/analysis_001/analysis_standard_2017_no_sacs.py index a0c5338d..a1e2ee5e 100644 --- a/examples/standard_studies/analysis_001/analysis_standard_2017_no_sacs.py +++ b/examples/standard_studies/analysis_001/analysis_standard_2017_no_sacs.py @@ -3,9 +3,9 @@ sys.path.append('../..') sys.path.append('../../..') from copy import deepcopy -from gmapi.data_management.datablock_list import DatablockList -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.database_IO import (read_json_gma_database, +from gmapy.data_management.datablock_list import DatablockList +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.database_IO import (read_json_gma_database, read_legacy_gma_database) from utils.convenience_funs import (get_sacs_predictions, diff --git a/examples/standard_studies/analysis_001/analysis_standards_2017.py b/examples/standard_studies/analysis_001/analysis_standards_2017.py index b686abd6..cdc3bc72 100644 --- a/examples/standard_studies/analysis_001/analysis_standards_2017.py +++ b/examples/standard_studies/analysis_001/analysis_standards_2017.py @@ -3,9 +3,9 @@ sys.path.append('../..') sys.path.append('../../..') from copy import deepcopy -from gmapi.data_management.datablock_list import DatablockList -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.database_IO import (read_json_gma_database, +from gmapy.data_management.datablock_list import DatablockList +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.database_IO import (read_json_gma_database, read_legacy_gma_database) from utils.convenience_funs import (get_sacs_predictions, diff --git a/examples/standard_studies/analysis_001/analysis_standards_2017_mannhart_sacs.py b/examples/standard_studies/analysis_001/analysis_standards_2017_mannhart_sacs.py index 96d40244..2b6251da 100644 --- a/examples/standard_studies/analysis_001/analysis_standards_2017_mannhart_sacs.py +++ b/examples/standard_studies/analysis_001/analysis_standards_2017_mannhart_sacs.py @@ -3,9 +3,9 @@ sys.path.append('../..') sys.path.append('../../..') from copy import deepcopy -from gmapi.data_management.datablock_list import DatablockList -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.database_IO import (read_json_gma_database, +from gmapy.data_management.datablock_list import DatablockList +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.database_IO import (read_json_gma_database, read_legacy_gma_database) from utils.convenience_funs import (get_sacs_predictions, diff --git a/examples/standard_studies/analysis_002/gmap_fit_2017.py b/examples/standard_studies/analysis_002/gmap_fit_2017.py index b31b0e16..233a628b 100644 --- a/examples/standard_studies/analysis_002/gmap_fit_2017.py +++ b/examples/standard_studies/analysis_002/gmap_fit_2017.py @@ -3,9 +3,9 @@ sys.path.append('../..') sys.path.append('../../..') from copy import deepcopy -from gmapi.data_management.datablock_list import DatablockList -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.database_IO import (read_json_gma_database, +from gmapy.data_management.datablock_list import DatablockList +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.database_IO import (read_json_gma_database, read_legacy_gma_database) from utils.convenience_funs import (get_sacs_predictions, diff --git a/examples/standard_studies/analysis_002/gmap_fit_latest.py b/examples/standard_studies/analysis_002/gmap_fit_latest.py index 815ea6f8..58487dd5 100644 --- a/examples/standard_studies/analysis_002/gmap_fit_latest.py +++ b/examples/standard_studies/analysis_002/gmap_fit_latest.py @@ -3,9 +3,9 @@ sys.path.append('../..') sys.path.append('../../..') from copy import deepcopy -from gmapi.data_management.datablock_list import DatablockList -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.database_IO import (read_json_gma_database, +from gmapy.data_management.datablock_list import DatablockList +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.database_IO import (read_json_gma_database, read_legacy_gma_database) from utils.convenience_funs import (get_sacs_predictions, diff --git a/examples/standard_studies/analysis_002/gmap_fit_modified.py b/examples/standard_studies/analysis_002/gmap_fit_modified.py index 4c5735a5..da3fd05a 100644 --- a/examples/standard_studies/analysis_002/gmap_fit_modified.py +++ b/examples/standard_studies/analysis_002/gmap_fit_modified.py @@ -3,9 +3,9 @@ sys.path.append('../..') sys.path.append('../../..') from copy import deepcopy -from gmapi.data_management.datablock_list import DatablockList -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.database_IO import (read_json_gma_database, +from gmapy.data_management.datablock_list import DatablockList +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.database_IO import (read_json_gma_database, read_legacy_gma_database) from utils.convenience_funs import (get_sacs_predictions, diff --git a/examples/standard_studies/utils/convenience_funs.py b/examples/standard_studies/utils/convenience_funs.py index 2ae7f67d..77d787d8 100644 --- a/examples/standard_studies/utils/convenience_funs.py +++ b/examples/standard_studies/utils/convenience_funs.py @@ -4,10 +4,10 @@ from copy import deepcopy import pandas as pd import numpy as np -from gmapi.data_management.dataset import Dataset -from gmapi.data_management.datablock import Datablock -from gmapi.data_management.datablock_list import DatablockList -from gmapi.mappings.compound_map import CompoundMap +from gmapy.data_management.dataset import Dataset +from gmapy.data_management.datablock import Datablock +from gmapy.data_management.datablock_list import DatablockList +from gmapy.mappings.compound_map import CompoundMap import json diff --git a/examples/standard_studies/utils/r_adapter.py b/examples/standard_studies/utils/r_adapter.py index 51ac6daa..2d5ff3fc 100644 --- a/examples/standard_studies/utils/r_adapter.py +++ b/examples/standard_studies/utils/r_adapter.py @@ -2,7 +2,7 @@ sys.path.append('..') sys.path.append('../..') sys.path.append('../../..') -from gmapi.mappings.compound_map import CompoundMap +from gmapy.mappings.compound_map import CompoundMap import numpy as np import pandas as pd diff --git a/gmapi/__init__.py b/gmapy/__init__.py similarity index 100% rename from gmapi/__init__.py rename to gmapy/__init__.py diff --git a/gmapi/data_management/__init__.py b/gmapy/data_management/__init__.py similarity index 100% rename from gmapi/data_management/__init__.py rename to gmapy/data_management/__init__.py diff --git a/gmapi/data_management/database_IO.py b/gmapy/data_management/database_IO.py similarity index 100% rename from gmapi/data_management/database_IO.py rename to gmapy/data_management/database_IO.py diff --git a/gmapi/data_management/datablock.py b/gmapy/data_management/datablock.py similarity index 100% rename from gmapi/data_management/datablock.py rename to gmapy/data_management/datablock.py diff --git a/gmapi/data_management/datablock_list.py b/gmapy/data_management/datablock_list.py similarity index 100% rename from gmapi/data_management/datablock_list.py rename to gmapy/data_management/datablock_list.py diff --git a/gmapi/data_management/dataset.py b/gmapy/data_management/dataset.py similarity index 100% rename from gmapi/data_management/dataset.py rename to gmapy/data_management/dataset.py diff --git a/gmapi/data_management/specialized_uncertainty_funs/__init__.py b/gmapy/data_management/specialized_uncertainty_funs/__init__.py similarity index 100% rename from gmapi/data_management/specialized_uncertainty_funs/__init__.py rename to gmapy/data_management/specialized_uncertainty_funs/__init__.py diff --git a/gmapi/data_management/specialized_uncertainty_funs/legacy_uncertainty_funs.py b/gmapy/data_management/specialized_uncertainty_funs/legacy_uncertainty_funs.py similarity index 100% rename from gmapi/data_management/specialized_uncertainty_funs/legacy_uncertainty_funs.py rename to gmapy/data_management/specialized_uncertainty_funs/legacy_uncertainty_funs.py diff --git a/gmapi/data_management/specialized_uncertainty_funs/simple_uncertainty_funs.py b/gmapy/data_management/specialized_uncertainty_funs/simple_uncertainty_funs.py similarity index 100% rename from gmapi/data_management/specialized_uncertainty_funs/simple_uncertainty_funs.py rename to gmapy/data_management/specialized_uncertainty_funs/simple_uncertainty_funs.py diff --git a/gmapi/data_management/tablefuns.py b/gmapy/data_management/tablefuns.py similarity index 100% rename from gmapi/data_management/tablefuns.py rename to gmapy/data_management/tablefuns.py diff --git a/gmapi/data_management/unc_utils.py b/gmapy/data_management/unc_utils.py similarity index 100% rename from gmapi/data_management/unc_utils.py rename to gmapy/data_management/unc_utils.py diff --git a/gmapi/data_management/uncfuns.py b/gmapy/data_management/uncfuns.py similarity index 100% rename from gmapi/data_management/uncfuns.py rename to gmapy/data_management/uncfuns.py diff --git a/gmapi/gma_database_class.py b/gmapy/gma_database_class.py similarity index 100% rename from gmapi/gma_database_class.py rename to gmapy/gma_database_class.py diff --git a/gmapi/gma_database_usu_class.py b/gmapy/gma_database_usu_class.py similarity index 100% rename from gmapi/gma_database_usu_class.py rename to gmapy/gma_database_usu_class.py diff --git a/gmapi/gmap.py b/gmapy/gmap.py similarity index 100% rename from gmapi/gmap.py rename to gmapy/gmap.py diff --git a/gmapi/inference.py b/gmapy/inference.py similarity index 100% rename from gmapi/inference.py rename to gmapy/inference.py diff --git a/gmapi/legacy/__init__.py b/gmapy/legacy/__init__.py similarity index 100% rename from gmapi/legacy/__init__.py rename to gmapy/legacy/__init__.py diff --git a/gmapi/legacy/conversion_utils.py b/gmapy/legacy/conversion_utils.py similarity index 100% rename from gmapi/legacy/conversion_utils.py rename to gmapy/legacy/conversion_utils.py diff --git a/gmapi/legacy/data_extraction_functions.py b/gmapy/legacy/data_extraction_functions.py similarity index 100% rename from gmapi/legacy/data_extraction_functions.py rename to gmapy/legacy/data_extraction_functions.py diff --git a/gmapi/legacy/data_management.py b/gmapy/legacy/data_management.py similarity index 100% rename from gmapi/legacy/data_management.py rename to gmapy/legacy/data_management.py diff --git a/gmapi/legacy/database_reading.py b/gmapy/legacy/database_reading.py similarity index 100% rename from gmapi/legacy/database_reading.py rename to gmapy/legacy/database_reading.py diff --git a/gmapi/legacy/database_reading_utils.py b/gmapy/legacy/database_reading_utils.py similarity index 100% rename from gmapi/legacy/database_reading_utils.py rename to gmapy/legacy/database_reading_utils.py diff --git a/gmapi/legacy/fortran_utils.py b/gmapy/legacy/fortran_utils.py similarity index 100% rename from gmapi/legacy/fortran_utils.py rename to gmapy/legacy/fortran_utils.py diff --git a/gmapi/legacy/generic_utils.py b/gmapy/legacy/generic_utils.py similarity index 100% rename from gmapi/legacy/generic_utils.py rename to gmapy/legacy/generic_utils.py diff --git a/gmapi/legacy/gmap_functions.py b/gmapy/legacy/gmap_functions.py similarity index 100% rename from gmapi/legacy/gmap_functions.py rename to gmapy/legacy/gmap_functions.py diff --git a/gmapi/legacy/gmap_snippets.py b/gmapy/legacy/gmap_snippets.py similarity index 100% rename from gmapi/legacy/gmap_snippets.py rename to gmapy/legacy/gmap_snippets.py diff --git a/gmapi/legacy/inference.py b/gmapy/legacy/inference.py similarity index 100% rename from gmapi/legacy/inference.py rename to gmapy/legacy/inference.py diff --git a/gmapi/legacy/legacy_gmap.py b/gmapy/legacy/legacy_gmap.py similarity index 100% rename from gmapi/legacy/legacy_gmap.py rename to gmapy/legacy/legacy_gmap.py diff --git a/gmapi/legacy/legacy_maps.py b/gmapy/legacy/legacy_maps.py similarity index 100% rename from gmapi/legacy/legacy_maps.py rename to gmapy/legacy/legacy_maps.py diff --git a/gmapi/legacy/linpack_utils.py b/gmapy/legacy/linpack_utils.py similarity index 100% rename from gmapi/legacy/linpack_utils.py rename to gmapy/legacy/linpack_utils.py diff --git a/gmapi/legacy/output_management.py b/gmapy/legacy/output_management.py similarity index 100% rename from gmapi/legacy/output_management.py rename to gmapy/legacy/output_management.py diff --git a/gmapi/mappings/__init__.py b/gmapy/mappings/__init__.py similarity index 100% rename from gmapi/mappings/__init__.py rename to gmapy/mappings/__init__.py diff --git a/gmapi/mappings/basic_integral_maps.py b/gmapy/mappings/basic_integral_maps.py similarity index 100% rename from gmapi/mappings/basic_integral_maps.py rename to gmapy/mappings/basic_integral_maps.py diff --git a/gmapi/mappings/basic_maps.py b/gmapy/mappings/basic_maps.py similarity index 100% rename from gmapi/mappings/basic_maps.py rename to gmapy/mappings/basic_maps.py diff --git a/gmapi/mappings/compound_map.py b/gmapy/mappings/compound_map.py similarity index 100% rename from gmapi/mappings/compound_map.py rename to gmapy/mappings/compound_map.py diff --git a/gmapi/mappings/cross_section_absolute_ratio_map.py b/gmapy/mappings/cross_section_absolute_ratio_map.py similarity index 100% rename from gmapi/mappings/cross_section_absolute_ratio_map.py rename to gmapy/mappings/cross_section_absolute_ratio_map.py diff --git a/gmapi/mappings/cross_section_fission_average_map.py b/gmapy/mappings/cross_section_fission_average_map.py similarity index 100% rename from gmapi/mappings/cross_section_fission_average_map.py rename to gmapy/mappings/cross_section_fission_average_map.py diff --git a/gmapi/mappings/cross_section_map.py b/gmapy/mappings/cross_section_map.py similarity index 100% rename from gmapi/mappings/cross_section_map.py rename to gmapy/mappings/cross_section_map.py diff --git a/gmapi/mappings/cross_section_ratio_map.py b/gmapy/mappings/cross_section_ratio_map.py similarity index 100% rename from gmapi/mappings/cross_section_ratio_map.py rename to gmapy/mappings/cross_section_ratio_map.py diff --git a/gmapi/mappings/cross_section_ratio_of_sacs_map.py b/gmapy/mappings/cross_section_ratio_of_sacs_map.py similarity index 100% rename from gmapi/mappings/cross_section_ratio_of_sacs_map.py rename to gmapy/mappings/cross_section_ratio_of_sacs_map.py diff --git a/gmapi/mappings/cross_section_ratio_shape_map.py b/gmapy/mappings/cross_section_ratio_shape_map.py similarity index 100% rename from gmapi/mappings/cross_section_ratio_shape_map.py rename to gmapy/mappings/cross_section_ratio_shape_map.py diff --git a/gmapi/mappings/cross_section_shape_map.py b/gmapy/mappings/cross_section_shape_map.py similarity index 100% rename from gmapi/mappings/cross_section_shape_map.py rename to gmapy/mappings/cross_section_shape_map.py diff --git a/gmapi/mappings/cross_section_shape_of_ratio_map.py b/gmapy/mappings/cross_section_shape_of_ratio_map.py similarity index 100% rename from gmapi/mappings/cross_section_shape_of_ratio_map.py rename to gmapy/mappings/cross_section_shape_of_ratio_map.py diff --git a/gmapi/mappings/cross_section_shape_of_sum_map.py b/gmapy/mappings/cross_section_shape_of_sum_map.py similarity index 100% rename from gmapi/mappings/cross_section_shape_of_sum_map.py rename to gmapy/mappings/cross_section_shape_of_sum_map.py diff --git a/gmapi/mappings/cross_section_total_map.py b/gmapy/mappings/cross_section_total_map.py similarity index 100% rename from gmapi/mappings/cross_section_total_map.py rename to gmapy/mappings/cross_section_total_map.py diff --git a/gmapi/mappings/helperfuns/__init__.py b/gmapy/mappings/helperfuns/__init__.py similarity index 100% rename from gmapi/mappings/helperfuns/__init__.py rename to gmapy/mappings/helperfuns/__init__.py diff --git a/gmapi/mappings/helperfuns/helperfuns.py b/gmapy/mappings/helperfuns/helperfuns.py similarity index 100% rename from gmapi/mappings/helperfuns/helperfuns.py rename to gmapy/mappings/helperfuns/helperfuns.py diff --git a/gmapi/mappings/helperfuns/numeric_jacobian.py b/gmapy/mappings/helperfuns/numeric_jacobian.py similarity index 100% rename from gmapi/mappings/helperfuns/numeric_jacobian.py rename to gmapy/mappings/helperfuns/numeric_jacobian.py diff --git a/gmapi/mappings/helperfuns/romberg_integration.py b/gmapy/mappings/helperfuns/romberg_integration.py similarity index 100% rename from gmapi/mappings/helperfuns/romberg_integration.py rename to gmapy/mappings/helperfuns/romberg_integration.py diff --git a/gmapi/mappings/priortools.py b/gmapy/mappings/priortools.py similarity index 100% rename from gmapi/mappings/priortools.py rename to gmapy/mappings/priortools.py diff --git a/gmapi/mappings/usu_error_map.py b/gmapy/mappings/usu_error_map.py similarity index 100% rename from gmapi/mappings/usu_error_map.py rename to gmapy/mappings/usu_error_map.py diff --git a/gmapi/optimization_auxfuns.py b/gmapy/optimization_auxfuns.py similarity index 100% rename from gmapi/optimization_auxfuns.py rename to gmapy/optimization_auxfuns.py diff --git a/legacy-tests/test_001/run_test.sh b/legacy-tests/test_001/run_test.sh index 24a99332..bb1c94e2 100755 --- a/legacy-tests/test_001/run_test.sh +++ b/legacy-tests/test_001/run_test.sh @@ -67,7 +67,7 @@ cd result/python/ PYTHONPATH="$GMAP_python_dir" python -c ' import pandas as pd -from gmapi.legacy.legacy_gmap import run_gmap; +from gmapy.legacy.legacy_gmap import run_gmap; res = run_gmap(dbfile="data.gma", dbtype="legacy", fix_ppp_bug=False, fix_sacs_jacobian=False, legacy_output=True) diff --git a/legacy-tests/test_002/run_test.sh b/legacy-tests/test_002/run_test.sh index abd06d52..c23fb383 100755 --- a/legacy-tests/test_002/run_test.sh +++ b/legacy-tests/test_002/run_test.sh @@ -67,7 +67,7 @@ cd result/python/ PYTHONPATH="$GMAP_python_dir" python -c ' import pandas as pd -from gmapi.legacy.legacy_gmap import run_gmap; +from gmapy.legacy.legacy_gmap import run_gmap; res = run_gmap(dbfile="gmadata.json", dbtype="json", fix_ppp_bug=False, fix_sacs_jacobian=False, legacy_output=True) diff --git a/legacy-tests/test_003/run_test.sh b/legacy-tests/test_003/run_test.sh index abd06d52..c23fb383 100755 --- a/legacy-tests/test_003/run_test.sh +++ b/legacy-tests/test_003/run_test.sh @@ -67,7 +67,7 @@ cd result/python/ PYTHONPATH="$GMAP_python_dir" python -c ' import pandas as pd -from gmapi.legacy.legacy_gmap import run_gmap; +from gmapy.legacy.legacy_gmap import run_gmap; res = run_gmap(dbfile="gmadata.json", dbtype="json", fix_ppp_bug=False, fix_sacs_jacobian=False, legacy_output=True) diff --git a/legacy-tests/test_004/run_test.sh b/legacy-tests/test_004/run_test.sh index 24a99332..bb1c94e2 100755 --- a/legacy-tests/test_004/run_test.sh +++ b/legacy-tests/test_004/run_test.sh @@ -67,7 +67,7 @@ cd result/python/ PYTHONPATH="$GMAP_python_dir" python -c ' import pandas as pd -from gmapi.legacy.legacy_gmap import run_gmap; +from gmapy.legacy.legacy_gmap import run_gmap; res = run_gmap(dbfile="data.gma", dbtype="legacy", fix_ppp_bug=False, fix_sacs_jacobian=False, legacy_output=True) diff --git a/legacy-tests/test_005/run_test.sh b/legacy-tests/test_005/run_test.sh index 3840df22..80ff2c56 100755 --- a/legacy-tests/test_005/run_test.sh +++ b/legacy-tests/test_005/run_test.sh @@ -67,7 +67,7 @@ cd result/python/ PYTHONPATH="$GMAP_python_dir" python -c ' import pandas as pd -from gmapi.legacy.legacy_gmap import run_gmap; +from gmapy.legacy.legacy_gmap import run_gmap; res = run_gmap(dbfile="gmadata.json", dbtype="json", correct_ppp=False, fix_sacs_jacobian=False, legacy_output=True) res["table"].to_csv("restable.csv", sep=";") diff --git a/pyproject.toml b/pyproject.toml index 77751690..00353b40 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.poetry] -name = "gmapi" +name = "gmapy" version = "0.13" description = "package to evaluate cross sections" authors = ["Georg Schnabel"] @@ -14,7 +14,6 @@ scipy = "^1.9.1" fortranformat = "^1.2.2" scikit-sparse = "^0.4.6" - [tool.poetry.group.dev.dependencies] pytest = "^7.1.3" openpyxl = "^3.0.10" diff --git a/tests/test_basic_integral_mappings.py b/tests/test_basic_integral_mappings.py index f465783e..a56e4b0a 100644 --- a/tests/test_basic_integral_mappings.py +++ b/tests/test_basic_integral_mappings.py @@ -1,8 +1,8 @@ import unittest import numpy as np -from gmapi.mappings.basic_integral_maps import (basic_integral_propagate, +from gmapy.mappings.basic_integral_maps import (basic_integral_propagate, get_basic_integral_sensmat) -from gmapi.mappings.helperfuns import numeric_jacobian +from gmapy.mappings.helperfuns import numeric_jacobian class TestBasicIntegralMapping(unittest.TestCase): diff --git a/tests/test_basic_integral_of_product_mappings.py b/tests/test_basic_integral_of_product_mappings.py index fa734e01..cecc5228 100644 --- a/tests/test_basic_integral_of_product_mappings.py +++ b/tests/test_basic_integral_of_product_mappings.py @@ -1,10 +1,10 @@ import unittest import numpy as np -from gmapi.mappings.basic_maps import basic_propagate -from gmapi.mappings.basic_integral_maps import ( +from gmapy.mappings.basic_maps import basic_propagate +from gmapy.mappings.basic_integral_maps import ( basic_integral_of_product_propagate, get_basic_integral_of_product_sensmats) -from gmapi.mappings.helperfuns import numeric_jacobian, compute_romberg_integral +from gmapy.mappings.helperfuns import numeric_jacobian, compute_romberg_integral class TestBasicIntegralOfProductMapping(unittest.TestCase): diff --git a/tests/test_basic_mappings.py b/tests/test_basic_mappings.py index 9989eede..7296a953 100644 --- a/tests/test_basic_mappings.py +++ b/tests/test_basic_mappings.py @@ -1,9 +1,9 @@ import unittest import numpy as np from scipy.sparse import csr_matrix -from gmapi.mappings.basic_maps import (basic_propagate, get_basic_sensmat, +from gmapy.mappings.basic_maps import (basic_propagate, get_basic_sensmat, basic_multiply_Sdic_rows, basic_extract_Sdic_coeffs) -from gmapi.mappings.helperfuns import numeric_jacobian, return_matrix +from gmapy.mappings.helperfuns import numeric_jacobian, return_matrix class TestBasicMappingsPropagation(unittest.TestCase): diff --git a/tests/test_basic_product_mapping.py b/tests/test_basic_product_mapping.py index 6306c38f..aa4a2348 100644 --- a/tests/test_basic_product_mapping.py +++ b/tests/test_basic_product_mapping.py @@ -1,8 +1,8 @@ import unittest import numpy as np -from gmapi.mappings.basic_maps import (basic_propagate, basic_product_propagate, +from gmapy.mappings.basic_maps import (basic_propagate, basic_product_propagate, get_basic_product_sensmats) -from gmapi.mappings.helperfuns import numeric_jacobian +from gmapy.mappings.helperfuns import numeric_jacobian class TestBasicProductPropagate(unittest.TestCase): diff --git a/tests/test_conversions.py b/tests/test_conversions.py index c4d6bd13..8dd161d1 100644 --- a/tests/test_conversions.py +++ b/tests/test_conversions.py @@ -3,9 +3,9 @@ from tempfile import TemporaryDirectory import numpy as np -from gmapi.legacy.legacy_gmap import run_gmap -from gmapi.legacy.database_reading import read_gma_database -from gmapi.legacy.conversion_utils import (sanitize_datablock, +from gmapy.legacy.legacy_gmap import run_gmap +from gmapy.legacy.database_reading import read_gma_database +from gmapy.legacy.conversion_utils import (sanitize_datablock, desanitize_datablock, compare_legacy_datablock_lists, augment_datablocks_with_NTOT, sanitize_prior, desanitize_prior, convert_GMA_database_to_JSON) diff --git a/tests/test_gma_database_class.py b/tests/test_gma_database_class.py index ce59ef46..2e7dae38 100644 --- a/tests/test_gma_database_class.py +++ b/tests/test_gma_database_class.py @@ -1,7 +1,7 @@ import unittest import pathlib import pandas as pd -from gmapi.gma_database_class import GMADatabase +from gmapy.gma_database_class import GMADatabase import numpy as np from copy import deepcopy from scipy.sparse import csr_matrix diff --git a/tests/test_gma_database_usu_class.py b/tests/test_gma_database_usu_class.py index 5c9c9a43..795d63f5 100644 --- a/tests/test_gma_database_usu_class.py +++ b/tests/test_gma_database_usu_class.py @@ -1,14 +1,14 @@ import unittest import pathlib import pandas as pd -from gmapi.gma_database_usu_class import GMADatabaseUSU +from gmapy.gma_database_usu_class import GMADatabaseUSU import numpy as np from copy import deepcopy from scipy.sparse import csr_matrix from sksparse.cholmod import cholesky -from gmapi.mappings.helperfuns import numeric_jacobian +from gmapy.mappings.helperfuns import numeric_jacobian -from gmapi.optimization_auxfuns import create_posterior_funs +from gmapy.optimization_auxfuns import create_posterior_funs # NOTE: This test case tests at present tests mostly the functionality diff --git a/tests/test_gmap_simplified.py b/tests/test_gmap_simplified.py index eddab065..3339d693 100644 --- a/tests/test_gmap_simplified.py +++ b/tests/test_gmap_simplified.py @@ -2,8 +2,8 @@ import pathlib import numpy as np from pandas.testing import assert_frame_equal -from gmapi.gmap import run_gmap_simplified -from gmapi.legacy.legacy_gmap import run_gmap +from gmapy.gmap import run_gmap_simplified +from gmapy.legacy.legacy_gmap import run_gmap class TestGmapSimplified(unittest.TestCase): diff --git a/tests/test_inference.py b/tests/test_inference.py index 6f60ee8b..b465fe6e 100644 --- a/tests/test_inference.py +++ b/tests/test_inference.py @@ -4,15 +4,15 @@ import pandas as pd from scipy.sparse import coo_matrix, csr_matrix -from gmapi.legacy.database_reading import read_gma_database -from gmapi.legacy.conversion_utils import (sanitize_datablock, sanitize_prior) -from gmapi.data_management.uncfuns import (create_relunc_vector, +from gmapy.legacy.database_reading import read_gma_database +from gmapy.legacy.conversion_utils import (sanitize_datablock, sanitize_prior) +from gmapy.data_management.uncfuns import (create_relunc_vector, create_experimental_covmat) -from gmapi.data_management.tablefuns import (create_prior_table, +from gmapy.data_management.tablefuns import (create_prior_table, create_experiment_table) -from gmapi.mappings.priortools import attach_shape_prior -from gmapi.inference import gls_update -from gmapi.mappings.compound_map import CompoundMap +from gmapy.mappings.priortools import attach_shape_prior +from gmapy.inference import gls_update +from gmapy.mappings.compound_map import CompoundMap class TestInference(unittest.TestCase): diff --git a/tests/test_legacy_divergence.py b/tests/test_legacy_divergence.py index 6da1607f..fe038f23 100644 --- a/tests/test_legacy_divergence.py +++ b/tests/test_legacy_divergence.py @@ -4,7 +4,7 @@ import numpy as np import pandas as pd -from gmapi.legacy.legacy_gmap import run_gmap +from gmapy.legacy.legacy_gmap import run_gmap class TestLegacyDivergence(unittest.TestCase): diff --git a/tests/test_lm_update.py b/tests/test_lm_update.py index 7ba5aead..0dfab1a0 100644 --- a/tests/test_lm_update.py +++ b/tests/test_lm_update.py @@ -3,15 +3,15 @@ import pandas as pd import numpy as np from scipy.sparse import block_diag, diags -from gmapi.data_management.tablefuns import (create_prior_table, +from gmapy.data_management.tablefuns import (create_prior_table, create_experiment_table) -from gmapi.data_management.uncfuns import create_experimental_covmat -from gmapi.mappings.priortools import attach_shape_prior, remove_dummy_datasets -from gmapi.inference import gls_update, lm_update, compute_posterior_covmat -from gmapi.data_management.database_IO import read_legacy_gma_database -from gmapi.mappings.compound_map import CompoundMap -from gmapi.gmap import run_gmap_simplified -from gmapi.data_management.uncfuns import create_relunc_vector +from gmapy.data_management.uncfuns import create_experimental_covmat +from gmapy.mappings.priortools import attach_shape_prior, remove_dummy_datasets +from gmapy.inference import gls_update, lm_update, compute_posterior_covmat +from gmapy.data_management.database_IO import read_legacy_gma_database +from gmapy.mappings.compound_map import CompoundMap +from gmapy.gmap import run_gmap_simplified +from gmapy.data_management.uncfuns import create_relunc_vector diff --git a/tests/test_mapping_jacobians.py b/tests/test_mapping_jacobians.py index 12c69c92..2e118525 100644 --- a/tests/test_mapping_jacobians.py +++ b/tests/test_mapping_jacobians.py @@ -3,24 +3,24 @@ import numpy as np import pandas as pd -from gmapi.legacy.database_reading import read_gma_database -from gmapi.legacy.conversion_utils import (sanitize_datablock, sanitize_prior) -from gmapi.data_management.tablefuns import (create_prior_table, +from gmapy.legacy.database_reading import read_gma_database +from gmapy.legacy.conversion_utils import (sanitize_datablock, sanitize_prior) +from gmapy.data_management.tablefuns import (create_prior_table, create_experiment_table) -from gmapi.data_management.uncfuns import create_relunc_vector -from gmapi.mappings.priortools import attach_shape_prior -from gmapi.mappings.helperfuns import numeric_jacobian - -from gmapi.mappings.compound_map import CompoundMap -from gmapi.mappings.cross_section_absolute_ratio_map import CrossSectionAbsoluteRatioMap -from gmapi.mappings.cross_section_fission_average_map import CrossSectionFissionAverageMap -from gmapi.mappings.cross_section_map import CrossSectionMap -from gmapi.mappings.cross_section_ratio_map import CrossSectionRatioMap -from gmapi.mappings.cross_section_ratio_shape_map import CrossSectionRatioShapeMap -from gmapi.mappings.cross_section_shape_map import CrossSectionShapeMap -from gmapi.mappings.cross_section_shape_of_ratio_map import CrossSectionShapeOfRatioMap -from gmapi.mappings.cross_section_shape_of_sum_map import CrossSectionShapeOfSumMap -from gmapi.mappings.cross_section_total_map import CrossSectionTotalMap +from gmapy.data_management.uncfuns import create_relunc_vector +from gmapy.mappings.priortools import attach_shape_prior +from gmapy.mappings.helperfuns import numeric_jacobian + +from gmapy.mappings.compound_map import CompoundMap +from gmapy.mappings.cross_section_absolute_ratio_map import CrossSectionAbsoluteRatioMap +from gmapy.mappings.cross_section_fission_average_map import CrossSectionFissionAverageMap +from gmapy.mappings.cross_section_map import CrossSectionMap +from gmapy.mappings.cross_section_ratio_map import CrossSectionRatioMap +from gmapy.mappings.cross_section_ratio_shape_map import CrossSectionRatioShapeMap +from gmapy.mappings.cross_section_shape_map import CrossSectionShapeMap +from gmapy.mappings.cross_section_shape_of_ratio_map import CrossSectionShapeOfRatioMap +from gmapy.mappings.cross_section_shape_of_sum_map import CrossSectionShapeOfSumMap +from gmapy.mappings.cross_section_total_map import CrossSectionTotalMap class TestMappingJacobians(unittest.TestCase): diff --git a/tests/test_new_mapping_jacobians.py b/tests/test_new_mapping_jacobians.py index 8e70eaf8..c272e244 100644 --- a/tests/test_new_mapping_jacobians.py +++ b/tests/test_new_mapping_jacobians.py @@ -7,14 +7,14 @@ import numpy as np import pandas as pd -from gmapi.mappings.helperfuns import numeric_jacobian -from gmapi.data_management.database_IO import read_legacy_gma_database -from gmapi.data_management.uncfuns import create_relunc_vector -from gmapi.data_management.dataset import Dataset -from gmapi.data_management.datablock import Datablock -from gmapi.data_management.tablefuns import (create_prior_table, +from gmapy.mappings.helperfuns import numeric_jacobian +from gmapy.data_management.database_IO import read_legacy_gma_database +from gmapy.data_management.uncfuns import create_relunc_vector +from gmapy.data_management.dataset import Dataset +from gmapy.data_management.datablock import Datablock +from gmapy.data_management.tablefuns import (create_prior_table, create_experiment_table) -from gmapi.mappings.cross_section_ratio_of_sacs_map import CrossSectionRatioOfSacsMap +from gmapy.mappings.cross_section_ratio_of_sacs_map import CrossSectionRatioOfSacsMap class TestNewMappingJacobians(unittest.TestCase): diff --git a/tests/test_romberg_integral_mapping.py b/tests/test_romberg_integral_mapping.py index c0a7476a..4c787bf6 100644 --- a/tests/test_romberg_integral_mapping.py +++ b/tests/test_romberg_integral_mapping.py @@ -1,8 +1,8 @@ import unittest import numpy as np -from gmapi.mappings.basic_maps import (basic_propagate, get_basic_sensmat, +from gmapy.mappings.basic_maps import (basic_propagate, get_basic_sensmat, basic_extract_Sdic_coeffs) -from gmapi.mappings.helperfuns import numeric_jacobian, compute_romberg_integral +from gmapy.mappings.helperfuns import numeric_jacobian, compute_romberg_integral class TestRombergIntegralMapping(unittest.TestCase): diff --git a/tests/test_usu_error_mapping.py b/tests/test_usu_error_mapping.py index 1da2674a..20ea82b2 100644 --- a/tests/test_usu_error_mapping.py +++ b/tests/test_usu_error_mapping.py @@ -2,13 +2,13 @@ import pathlib import numpy as np import pandas as pd -from gmapi.data_management.database_IO import read_legacy_gma_database -from gmapi.data_management.tablefuns import (create_prior_table, +from gmapy.data_management.database_IO import read_legacy_gma_database +from gmapy.data_management.tablefuns import (create_prior_table, create_experiment_table) -from gmapi.mappings.priortools import attach_shape_prior -from gmapi.mappings.usu_error_map import USUErrorMap -from gmapi.mappings.compound_map import CompoundMap -from gmapi.mappings.helperfuns import numeric_jacobian +from gmapy.mappings.priortools import attach_shape_prior +from gmapy.mappings.usu_error_map import USUErrorMap +from gmapy.mappings.compound_map import CompoundMap +from gmapy.mappings.helperfuns import numeric_jacobian class TestUSUErrorMapping(unittest.TestCase):