Oct 24, 2017 · Dec 18, 2017 · Dec 21, 2017 · Dec 21, 2017 · Dec 21, 2017 · Dec 21, 2017
diff --git a/nibabel/analyze.py b/nibabel/analyze.py
        >>> hdr.get_zooms()
        (3.0, 4.0)
        """
        if units not in ('norm', 'raw'):
            raise ValueError("`units` parameter must be 'norm' or 'raw'")
        hdr = self._structarr
        dims = hdr['dim']
        ndim = dims[0]
            spatial/temporal or as raw values to be interpreted according to
            format specification.
        """
        if units not in ('norm', 'raw'):
            raise ValueError("`units` parameter must be 'norm' or 'raw'")
        hdr = self._structarr
        dims = hdr['dim']
        ndim = dims[0]
diff --git a/nibabel/ecat.py b/nibabel/ecat.py

    def get_zooms(self, frame=0, units='norm', raise_unknown=False):
        """returns zooms  ...pixdims"""
        if units not in ('norm', 'raw'):
            raise ValueError("`units` parameter must be 'norm' or 'raw'")
        subhdr = self.subheaders[frame]
        x_zoom = subhdr['x_pixel_size'] * 10
        y_zoom = subhdr['y_pixel_size'] * 10
diff --git a/nibabel/freesurfer/mghformat.py b/nibabel/freesurfer/mghformat.py
            Zooms are specified in normalized units of mm/sec for
            spatial/temporal dimensions or as raw values to be stored in
            header.

        .. _mghformat: https://surfer.nmr.mgh.harvard.edu/fswiki/FsTutorial/MghFormat#line-82
        """
        if units not in ('norm', 'raw'):
            raise ValueError("`units` parameter must be 'norm' or 'raw'")
        hdr = self._structarr
        zooms = np.asarray(zooms)
        ndims = self._ndims()
diff --git a/nibabel/minc1.py b/nibabel/minc1.py

    def get_zooms(self, units='norm', raise_unknown=False):
        """ Get real-world sizes of voxels """
        if units not in ('norm', 'raw'):
            raise ValueError("`units` parameter must be 'norm' or 'raw'")
        # zooms must be positive; but steps in MINC can be negative
        return tuple([abs(float(dim.step)) if hasattr(dim, 'step') else 1.0
                      for dim in self._dims])
diff --git a/nibabel/nifti1.py b/nibabel/nifti1.py
                          ''.format(self.__class__.__name__),
                          FutureWarning, stacklevel=2)

        if units not in ('norm', 'raw') and not isinstance(units, tuple):
            raise ValueError("`units` parameter must be 'norm', 'raw',"
                             " or a tuple of unit codes (see set_xyzt_units)")
        super(Nifti1Header, self).set_zooms(zooms, units=units)

        if isinstance(units, tuple):
            elif len(zooms) > 3 and t_code in ('unknown', 'sec', 'msec', 'usec'):
                t_code = 'sec'
            self.set_xyzt_units(xyz_code, t_code)
        elif units != 'raw':
            raise ValueError("`units` parameter must be 'norm', 'raw',"
                             " or a tuple of unit codes (see set_xyzt_units)")

    def _clean_after_mapping(self):
        """ Set format-specific stuff after converting header from mapping
diff --git a/nibabel/spatialimages.py b/nibabel/spatialimages.py
        zooms : tuple
            Spacing between voxels along each axis
        '''
        if units not in ('norm', 'raw'):
            raise ValueError("`units` parameter must be 'norm' or 'raw'")
        return self._zooms

    def set_zooms(self, zooms, units='norm'):
            spatial/temporal or as raw values to be interpreted according to
            format specification.
        '''
        if units not in ('norm', 'raw'):
            raise ValueError("`units` parameter must be 'norm' or 'raw'")
        zooms = tuple(float(z) for z in zooms)
        shape = self.get_data_shape()
        ndim = len(shape)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -690,6 +690,8 @@ def get_zooms(self, units='norm', raise_unknown=False):
		>>> hdr.get_zooms()
		(3.0, 4.0)
		"""
		if units not in ('norm', 'raw'):
		raise ValueError("`units` parameter must be 'norm' or 'raw'")
		hdr = self._structarr
		dims = hdr['dim']
		ndim = dims[0]
Expand All		@@ -712,6 +714,8 @@ def set_zooms(self, zooms, units='norm'):
		spatial/temporal or as raw values to be interpreted according to
		format specification.
		"""
		if units not in ('norm', 'raw'):
		raise ValueError("`units` parameter must be 'norm' or 'raw'")
		hdr = self._structarr
		dims = hdr['dim']
		ndim = dims[0]
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -580,6 +580,8 @@ def get_frame_affine(self, frame=0):

		def get_zooms(self, frame=0, units='norm', raise_unknown=False):
		"""returns zooms ...pixdims"""
		if units not in ('norm', 'raw'):
		raise ValueError("`units` parameter must be 'norm' or 'raw'")
		subhdr = self.subheaders[frame]
		x_zoom = subhdr['x_pixel_size'] * 10
Copy link MemberAuthor effigiesMar 14, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I wasn't sure whether to make`'raw'` change this factor to 1.
		y_zoom = subhdr['y_pixel_size'] * 10
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -301,7 +301,11 @@ def set_zooms(self, zooms, units='norm'):
		Zooms are specified in normalized units of mm/sec for
		spatial/temporal dimensions or as raw values to be stored in
		header.

		.. _mghformat: https://surfer.nmr.mgh.harvard.edu/fswiki/FsTutorial/MghFormat#line-82
		"""
		if units not in ('norm', 'raw'):
		raise ValueError("`units` parameter must be 'norm' or 'raw'")
Copy link Member yarikopticApr 24, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. too frequent of a code pattern. In current design I guess the only way to mitigate is to come up with`self._check_units(units)` to centralize it Copy link MemberAuthor effigiesApr 24, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. We could do something like that.
		hdr = self._structarr
		zooms = np.asarray(zooms)
		ndims = self._ndims()
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -92,6 +92,8 @@ def get_data_shape(self):

		def get_zooms(self, units='norm', raise_unknown=False):
		""" Get real-world sizes of voxels """
		if units not in ('norm', 'raw'):
		raise ValueError("`units` parameter must be 'norm' or 'raw'")
		# zooms must be positive; but steps in MINC can be negative
		return tuple([abs(float(dim.step)) if hasattr(dim, 'step') else 1.0
		for dim in self._dims])
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1810,6 +1810,9 @@ def set_zooms(self, zooms, units=None):
		''.format(self.__class__.__name__),
		FutureWarning, stacklevel=2)

		if units not in ('norm', 'raw') and not isinstance(units, tuple):
		raise ValueError("`units` parameter must be 'norm', 'raw',"
		" or a tuple of unit codes (see set_xyzt_units)")
		super(Nifti1Header, self).set_zooms(zooms, units=units)

		if isinstance(units, tuple):
Expand All		@@ -1822,9 +1825,6 @@ def set_zooms(self, zooms, units=None):
		elif len(zooms) > 3 and t_code in ('unknown', 'sec', 'msec', 'usec'):
		t_code = 'sec'
		self.set_xyzt_units(xyz_code, t_code)
		elif units != 'raw':
		raise ValueError("`units` parameter must be 'norm', 'raw',"
		" or a tuple of unit codes (see set_xyzt_units)")

		def _clean_after_mapping(self):
		""" Set format-specific stuff after converting header from mapping
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -241,6 +241,8 @@ def get_zooms(self, units='norm', raise_unknown=False):
		zooms : tuple
		Spacing between voxels along each axis
		'''
		if units not in ('norm', 'raw'):
		raise ValueError("`units` parameter must be 'norm' or 'raw'")
		return self._zooms

		def set_zooms(self, zooms, units='norm'):
Expand All		@@ -255,6 +257,8 @@ def set_zooms(self, zooms, units='norm'):
		spatial/temporal or as raw values to be interpreted according to
		format specification.
		'''
		if units not in ('norm', 'raw'):
		raise ValueError("`units` parameter must be 'norm' or 'raw'")
		zooms = tuple(float(z) for z in zooms)
		shape = self.get_data_shape()
		ndim = len(shape)
Expand Down