Merge pull request #181 from njoy/feature/cmake-update

Feature/cmake update
njoy · Nov 27, 2023 · 8f7eb3c · 8f7eb3c
2 parents ceb4e8a + fb09fe7
commit 8f7eb3c
Show file tree

Hide file tree

Showing 462 changed files with 674 additions and 4,020 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,22 @@
 ########################################################################
 # Preamble
 ########################################################################
+
 cmake_minimum_required( VERSION 3.14 )
-project( ENDFtk LANGUAGES CXX )
+
+set( subproject OFF )
+if( DEFINED PROJECT_NAME )
+  set( subproject ON )
+endif()
+
+project( ENDFtk
+  VERSION 0.5.0
+  LANGUAGES CXX
+)
+
+include( CTest )
+include( CMakeDependentOption )
+include( GNUInstallDirs )
 
 ########################################################################
 # Project-wide setup
@@ -11,18 +25,16 @@ project( ENDFtk LANGUAGES CXX )
 set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_STANDARD_REQUIRED YES )
 
-option( ENDFtk.tests "Build the ENDFtk unit tests" OFF )
-option( ENDFtk.python "Build ENDFtk python bindings" ON )
-option( strict_compile
-    "Treat all warnings as errors." ON
-    )
-
-# Compile flags
-set( common_flags "-Wall" "-Wextra" "-Wpedantic" )
-set( strict_flags "-Werror" )
-set( release_flags "-O3" )
-set( debug_flags "-O0" "-g" )
-
+cmake_dependent_option(
+  ENDFtk.tests
+  "Build the ENDFtk unit tests and integrate with ctest" ON
+  "BUILD_TESTING AND NOT ${subproject}" OFF
+)
+cmake_dependent_option(
+  ENDFtk.python
+  "Build ENDFtk python bindings" ON
+  "NOT ${subproject}" OFF
+)
 
 ########################################################################
 # Dependencies
@@ -55,23 +67,29 @@ endif()
 # ENDFtk : library
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-include_directories( src/ )
-
 add_library( ENDFtk INTERFACE )
-target_include_directories( ENDFtk INTERFACE src/ )
+add_library( njoy::ENDFtk ALIAS ENDFtk )
+target_include_directories( ENDFtk
+  INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
 target_link_libraries( ENDFtk
-    INTERFACE Log
-    INTERFACE catch-adapter
-    INTERFACE disco
-    INTERFACE header-utilities
-    INTERFACE range-v3
-    )
+    INTERFACE
+      Log
+      disco
+      header-utilities
+      range-v3
+)
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # ENDFtk : python bindings
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 if( ENDFtk.python )
+
+  FetchContent_MakeAvailable( pybind11 )
+
   pybind11_add_module( ENDFtk.python
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/ENDFtk.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/record/ControlRecord.python.cpp
@@ -309,14 +327,14 @@ if( ENDFtk.python )
 
   target_link_libraries( ENDFtk.python PRIVATE ENDFtk )
   target_include_directories( ENDFtk.python PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/python/src )
-  target_compile_options( ENDFtk.python PRIVATE "-fvisibility=hidden" )
+  target_compile_options( ENDFtk.python PRIVATE -fvisibility=hidden )
   set_target_properties( ENDFtk.python PROPERTIES OUTPUT_NAME ENDFtk )
   set_target_properties( ENDFtk.python PROPERTIES COMPILE_DEFINITIONS "PYBIND11" )
-  set_target_properties( ENDFtk.python PROPERTIES POSITION_INDEPENDENT_CODE ON)
+  set_target_properties( ENDFtk.python PROPERTIES POSITION_INDEPENDENT_CODE ON )
 
   message( STATUS "Building ENDFtk's python API" )
 
-  list( APPEND ENDFTK_PYTHONPATH ${CMAKE_CURRENT_BINARY_DIR} )
+  list( APPEND ENDFtk_PYTHONPATH ${CMAKE_CURRENT_BINARY_DIR} )
 
   include( cmake/unit_testing_python.cmake )
 

diff --git a/cmake/develop_dependencies.cmake b/cmake/develop_dependencies.cmake
@@ -45,9 +45,7 @@ FetchContent_Declare( pybind11
 
 FetchContent_MakeAvailable(
     Log
-    catch-adapter
     disco
     header-utilities
     range-v3
-    pybind11
     )
diff --git a/cmake/release_dependencies.cmake b/cmake/release_dependencies.cmake
@@ -46,11 +46,9 @@ set( SPDLOG_BUILD_TESTING CACHE BOOL OFF )
 #######################################################################
 
 FetchContent_MakeAvailable(
-    catch-adapter
     disco
     header-utilities
     Log
-    pybind11
     range-v3
     spdlog
     )
diff --git a/cmake/unit_testing.cmake b/cmake/unit_testing.cmake
diff --git a/cmake/unit_testing_python.cmake b/cmake/unit_testing_python.cmake
diff --git a/...t/Test_ENDFtk_MF1_MT455_DecayConstants.py → ...5/Test_ENDFtk_MF1_MT455_DecayConstants.py b/...t/Test_ENDFtk_MF1_MT455_DecayConstants.py → ...5/Test_ENDFtk_MF1_MT455_DecayConstants.py
diff --git a/...Ftk_MF1_MT455_EnergyDependentConstants.py → ...Ftk_MF1_MT455_EnergyDependentConstants.py b/...Ftk_MF1_MT455_EnergyDependentConstants.py → ...Ftk_MF1_MT455_EnergyDependentConstants.py
diff --git a/...k_MF1_MT455_EnergyIndependentConstants.py → ...k_MF1_MT455_EnergyIndependentConstants.py b/...k_MF1_MT455_EnergyIndependentConstants.py → ...k_MF1_MT455_EnergyIndependentConstants.py
diff --git a/python/test/MF1/MT455/__init__.py b/python/test/MF1/MT455/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...NDFtk_MF1_MT458_EnergyReleaseComponent.py → ...NDFtk_MF1_MT458_EnergyReleaseComponent.py b/...NDFtk_MF1_MT458_EnergyReleaseComponent.py → ...NDFtk_MF1_MT458_EnergyReleaseComponent.py
diff --git a/..._ENDFtk_MF1_MT458_PolynomialComponents.py → ..._ENDFtk_MF1_MT458_PolynomialComponents.py b/..._ENDFtk_MF1_MT458_PolynomialComponents.py → ..._ENDFtk_MF1_MT458_PolynomialComponents.py
diff --git a/...t_ENDFtk_MF1_MT458_TabulatedComponents.py → ...t_ENDFtk_MF1_MT458_TabulatedComponents.py b/...t_ENDFtk_MF1_MT458_TabulatedComponents.py → ...t_ENDFtk_MF1_MT458_TabulatedComponents.py
diff --git a/...NDFtk_MF1_MT458_ThermalPointComponents.py → ...NDFtk_MF1_MT458_ThermalPointComponents.py b/...NDFtk_MF1_MT458_ThermalPointComponents.py → ...NDFtk_MF1_MT458_ThermalPointComponents.py
diff --git a/python/test/MF1/MT458/__init__.py b/python/test/MF1/MT458/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...est_ENDFtk_MF1_MT460_ContinuousPhotons.py → ...est_ENDFtk_MF1_MT460_ContinuousPhotons.py b/...est_ENDFtk_MF1_MT460_ContinuousPhotons.py → ...est_ENDFtk_MF1_MT460_ContinuousPhotons.py
diff --git a/...k_MF1_MT460_DiscretePhotonMultiplicity.py → ...k_MF1_MT460_DiscretePhotonMultiplicity.py b/...k_MF1_MT460_DiscretePhotonMultiplicity.py → ...k_MF1_MT460_DiscretePhotonMultiplicity.py
diff --git a/.../Test_ENDFtk_MF1_MT460_DiscretePhotons.py → .../Test_ENDFtk_MF1_MT460_DiscretePhotons.py b/.../Test_ENDFtk_MF1_MT460_DiscretePhotons.py → .../Test_ENDFtk_MF1_MT460_DiscretePhotons.py
diff --git a/python/test/MF1/MT460/__init__.py b/python/test/MF1/MT460/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_MF1_MT451_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT451_Section.py b/python/test/Test_ENDFtk_MF1_MT451_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT451_Section.py
diff --git a/python/test/Test_ENDFtk_MF1_MT452_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT452_Section.py b/python/test/Test_ENDFtk_MF1_MT452_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT452_Section.py
diff --git a/python/test/Test_ENDFtk_MF1_MT455_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT455_Section.py b/python/test/Test_ENDFtk_MF1_MT455_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT455_Section.py
diff --git a/python/test/Test_ENDFtk_MF1_MT456_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT456_Section.py b/python/test/Test_ENDFtk_MF1_MT456_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT456_Section.py
diff --git a/python/test/Test_ENDFtk_MF1_MT458_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT458_Section.py b/python/test/Test_ENDFtk_MF1_MT458_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT458_Section.py
diff --git a/python/test/Test_ENDFtk_MF1_MT460_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT460_Section.py b/python/test/Test_ENDFtk_MF1_MT460_Section.py → ...test/MF1/Test_ENDFtk_MF1_MT460_Section.py
diff --git a/...Test_ENDFtk_MF1_PolynomialMultiplicity.py → ...Test_ENDFtk_MF1_PolynomialMultiplicity.py b/...Test_ENDFtk_MF1_PolynomialMultiplicity.py → ...Test_ENDFtk_MF1_PolynomialMultiplicity.py
diff --git a/.../Test_ENDFtk_MF1_TabulatedMultiplicity.py → .../Test_ENDFtk_MF1_TabulatedMultiplicity.py b/.../Test_ENDFtk_MF1_TabulatedMultiplicity.py → .../Test_ENDFtk_MF1_TabulatedMultiplicity.py
diff --git a/python/test/MF1/__init__.py b/python/test/MF1/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/.../test/Test_ENDFtk_MF10_ReactionProduct.py → .../MF10/Test_ENDFtk_MF10_ReactionProduct.py b/.../test/Test_ENDFtk_MF10_ReactionProduct.py → .../MF10/Test_ENDFtk_MF10_ReactionProduct.py
diff --git a/python/test/Test_ENDFtk_MF10_Section.py → python/test/MF10/Test_ENDFtk_MF10_Section.py b/python/test/Test_ENDFtk_MF10_Section.py → python/test/MF10/Test_ENDFtk_MF10_Section.py
diff --git a/python/test/MF10/__init__.py b/python/test/MF10/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...n/test/Test_ENDFtk_MF12_Multiplicities.py → ...t/MF12/Test_ENDFtk_MF12_Multiplicities.py b/...n/test/Test_ENDFtk_MF12_Multiplicities.py → ...t/MF12/Test_ENDFtk_MF12_Multiplicities.py
diff --git a/...t/Test_ENDFtk_MF12_PartialMultiplicity.py → ...2/Test_ENDFtk_MF12_PartialMultiplicity.py b/...t/Test_ENDFtk_MF12_PartialMultiplicity.py → ...2/Test_ENDFtk_MF12_PartialMultiplicity.py
diff --git a/python/test/Test_ENDFtk_MF12_Section.py → python/test/MF12/Test_ENDFtk_MF12_Section.py b/python/test/Test_ENDFtk_MF12_Section.py → python/test/MF12/Test_ENDFtk_MF12_Section.py
diff --git a/...est/Test_ENDFtk_MF12_TotalMultiplicity.py → ...F12/Test_ENDFtk_MF12_TotalMultiplicity.py b/...est/Test_ENDFtk_MF12_TotalMultiplicity.py → ...F12/Test_ENDFtk_MF12_TotalMultiplicity.py
diff --git a/...st_ENDFtk_MF12_TransitionProbabilities.py → ...st_ENDFtk_MF12_TransitionProbabilities.py b/...st_ENDFtk_MF12_TransitionProbabilities.py → ...st_ENDFtk_MF12_TransitionProbabilities.py
diff --git a/python/test/MF12/__init__.py b/python/test/MF12/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...t/Test_ENDFtk_MF13_PartialCrossSection.py → ...3/Test_ENDFtk_MF13_PartialCrossSection.py b/...t/Test_ENDFtk_MF13_PartialCrossSection.py → ...3/Test_ENDFtk_MF13_PartialCrossSection.py
diff --git a/python/test/Test_ENDFtk_MF13_Section.py → python/test/MF13/Test_ENDFtk_MF13_Section.py b/python/test/Test_ENDFtk_MF13_Section.py → python/test/MF13/Test_ENDFtk_MF13_Section.py
diff --git a/...est/Test_ENDFtk_MF13_TotalCrossSection.py → ...F13/Test_ENDFtk_MF13_TotalCrossSection.py b/...est/Test_ENDFtk_MF13_TotalCrossSection.py → ...F13/Test_ENDFtk_MF13_TotalCrossSection.py
diff --git a/python/test/MF13/__init__.py b/python/test/MF13/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...st_ENDFtk_MF14_IsotropicDiscretePhoton.py → ...st_ENDFtk_MF14_IsotropicDiscretePhoton.py b/...st_ENDFtk_MF14_IsotropicDiscretePhoton.py → ...st_ENDFtk_MF14_IsotropicDiscretePhoton.py
diff --git a/.../Test_ENDFtk_MF14_LegendreCoefficients.py → .../Test_ENDFtk_MF14_LegendreCoefficients.py b/.../Test_ENDFtk_MF14_LegendreCoefficients.py → .../Test_ENDFtk_MF14_LegendreCoefficients.py
diff --git a/...Test_ENDFtk_MF14_LegendreDistributions.py → ...Test_ENDFtk_MF14_LegendreDistributions.py b/...Test_ENDFtk_MF14_LegendreDistributions.py → ...Test_ENDFtk_MF14_LegendreDistributions.py
diff --git a/python/test/Test_ENDFtk_MF14_Section.py → python/test/MF14/Test_ENDFtk_MF14_Section.py b/python/test/Test_ENDFtk_MF14_Section.py → python/test/MF14/Test_ENDFtk_MF14_Section.py
diff --git a/...Test_ENDFtk_MF14_TabulatedDistribution.py → ...Test_ENDFtk_MF14_TabulatedDistribution.py b/...Test_ENDFtk_MF14_TabulatedDistribution.py → ...Test_ENDFtk_MF14_TabulatedDistribution.py
diff --git a/...est_ENDFtk_MF14_TabulatedDistributions.py → ...est_ENDFtk_MF14_TabulatedDistributions.py b/...est_ENDFtk_MF14_TabulatedDistributions.py → ...est_ENDFtk_MF14_TabulatedDistributions.py
diff --git a/python/test/MF14/__init__.py b/python/test/MF14/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...ENDFtk_MF15_OutgoingEnergyDistribution.py → ...ENDFtk_MF15_OutgoingEnergyDistribution.py b/...ENDFtk_MF15_OutgoingEnergyDistribution.py → ...ENDFtk_MF15_OutgoingEnergyDistribution.py
diff --git a/python/test/Test_ENDFtk_MF15_Probability.py → ...test/MF15/Test_ENDFtk_MF15_Probability.py b/python/test/Test_ENDFtk_MF15_Probability.py → ...test/MF15/Test_ENDFtk_MF15_Probability.py
diff --git a/python/test/Test_ENDFtk_MF15_Section.py → python/test/MF15/Test_ENDFtk_MF15_Section.py b/python/test/Test_ENDFtk_MF15_Section.py → python/test/MF15/Test_ENDFtk_MF15_Section.py
diff --git a/...est/Test_ENDFtk_MF15_TabulatedSpectrum.py → ...F15/Test_ENDFtk_MF15_TabulatedSpectrum.py b/...est/Test_ENDFtk_MF15_TabulatedSpectrum.py → ...F15/Test_ENDFtk_MF15_TabulatedSpectrum.py
diff --git a/python/test/MF15/__init__.py b/python/test/MF15/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...st_ENDFtk_MF2_MT151_BackgroundChannels.py → ...st_ENDFtk_MF2_MT151_BackgroundChannels.py b/...st_ENDFtk_MF2_MT151_BackgroundChannels.py → ...st_ENDFtk_MF2_MT151_BackgroundChannels.py
diff --git a/...est_ENDFtk_MF2_MT151_BreitWignerLValue.py → ...est_ENDFtk_MF2_MT151_BreitWignerLValue.py b/...est_ENDFtk_MF2_MT151_BreitWignerLValue.py → ...est_ENDFtk_MF2_MT151_BreitWignerLValue.py
diff --git a/...Ftk_MF2_MT151_FrohnerBackgroundRMatrix.py → ...Ftk_MF2_MT151_FrohnerBackgroundRMatrix.py b/...Ftk_MF2_MT151_FrohnerBackgroundRMatrix.py → ...Ftk_MF2_MT151_FrohnerBackgroundRMatrix.py
diff --git a/python/test/Test_ENDFtk_MF2_MT151_Isotope.py → ...F2/MT151/Test_ENDFtk_MF2_MT151_Isotope.py b/python/test/Test_ENDFtk_MF2_MT151_Isotope.py → ...F2/MT151/Test_ENDFtk_MF2_MT151_Isotope.py
diff --git a/...ENDFtk_MF2_MT151_MultiLevelBreitWigner.py → ...ENDFtk_MF2_MT151_MultiLevelBreitWigner.py b/...ENDFtk_MF2_MT151_MultiLevelBreitWigner.py → ...ENDFtk_MF2_MT151_MultiLevelBreitWigner.py
diff --git a/...t_ENDFtk_MF2_MT151_NoBackgroundRMatrix.py → ...t_ENDFtk_MF2_MT151_NoBackgroundRMatrix.py b/...t_ENDFtk_MF2_MT151_NoBackgroundRMatrix.py → ...t_ENDFtk_MF2_MT151_NoBackgroundRMatrix.py
diff --git a/...st/Test_ENDFtk_MF2_MT151_ParticlePairs.py → ...51/Test_ENDFtk_MF2_MT151_ParticlePairs.py b/...st/Test_ENDFtk_MF2_MT151_ParticlePairs.py → ...51/Test_ENDFtk_MF2_MT151_ParticlePairs.py
diff --git a/...t/Test_ENDFtk_MF2_MT151_RMatrixLimited.py → ...1/Test_ENDFtk_MF2_MT151_RMatrixLimited.py b/...t/Test_ENDFtk_MF2_MT151_RMatrixLimited.py → ...1/Test_ENDFtk_MF2_MT151_RMatrixLimited.py
diff --git a/.../test/Test_ENDFtk_MF2_MT151_ReichMoore.py → ...MT151/Test_ENDFtk_MF2_MT151_ReichMoore.py b/.../test/Test_ENDFtk_MF2_MT151_ReichMoore.py → ...MT151/Test_ENDFtk_MF2_MT151_ReichMoore.py
diff --git a/...Test_ENDFtk_MF2_MT151_ReichMooreLValue.py → ...Test_ENDFtk_MF2_MT151_ReichMooreLValue.py b/...Test_ENDFtk_MF2_MT151_ReichMooreLValue.py → ...Test_ENDFtk_MF2_MT151_ReichMooreLValue.py
diff --git a/...est_ENDFtk_MF2_MT151_ResonanceChannels.py → ...est_ENDFtk_MF2_MT151_ResonanceChannels.py b/...est_ENDFtk_MF2_MT151_ResonanceChannels.py → ...est_ENDFtk_MF2_MT151_ResonanceChannels.py
diff --git a/...t_ENDFtk_MF2_MT151_ResonanceParameters.py → ...t_ENDFtk_MF2_MT151_ResonanceParameters.py b/...t_ENDFtk_MF2_MT151_ResonanceParameters.py → ...t_ENDFtk_MF2_MT151_ResonanceParameters.py
diff --git a/...NDFtk_MF2_MT151_SammyBackgroundRMatrix.py → ...NDFtk_MF2_MT151_SammyBackgroundRMatrix.py b/...NDFtk_MF2_MT151_SammyBackgroundRMatrix.py → ...NDFtk_MF2_MT151_SammyBackgroundRMatrix.py
diff --git a/...Test_ENDFtk_MF2_MT151_ScatteringRadius.py → ...Test_ENDFtk_MF2_MT151_ScatteringRadius.py b/...Test_ENDFtk_MF2_MT151_ScatteringRadius.py → ...Test_ENDFtk_MF2_MT151_ScatteringRadius.py
diff --git a/...NDFtk_MF2_MT151_SingleLevelBreitWigner.py → ...NDFtk_MF2_MT151_SingleLevelBreitWigner.py b/...NDFtk_MF2_MT151_SingleLevelBreitWigner.py → ...NDFtk_MF2_MT151_SingleLevelBreitWigner.py
diff --git a/...test/Test_ENDFtk_MF2_MT151_SpecialCase.py → ...T151/Test_ENDFtk_MF2_MT151_SpecialCase.py b/...test/Test_ENDFtk_MF2_MT151_SpecialCase.py → ...T151/Test_ENDFtk_MF2_MT151_SpecialCase.py
diff --git a/...n/test/Test_ENDFtk_MF2_MT151_SpinGroup.py → .../MT151/Test_ENDFtk_MF2_MT151_SpinGroup.py b/...n/test/Test_ENDFtk_MF2_MT151_SpinGroup.py → .../MT151/Test_ENDFtk_MF2_MT151_SpinGroup.py
diff --git a/...k_MF2_MT151_TabulatedBackgroundRMatrix.py → ...k_MF2_MT151_TabulatedBackgroundRMatrix.py b/...k_MF2_MT151_TabulatedBackgroundRMatrix.py → ...k_MF2_MT151_TabulatedBackgroundRMatrix.py
diff --git a/...tk_MF2_MT151_UnresolvedEnergyDependent.py → ...tk_MF2_MT151_UnresolvedEnergyDependent.py b/...tk_MF2_MT151_UnresolvedEnergyDependent.py → ...tk_MF2_MT151_UnresolvedEnergyDependent.py
diff --git a/...UnresolvedEnergyDependentFissionWidths.py → ...UnresolvedEnergyDependentFissionWidths.py b/...UnresolvedEnergyDependentFissionWidths.py → ...UnresolvedEnergyDependentFissionWidths.py
diff --git a/...lvedEnergyDependentFissionWidthsJValue.py → ...lvedEnergyDependentFissionWidthsJValue.py b/...lvedEnergyDependentFissionWidthsJValue.py → ...lvedEnergyDependentFissionWidthsJValue.py
diff --git a/...lvedEnergyDependentFissionWidthsLValue.py → ...lvedEnergyDependentFissionWidthsLValue.py b/...lvedEnergyDependentFissionWidthsLValue.py → ...lvedEnergyDependentFissionWidthsLValue.py
diff --git a/..._MT151_UnresolvedEnergyDependentJValue.py → ..._MT151_UnresolvedEnergyDependentJValue.py b/..._MT151_UnresolvedEnergyDependentJValue.py → ..._MT151_UnresolvedEnergyDependentJValue.py
diff --git a/..._MT151_UnresolvedEnergyDependentLValue.py → ..._MT151_UnresolvedEnergyDependentLValue.py b/..._MT151_UnresolvedEnergyDependentLValue.py → ..._MT151_UnresolvedEnergyDependentLValue.py
diff --git a/..._MF2_MT151_UnresolvedEnergyIndependent.py → ..._MF2_MT151_UnresolvedEnergyIndependent.py b/..._MF2_MT151_UnresolvedEnergyIndependent.py → ..._MF2_MT151_UnresolvedEnergyIndependent.py
diff --git a/...T151_UnresolvedEnergyIndependentLValue.py → ...T151_UnresolvedEnergyIndependentLValue.py b/...T151_UnresolvedEnergyIndependentLValue.py → ...T151_UnresolvedEnergyIndependentLValue.py
diff --git a/python/test/MF2/MT151/__init__.py b/python/test/MF2/MT151/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_MF2_MT151_Section.py → ...test/MF2/Test_ENDFtk_MF2_MT151_Section.py b/python/test/Test_ENDFtk_MF2_MT151_Section.py → ...test/MF2/Test_ENDFtk_MF2_MT151_Section.py
diff --git a/python/test/Test_ENDFtk_MF2_MT152_Section.py → ...test/MF2/Test_ENDFtk_MF2_MT152_Section.py b/python/test/Test_ENDFtk_MF2_MT152_Section.py → ...test/MF2/Test_ENDFtk_MF2_MT152_Section.py
diff --git a/python/test/MF2/__init__.py b/python/test/MF2/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_MF23_File.py → python/test/MF23/Test_ENDFtk_MF23_File.py b/python/test/Test_ENDFtk_MF23_File.py → python/test/MF23/Test_ENDFtk_MF23_File.py
diff --git a/python/test/Test_ENDFtk_MF23_Section.py → python/test/MF23/Test_ENDFtk_MF23_Section.py b/python/test/Test_ENDFtk_MF23_Section.py → python/test/MF23/Test_ENDFtk_MF23_Section.py
diff --git a/python/test/MF23/__init__.py b/python/test/MF23/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/..._ENDFtk_MF26_LAW1_LegendreCoefficients.py → ..._ENDFtk_MF26_LAW1_LegendreCoefficients.py b/..._ENDFtk_MF26_LAW1_LegendreCoefficients.py → ..._ENDFtk_MF26_LAW1_LegendreCoefficients.py
diff --git a/...ENDFtk_MF26_LAW2_TabulatedDistribution.py → ...ENDFtk_MF26_LAW2_TabulatedDistribution.py b/...ENDFtk_MF26_LAW2_TabulatedDistribution.py → ...ENDFtk_MF26_LAW2_TabulatedDistribution.py
diff --git a/.../Test_ENDFtk_MF26_ContinuumEnergyAngle.py → .../Test_ENDFtk_MF26_ContinuumEnergyAngle.py b/.../Test_ENDFtk_MF26_ContinuumEnergyAngle.py → .../Test_ENDFtk_MF26_ContinuumEnergyAngle.py
diff --git a/..._ENDFtk_MF26_DiscreteTwoBodyScattering.py → ..._ENDFtk_MF26_DiscreteTwoBodyScattering.py b/..._ENDFtk_MF26_DiscreteTwoBodyScattering.py → ..._ENDFtk_MF26_DiscreteTwoBodyScattering.py
diff --git a/...n/test/Test_ENDFtk_MF26_EnergyTransfer.py → ...t/MF26/Test_ENDFtk_MF26_EnergyTransfer.py b/...n/test/Test_ENDFtk_MF26_EnergyTransfer.py → ...t/MF26/Test_ENDFtk_MF26_EnergyTransfer.py
diff --git a/python/test/Test_ENDFtk_MF26_Multiplicity.py → ...est/MF26/Test_ENDFtk_MF26_Multiplicity.py b/python/test/Test_ENDFtk_MF26_Multiplicity.py → ...est/MF26/Test_ENDFtk_MF26_Multiplicity.py
diff --git a/.../test/Test_ENDFtk_MF26_ReactionProduct.py → .../MF26/Test_ENDFtk_MF26_ReactionProduct.py b/.../test/Test_ENDFtk_MF26_ReactionProduct.py → .../MF26/Test_ENDFtk_MF26_ReactionProduct.py
diff --git a/python/test/Test_ENDFtk_MF26_Section.py → python/test/MF26/Test_ENDFtk_MF26_Section.py b/python/test/Test_ENDFtk_MF26_Section.py → python/test/MF26/Test_ENDFtk_MF26_Section.py
diff --git a/python/test/MF26/__init__.py b/python/test/MF26/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_MF27_File.py → python/test/MF27/Test_ENDFtk_MF27_File.py b/python/test/Test_ENDFtk_MF27_File.py → python/test/MF27/Test_ENDFtk_MF27_File.py
diff --git a/python/test/Test_ENDFtk_MF27_Section.py → python/test/MF27/Test_ENDFtk_MF27_Section.py b/python/test/Test_ENDFtk_MF27_Section.py → python/test/MF27/Test_ENDFtk_MF27_Section.py
diff --git a/python/test/MF27/__init__.py b/python/test/MF27/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_MF28_Section.py → python/test/MF28/Test_ENDFtk_MF28_Section.py b/python/test/Test_ENDFtk_MF28_Section.py → python/test/MF28/Test_ENDFtk_MF28_Section.py
diff --git a/python/test/Test_ENDFtk_MF28_SubshellData.py → ...est/MF28/Test_ENDFtk_MF28_SubshellData.py b/python/test/Test_ENDFtk_MF28_SubshellData.py → ...est/MF28/Test_ENDFtk_MF28_SubshellData.py
diff --git a/python/test/MF28/__init__.py b/python/test/MF28/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_MF3_File.py → python/test/MF3/Test_ENDFtk_MF3_File.py b/python/test/Test_ENDFtk_MF3_File.py → python/test/MF3/Test_ENDFtk_MF3_File.py
diff --git a/python/test/Test_ENDFtk_MF3_Section.py → python/test/MF3/Test_ENDFtk_MF3_Section.py b/python/test/Test_ENDFtk_MF3_Section.py → python/test/MF3/Test_ENDFtk_MF3_Section.py
diff --git a/python/test/MF3/__init__.py b/python/test/MF3/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_MF31_Section.py → python/test/MF31/Test_ENDFtk_MF31_Section.py b/python/test/Test_ENDFtk_MF31_Section.py → python/test/MF31/Test_ENDFtk_MF31_Section.py
diff --git a/python/test/MF31/__init__.py b/python/test/MF31/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...Ftk_MF32_MT151_LCOMP1_CovarianceMatrix.py → ...Ftk_MF32_MT151_LCOMP1_CovarianceMatrix.py b/...Ftk_MF32_MT151_LCOMP1_CovarianceMatrix.py → ...Ftk_MF32_MT151_LCOMP1_CovarianceMatrix.py
diff --git a/..._MF32_MT151_LCOMP1_ResonanceParameters.py → ..._MF32_MT151_LCOMP1_ResonanceParameters.py b/..._MF32_MT151_LCOMP1_ResonanceParameters.py → ..._MF32_MT151_LCOMP1_ResonanceParameters.py
diff --git a/...ENDFtk_MF32_MT151_LCOMP2_ParticlePairs.py → ...ENDFtk_MF32_MT151_LCOMP2_ParticlePairs.py b/...ENDFtk_MF32_MT151_LCOMP2_ParticlePairs.py → ...ENDFtk_MF32_MT151_LCOMP2_ParticlePairs.py
diff --git a/...tk_MF32_MT151_LCOMP2_ResonanceChannels.py → ...tk_MF32_MT151_LCOMP2_ResonanceChannels.py b/...tk_MF32_MT151_LCOMP2_ResonanceChannels.py → ...tk_MF32_MT151_LCOMP2_ResonanceChannels.py
diff --git a/..._MF32_MT151_LCOMP2_ResonanceParameters.py → ..._MF32_MT151_LCOMP2_ResonanceParameters.py b/..._MF32_MT151_LCOMP2_ResonanceParameters.py → ..._MF32_MT151_LCOMP2_ResonanceParameters.py
diff --git a/...est_ENDFtk_MF32_MT151_LCOMP2_SpinGroup.py → ...est_ENDFtk_MF32_MT151_LCOMP2_SpinGroup.py b/...est_ENDFtk_MF32_MT151_LCOMP2_SpinGroup.py → ...est_ENDFtk_MF32_MT151_LCOMP2_SpinGroup.py
diff --git a/..._MT151_CompactBreitWignerUncertainties.py → ..._MT151_CompactBreitWignerUncertainties.py b/..._MT151_CompactBreitWignerUncertainties.py → ..._MT151_CompactBreitWignerUncertainties.py
diff --git a/...tk_MF32_MT151_CompactCorrelationMatrix.py → ...tk_MF32_MT151_CompactCorrelationMatrix.py b/...tk_MF32_MT151_CompactCorrelationMatrix.py → ...tk_MF32_MT151_CompactCorrelationMatrix.py
diff --git a/...F32_MT151_CompactMultiLevelBreitWigner.py → ...F32_MT151_CompactMultiLevelBreitWigner.py b/...F32_MT151_CompactMultiLevelBreitWigner.py → ...F32_MT151_CompactMultiLevelBreitWigner.py
diff --git a/...NDFtk_MF32_MT151_CompactRMatrixLimited.py → ...NDFtk_MF32_MT151_CompactRMatrixLimited.py b/...NDFtk_MF32_MT151_CompactRMatrixLimited.py → ...NDFtk_MF32_MT151_CompactRMatrixLimited.py
diff --git a/...151_CompactRMatrixLimitedUncertainties.py → ...151_CompactRMatrixLimitedUncertainties.py b/...151_CompactRMatrixLimitedUncertainties.py → ...151_CompactRMatrixLimitedUncertainties.py
diff --git a/...st_ENDFtk_MF32_MT151_CompactReichMoore.py → ...st_ENDFtk_MF32_MT151_CompactReichMoore.py b/...st_ENDFtk_MF32_MT151_CompactReichMoore.py → ...st_ENDFtk_MF32_MT151_CompactReichMoore.py
diff --git a/...2_MT151_CompactReichMooreUncertainties.py → ...2_MT151_CompactReichMooreUncertainties.py b/...2_MT151_CompactReichMooreUncertainties.py → ...2_MT151_CompactReichMooreUncertainties.py
diff --git a/...32_MT151_CompactSingleLevelBreitWigner.py → ...32_MT151_CompactSingleLevelBreitWigner.py b/...32_MT151_CompactSingleLevelBreitWigner.py → ...32_MT151_CompactSingleLevelBreitWigner.py
diff --git a/...F32_MT151_GeneralMultiLevelBreitWigner.py → ...F32_MT151_GeneralMultiLevelBreitWigner.py b/...F32_MT151_GeneralMultiLevelBreitWigner.py → ...F32_MT151_GeneralMultiLevelBreitWigner.py
diff --git a/...NDFtk_MF32_MT151_GeneralRMatrixLimited.py → ...NDFtk_MF32_MT151_GeneralRMatrixLimited.py b/...NDFtk_MF32_MT151_GeneralRMatrixLimited.py → ...NDFtk_MF32_MT151_GeneralRMatrixLimited.py
diff --git a/...st_ENDFtk_MF32_MT151_GeneralReichMoore.py → ...st_ENDFtk_MF32_MT151_GeneralReichMoore.py b/...st_ENDFtk_MF32_MT151_GeneralReichMoore.py → ...st_ENDFtk_MF32_MT151_GeneralReichMoore.py
diff --git a/...32_MT151_GeneralSingleLevelBreitWigner.py → ...32_MT151_GeneralSingleLevelBreitWigner.py b/...32_MT151_GeneralSingleLevelBreitWigner.py → ...32_MT151_GeneralSingleLevelBreitWigner.py
diff --git a/...tk_MF32_MT151_LimitedBreitWignerLValue.py → ...tk_MF32_MT151_LimitedBreitWignerLValue.py b/...tk_MF32_MT151_LimitedBreitWignerLValue.py → ...tk_MF32_MT151_LimitedBreitWignerLValue.py
diff --git a/...F32_MT151_LimitedMultiLevelBreitWigner.py → ...F32_MT151_LimitedMultiLevelBreitWigner.py b/...F32_MT151_LimitedMultiLevelBreitWigner.py → ...F32_MT151_LimitedMultiLevelBreitWigner.py
diff --git a/...32_MT151_LimitedSingleLevelBreitWigner.py → ...32_MT151_LimitedSingleLevelBreitWigner.py b/...32_MT151_LimitedSingleLevelBreitWigner.py → ...32_MT151_LimitedSingleLevelBreitWigner.py
diff --git a/...eichMooreScatteringRadiusUncertainties.py → ...eichMooreScatteringRadiusUncertainties.py b/...eichMooreScatteringRadiusUncertainties.py → ...eichMooreScatteringRadiusUncertainties.py
diff --git a/...MF32_MT151_ScatteringRadiusCovariances.py → ...MF32_MT151_ScatteringRadiusCovariances.py b/...MF32_MT151_ScatteringRadiusCovariances.py → ...MF32_MT151_ScatteringRadiusCovariances.py
diff --git a/..._MF32_MT151_ShortRangeBreitWignerBlock.py → ..._MF32_MT151_ShortRangeBreitWignerBlock.py b/..._MF32_MT151_ShortRangeBreitWignerBlock.py → ..._MF32_MT151_ShortRangeBreitWignerBlock.py
diff --git a/...32_MT151_ShortRangeRMatrixLimitedBlock.py → ...32_MT151_ShortRangeRMatrixLimitedBlock.py b/...32_MT151_ShortRangeRMatrixLimitedBlock.py → ...32_MT151_ShortRangeRMatrixLimitedBlock.py
diff --git a/...k_MF32_MT151_ShortRangeReichMooreBlock.py → ...k_MF32_MT151_ShortRangeReichMooreBlock.py b/...k_MF32_MT151_ShortRangeReichMooreBlock.py → ...k_MF32_MT151_ShortRangeReichMooreBlock.py
diff --git a/..._MF32_MT151_UnresolvedCovarianceMatrix.py → ..._MF32_MT151_UnresolvedCovarianceMatrix.py b/..._MF32_MT151_UnresolvedCovarianceMatrix.py → ..._MF32_MT151_UnresolvedCovarianceMatrix.py
diff --git a/...est_ENDFtk_MF32_MT151_UnresolvedLValue.py → ...est_ENDFtk_MF32_MT151_UnresolvedLValue.py b/...est_ENDFtk_MF32_MT151_UnresolvedLValue.py → ...est_ENDFtk_MF32_MT151_UnresolvedLValue.py
diff --git a/...32_MT151_UnresolvedRelativeCovariances.py → ...32_MT151_UnresolvedRelativeCovariances.py b/...32_MT151_UnresolvedRelativeCovariances.py → ...32_MT151_UnresolvedRelativeCovariances.py
diff --git a/python/test/Test_ENDFtk_MF33_Section.py → python/test/MF33/Test_ENDFtk_MF33_Section.py b/python/test/Test_ENDFtk_MF33_Section.py → python/test/MF33/Test_ENDFtk_MF33_Section.py
diff --git a/python/test/MF33/__init__.py b/python/test/MF33/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...on/test/Test_ENDFtk_MF34_LegendreBlock.py → ...st/MF34/Test_ENDFtk_MF34_LegendreBlock.py b/...on/test/Test_ENDFtk_MF34_LegendreBlock.py → ...st/MF34/Test_ENDFtk_MF34_LegendreBlock.py
diff --git a/...on/test/Test_ENDFtk_MF34_ReactionBlock.py → ...st/MF34/Test_ENDFtk_MF34_ReactionBlock.py b/...on/test/Test_ENDFtk_MF34_ReactionBlock.py → ...st/MF34/Test_ENDFtk_MF34_ReactionBlock.py
diff --git a/python/test/Test_ENDFtk_MF34_Section.py → python/test/MF34/Test_ENDFtk_MF34_Section.py b/python/test/Test_ENDFtk_MF34_Section.py → python/test/MF34/Test_ENDFtk_MF34_Section.py
diff --git a/python/test/MF34/__init__.py b/python/test/MF34/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_MF35_Section.py → python/test/MF35/Test_ENDFtk_MF35_Section.py b/python/test/Test_ENDFtk_MF35_Section.py → python/test/MF35/Test_ENDFtk_MF35_Section.py
diff --git a/python/test/Test_ENDFtk_MF35_SquareMatrix.py → ...est/MF35/Test_ENDFtk_MF35_SquareMatrix.py b/python/test/Test_ENDFtk_MF35_SquareMatrix.py → ...est/MF35/Test_ENDFtk_MF35_SquareMatrix.py
diff --git a/python/test/MF35/__init__.py b/python/test/MF35/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_MF4_Isotropic.py → python/test/MF4/Test_ENDFtk_MF4_Isotropic.py b/python/test/Test_ENDFtk_MF4_Isotropic.py → python/test/MF4/Test_ENDFtk_MF4_Isotropic.py
diff --git a/...t/Test_ENDFtk_MF4_LegendreCoefficients.py → ...4/Test_ENDFtk_MF4_LegendreCoefficients.py b/...t/Test_ENDFtk_MF4_LegendreCoefficients.py → ...4/Test_ENDFtk_MF4_LegendreCoefficients.py
diff --git a/.../Test_ENDFtk_MF4_LegendreDistributions.py → .../Test_ENDFtk_MF4_LegendreDistributions.py b/.../Test_ENDFtk_MF4_LegendreDistributions.py → .../Test_ENDFtk_MF4_LegendreDistributions.py
diff --git a/...est/Test_ENDFtk_MF4_MixedDistributions.py → ...MF4/Test_ENDFtk_MF4_MixedDistributions.py b/...est/Test_ENDFtk_MF4_MixedDistributions.py → ...MF4/Test_ENDFtk_MF4_MixedDistributions.py
diff --git a/python/test/Test_ENDFtk_MF4_Section.py → python/test/MF4/Test_ENDFtk_MF4_Section.py b/python/test/Test_ENDFtk_MF4_Section.py → python/test/MF4/Test_ENDFtk_MF4_Section.py
diff --git a/.../Test_ENDFtk_MF4_TabulatedDistribution.py → .../Test_ENDFtk_MF4_TabulatedDistribution.py b/.../Test_ENDFtk_MF4_TabulatedDistribution.py → .../Test_ENDFtk_MF4_TabulatedDistribution.py
diff --git a/...Test_ENDFtk_MF4_TabulatedDistributions.py → ...Test_ENDFtk_MF4_TabulatedDistributions.py b/...Test_ENDFtk_MF4_TabulatedDistributions.py → ...Test_ENDFtk_MF4_TabulatedDistributions.py
diff --git a/python/test/MF4/__init__.py b/python/test/MF4/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_MF40_LevelBlock.py → .../test/MF40/Test_ENDFtk_MF40_LevelBlock.py b/python/test/Test_ENDFtk_MF40_LevelBlock.py → .../test/MF40/Test_ENDFtk_MF40_LevelBlock.py
diff --git a/python/test/Test_ENDFtk_MF40_Section.py → python/test/MF40/Test_ENDFtk_MF40_Section.py b/python/test/Test_ENDFtk_MF40_Section.py → python/test/MF40/Test_ENDFtk_MF40_Section.py
diff --git a/python/test/MF40/__init__.py b/python/test/MF40/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...t/Test_ENDFtk_MF5_DistributionFunction.py → ...5/Test_ENDFtk_MF5_DistributionFunction.py b/...t/Test_ENDFtk_MF5_DistributionFunction.py → ...5/Test_ENDFtk_MF5_DistributionFunction.py
diff --git a/...t/Test_ENDFtk_MF5_EffectiveTemperature.py → ...5/Test_ENDFtk_MF5_EffectiveTemperature.py b/...t/Test_ENDFtk_MF5_EffectiveTemperature.py → ...5/Test_ENDFtk_MF5_EffectiveTemperature.py
diff --git a/...st/Test_ENDFtk_MF5_EvaporationSpectrum.py → ...F5/Test_ENDFtk_MF5_EvaporationSpectrum.py b/...st/Test_ENDFtk_MF5_EvaporationSpectrum.py → ...F5/Test_ENDFtk_MF5_EvaporationSpectrum.py
diff --git a/..._ENDFtk_MF5_GeneralEvaporationSpectrum.py → ..._ENDFtk_MF5_GeneralEvaporationSpectrum.py b/..._ENDFtk_MF5_GeneralEvaporationSpectrum.py → ..._ENDFtk_MF5_GeneralEvaporationSpectrum.py
diff --git a/...est/Test_ENDFtk_MF5_MadlandNixSpectrum.py → ...MF5/Test_ENDFtk_MF5_MadlandNixSpectrum.py b/...est/Test_ENDFtk_MF5_MadlandNixSpectrum.py → ...MF5/Test_ENDFtk_MF5_MadlandNixSpectrum.py
diff --git a/...t_ENDFtk_MF5_MaxwellianFissionSpectrum.py → ...t_ENDFtk_MF5_MaxwellianFissionSpectrum.py b/...t_ENDFtk_MF5_MaxwellianFissionSpectrum.py → ...t_ENDFtk_MF5_MaxwellianFissionSpectrum.py
diff --git a/..._ENDFtk_MF5_OutgoingEnergyDistribution.py → ..._ENDFtk_MF5_OutgoingEnergyDistribution.py b/..._ENDFtk_MF5_OutgoingEnergyDistribution.py → ..._ENDFtk_MF5_OutgoingEnergyDistribution.py
diff --git a/python/test/Test_ENDFtk_MF5_Parameter.py → python/test/MF5/Test_ENDFtk_MF5_Parameter.py b/python/test/Test_ENDFtk_MF5_Parameter.py → python/test/MF5/Test_ENDFtk_MF5_Parameter.py
diff --git a/...st/Test_ENDFtk_MF5_PartialDistribution.py → ...F5/Test_ENDFtk_MF5_PartialDistribution.py b/...st/Test_ENDFtk_MF5_PartialDistribution.py → ...F5/Test_ENDFtk_MF5_PartialDistribution.py
diff --git a/python/test/Test_ENDFtk_MF5_Probability.py → ...n/test/MF5/Test_ENDFtk_MF5_Probability.py b/python/test/Test_ENDFtk_MF5_Probability.py → ...n/test/MF5/Test_ENDFtk_MF5_Probability.py
diff --git a/python/test/Test_ENDFtk_MF5_Section.py → python/test/MF5/Test_ENDFtk_MF5_Section.py b/python/test/Test_ENDFtk_MF5_Section.py → python/test/MF5/Test_ENDFtk_MF5_Section.py
diff --git a/...test/Test_ENDFtk_MF5_TabulatedSpectrum.py → .../MF5/Test_ENDFtk_MF5_TabulatedSpectrum.py b/...test/Test_ENDFtk_MF5_TabulatedSpectrum.py → .../MF5/Test_ENDFtk_MF5_TabulatedSpectrum.py
diff --git a/python/test/Test_ENDFtk_MF5_WattSpectrum.py → .../test/MF5/Test_ENDFtk_MF5_WattSpectrum.py b/python/test/Test_ENDFtk_MF5_WattSpectrum.py → .../test/MF5/Test_ENDFtk_MF5_WattSpectrum.py
diff --git a/python/test/MF5/__init__.py b/python/test/MF5/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/.../test/Test_ENDFtk_MF6_LAW1_KalbachMann.py → .../LAW1/Test_ENDFtk_MF6_LAW1_KalbachMann.py b/.../test/Test_ENDFtk_MF6_LAW1_KalbachMann.py → .../LAW1/Test_ENDFtk_MF6_LAW1_KalbachMann.py
diff --git a/...t_ENDFtk_MF6_LAW1_LegendreCoefficients.py → ...t_ENDFtk_MF6_LAW1_LegendreCoefficients.py b/...t_ENDFtk_MF6_LAW1_LegendreCoefficients.py → ...t_ENDFtk_MF6_LAW1_LegendreCoefficients.py
diff --git a/..._ENDFtk_MF6_LAW1_TabulatedDistribution.py → ..._ENDFtk_MF6_LAW1_TabulatedDistribution.py b/..._ENDFtk_MF6_LAW1_TabulatedDistribution.py → ..._ENDFtk_MF6_LAW1_TabulatedDistribution.py
diff --git a/..._ENDFtk_MF6_LAW1_ThermalScatteringData.py → ..._ENDFtk_MF6_LAW1_ThermalScatteringData.py b/..._ENDFtk_MF6_LAW1_ThermalScatteringData.py → ..._ENDFtk_MF6_LAW1_ThermalScatteringData.py
diff --git a/...t_ENDFtk_MF6_LAW2_LegendreCoefficients.py → ...t_ENDFtk_MF6_LAW2_LegendreCoefficients.py b/...t_ENDFtk_MF6_LAW2_LegendreCoefficients.py → ...t_ENDFtk_MF6_LAW2_LegendreCoefficients.py
diff --git a/..._ENDFtk_MF6_LAW2_TabulatedDistribution.py → ..._ENDFtk_MF6_LAW2_TabulatedDistribution.py b/..._ENDFtk_MF6_LAW2_TabulatedDistribution.py → ..._ENDFtk_MF6_LAW2_TabulatedDistribution.py
diff --git a/...t_ENDFtk_MF6_LAW5_LegendreCoefficients.py → ...t_ENDFtk_MF6_LAW5_LegendreCoefficients.py b/...t_ENDFtk_MF6_LAW5_LegendreCoefficients.py → ...t_ENDFtk_MF6_LAW5_LegendreCoefficients.py
diff --git a/...Ftk_MF6_LAW5_NuclearAmplitudeExpansion.py → ...Ftk_MF6_LAW5_NuclearAmplitudeExpansion.py b/...Ftk_MF6_LAW5_NuclearAmplitudeExpansion.py → ...Ftk_MF6_LAW5_NuclearAmplitudeExpansion.py
diff --git a/...NDFtk_MF6_LAW5_NuclearPlusInterference.py → ...NDFtk_MF6_LAW5_NuclearPlusInterference.py b/...NDFtk_MF6_LAW5_NuclearPlusInterference.py → ...NDFtk_MF6_LAW5_NuclearPlusInterference.py
diff --git a/...st_ENDFtk_MF6_LAW7_AngularDistribution.py → ...st_ENDFtk_MF6_LAW7_AngularDistribution.py b/...st_ENDFtk_MF6_LAW7_AngularDistribution.py → ...st_ENDFtk_MF6_LAW7_AngularDistribution.py
diff --git a/...est_ENDFtk_MF6_LAW7_EnergyDistribution.py → ...est_ENDFtk_MF6_LAW7_EnergyDistribution.py b/...est_ENDFtk_MF6_LAW7_EnergyDistribution.py → ...est_ENDFtk_MF6_LAW7_EnergyDistribution.py
diff --git a/...k_MF6_ChargedParticleElasticScattering.py → ...k_MF6_ChargedParticleElasticScattering.py b/...k_MF6_ChargedParticleElasticScattering.py → ...k_MF6_ChargedParticleElasticScattering.py
diff --git a/...t/Test_ENDFtk_MF6_ContinuumEnergyAngle.py → ...6/Test_ENDFtk_MF6_ContinuumEnergyAngle.py b/...t/Test_ENDFtk_MF6_ContinuumEnergyAngle.py → ...6/Test_ENDFtk_MF6_ContinuumEnergyAngle.py
diff --git a/.../test/Test_ENDFtk_MF6_DefinedElsewhere.py → ...t/MF6/Test_ENDFtk_MF6_DefinedElsewhere.py b/.../test/Test_ENDFtk_MF6_DefinedElsewhere.py → ...t/MF6/Test_ENDFtk_MF6_DefinedElsewhere.py
diff --git a/...Test_ENDFtk_MF6_DiscreteTwoBodyRecoils.py → ...Test_ENDFtk_MF6_DiscreteTwoBodyRecoils.py b/...Test_ENDFtk_MF6_DiscreteTwoBodyRecoils.py → ...Test_ENDFtk_MF6_DiscreteTwoBodyRecoils.py
diff --git a/...t_ENDFtk_MF6_DiscreteTwoBodyScattering.py → ...t_ENDFtk_MF6_DiscreteTwoBodyScattering.py b/...t_ENDFtk_MF6_DiscreteTwoBodyScattering.py → ...t_ENDFtk_MF6_DiscreteTwoBodyScattering.py
diff --git a/...t_ENDFtk_MF6_IsotropicDiscreteEmission.py → ...t_ENDFtk_MF6_IsotropicDiscreteEmission.py b/...t_ENDFtk_MF6_IsotropicDiscreteEmission.py → ...t_ENDFtk_MF6_IsotropicDiscreteEmission.py
diff --git a/.../Test_ENDFtk_MF6_LaboratoryAngleEnergy.py → .../Test_ENDFtk_MF6_LaboratoryAngleEnergy.py b/.../Test_ENDFtk_MF6_LaboratoryAngleEnergy.py → .../Test_ENDFtk_MF6_LaboratoryAngleEnergy.py
diff --git a/python/test/Test_ENDFtk_MF6_Multiplicity.py → .../test/MF6/Test_ENDFtk_MF6_Multiplicity.py b/python/test/Test_ENDFtk_MF6_Multiplicity.py → .../test/MF6/Test_ENDFtk_MF6_Multiplicity.py
diff --git a/...n/test/Test_ENDFtk_MF6_NBodyPhaseSpace.py → ...st/MF6/Test_ENDFtk_MF6_NBodyPhaseSpace.py b/...n/test/Test_ENDFtk_MF6_NBodyPhaseSpace.py → ...st/MF6/Test_ENDFtk_MF6_NBodyPhaseSpace.py
diff --git a/...n/test/Test_ENDFtk_MF6_ReactionProduct.py → ...st/MF6/Test_ENDFtk_MF6_ReactionProduct.py b/...n/test/Test_ENDFtk_MF6_ReactionProduct.py → ...st/MF6/Test_ENDFtk_MF6_ReactionProduct.py
diff --git a/python/test/Test_ENDFtk_MF6_Section.py → python/test/MF6/Test_ENDFtk_MF6_Section.py b/python/test/Test_ENDFtk_MF6_Section.py → python/test/MF6/Test_ENDFtk_MF6_Section.py
diff --git a/python/test/Test_ENDFtk_MF6_Unknown.py → python/test/MF6/Test_ENDFtk_MF6_Unknown.py b/python/test/Test_ENDFtk_MF6_Unknown.py → python/test/MF6/Test_ENDFtk_MF6_Unknown.py
diff --git a/python/test/MF6/__init__.py b/python/test/MF6/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...st/Test_ENDFtk_MF7_MT2_CoherentElastic.py → ...T2/Test_ENDFtk_MF7_MT2_CoherentElastic.py b/...st/Test_ENDFtk_MF7_MT2_CoherentElastic.py → ...T2/Test_ENDFtk_MF7_MT2_CoherentElastic.py
diff --git a/.../Test_ENDFtk_MF7_MT2_IncoherentElastic.py → .../Test_ENDFtk_MF7_MT2_IncoherentElastic.py b/.../Test_ENDFtk_MF7_MT2_IncoherentElastic.py → .../Test_ENDFtk_MF7_MT2_IncoherentElastic.py
diff --git a/.../test/Test_ENDFtk_MF7_MT2_MixedElastic.py → ...7/MT2/Test_ENDFtk_MF7_MT2_MixedElastic.py b/.../test/Test_ENDFtk_MF7_MT2_MixedElastic.py → ...7/MT2/Test_ENDFtk_MF7_MT2_MixedElastic.py
diff --git a/...est_ENDFtk_MF7_MT4_AnalyticalFunctions.py → ...est_ENDFtk_MF7_MT4_AnalyticalFunctions.py b/...est_ENDFtk_MF7_MT4_AnalyticalFunctions.py → ...est_ENDFtk_MF7_MT4_AnalyticalFunctions.py
diff --git a/...st_ENDFtk_MF7_MT4_EffectiveTemperature.py → ...st_ENDFtk_MF7_MT4_EffectiveTemperature.py b/...st_ENDFtk_MF7_MT4_EffectiveTemperature.py → ...st_ENDFtk_MF7_MT4_EffectiveTemperature.py
diff --git a/...Test_ENDFtk_MF7_MT4_ScatteringFunction.py → ...Test_ENDFtk_MF7_MT4_ScatteringFunction.py b/...Test_ENDFtk_MF7_MT4_ScatteringFunction.py → ...Test_ENDFtk_MF7_MT4_ScatteringFunction.py
diff --git a/..._ENDFtk_MF7_MT4_ScatteringLawConstants.py → ..._ENDFtk_MF7_MT4_ScatteringLawConstants.py b/..._ENDFtk_MF7_MT4_ScatteringLawConstants.py → ..._ENDFtk_MF7_MT4_ScatteringLawConstants.py
diff --git a/...Test_ENDFtk_MF7_MT4_TabulatedFunctions.py → ...Test_ENDFtk_MF7_MT4_TabulatedFunctions.py b/...Test_ENDFtk_MF7_MT4_TabulatedFunctions.py → ...Test_ENDFtk_MF7_MT4_TabulatedFunctions.py
diff --git a/...st_ENDFtk_MF7_MT451_ElementInformation.py → ...st_ENDFtk_MF7_MT451_ElementInformation.py b/...st_ENDFtk_MF7_MT451_ElementInformation.py → ...st_ENDFtk_MF7_MT451_ElementInformation.py
diff --git a/python/test/Test_ENDFtk_MF7_MT2_Section.py → ...n/test/MF7/Test_ENDFtk_MF7_MT2_Section.py b/python/test/Test_ENDFtk_MF7_MT2_Section.py → ...n/test/MF7/Test_ENDFtk_MF7_MT2_Section.py
diff --git a/python/test/Test_ENDFtk_MF7_MT451_Section.py → ...test/MF7/Test_ENDFtk_MF7_MT451_Section.py b/python/test/Test_ENDFtk_MF7_MT451_Section.py → ...test/MF7/Test_ENDFtk_MF7_MT451_Section.py
diff --git a/python/test/Test_ENDFtk_MF7_MT4_Section.py → ...n/test/MF7/Test_ENDFtk_MF7_MT4_Section.py b/python/test/Test_ENDFtk_MF7_MT4_Section.py → ...n/test/MF7/Test_ENDFtk_MF7_MT4_Section.py
diff --git a/python/test/MF7/__init__.py b/python/test/MF7/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/.../test/Test_ENDFtk_MF8_FissionYieldData.py → ...t/MF8/Test_ENDFtk_MF8_FissionYieldData.py b/.../test/Test_ENDFtk_MF8_FissionYieldData.py → ...t/MF8/Test_ENDFtk_MF8_FissionYieldData.py
diff --git a/python/test/Test_ENDFtk_MF8_MT454_Section.py → ...test/MF8/Test_ENDFtk_MF8_MT454_Section.py b/python/test/Test_ENDFtk_MF8_MT454_Section.py → ...test/MF8/Test_ENDFtk_MF8_MT454_Section.py
diff --git a/..._ENDFtk_MF8_MT457_AverageDecayEnergies.py → ..._ENDFtk_MF8_MT457_AverageDecayEnergies.py b/..._ENDFtk_MF8_MT457_AverageDecayEnergies.py → ..._ENDFtk_MF8_MT457_AverageDecayEnergies.py
diff --git a/...st_ENDFtk_MF8_MT457_ContinuousSpectrum.py → ...st_ENDFtk_MF8_MT457_ContinuousSpectrum.py b/...st_ENDFtk_MF8_MT457_ContinuousSpectrum.py → ...st_ENDFtk_MF8_MT457_ContinuousSpectrum.py
diff --git a/...n/test/Test_ENDFtk_MF8_MT457_DecayMode.py → ...st/MF8/Test_ENDFtk_MF8_MT457_DecayMode.py b/...n/test/Test_ENDFtk_MF8_MT457_DecayMode.py → ...st/MF8/Test_ENDFtk_MF8_MT457_DecayMode.py
diff --git a/.../test/Test_ENDFtk_MF8_MT457_DecayModes.py → ...t/MF8/Test_ENDFtk_MF8_MT457_DecayModes.py b/.../test/Test_ENDFtk_MF8_MT457_DecayModes.py → ...t/MF8/Test_ENDFtk_MF8_MT457_DecayModes.py
diff --git a/...st/Test_ENDFtk_MF8_MT457_DecaySpectrum.py → ...F8/Test_ENDFtk_MF8_MT457_DecaySpectrum.py b/...st/Test_ENDFtk_MF8_MT457_DecaySpectrum.py → ...F8/Test_ENDFtk_MF8_MT457_DecaySpectrum.py
diff --git a/...Test_ENDFtk_MF8_MT457_DiscreteSpectrum.py → ...Test_ENDFtk_MF8_MT457_DiscreteSpectrum.py b/...Test_ENDFtk_MF8_MT457_DiscreteSpectrum.py → ...Test_ENDFtk_MF8_MT457_DiscreteSpectrum.py
diff --git a/python/test/Test_ENDFtk_MF8_MT457_Section.py → ...test/MF8/Test_ENDFtk_MF8_MT457_Section.py b/python/test/Test_ENDFtk_MF8_MT457_Section.py → ...test/MF8/Test_ENDFtk_MF8_MT457_Section.py
diff --git a/python/test/Test_ENDFtk_MF8_MT459_Section.py → ...test/MF8/Test_ENDFtk_MF8_MT459_Section.py b/python/test/Test_ENDFtk_MF8_MT459_Section.py → ...test/MF8/Test_ENDFtk_MF8_MT459_Section.py
diff --git a/python/test/MF8/__init__.py b/python/test/MF8/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/...n/test/Test_ENDFtk_MF9_ReactionProduct.py → ...st/MF9/Test_ENDFtk_MF9_ReactionProduct.py b/...n/test/Test_ENDFtk_MF9_ReactionProduct.py → ...st/MF9/Test_ENDFtk_MF9_ReactionProduct.py
diff --git a/python/test/Test_ENDFtk_MF9_Section.py → python/test/MF9/Test_ENDFtk_MF9_Section.py b/python/test/Test_ENDFtk_MF9_Section.py → python/test/MF9/Test_ENDFtk_MF9_Section.py
diff --git a/python/test/MF9/__init__.py b/python/test/MF9/__init__.py
@@ -0,0 +1 @@
+# empty __init__.py
diff --git a/python/test/Test_ENDFtk_Tree_File.py → python/test/tree/Test_ENDFtk_Tree_File.py b/python/test/Test_ENDFtk_Tree_File.py → python/test/tree/Test_ENDFtk_Tree_File.py
diff --git a/python/test/Test_ENDFtk_Tree_Material.py → ...on/test/tree/Test_ENDFtk_Tree_Material.py b/python/test/Test_ENDFtk_Tree_Material.py → ...on/test/tree/Test_ENDFtk_Tree_Material.py
diff --git a/python/test/Test_ENDFtk_Tree_Tape.py → python/test/tree/Test_ENDFtk_Tree_Tape.py b/python/test/Test_ENDFtk_Tree_Tape.py → python/test/tree/Test_ENDFtk_Tree_Tape.py
diff --git a/src/ENDFtk/ControlRecord/test/CMakeLists.txt b/src/ENDFtk/ControlRecord/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.ControlRecord.test ControlRecord.test.cpp )
-target_compile_options( ENDFtk.ControlRecord.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.ControlRecord.test PUBLIC ENDFtk ) 
-add_test( NAME ENDFtk.ControlRecord COMMAND ENDFtk.ControlRecord.test )
+add_cpp_test( ControlRecord ControlRecord.test.cpp )
diff --git a/src/ENDFtk/DirectoryRecord/test/CMakeLists.txt b/src/ENDFtk/DirectoryRecord/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.DirectoryRecord.test DirectoryRecord.test.cpp )
-target_compile_options( ENDFtk.DirectoryRecord.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.DirectoryRecord.test PUBLIC ENDFtk ) 
-add_test( NAME ENDFtk.DirectoryRecord COMMAND ENDFtk.DirectoryRecord.test )
+add_cpp_test( DirectoryRecord DirectoryRecord.test.cpp )
diff --git a/src/ENDFtk/HeadRecord/test/CMakeLists.txt b/src/ENDFtk/HeadRecord/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.HeadRecord.test HeadRecord.test.cpp )
-target_compile_options( ENDFtk.HeadRecord.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.HeadRecord.test PUBLIC ENDFtk ) 
-add_test( NAME ENDFtk.HeadRecord COMMAND ENDFtk.HeadRecord.test )
+add_cpp_test( HeadRecord HeadRecord.test.cpp )
diff --git a/src/ENDFtk/InterpolationRecord/test/CMakeLists.txt b/src/ENDFtk/InterpolationRecord/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.InterpolationRecord.test InterpolationRecord.test.cpp )
-target_compile_options( ENDFtk.InterpolationRecord.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.InterpolationRecord.test PUBLIC ENDFtk )
-add_test( NAME ENDFtk.InterpolationRecord COMMAND ENDFtk.InterpolationRecord.test )
+add_cpp_test( InterpolationRecord InterpolationRecord.test.cpp )
diff --git a/src/ENDFtk/InterpolationSequenceRecord/test/CMakeLists.txt b/src/ENDFtk/InterpolationSequenceRecord/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.InterpolationSequenceRecord.test InterpolationSequenceRecord.test.cpp )
-target_compile_options( ENDFtk.InterpolationSequenceRecord.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.InterpolationSequenceRecord.test PUBLIC ENDFtk ) 
-add_test( NAME ENDFtk.InterpolationSequenceRecord COMMAND ENDFtk.InterpolationSequenceRecord.test )
+add_cpp_test( InterpolationSequenceRecord InterpolationSequenceRecord.test.cpp )
diff --git a/src/ENDFtk/ListRecord/test/CMakeLists.txt b/src/ENDFtk/ListRecord/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.ListRecord.test ListRecord.test.cpp )
-target_compile_options( ENDFtk.ListRecord.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.ListRecord.test PUBLIC ENDFtk ) 
-add_test( NAME ENDFtk.ListRecord COMMAND ENDFtk.ListRecord.test )
+add_cpp_test( ListRecord ListRecord.test.cpp )
diff --git a/src/ENDFtk/Material/test/CMakeLists.txt b/src/ENDFtk/Material/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.Material.test Material.test.cpp )
-target_compile_options( ENDFtk.Material.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.Material.test PUBLIC ENDFtk )
-add_test( NAME ENDFtk.Material COMMAND ENDFtk.Material.test )
+add_cpp_test( Material Material.test.cpp )
diff --git a/src/ENDFtk/StructureDivision/test/CMakeLists.txt b/src/ENDFtk/StructureDivision/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.StructureDivision.test StructureDivision.test.cpp )
-target_compile_options( ENDFtk.StructureDivision.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.StructureDivision.test PUBLIC ENDFtk ) 
-add_test( NAME ENDFtk.StructureDivision COMMAND ENDFtk.StructureDivision.test )
+add_cpp_test( StructureDivision StructureDivision.test.cpp )
diff --git a/src/ENDFtk/TabulationRecord/test/CMakeLists.txt b/src/ENDFtk/TabulationRecord/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.TabulationRecord.test TabulationRecord.test.cpp )
-target_compile_options( ENDFtk.TabulationRecord.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.TabulationRecord.test PUBLIC ENDFtk ) 
-add_test( NAME ENDFtk.TabulationRecord COMMAND ENDFtk.TabulationRecord.test )
+add_cpp_test( TabulationRecord TabulationRecord.test.cpp )
diff --git a/src/ENDFtk/Tape/test/CMakeLists.txt b/src/ENDFtk/Tape/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.Tape.test Tape.test.cpp )
-target_compile_options( ENDFtk.Tape.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.Tape.test PUBLIC ENDFtk )
-add_test( NAME ENDFtk.Tape COMMAND ENDFtk.Tape.test )
+add_cpp_test( Tape Tape.test.cpp )
diff --git a/src/ENDFtk/TapeIdentification/test/CMakeLists.txt b/src/ENDFtk/TapeIdentification/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.TapeIdentification.test TapeIdentification.test.cpp )
-target_compile_options( ENDFtk.TapeIdentification.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.TapeIdentification.test PUBLIC ENDFtk ) 
-add_test( NAME ENDFtk.TapeIdentification COMMAND ENDFtk.TapeIdentification.test )
+add_cpp_test( TapeIdentification TapeIdentification.test.cpp )
diff --git a/src/ENDFtk/TextRecord/test/CMakeLists.txt b/src/ENDFtk/TextRecord/test/CMakeLists.txt
@@ -1,14 +1 @@
-
-add_executable( ENDFtk.TextRecord.test TextRecord.test.cpp )
-target_compile_options( ENDFtk.TextRecord.test PRIVATE ${${PREFIX}_common_flags}
-$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags}
-$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
-$<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags}
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
-$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
-
-${CXX_appended_flags} ${ENDFtk_appended_flags} )
-target_link_libraries( ENDFtk.TextRecord.test PUBLIC ENDFtk ) 
-add_test( NAME ENDFtk.TextRecord COMMAND ENDFtk.TextRecord.test )
+add_cpp_test( TextRecord TextRecord.test.cpp )