Apply suggestions from code review

Author: orbeckst

CHANGELOG

@@ -29,7 +29,7 @@ The rules for this file:
     broadcasted to the grid's shape according to `numpy` broadcasting rules
     (PR #142)
   * `Grid` now allows forcing MRC/CCP4 maps to be read as volumes even when
-    the header indicates they are stacks of 2D images.
+    the header indicates they are stacks of 2D images. (#150, PR #149)
 
   Fixes
 

gridData/core.py

@@ -541,7 +541,8 @@ def _load(
                 "grid={0} edges={1} origin={2} delta={3}".format(
                     grid, edges, origin, delta))
 
-    def load(self, filename, file_format=None, **kwargs):
+    # NOTE: keep loader kwargs in sync between load() and __init__()
+    def load(self, filename, file_format=None, assume_volumetric=False):
         """Load saved grid and edges from `filename`
 
         The :meth:`load` method calls the class's constructor method and
@@ -554,16 +555,16 @@ def load(self, filename, file_format=None, **kwargs):
             # are not really a file
             raise IOError(errno.ENOENT, "file not found", filename)
         loader = self._get_loader(filename, file_format=file_format)
-        loader(filename, **kwargs)
+        loader(filename, assume_volumetric=assume_volumetric)
 
-    def _load_python(self, filename, assume_volumetric=False):
+    def _load_python(self, filename, **kwargs):
         with open(filename, 'rb') as f:
             saved = pickle.load(f)
         self._load(grid=saved['grid'],
                    edges=saved['edges'],
                    metadata=saved['metadata'])
 
-    def _load_mrc(self, filename, assume_volumetric=False):
+    def _load_mrc(self, filename, assume_volumetric=False, **kwargs):
         """Initializes Grid from a MRC/CCP4 file."""
         mrcfile = mrc.MRC(filename, assume_volumetric=assume_volumetric)
         grid, edges = mrcfile.histogramdd()
@@ -572,14 +573,14 @@ def _load_mrc(self, filename, assume_volumetric=False):
         # https://github.com/MDAnalysis/GridDataFormats/pull/100#discussion_r782604833
         self._mrc_header = mrcfile.header.copy()
 
-    def _load_dx(self, filename, assume_volumetric=False):
+    def _load_dx(self, filename, **kwargs):
         """Initializes Grid from a OpenDX file."""
         dx = OpenDX.field(0)
         dx.read(filename)
         grid, edges = dx.histogramdd()
         self._load(grid=grid, edges=edges, metadata=self.metadata)
 
-    def _load_plt(self, filename, assume_volumetric=False):
+    def _load_plt(self, filename, **kwargs):
         """Initialize Grid from gOpenMol plt file."""
         g = gOpenMol.Plt()
         g.read(filename)

gridData/mrc.py

@@ -103,7 +103,7 @@ def read(self, filename, assume_volumetric=False):
             self.filename = filename
         with mrcfile.open(filename) as mrc:
             if assume_volumetric:
-                # non 3D volumes should always fail, regardless of is_volume value
+                # non 3D volumes should always fail, regardless of assume_volumetric value
                 is_volume = mrc.data is not None and len(mrc.data.shape) == 3
             else:
                 is_volume = mrc.is_volume()