Fixed Fortney grid select fields so no error is thrown

ExoCTK · Jul 17, 2024 · 291c0d6 · 291c0d6
1 parent f65ddc2
commit 291c0d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/exoctk/exoctk_app/app_exoctk.py b/exoctk/exoctk_app/app_exoctk.py
@@ -17,7 +17,6 @@
 
 from exoctk import log_exoctk
 from exoctk.contam_visibility.new_vis_plot import build_visibility_plot, get_exoplanet_positions
-#from exoctk.contam_visibility import visibilityPA as vpa
 from exoctk.contam_visibility import field_simulator as fs
 from exoctk.contam_visibility import contamination_figure as cf
 from exoctk.contam_visibility.miniTools import contamVerify
@@ -139,7 +138,7 @@ def fortney():
                                  plot_div=div,
                                  js_resources=js_resources,
                                  css_resources=css_resources,
-                                 temp=temp_out,
+                                 temp=sorted(temp_out, key=float),
                                  table_string=table_string
                                  )
 
@@ -525,11 +524,7 @@ def contam_visibility():
                 else:
 
                     # Get stars
-<<<<<<< HEAD
                     stars = fs.find_sources(ra_deg, dec_deg, target_date=form.epoch.data, verbose=False)
-=======
-                    stars = fs.find_sources(ra_deg, dec_deg, verbose=False)
->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
 
                     # Add companion
                     print(comp_teff, comp_mag, comp_dist, comp_pa)

diff --git a/exoctk/exoctk_app/form_validation.py b/exoctk/exoctk_app/form_validation.py
@@ -40,10 +40,7 @@ class ContamVisForm(BaseForm):
     ra = DecimalField('ra', validators=[NumberRange(min=0, max=360, message='RA must be between 0 and 360 degrees')])
     dec = DecimalField('dec', validators=[NumberRange(min=-90, max=90, message='Declinaton must be between -90 and 90 degrees')])
     v3pa = DecimalField('v3pa', default=-1, validators=[NumberRange(min=-1, max=360, message='PA must be between 0 and 360 degrees')])
-<<<<<<< HEAD
     epoch = IntegerField('epoch', default=Time.now().value.year, validators=[NumberRange(min=2000, max=2050, message='Epoch must be between 2000 and 2050')])
-=======
->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     inst = SelectField('inst', choices=[('NIS_SUBSTRIP256', 'NIRISS - SOSS - SUBSTRIP256'), ('NIS_SUBSTRIP96', 'NIRISS - SOSS - SUBSTRIP96'), ('NRCA5_GRISM256_F322W2', 'NIRCam - Grism Time Series - F322W2 (Visibility Only)'), ('NRCA5_GRISM256_F444W', 'NIRCam - Grism Time Series - F444W (Visibility Only)'), ('MIRI_SLITLESSPRISM', 'MIRI - LRS (Visibility Only)'), ('NIRSpec', 'NIRSpec (Visibility Only)')])
     delta_mag = DecimalField('delta_mag', default=None, validators=[Optional()])
     dist = DecimalField('dist', default=None, validators=[Optional()])
@@ -59,9 +56,9 @@ class FortneyModelForm(BaseForm):
     planet_mass_unit = SelectField('planet_mass_unit', choices=[('M_jup', 'Jupiter Mass'), ('kilogram', 'kilogram'), ('g', 'gram'), ('M_earth', 'Earth Mass'), ('M_sun', 'Solar Mass')], validators=[InputRequired('A mass unit is required')])
     planet_radius = DecimalField('planet_radius', default=1.25, validators=[InputRequired('A planet radius is required!'), NumberRange(min=0, message='Planet radius must be positive')])
     planet_radius_unit = SelectField('planet_radius_unit', choices=[('R_jup', 'Jupiter Radius'), ('kilometer', 'kilometer'), ('m', 'meter'), ('R_earth', 'Earth Radius'), ('R_sun', 'Solar Radius')], validators=[InputRequired('A planet radius unit is required')])
-    stellar_radius = DecimalField('stellar_radius', default=1.0, validators=[InputRequired('A stellar radius is required!'), NumberRange(min=0, message='Stellar radius must be positive')])
+    stellar_radius = DecimalField('stellar_radius', validators=[InputRequired('A stellar radius is required!'), NumberRange(min=0, message='Stellar radius must be positive')])
     stellar_radius_unit = SelectField('stellar_radius_unit', choices=[('R_sun', 'Solar Radius'), ('R_jup', 'Jupiter Radius'), ('kilometer', 'kilometer'), ('m', 'meter'), ('R_earth', 'Earth Radius')], validators=[InputRequired('A stellar radius unit is required')])
-    chemistry = SelectField('chemistry', choices=[('noTiO', '500'), ('eqchem', '750'), (1000, '1000'), (1250, '1250'), (1500, '1500'), (1750, '1750'), (2000, '2000'), (2250, '2250'), (2500, '2500')], validators=[InputRequired('A chemistry type is required')])
+    chemistry = SelectField('chemistry', choices=[('noTiO', '500'), ('eqchem', '750')], validators=[InputRequired('A chemistry type is required')])
     clouds = SelectField('clouds', choices=[('0', 'Nothing'), ('ray10', 'Weak Rayleigh'), ('ray100', 'Medium Rayleigh'), ('ray1000', 'Strong Rayleigh'), ('flat10', 'Weak Cloud'), ('flat100', 'Medium Cloud'), ('flat1000', 'Strong Cloud')], validators=[InputRequired('A cloud model is required')])
 
     # Form submits

diff --git a/exoctk/exoctk_app/templates/fortney.html b/exoctk/exoctk_app/templates/fortney.html
@@ -29,7 +29,6 @@ <h1>Fortney Grid</h1>
                 <div class="col-sm-3">
 
                     <select id="ptemp" name="ptemp" class="form-control" data-placeholder="Select Temp (K)">
-                        <option value=""></option>
                         {% for i in temp %}
                             <option {{ i }} value={{ i }}>{{ i }}</option>
                         {% endfor %}
@@ -45,7 +44,6 @@ <h1>Fortney Grid</h1>
                 <div class="col-sm-3">
 
                     <select id="pchem" name="pchem" class="form-control" data-placeholder="Select Chemistry">
-                        <option value=""></option>
                         <option value='noTiO'>Equilibrium Chemistry</option>
                         <option value='eqchem'>Equilibrium Chemistry, w/ TiO</option>
                     </select>
@@ -60,7 +58,6 @@ <h1>Fortney Grid</h1>
                 <div class="col-sm-3">
 
                     <select id="cloud" name="cloud" class="form-control" data-placeholder="Clouds/Scattering">
-                        <option value=""></option>
                         <option value="0">Nothing</option>
                         <option value="ray10">Weak Rayleigh</option>
                         <option value="ray100">Medium Rayleigh</option>