Skip to content

Commit

Permalink
Merge pull request #33 from ExoCTK/broadening_tor_outputs
Browse files Browse the repository at this point in the history
Adding the ability to pass maximum count to the tor.
  • Loading branch information
mattjhill authored Jul 7, 2017
2 parents ffa001e + 633be1d commit 8ebf548
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ExoCTK/tor/tor.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ def create_tor_dict(transit_time, n_group, mag, band, filt, ins, subarray, sat_m
obs_eff = calc_obs_efficiency(t_exp, t_duration)

# Write out dict
tor_dict = {'n_col': n_col, 'n_row': n_row, 'n_amp': n_amp, 'n_group': n_group, 'n_reset': n_reset,
tor_dict = {'n_col': n_col, 'n_row': n_row, 'n_amp': n_amp, 'n_group': n_group, 'n_reset': n_reset, 'sat_max': sat_max,
'n_frame': n_frame, 'n_skip': n_skip, 'obs_time': transit_time, 't_frame': round(t_frame, 3), 't_int': round(t_int, 3), 't_ramp': t_ramp,
'n_int': n_int, 't_exp': round(t_exp/3600, 3), 't_duration': round(t_duration/3600, 3), 'obs_eff': obs_eff}
return tor_dict
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ edit_on_github = True
github_project = ExoCTK/ExoCTK
install_requires = numpy scipy cython matplotlib numba pysynphot sphinx_automodapi sphinx_rtd_theme bibtexparser bokeh batman-package
# version should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440)
version = 0.1.2dev
version = 0.1.3
external_files = /user/jfilippazzo/Models/ExoCTK/

[entry_points]
Expand Down

0 comments on commit 8ebf548

Please sign in to comment.