Skip to content

Commit

Permalink
Merge pull request #88 from timahutchinson/master
Browse files Browse the repository at this point in the history
updates desispec to use PEP8 updates to redmonster class names
  • Loading branch information
sbailey committed Oct 31, 2015
2 parents ba9fba7 + 128df94 commit 9dfad1d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions py/desispec/zfind/redmonster.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ def __init__(self, wave, flux, ivar, R=None, dloglam=1e-4):
TODO: document redmonster specific output variables
"""
try:
from redmonster.physics.zfinder import Zfinder
from redmonster.physics.zfitter import Zfitter
from redmonster.physics.zpicker2 import Zpicker
from redmonster.physics.zfinder import ZFinder
from redmonster.physics.zfitter import ZFitter
from redmonster.physics.zpicker2 import ZPicker
except ImportError:
get_logger().error("You are attempting to use RedMonster, but it is not available for import!")
raise
Expand Down Expand Up @@ -71,9 +71,9 @@ def __init__(self, wave, flux, ivar, R=None, dloglam=1e-4):
self.zfinders = list()
self.zfitters = list()
for template, zmin, zmax in self.templates:
zfind = Zfinder(os.path.join(self.template_dir, template), npoly=2, zmin=zmin, zmax=zmax)
zfind = ZFinder(os.path.join(self.template_dir, template), npoly=2, zmin=zmin, zmax=zmax)
zfind.zchi2(self.flux, self.loglam, self.ivar, npixstep=2)
zfit = Zfitter(zfind.zchi2arr, zfind.zbase)
zfit = ZFitter(zfind.zchi2arr, zfind.zbase)
zfit.z_refine2()

self.zfinders.append(zfind)
Expand All @@ -87,7 +87,7 @@ def __init__(self, wave, flux, ivar, R=None, dloglam=1e-4):
self.zfitters[i].zwarning.astype(int))

#- Zpicker
self.zpicker = Zpicker(specobj, self.zfinders, self.zfitters, flags)
self.zpicker = ZPicker(specobj, self.zfinders, self.zfitters, flags)

#- Fill in outputs
self.type = np.asarray([self.zpicker.type[i][0] for i in range(nspec)])
Expand Down

0 comments on commit 9dfad1d

Please sign in to comment.