Skip to content

Commit

Permalink
even more minor style changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rcooper295 committed Sep 1, 2023
1 parent b54db76 commit cb55336
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions jwst/ami/oifits.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ def populate_nrm_dict(self):
ucoord = self.bls[:, 1]
vcoord = self.bls[:, 0]

Check warning on line 152 in jwst/ami/oifits.py

View check run for this annotation

Codecov / codecov/patch

jwst/ami/oifits.py#L151-L152

Added lines #L151 - L152 were not covered by tests

D = 6.5 # Primary mirror display
# D = 6.5 # Primary mirror display

theta = np.linspace(0, 2*np.pi, 100)
# theta = np.linspace(0, 2*np.pi, 100)

# x = D/2. * np.cos(theta) # Primary mirror display
# y = D/2. * np.sin(theta)
Expand Down Expand Up @@ -490,7 +490,6 @@ def populate_oimodel(self):
m.meta.oifits.instrument_mode = self.oifits_dct['info']['INSMODE']

Check warning on line 490 in jwst/ami/oifits.py

View check run for this annotation

Codecov / codecov/patch

jwst/ami/oifits.py#L483-L490

Added lines #L483 - L490 were not covered by tests

# oi_array extension data
nrows = 7
m.array['TEL_NAME'] = self.oifits_dct['OI_ARRAY']['TEL_NAME']
m.array['STA_NAME'] = self.oifits_dct['OI_ARRAY']['STA_NAME']
m.array['STA_INDEX'] = self.oifits_dct['OI_ARRAY']['STA_INDEX']
Expand Down
6 changes: 3 additions & 3 deletions jwst/ami/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,6 @@ def get_src_spec(sptype):
return sptype

Check warning on line 1251 in jwst/ami/utils.py

View check run for this annotation

Codecov / codecov/patch

jwst/ami/utils.py#L1249-L1251

Added lines #L1249 - L1251 were not covered by tests
else:
# phoenix model lookup table used in JWST ETCs
catname = 'Phoenix'
lookuptable = {

Check warning on line 1254 in jwst/ami/utils.py

View check run for this annotation

Codecov / codecov/patch

jwst/ami/utils.py#L1254

Added line #L1254 was not covered by tests
"O3V": (45000, 0.0, 4.0),
"O5V": (41000, 0.0, 4.5),
Expand Down Expand Up @@ -1312,7 +1311,7 @@ def get_src_spec(sptype):
return grid_to_spec('phoenix', keys[0], keys[1], keys[2])
except IOError:
errmsg = ("Could not find a match in catalog {catname} for key {sptype}. Check that is a valid name in the " +

Check warning on line 1313 in jwst/ami/utils.py

View check run for this annotation

Codecov / codecov/patch

jwst/ami/utils.py#L1309-L1313

Added lines #L1309 - L1313 were not covered by tests
"lookup table, and/or that synphot is installed properly.".format(catname, sptype))
"lookup table, and/or that synphot is installed properly.".format())
raise LookupError(errmsg)

Check warning on line 1315 in jwst/ami/utils.py

View check run for this annotation

Codecov / codecov/patch

jwst/ami/utils.py#L1315

Added line #L1315 was not covered by tests

def combine_src_filt(bandpass, srcspec, trim=0.01, nlambda=19, verbose=False, plot=False):

Check warning on line 1317 in jwst/ami/utils.py

View check run for this annotation

Codecov / codecov/patch

jwst/ami/utils.py#L1317

Added line #L1317 was not covered by tests
Expand Down Expand Up @@ -1365,7 +1364,8 @@ def combine_src_filt(bandpass, srcspec, trim=0.01, nlambda=19, verbose=False, pl
effstims = []

Check warning on line 1364 in jwst/ami/utils.py

View check run for this annotation

Codecov / codecov/patch

jwst/ami/utils.py#L1359-L1364

Added lines #L1359 - L1364 were not covered by tests

binfac = ptsin // nlambda
if verbose: print("Binning spectrum by %i: from %i points to %i points" % (binfac, ptsin, nlambda))
if verbose:
print("Binning spectrum by %i: from %i points to %i points" % (binfac, ptsin, nlambda))
for wave in wavesteps:
if verbose:
print(f"\t Integrating across band centered at {wave.to(u.micron):.2f} "

Check warning on line 1371 in jwst/ami/utils.py

View check run for this annotation

Codecov / codecov/patch

jwst/ami/utils.py#L1366-L1371

Added lines #L1366 - L1371 were not covered by tests
Expand Down

0 comments on commit cb55336

Please sign in to comment.