Use existing flex.shoebox methods for panel and bbox

jbeilstenedmands · Jun 12, 2024 · 11333eb · 11333eb
1 parent 5cc3d3c
commit 11333eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/src/dials/array_family/boost_python/flex_shoebox.cc b/src/dials/array_family/boost_python/flex_shoebox.cc
@@ -767,8 +767,6 @@ namespace dials { namespace af { namespace boost_python {
       n += s1.data.size();
     }
     size_t ntot = 0;
-    af::shared<size_t> panel(self.size(), 0);
-    af::shared<int6> bbox(self.size(), af::init_functor_null<int6>());
     af::shared<float> data_array(n, 0);
     af::shared<float> bg_array(n, 0);
     af::shared<size_t> mask_array(n, 0);
@@ -778,14 +776,10 @@ namespace dials { namespace af { namespace boost_python {
       std::copy(s1.background.begin(), s1.background.end(), bg_array.begin() + ntot);
       std::copy(s1.mask.begin(), s1.mask.end(), mask_array.begin() + ntot);
       ntot += s1.data.size();
-      panel[i] = s1.panel;
-      bbox[i] = s1.bbox;
     }
     result.append(data_array);
     result.append(bg_array);
     result.append(mask_array);
-    result.append(panel);
-    result.append(bbox);
     return result;
   }
 

diff --git a/src/dials/array_family/flex_ext.py b/src/dials/array_family/flex_ext.py
@@ -225,13 +225,6 @@ def from_msgpack_file(filename):
                 infile.read()
             )
 
-    def as_nxmx(self, filename, expts):
-        from dials.util.nexus import get_entry, nx_reflections
-
-        self.clean_experiment_identifiers_map()
-        e = get_entry(filename, "w")
-        nx_reflections.dump(e, self, expts)
-
     def as_file(self, filename):
         """
         Write the reflection table to file in either msgpack or pickle format

diff --git a/src/dials/util/table_as_hdf5_file.py b/src/dials/util/table_as_hdf5_file.py
@@ -68,7 +68,9 @@ def encode_columns(
     @staticmethod
     def encode_shoebox(group: h5py.Group, data: flex.shoebox, key: str):
         """Encode a column of shoeboxes."""
-        sbdata, bg, mask, panel, bbox = data.get_shoebox_data_arrays()
+        sbdata, bg, mask = data.get_shoebox_data_arrays()
+        panel = data.panels()
+        bbox = data.bounding_boxes()
         data = flumpy.to_numpy(sbdata)
         lz4 = hdf5plugin.LZ4()
         sbox_group = group.create_group(key)