Merge pull request #1 from Edgar-21/fix_import

add required imports, syntax to calls
svalinn · Jul 18, 2024 · 8395a04 · 8395a04
2 parents 6a97e1c + b1899d2
commit 8395a04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/examples/mixPureFusionMaterials.py b/examples/mixPureFusionMaterials.py
@@ -160,19 +160,18 @@
 
 ########################################################################
 def main():
-    #
     # remove old mixmat_lib
     try:
         os.remove("mixedPureFusionMaterials_libv1.json")
     except:
         pass
 
     # Load material library
-    mat_lib = MaterialLibrary()
-    mat_lib.from_json("PureFusionMaterials_libv1.json")
+    mat_lib = mdbt.MaterialLibrary()
+    mat_lib.from_json("../db-outputs/PureFusionMaterials_libv1.json")
 
     # create material library object
-    mixmat_lib = MaterialLibrary()
+    mixmat_lib = mdbt.MaterialLibrary()
     for mat_name, mat_input in mat_data.items():
         mixmat_lib[mat_name] = mdbt.mix_by_volume(
             mat_lib, mat_input["vol_fracs"], mat_input["mixture_citation"]

diff --git a/pureMaterials/createPurematlib.py b/pureMaterials/createPurematlib.py
@@ -1,7 +1,8 @@
 import os
 
 import material_db_tools as mdbt
-
+from pyne.material import Material
+from pyne.material_library import MaterialLibrary
 
 mat_data = {}
 
@@ -585,14 +586,14 @@ def main():
     # get material definition
     for mat_name, mat_input in mat_data.items():
         if "nucvec" in mat_input:
-            mat_lib[mat_name] = make_mat(
+            mat_lib[mat_name] = mdbt.make_mat(
                 mat_input["nucvec"],
                 mat_input["density"],
                 mat_input["citation"],
                 mat_input.get("molecular_mass"),
             )
         if "atom_frac" in mat_input:
-            mat_lib[mat_name] = make_mat_from_atom(
+            mat_lib[mat_name] = mdbt.make_mat_from_atom(
                 mat_input["atom_frac"],
                 mat_input["density"],
                 mat_input["citation"],