Skip to content

Commit

Permalink
Revert "add new SEDs and update baseline test results"
Browse files Browse the repository at this point in the history 
This reverts commit d64e7d4.
  • Loading branch information
@cquiroz
cquiroz committed Nov 25, 2024
1 parent d4afe36 commit 069a937
Show file tree
Hide file tree
Showing 112 changed files with 5,768 additions and 26,185,545 deletions.
2 changes: 1 addition & 1 deletion bundle/edu.gemini.itc.web/src/main/resources/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ <h1>Integration Time Calculator Test Page</h1>
<br>
Plots of data files: <a href='../itcdocs/plots/index.html'>../itcdocs/plots/</a>
<hr>
<footer>Last updated 2024-Nov-14</footer>
<footer>Last updated 2024-Aug-27</footer>
</body>
</html>
140 changes: 115 additions & 25 deletions bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCacqCam.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
<title>Acquisition Camera ITC</title>
<base target="content_frame">
<link rel="stylesheet" type="text/css" href="itc_test.css" />
<script src="./jQuery/jquery-3.6.1.js" type="text/javascript"></script>
<script>$(function(){$("#seds_stellar").load("./seds_stellar.html");});</script>
<script>$(function(){$("#seds_nonstellar").load("./seds_nonstellar.html");});</script>
</head>

<body link="#0000FF" vlink="#8B0000" text="#000000" bgcolor="#ffffff">
Expand All @@ -26,11 +23,10 @@
cellpadding="6" cellspacing="0">
<tr>
<td colspan="3"><b>Spatial profile and brightness:</b><i><font size="-1">(<a href="#" onclick="window.open('http://www.gemini.edu/?q=node/10257','mywindow','width=1000,height=700,toolbar=no,location=no,directories=no,sta tus=no,menubar=no,scrollbars=yes,copyhistory=no,resizable=no'); return false">more info</a>)</font></i><br>
<i>Choose one of point, extended or user-defined source profile and the brightness in any filter/wavelength</i>
</td>
<i>Choose one of point, extended or user-defined source profile and the brightness in any filter/wavelength </i></td>
</tr>

<tr>

<td><input type="radio" name="Profile" value="POINT" checked></td>
<td colspan="2"><b>Point source</b> (<a href="#" onclick="window.open('http://www.gemini.edu/?q=node/10257#spatial','mywindow','width=1000,height=700,toolbar=no,location=no,directories=no,sta tus=no,menubar=no,scrollbars=yes,copyhistory=no,resizable=no'); return false">nominal PSF</a>) with spatially integrated brightness <input type="text" name="psSourceNorm" size="8" value="20.0">
<select name="psSourceUnits" size="1">
Expand All @@ -43,14 +39,14 @@
</select> (e.g. 19.3 mag or 2e-17 W/m²/µm)
</td>
</tr>

<tr>

<td valign="top"></td>
<td colspan="2"><b>Extended source</b> having ... (When this option is selected the image quality selection in section 3 of the ITC is disabled.) </td>
<td colspan="2"><b>Extended source</b> having ...(When this option is selected the image quality selection in section 3 of the ITC is disabled.) </td>
</tr>

<tr>
<td>&nbsp;</td>

<td><img src="spacer.gif" width="40" height="1" style="opacity:0.0"/><input type="radio" name="Profile" value="GAUSSIAN"></td>
<td>Gaussian profile with full width half maximum of <input type="text" name="gaussFwhm" size="5" value="1.0"> arcsec and spatially integrated brightness of <input type="text" name="gaussSourceNorm" size="8" value="1.0e-3">
<select name="gaussSourceUnits" size="1">
Expand All @@ -63,8 +59,8 @@
</select> (e.g. 19.3 mag or 2e-17 W/m²/µm)
</td>
</tr>

<tr>

<td>&nbsp;</td>
<td><img src="spacer.gif" width="40" height="1" style="opacity:0.0"/><input type="radio" name="Profile" value="UNIFORM"></td>
<td>Uniform surface brightness <input type="text" name="usbSourceNorm" size="8" value="22.0">
Expand Down Expand Up @@ -104,7 +100,9 @@
</tr>

<tr>
<td colspan="3"><p align="right"><input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;"></p></td>
<td colspan="3">
<p align="right"><input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;"></p>
</td>
</tr>

<tr>
Expand All @@ -117,9 +115,104 @@
<i>Choose one SED, the redshift and extinction</i></td>
</tr>

<tr id="seds_nonstellar"></tr>
<tr>
<td><input value="LIBRARY_NON_STAR" name="Distribution" type="radio" /></td>
<td colspan="2">Library spectrum of a non-stellar object
<select name="nsSpectrumType" size="1">
<option value="Mars">Mars (540 nm - 5.0 µm)</option>
<option value="Jupiter">Jupiter (530 nm - 5.9 µm)</option>
<option value="Saturn">Saturn (530 nm - 5.9 µm)</option>
<option value="Uranus">Uranus (540 nm - 5.0 µm)</option>
<option value="Neptune">Neptune (540 nm - 5.0 µm)</option>
<option value="none" disabled></option>
<option value="Orion-nebula">HII region (Orion, 100 nm - 1.1 µm)</option>
<option value="Planetary-nebula">Planetary nebula (NGC 7009, 100 nm - 1.1 µm)</option>
<option value="Planetary-nebula2">Planetary nebula (IC 5117, 480 nm - 2.5 µm)</option>
<option value="none" disabled></option>
<option value="elliptical-galaxy">Elliptical galaxy (22 nm - 9.7 µm)</option>
<option value="spiral-galaxy" selected>Spiral galaxy (Sc, 22 nm - 9.7 µm)</option>
<option value="none" disabled></option>
<option value="QSO">QSO (80 nm - 0.855 µm)</option>
<option value="QSO2">QSO (276 nm - 3.52 µm)</option>
</select>
</td>
</tr>

<tr id="seds_stellar"></tr>
<tr>
<td><input value="LIBRARY_STAR" name="Distribution" checked="checked" type="radio" /></td>
<td colspan="2">Library spectrum of a
<select name="stSpectrumType" size="1">
<option value="O5V">O5V</option>
<option value="O8III">O8III</option>
<option value="B0V">B0V</option>
<option value="B5-7V">B5-7V</option>
<option value="B5III">B5III</option>
<option value="B5I">B5I</option>
<option value="A0V" selected>A0V</option>
<option value="A0III">A0III</option>
<option value="A0I">A0I</option>
<option value="A5V">A5V</option>
<option value="A5III">A5III</option>
<option value="F0V">F0V</option>
<option value="F0III">F0III</option>
<option value="F0I">F0I</option>
<option value="F5V">F5V</option>
<option value="F5V-w">F5V-w</option>
<option value="F6V-r">F6V-r</option>
<option value="F5III">F5III</option>
<option value="F5I">F5I</option>
<option value="G0V">G0V</option>
<option value="G0V-w">G0V-w</option>
<option value="G0V-r">G0V-r</option>
<option value="G0III">G0III</option>
<option value="G0I">G0I</option>
<option value="G2V">G2V</option>
<option value="G5V">G5V</option>
<option value="G5V-w">G5V-w</option>
<option value="G5V-r">G5V-r</option>
<option value="G5III">G5III</option>
<option value="G5III-w">G5III-w</option>
<option value="G5III-r">G5III-r</option>
<option value="G5I">G5I</option>
<option value="K0V">K0V</option>
<option value="K0V-r">K0V-r</option>
<option value="K0III">K0III</option>
<option value="K0III-w">K0III-w</option>
<option value="K0III-r">K0III-r</option>
<option value="K0-1II">K0-1II</option>
<option value="K4V">K4V</option>
<option value="K4III">K4III</option>
<option value="K4III-w">K4III-w</option>
<option value="K4III-r">K4III-r</option>
<option value="K4I">K4I</option>
<option value="M0V">M0V</option>
<option value="M0III">M0III</option>
<option value="M3V">M3V</option>
<option value="M3III">M3III</option>
<option value="M6V">M6V</option>
<option value="M6III">M6III</option>
<option value="M9III">M9III</option>

<option value="none" disabled></option>
<option value="none" disabled>Cool Star Models:</option>
<option value="csm2800K">2800K</option>
<option value="csm2600K">2600K</option>
<option value="csm2400K">2400K</option>
<option value="csm2200K">2200K</option>
<option value="csm2000K">2000K</option>
<option value="csm1800K">1800K</option>
<option value="csm1600K">1600K</option>
<option value="csm1400K">1400K</option>
<option value="csm1200K">1200K</option>
<option value="csm1000K">1000K</option>
<option value="csm900K">900K</option>
<option value="csm800K">800K</option>
<option value="csm600K">600K</option>
<option value="csm400K">400K</option>

</select> star (300 nm - 6 µm)
</td>
</tr>

<tr>
<td><input type="radio" value="ELINE" name="Distribution"></td>
Expand Down Expand Up @@ -149,15 +242,15 @@
<td><input type="radio" value="PLAW" name="Distribution"></td>
<td colspan="2">Model power-law spectrum (S_lambda = lambda ^ <input type="text" name="powerIndex" size="5" value="-1.0"> ) </td>
</tr>

<tr>
<td><input type="radio" value="USER_DEFINED" name="Distribution"></td>

<td colspan="2">User-defined spectrum read from file (size &lt; 1MB) <input type=FILE name = "specUserDef"></td>
</tr>

<tr>
<td colspan="3">with the <b>spectrum mapped</b> to a redshift <input type="radio" name="Recession" value="REDSHIFT" checked> z = <input type="text" name="z" size="5" value="0.0"> or a radial velocity <input type="radio" name="Recession" value="VELOCITY"> v
= <input type="text" name="v" size="5" value="0.0"> km/s</td>

</tr>

<tr>
Expand Down Expand Up @@ -321,30 +414,27 @@
<!-- calc method C-->
<tr>
<td colspan="3"><input type="radio" value="intTime" name="calcMethod"> Total integration time to achieve a S/N ratio of <input type="text" name="sigmaC" size="3" value="5"> using an exposure time for each exposure of <input type="text" name="expTimeC" size="5" value="60"> secs and with a fraction <input type="text" name="fracOnSourceC" size="4" value="1.0"> of exposures that observe the source </td>
</tr>

</tr>
<tr>
<tr>
<td colspan="2" height="40" valign="bottom"><b>Telescope offset:</b><i><span>(<a href="#" onclick="window.open('http://www.gemini.edu/sciops/instruments/gnirs/spectroscopy/observing-strategies#offsetting','mywindow','width=1000,height=700,toolbar=no,location=no,directories=no,sta tus=no,menubar=no,scrollbars=yes,copyhistory=no,resizable=no'); return false">more info</a>)</span></i></td>
</tr>

<tr>
<td colspan="2">Dither offset size: <input name="offset" size="5" value="0.0" type="text" /> arcsec</td>
</tr>

<tr>
<td height="50" valign="bottom" colspan="3"><b>Analysis method:</b> <i><font size="-1">(</font><a href="#" onclick="window.open('http://www.gemini.edu/?q=node/10256#analysis','mywindow','width=1000,height=700,toolbar=no,location=no,directories=no,sta tus=no,menubar=no,scrollbars=yes,copyhistory=no,resizable=no'); return false"><font size="-1">more info</font></a><font size="-1">)</font></i></td>
</tr>

<tr>
<td colspan="3"><input type="radio" value="autoAper" name="analysisMethod" checked> Software aperture that gives 'optimum' S/N ratio and with a sky aperture <input type="text" name="autoSkyAper" size="4" value="5"> times the target aperture</td>
</tr>
<td height="50" valign="bottom" colspan="3"><b>Analysis method:</b> <i><font size="-1">(</font><a href="#" onclick="window.open('http://www.gemini.edu/?q=node/10256#analysis','mywindow','width=1000,height=700,toolbar=no,location=no,directories=no,sta tus=no,menubar=no,scrollbars=yes,copyhistory=no,resizable=no'); return false"><font size="-1">more info</font></a><font size="-1">)</font></i></td>
</tr> <tr>
<td colspan="3"><input type="radio" value="autoAper" name="analysisMethod" checked> Software aperture that gives 'optimum' S/N ratio and with a sky aperture <input type="text" name="autoSkyAper" size="4" value="5"> times the target aperture</td>

</tr>
<tr>
<td colspan="3"><input type="radio" value="userAper" name="analysisMethod"> Software aperture of diameter (or slit length) <input type="text" name="userAperDiam" size="4" value="2">
arcsec and with a sky aperture <input type="text" name="userSkyAper" size="4" value="5"> times the target aperture</td>
</tr>

<tr>

<td colspan="3">
<p align="right"><input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;"></p>
</td>
Expand Down
Loading

0 comments on commit 069a937

Please sign in to comment.