Skip to content

Commit

Permalink
Merge pull request #237 from mkelley/remote-tests-20200208
Browse files Browse the repository at this point in the history
More Ceres abs. mag changes.
  • Loading branch information
mkelley committed Feb 8, 2020
2 parents 8005cd2 + 8d3f58c commit 4f3946e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion docs/sbpy/data/ephem.rst
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Offering almost identical functionality, the
... epochs={'start': Time('2018-10-22'),
... 'stop': Time('2018-10-26'),
... 'step': 1*u.day}) # doctest: +REMOTE_DATA
>>> eph # doctest: +REMOTE_DATA
>>> eph # doctest: +REMOTE_DATA +SKIP
<QTable length=5>
Targetname Date ... Moon distance Moon altitude
... deg deg
Expand Down
8 changes: 4 additions & 4 deletions docs/sbpy/photometry.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ model parameters:
>>> phys = Phys.from_sbdb('Ceres') # doctest: +REMOTE_DATA
>>> m = HG.from_phys(phys) # doctest: +REMOTE_DATA
INFO: Model initialized for 1 Ceres. [sbpy.photometry.core]
>>> print(m) # doctest: +REMOTE_DATA
>>> print(m) # doctest: +REMOTE_DATA
Model: HG
Inputs: ('x',)
Outputs: ('y',)
Model set size: 1
Parameters:
H G
---- ----
3.34 0.12
H G
--- ----
3.4 0.12

Note that model set is not supported. Only one model can be initialized with
the first set of valid parameters in the input `~sbpy.data.DataClass`.
Expand Down
24 changes: 12 additions & 12 deletions sbpy/photometry/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ class DiskIntegratedPhaseFunc(Fittable1DModel):
>>> phys = Phys.from_sbdb('Ceres') # doctest: +REMOTE_DATA
>>> print(phys['targetname','H','G']) # doctest: +REMOTE_DATA
<QTable length=1>
targetname H G
targetname H G
str7 float64 float64
---------- ------- -------
1 Ceres 3.4 0.12
Expand All @@ -164,9 +164,9 @@ class DiskIntegratedPhaseFunc(Fittable1DModel):
Outputs: ('y',)
Model set size: 1
Parameters:
H G
---- ----
3.4 0.12
H G
--- ----
3.4 0.12
>>> print(m.meta['targetname']) # doctest: +REMOTE_DATA
1 Ceres
>>> print(m.radius) # doctest: +REMOTE_DATA
Expand All @@ -177,7 +177,7 @@ class DiskIntegratedPhaseFunc(Fittable1DModel):
>>> elem = Orbit.from_horizons('Ceres') # doctest: +REMOTE_DATA
>>> print(elem['targetname','H','G']) # doctest: +REMOTE_DATA
<QTable masked=True length=1>
targetname H G
targetname H G
mag
str7 float64 float64
---------- ------- -------
Expand Down Expand Up @@ -279,7 +279,7 @@ def from_phys(cls, phys, **kwargs):
>>> phys = Phys.from_sbdb('Ceres') # doctest: +REMOTE_DATA
>>> print(phys['targetname','H','G']) # doctest: +REMOTE_DATA
<QTable length=1>
targetname H G
targetname H G
str7 float64 float64
---------- ------- -------
1 Ceres 3.4 0.12
Expand All @@ -291,9 +291,9 @@ def from_phys(cls, phys, **kwargs):
Outputs: ('y',)
Model set size: 1
Parameters:
H G
---- ----
3.4 0.12
H G
--- ----
3.4 0.12
>>> print(m.meta['targetname']) # doctest: +REMOTE_DATA
1 Ceres
>>> print(m.radius) # doctest: +REMOTE_DATA
Expand Down Expand Up @@ -362,7 +362,7 @@ def to_phys(self):
km
str7 float64 float64 float64
---------- ------- ------- -------
1 Ceres 469.7 3.34 0.12
1 Ceres 469.7 3.4 0.12
>>> m = HG.from_phys(phys) # doctest: +REMOTE_DATA
INFO: Model initialized for 1 Ceres. [sbpy.photometry.core]
>>> m.wfb = 'V' # doctest: +REMOTE_DATA
Expand All @@ -376,8 +376,8 @@ def to_phys(self):
targetname diameter H G pv A
km mag
str7 float64 float64 float64 float64 float64
---------- -------- ------- ------- ------------------- -------------------
1 Ceres 939.4 3.34 0.12 0.09166630037900923 0.03339866929973315
---------- -------- ------- ------- ----------------- -------------------
1 Ceres 939.4 3.4 0.12 0.086738059863538 0.03160306203157442
"""
cols = {}
if (self.meta is not None) and ('targetname' in self.meta.keys()):
Expand Down

0 comments on commit 4f3946e

Please sign in to comment.