[yt-svn] commit/yt: 4 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Sun Jul 16 07:32:04 PDT 2017
4 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/0e7ea0f157a4/
Changeset: 0e7ea0f157a4
User: jzuhone
Date: 2017-07-08 03:22:45+00:00
Summary: When a derived field object is passed here parse it correctly
Affected #: 1 file
diff -r 6e1264f48f8060e56cbaab4a367d7dd67e803485 -r 0e7ea0f157a4da2e3af956151764055b306413af yt/visualization/fits_image.py
--- a/yt/visualization/fits_image.py
+++ b/yt/visualization/fits_image.py
@@ -11,6 +11,7 @@
#-----------------------------------------------------------------------------
from yt.extern.six import string_types
import numpy as np
+from yt.fields.derived_field import DerivedField
from yt.funcs import mylog, iterable, fix_axis, ensure_list
from yt.visualization.fixed_resolution import FixedResolutionBuffer
from yt.data_objects.construction_data_containers import YTCoveringGrid
@@ -147,6 +148,8 @@
for fd in fields:
if isinstance(fd, tuple):
self.fields.append(fd[1])
+ elif isinstance(fd, DerivedField):
+ self.fields.append(fd.name[1])
else:
self.fields.append(fd)
https://bitbucket.org/yt_analysis/yt/commits/4e4d87f4ba08/
Changeset: 4e4d87f4ba08
User: jzuhone
Date: 2017-07-08 03:29:50+00:00
Summary: The logic here allows us to parse all ways of specifying fields correctly
Affected #: 1 file
diff -r 0e7ea0f157a4da2e3af956151764055b306413af -r 4e4d87f4ba08ccdbe907d858d5654f25654d1ab9 yt/visualization/fits_image.py
--- a/yt/visualization/fits_image.py
+++ b/yt/visualization/fits_image.py
@@ -154,21 +154,21 @@
self.fields.append(fd)
first = True
- for key in fields:
- if key not in exclude_fields:
- if hasattr(img_data[key], "units"):
- self.field_units[key] = str(img_data[key].units)
+ for name, field in zip(self.fields, fields):
+ if name not in exclude_fields:
+ if hasattr(img_data[field], "units"):
+ self.field_units[name] = str(img_data[field].units)
else:
- self.field_units[key] = "dimensionless"
- mylog.info("Making a FITS image of field %s" % key)
+ self.field_units[name] = "dimensionless"
+ mylog.info("Making a FITS image of field %s" % name)
if first:
- hdu = _astropy.pyfits.PrimaryHDU(np.array(img_data[key]))
+ hdu = _astropy.pyfits.PrimaryHDU(np.array(img_data[field]))
first = False
else:
- hdu = _astropy.pyfits.ImageHDU(np.array(img_data[key]))
- hdu.name = key
- hdu.header["btype"] = key
- hdu.header["bunit"] = re.sub('()', '', self.field_units[key])
+ hdu = _astropy.pyfits.ImageHDU(np.array(img_data[field]))
+ hdu.name = name
+ hdu.header["btype"] = name
+ hdu.header["bunit"] = re.sub('()', '', self.field_units[name])
self.hdulist.append(hdu)
self.shape = self.hdulist[0].shape
https://bitbucket.org/yt_analysis/yt/commits/dfc2f90c7e41/
Changeset: dfc2f90c7e41
User: jzuhone
Date: 2017-07-08 18:39:51+00:00
Summary: Use the different ways of passing in field names here
Affected #: 1 file
diff -r 4e4d87f4ba08ccdbe907d858d5654f25654d1ab9 -r dfc2f90c7e4155a3e34863baea528fae4bdd5bc4 yt/visualization/tests/test_fits_image.py
--- a/yt/visualization/tests/test_fits_image.py
+++ b/yt/visualization/tests/test_fits_image.py
@@ -44,7 +44,7 @@
prj_frb = prj.to_frb((0.5, "unitary"), 128)
fid1 = FITSImageData(prj_frb, fields=["density","temperature"], units="cm")
- fits_prj = FITSProjection(ds, "z", ["density","temperature"], image_res=128,
+ fits_prj = FITSProjection(ds, "z", [ds.fields.gas.density,"temperature"], image_res=128,
width=(0.5,"unitary"))
assert_equal(fid1["density"].data, fits_prj["density"].data)
@@ -71,7 +71,7 @@
slc_frb = slc.to_frb((0.5, "unitary"), 128)
fid2 = FITSImageData(slc_frb, fields=["density","temperature"], units="cm")
- fits_slc = FITSSlice(ds, "z", ["density","temperature"], image_res=128,
+ fits_slc = FITSSlice(ds, "z", ["density",("gas","temperature")], image_res=128,
width=(0.5,"unitary"))
assert_equal(fid2["density"].data, fits_slc["density"].data)
@@ -87,7 +87,7 @@
cut = ds.cutting([0.1, 0.2, -0.9], [0.5, 0.42, 0.6])
cut_frb = cut.to_frb((0.5, "unitary"), 128)
- fid3 = FITSImageData(cut_frb, fields=["density","temperature"], units="cm")
+ fid3 = FITSImageData(cut_frb, fields=[("gas","density"), ds.fields.gas.temperature], units="cm")
fits_cut = FITSOffAxisSlice(ds, [0.1, 0.2, -0.9], ["density","temperature"],
image_res=128, center=[0.5, 0.42, 0.6],
width=(0.5,"unitary"))
https://bitbucket.org/yt_analysis/yt/commits/ef34e9c92495/
Changeset: ef34e9c92495
User: ngoldbaum
Date: 2017-07-16 14:31:52+00:00
Summary: Merge pull request #1482 from jzuhone/fid_fields
[bugfix] Allow FITS image classes to accept DerivedField objects
Affected #: 2 files
diff -r 0d0b4c14b44a835db69baecbcf3d5320d6941d70 -r ef34e9c9249555c1ffa7f8d8abf0d52d5612065c yt/visualization/fits_image.py
--- a/yt/visualization/fits_image.py
+++ b/yt/visualization/fits_image.py
@@ -11,6 +11,7 @@
#-----------------------------------------------------------------------------
from yt.extern.six import string_types
import numpy as np
+from yt.fields.derived_field import DerivedField
from yt.funcs import mylog, iterable, fix_axis, ensure_list
from yt.visualization.fixed_resolution import FixedResolutionBuffer
from yt.data_objects.construction_data_containers import YTCoveringGrid
@@ -147,25 +148,27 @@
for fd in fields:
if isinstance(fd, tuple):
self.fields.append(fd[1])
+ elif isinstance(fd, DerivedField):
+ self.fields.append(fd.name[1])
else:
self.fields.append(fd)
first = True
- for key in fields:
- if key not in exclude_fields:
- if hasattr(img_data[key], "units"):
- self.field_units[key] = str(img_data[key].units)
+ for name, field in zip(self.fields, fields):
+ if name not in exclude_fields:
+ if hasattr(img_data[field], "units"):
+ self.field_units[name] = str(img_data[field].units)
else:
- self.field_units[key] = "dimensionless"
- mylog.info("Making a FITS image of field %s" % key)
+ self.field_units[name] = "dimensionless"
+ mylog.info("Making a FITS image of field %s" % name)
if first:
- hdu = _astropy.pyfits.PrimaryHDU(np.array(img_data[key]))
+ hdu = _astropy.pyfits.PrimaryHDU(np.array(img_data[field]))
first = False
else:
- hdu = _astropy.pyfits.ImageHDU(np.array(img_data[key]))
- hdu.name = key
- hdu.header["btype"] = key
- hdu.header["bunit"] = re.sub('()', '', self.field_units[key])
+ hdu = _astropy.pyfits.ImageHDU(np.array(img_data[field]))
+ hdu.name = name
+ hdu.header["btype"] = name
+ hdu.header["bunit"] = re.sub('()', '', self.field_units[name])
self.hdulist.append(hdu)
self.shape = self.hdulist[0].shape
diff -r 0d0b4c14b44a835db69baecbcf3d5320d6941d70 -r ef34e9c9249555c1ffa7f8d8abf0d52d5612065c yt/visualization/tests/test_fits_image.py
--- a/yt/visualization/tests/test_fits_image.py
+++ b/yt/visualization/tests/test_fits_image.py
@@ -44,7 +44,7 @@
prj_frb = prj.to_frb((0.5, "unitary"), 128)
fid1 = FITSImageData(prj_frb, fields=["density","temperature"], units="cm")
- fits_prj = FITSProjection(ds, "z", ["density","temperature"], image_res=128,
+ fits_prj = FITSProjection(ds, "z", [ds.fields.gas.density,"temperature"], image_res=128,
width=(0.5,"unitary"))
assert_equal(fid1["density"].data, fits_prj["density"].data)
@@ -71,7 +71,7 @@
slc_frb = slc.to_frb((0.5, "unitary"), 128)
fid2 = FITSImageData(slc_frb, fields=["density","temperature"], units="cm")
- fits_slc = FITSSlice(ds, "z", ["density","temperature"], image_res=128,
+ fits_slc = FITSSlice(ds, "z", ["density",("gas","temperature")], image_res=128,
width=(0.5,"unitary"))
assert_equal(fid2["density"].data, fits_slc["density"].data)
@@ -87,7 +87,7 @@
cut = ds.cutting([0.1, 0.2, -0.9], [0.5, 0.42, 0.6])
cut_frb = cut.to_frb((0.5, "unitary"), 128)
- fid3 = FITSImageData(cut_frb, fields=["density","temperature"], units="cm")
+ fid3 = FITSImageData(cut_frb, fields=[("gas","density"), ds.fields.gas.temperature], units="cm")
fits_cut = FITSOffAxisSlice(ds, [0.1, 0.2, -0.9], ["density","temperature"],
image_res=128, center=[0.5, 0.42, 0.6],
width=(0.5,"unitary"))
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list