Merge branch 'master' into pyup-pin-numexpr-2.6.5

AxFoundation · Jul 2, 2018 · c563bf1 · c563bf1
2 parents a8058ce + 0ff0dcb
commit c563bf1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -27,8 +27,9 @@
                    'sphinx_rtd_theme',
                    'nbsphinx',
                    'recommonmark'],
-          'xenon': ['keras',
-                    'tensorflow']
+          'xenon': ['keras'
+                    'tensorflow',
+                    'scipy']
       },
       long_description=long_description,
       long_description_content_type="text/markdown",

diff --git a/strax/xenon/plugins.py b/strax/xenon/plugins.py
@@ -7,7 +7,6 @@
 
 import strax
 from .common import to_pe, pax_file, get_resource, get_elife
-from .itp_map import InterpolatingMap
 export, __all__ = strax.exporter()
 
 
@@ -525,6 +524,7 @@ class EventPositions(strax.Plugin):
          'Interaction angular position (radians)')]
 
     def setup(self):
+        from .itp_map import InterpolatingMap
         self.map = InterpolatingMap(get_resource(self.config['fdc_map'],
                                                  binary=True))
 
@@ -578,6 +578,7 @@ class CorrectedAreas(strax.Plugin):
              ('cs2', np.float32, 'Corrected S2 area (PE)')]
 
     def setup(self):
+        from .itp_map import InterpolatingMap
         self.s1_map = InterpolatingMap(
             get_resource(self.config['s1_relative_lce_map']))
         self.s2_map = InterpolatingMap(

diff --git a/strax/xenon/utils.py b/strax/xenon/utils.py