Further simplifications

Author: paulromano

openmc_plotter/plotgui.py

@@ -310,7 +310,10 @@ def getIDinfo(self, event):
            and 0 <= xPos and xPos < self.model.currentView.h_res:
             cell_id = int(self.model.cell_ids[yPos, xPos])
             mat_id = int(self.model.mat_ids[yPos, xPos])
-            id = self._domainId(cell_id, mat_id)
+            if cell_id < _OVERLAP:
+                id = cell_id
+            else:
+                id = cell_id if self.model.currentView.colorby == 'cell' else mat_id
             instance = self.model.instances[yPos, xPos]
             temp = "{:g}".format(self.model.property_data[yPos, xPos, 0])
             density = "{:g}".format(self.model.property_data[yPos, xPos, 1])
@@ -338,13 +341,6 @@ def getIDinfo(self, event):
 
         return id, instance, properties, domain, domain_kind
 
-    def _domainId(self, cell_id, mat_id):
-        if self.model.currentView.colorby != 'cell':
-            return mat_id
-        if cell_id == _OVERLAP and mat_id < _OVERLAP:
-            return mat_id
-        return cell_id
-
     def _cellLabel(self, cell_id):
         try:
             name = self.model.activeView.cells[cell_id].name
@@ -357,10 +353,10 @@ def _overlapInfo(self, id):
             return "OVERLAP"
 
         overlap_idx = int(_OVERLAP - int(id) - 1)
-        if overlap_idx not in self.model.overlap_map:
+        if not 0 <= overlap_idx < len(self.model.overlap_info):
             return "OVERLAP (unknown region)"
 
-        universe, cell1, cell2 = self.model.overlap_map[overlap_idx]
+        universe, cell1, cell2 = self.model.overlap_info[overlap_idx]
         label1 = self._cellLabel(cell1)
         label2 = self._cellLabel(cell2)
         return f"OVERLAP: Universe {universe}, Cells {label1} and {label2}"

openmc_plotter/plotmodel.py

@@ -325,7 +325,7 @@ def __init__(self, use_settings_pkl, model_path, default_res):
         self.map_view_params = None
 
         # Map to be populated by overlap functions
-        self.overlap_map = {}
+        self.overlap_info = None
 
         self.version = __version__
 
@@ -533,16 +533,14 @@ def makePlot(self, view: Optional["PlotView"] = None,
                     filter=filter_cpp,
                 )
             self.map_view_params = self.view_params_payload(view)
-                
+
         else:
             self.geom_data = geom_data
             self.property_data = property_data
             self.map_view_params = self.view_params_payload(view)
 
-        overlap_info, n = openmc.lib.slice_data_overlap_info()
-        self.overlap_map = {}
-        for i in range(n):
-            self.overlap_map[i] = (overlap_info[i*3], overlap_info[i*3+1], overlap_info[i*3+2])
+        # Get cell overlap information
+        self.overlap_info = openmc.lib.slice_data_overlap_info()
 
         # update current view
         cv = self.currentView = copy.deepcopy(view)
@@ -557,7 +555,7 @@ def makePlot(self, view: Optional["PlotView"] = None,
             domain = cv.materials
             source = self.modelMaterials
 
-        # Normalizes so that domain only sees -3, but 
+        # Normalizes so that domain only sees -3, but
         # overlap indices are still available in cell_ids
         self.ids[self.ids < _OVERLAP] = _OVERLAP  # new line