Save masks by detector name under the "data" key

Signed-off-by: Brianna Major <[email protected]>
HEXRD · Jan 8, 2024 · ff03ccd · ff03ccd
1 parent a7973d3
commit ff03ccd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/hexrdgui/masking/mask_compatibility.py b/hexrdgui/masking/mask_compatibility.py
@@ -27,10 +27,11 @@ def convert_masks_v1_to_v2(h5py_group):
                     'mtype': 'unknown',
                     'visible': name in visible,
                     'border': False,
+                    'data': {},
                 })
                 for i, mask in enumerate(masks.values()):
                     # Load the numpy array from the hdf5 file
-                    items[name].setdefault(key, {})[i] = mask[()]
+                    items[name]['data'].setdefault(key, {})[i] = mask[()]
     return [(k, v) for k, v in items.items()]
 
 

diff --git a/hexrdgui/masking/mask_manager.py b/hexrdgui/masking/mask_manager.py
@@ -78,19 +78,20 @@ def serialize(self):
             'name': self.name,
             'mtype': self.type,
             'visible': self.visible,
+            'data': {},
         }
         for i, (det, values) in enumerate(self._raw):
-            data.setdefault(det, {})[str(i)] = values
+            data['data'].setdefault(det, {})[str(i)] = values
         return data
 
     @classmethod
     def deserialize(cls, data):
         new_cls = cls(data['name'], data['mtype'], data['visible'])
         raw_data = []
         for det in HexrdConfig().detector_names:
-            if det not in data.keys():
+            if det not in data['data'].keys():
                 continue
-            raw_data.extend([(det, v) for v in data[det].values()])
+            raw_data.extend([(det, v) for v in data['data'][det].values()])
         new_cls.data = raw_data
         return new_cls