From 5ab6160c2a590685085069cec59cb798c192c64f Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Thu, 13 Oct 2016 07:09:50 -0500
Subject: [PATCH] Move fission Q file to openmc/data and make sure it's
 accessible from openmc-get-nndc-data

---
 .../data}/fission_Q_data_endfb71.h5           | Bin
 scripts/openmc-get-nndc-data                  |  36 ++++++++----------
 setup.py                                      |   2 +-
 3 files changed, 17 insertions(+), 21 deletions(-)
 rename {data => openmc/data}/fission_Q_data_endfb71.h5 (100%)

diff --git a/data/fission_Q_data_endfb71.h5 b/openmc/data/fission_Q_data_endfb71.h5
similarity index 100%
rename from data/fission_Q_data_endfb71.h5
rename to openmc/data/fission_Q_data_endfb71.h5
diff --git a/scripts/openmc-get-nndc-data b/scripts/openmc-get-nndc-data
index 5231b67ef0..fe9d3ff5bd 100755
--- a/scripts/openmc-get-nndc-data
+++ b/scripts/openmc-get-nndc-data
@@ -13,6 +13,8 @@ import argparse
 from six.moves import input
 from six.moves.urllib.request import urlopen
 
+import openmc.data
+
 
 description = """
 Download ENDF/B-VII.1 ACE data from NNDC and convert it to an HDF5 library for
@@ -20,6 +22,7 @@ use with OpenMC.
 
 """
 
+
 class CustomFormatter(argparse.ArgumentDefaultsHelpFormatter,
                       argparse.RawDescriptionHelpFormatter):
     pass
@@ -75,7 +78,8 @@ for f in files:
             if not chunk: break
             fh.write(chunk)
             downloaded += len(chunk)
-            status = '{0:10}  [{1:3.2f}%]'.format(downloaded, downloaded * 100. / file_size)
+            status = '{0:10}  [{1:3.2f}%]'.format(
+                downloaded, downloaded * 100. / file_size)
             print(status + chr(8)*len(status), end='')
         print('')
         filesComplete.append(f)
@@ -109,7 +113,7 @@ for f in files:
 for filename in glob.glob('nndc/293.6K/ENDF-B-VII.1-neutron-293.6K/*'):
     shutil.move(filename, 'nndc/293.6K/')
 
-#===============================================================================
+# ==============================================================================
 # EDIT GRAPHITE ZAID (6012 to 6000)
 
 print('Changing graphite ZAID from 6012 to 6000')
@@ -137,24 +141,16 @@ if not response or response.lower().startswith('y'):
             os.remove(f)
 
 # ==============================================================================
-# PROMPT USER TO GENERATE HDF5 LIBRARY
+# GENERATE HDF5 LIBRARY
 
-# Ask user to convert
-if not args.batch:
-    response = input('Generate HDF5 library? ([y]/n) ')
-else:
-    response = 'y'
+# get a list of all ACE files
+ace_files = sorted(glob.glob(os.path.join('nndc', '**', '*.ace*')))
 
-# Convert files if requested
-if not response or response.lower().startswith('y'):
-    # get a list of all ACE files
-    ace_files = sorted(glob.glob(os.path.join('nndc', '**', '*.ace*')))
+# Get path to fission energy release data
+data_dir = os.path.dirname(sys.modules['openmc.data'].__file__)
+fer_file = os.path.join(data_dir, 'fission_Q_data_endfb71.h5')
 
-    # Ensure 'import openmc.data' works in the openmc-ace-to-xml script
-    cwd = os.getcwd()
-    env = os.environ.copy()
-    env['PYTHONPATH'] = os.path.join(cwd, '..')
-
-    subprocess.call(['../scripts/openmc-ace-to-hdf5', '-d', 'nndc_hdf5',
-                     '--fission_energy_release', 'fission_Q_data_endfb71.h5']
-                    + ace_files, env=env)
+pwd = os.path.dirname(os.path.realpath(__file__))
+ace2hdf5 = os.path.join(pwd, 'openmc-ace-to-hdf5')
+subprocess.call([ace2hdf5, '-d', 'nndc_hdf5', '--fission_energy_release',
+                 fer_file] + ace_files)
diff --git a/setup.py b/setup.py
index fe1de3df8e..83098a9d5c 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ if have_setuptools:
 
         # Data files
         'package_data': {
-            'openmc.data': ['mass.mas12']
+            'openmc.data': ['mass.mas12', 'fission_Q_data_endfb71.h5']
         },
     })