Updating MF14

Author: whaeck

CMakeLists.txt

@@ -274,12 +274,12 @@ if( ENDFtk.python )
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/13.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/13/TotalCrossSection.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/13/PartialCrossSection.python.cpp
-#      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14.python.cpp
-#      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14/IsotropicDiscretePhoton.python.cpp
-#      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14/LegendreCoefficients.python.cpp
-#      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14/TabulatedDistribution.python.cpp
-#      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14/LegendreDistributions.python.cpp
-#      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14/TabulatedDistributions.python.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14.python.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14/IsotropicDiscretePhoton.python.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14/LegendreCoefficients.python.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14/TabulatedDistribution.python.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14/LegendreDistributions.python.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/14/TabulatedDistributions.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/15.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/15/OutgoingEnergyDistribution.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/15/TabulatedSpectrum.python.cpp
@@ -306,7 +306,7 @@ if( ENDFtk.python )
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/10.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/12.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/13.python.cpp
-#      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/14.python.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/14.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/15.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/23.python.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/26.python.cpp

cmake/unit_testing.cmake

@@ -198,12 +198,12 @@ add_subdirectory( src/ENDFtk/section/12/test )
 add_subdirectory( src/ENDFtk/section/13/PartialCrossSection/test )
 add_subdirectory( src/ENDFtk/section/13/TotalCrossSection/test )
 add_subdirectory( src/ENDFtk/section/13/test )
-#add_subdirectory( src/ENDFtk/section/14/IsotropicDiscretePhoton/test )
-#add_subdirectory( src/ENDFtk/section/14/LegendreCoefficients/test )
-#add_subdirectory( src/ENDFtk/section/14/LegendreDistributions/test )
-#add_subdirectory( src/ENDFtk/section/14/TabulatedDistribution/test )
-#add_subdirectory( src/ENDFtk/section/14/TabulatedDistributions/test )
-#add_subdirectory( src/ENDFtk/section/14/test )
+add_subdirectory( src/ENDFtk/section/14/IsotropicDiscretePhoton/test )
+add_subdirectory( src/ENDFtk/section/14/LegendreCoefficients/test )
+add_subdirectory( src/ENDFtk/section/14/LegendreDistributions/test )
+add_subdirectory( src/ENDFtk/section/14/TabulatedDistribution/test )
+add_subdirectory( src/ENDFtk/section/14/TabulatedDistributions/test )
+add_subdirectory( src/ENDFtk/section/14/test )
 add_subdirectory( src/ENDFtk/section/15/PartialDistribution/test )
 add_subdirectory( src/ENDFtk/section/15/Probability/test )
 add_subdirectory( src/ENDFtk/section/15/TabulatedSpectrum/OutgoingEnergyDistribution/test )

cmake/unit_testing_python.cmake

@@ -174,11 +174,11 @@ add_python_test( MF13.PartialCrossSection MF13/Test_ENDFtk_MF13_PartialCrossSect
 add_python_test( MF13.TotalCrossSection   MF13/Test_ENDFtk_MF13_TotalCrossSection.py )
 
 #add_python_test( MF14.Section                 MF14/Test_ENDFtk_MF14_Section.py )
-#add_python_test( MF14.IsotropicDiscretePhoton MF14/Test_ENDFtk_MF14_IsotropicDiscretePhoton.py )
-#add_python_test( MF14.LegendreCoefficients    MF14/Test_ENDFtk_MF14_LegendreCoefficients.py )
-#add_python_test( MF14.LegendreDistributions   MF14/Test_ENDFtk_MF14_LegendreDistributions.py )
-#add_python_test( MF14.TabulatedDistribution   MF14/Test_ENDFtk_MF14_TabulatedDistribution.py )
-#add_python_test( MF14.TabulatedDistributions  MF14/Test_ENDFtk_MF14_TabulatedDistributions.py )
+add_python_test( MF14.IsotropicDiscretePhoton MF14/Test_ENDFtk_MF14_IsotropicDiscretePhoton.py )
+add_python_test( MF14.LegendreCoefficients    MF14/Test_ENDFtk_MF14_LegendreCoefficients.py )
+add_python_test( MF14.LegendreDistributions   MF14/Test_ENDFtk_MF14_LegendreDistributions.py )
+add_python_test( MF14.TabulatedDistribution   MF14/Test_ENDFtk_MF14_TabulatedDistribution.py )
+add_python_test( MF14.TabulatedDistributions  MF14/Test_ENDFtk_MF14_TabulatedDistributions.py )
 
 #add_python_test( MF15.Section                    MF15/Test_ENDFtk_MF15_Section.py )
 add_python_test( MF15.OutgoingEnergyDistribution MF15/Test_ENDFtk_MF15_OutgoingEnergyDistribution.py )

python/src/ENDFtk.python.cpp

@@ -95,7 +95,7 @@ PYBIND11_MODULE( ENDFtk, module ) {
   wrapFile_10( module, viewmodule );
   wrapFile_12( module, viewmodule );
   wrapFile_13( module, viewmodule );
-//  wrapFile_14( module, viewmodule );
+  wrapFile_14( module, viewmodule );
   wrapFile_15( module, viewmodule );
   wrapFile_23( module, viewmodule );
   wrapFile_26( module, viewmodule );

python/src/file/14.python.cpp

@@ -30,20 +30,20 @@ void wrapFile_14( python::module& module, python::module& viewmodule ) {
   // wrap sections
   wrapSection_14( submodule, viewmodule );
 
-  // wrap views created by this file
-  // none of these are supposed to be created directly by the user
-  wrapBidirectionalAnyViewOf< Section >(
-      viewmodule,
-      "any_view< section::Type< 14 >, bidirectional >" );
-
-  // create the file
-  python::class_< File > file(
-
-    submodule,
-    "File",
-    "MF14 file - angular distributions of secondary photons"
-  );
-
-  // add standard file definitions
-  addStandardFileDefinitions< File, Section, SectionRange >( file );
+//  // wrap views created by this file
+//  // none of these are supposed to be created directly by the user
+//  wrapBidirectionalAnyViewOf< Section >(
+//      viewmodule,
+//      "any_view< section::Type< 14 >, bidirectional >" );
+//
+//  // create the file
+//  python::class_< File > file(
+//
+//    submodule,
+//    "File",
+//    "MF14 file - angular distributions of secondary photons"
+//  );
+//
+//  // add standard file definitions
+//  addStandardFileDefinitions< File, Section, SectionRange >( file );
 }

python/src/section/14.python.cpp

@@ -5,7 +5,7 @@
 // local includes
 #include "ENDFtk/section/14.hpp"
 #include "definitions.hpp"
-#include "views.hpp"
+#include "tools/views/views-python.hpp"
 
 // namespace aliases
 namespace python = pybind11;

python/src/section/14/IsotropicDiscretePhoton.python.cpp

@@ -5,7 +5,6 @@
 // local includes
 #include "ENDFtk/section/14.hpp"
 #include "definitions.hpp"
-#include "views.hpp"
 
 // namespace aliases
 namespace python = pybind11;

python/src/section/14/LegendreCoefficients.python.cpp

@@ -5,7 +5,6 @@
 // local includes
 #include "ENDFtk/section/14.hpp"
 #include "definitions.hpp"
-#include "views.hpp"
 
 // namespace aliases
 namespace python = pybind11;

python/src/section/14/LegendreDistributions.python.cpp

@@ -5,7 +5,7 @@
 // local includes
 #include "ENDFtk/section/14.hpp"
 #include "definitions.hpp"
-#include "views.hpp"
+#include "tools/views/views-python.hpp"
 
 // namespace aliases
 namespace python = pybind11;

python/src/section/14/TabulatedDistribution.python.cpp

@@ -5,7 +5,6 @@
 // local includes
 #include "ENDFtk/section/14.hpp"
 #include "definitions.hpp"
-#include "views.hpp"
 
 // namespace aliases
 namespace python = pybind11;

python/src/section/14/TabulatedDistributions.python.cpp

@@ -5,7 +5,7 @@
 // local includes
 #include "ENDFtk/section/14.hpp"
 #include "definitions.hpp"
-#include "views.hpp"
+#include "tools/views/views-python.hpp"
 
 // namespace aliases
 namespace python = pybind11;

src/ENDFtk/section/14.hpp

@@ -5,7 +5,6 @@
 #include <variant>
 
 // other includes
-#include "range/v3/view/transform.hpp"
 #include "ENDFtk/macros.hpp"
 #include "ENDFtk/ControlRecord.hpp"
 #include "ENDFtk/ListRecord.hpp"