make h5py import optional

maxiv-science · Nov 7, 2023 · 8bb6ffc · 8bb6ffc
1 parent 0ecc6ea
commit 8bb6ffc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/azint.cpp b/azint.cpp
@@ -120,13 +120,6 @@ void generate_matrix(const Poni& poni,
             for (int k=0; k<n_splitting; k++) {
                 float delta1 = (k + 0.5) / n_splitting;
                 for (int l=0; l<n_splitting; l++) {
-                    /*
-                    float p[] = {
-                        (i + (k + 0.5f) / n_splitting) * pixel_size - poni.poni1,
-                        (j + (l + 0.5f) / n_splitting) * pixel_size - poni.poni2,
-                        poni.dist
-                    };
-                    */
                     float delta2 = (l + 0.5) / n_splitting;
                     float p[] = {
                         A1 + delta1 * BA1 + delta2 * DA1 - poni.poni1,

diff --git a/azint/detector.py b/azint/detector.py
@@ -1,4 +1,7 @@
-import h5py
+try:
+    import h5py
+except ImportError:
+    h5py = None
 import numpy as np
 
 '''
@@ -48,6 +51,8 @@ def get_pixel_corners(self, pixel1, pixel2, shape):
 
 class NexusDetector(Detector):
     def __init__(self, filename):
+        if not h5py:
+            raise RuntimeError('h5py module missing: NexusDetector is not supported') 
 
         def find_det(name, item):
             if item.attrs.get('NX_class') == 'NXdetector':