Merge pull request #2021 from andrewwstephens/undo/REL-3977

feature/REL-3977: REMOVE Gaia bands from the ITC & OT
gemini-hlsw · May 16, 2022 · aa8c5d8 · aa8c5d8
2 parents 265666e + 36b93f4
commit aa8c5d8
Show file tree

Hide file tree

Showing 14 changed files with 126 additions and 163 deletions.
diff --git a/bundle/edu.gemini.catalog/src/main/scala/edu/gemini/catalog/votable/VoTableParser.scala b/bundle/edu.gemini.catalog/src/main/scala/edu/gemini/catalog/votable/VoTableParser.scala
@@ -331,15 +331,6 @@ object CatalogAdapter {
     override def parseAngularVelocity(ucd: Ucd, v: String): CatalogProblem \/ AngularVelocity =
       CatalogAdapter.parseDoubleValue(ucd, v).map(AngularVelocity.fromDegreesPerYear)
 
-    // PPXML g mag is mapped to Sloan 'g
-    override def parseBand(id: FieldId, band: String): Option[MagnitudeBand] =
-      (id.id, id.ucd) match {
-        case ("gmag" | "gmag_err", ucd) if ucd.includes(UcdWord("em.opt.g")) =>
-          Some(MagnitudeBand._g)
-        case _                                                               =>
-          super.parseBand(id, band)
-      }
-
     override def filterAndDeduplicateMagnitudes(magnitudeFields: List[(FieldId, Magnitude)]): List[Magnitude] = {
       // Read all magnitudes, including duplicates
       val magMap1 = (Map.empty[String, Magnitude]/:magnitudeFields) {

diff --git a/bundle/edu.gemini.catalog/src/test/scala/edu/gemini/catalog/votable/VoTableParserSpec.scala b/bundle/edu.gemini.catalog/src/test/scala/edu/gemini/catalog/votable/VoTableParserSpec.scala
@@ -733,6 +733,9 @@ class VoTableParserSpec extends Specification with VoTableParser {
     }
     "be able to validate and parse an v1.4 xml from ucac4" in {
       val xmlFile = "votable-ucac4-v1_4.xml"
+
+      println(VoTableParser.parse(CatalogName.UCAC4, getClass.getResourceAsStream(s"/$xmlFile")))
+
       VoTableParser.parse(CatalogName.UCAC4, getClass.getResourceAsStream(s"/$xmlFile")).map(_.tables.forall(!_.containsError)) must beEqualTo(\/.right(true))
       VoTableParser.parse(CatalogName.UCAC4, getClass.getResourceAsStream(s"/$xmlFile")).getOrElse(ParsedVoResource(Nil)).tables should be size 1
     }

diff --git a/bundle/edu.gemini.itc.web/src/main/resources/index.html b/bundle/edu.gemini.itc.web/src/main/resources/index.html
@@ -100,6 +100,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 2022-Apr-23</footer>
+<footer>Last updated 2022-May-16</footer>
 </body>
 </html>
diff --git a/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCacqCam.html b/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCacqCam.html
@@ -80,16 +80,13 @@
                     <select name="WavebandDefinition" size="1">
                         <option value="U">U (0.36 µm)</option>
                         <option value="B">B (0.44 µm)</option>
-                        <option value="g">g' (0.48 µm)</option>
- 						<option value="G_BP">G_BP (0.51 µm)</option>
+                        <option value="g">g' (0.48 µm) </option>
                         <option value="V">V (0.55 µm)</option>
-                        <option value="r">r' (0.62 µm)</option>
-						<option value="G">G (0.64 µm)</option>
+                        <option value="r">r' (0.62 µm) </option>
                         <option value="R" selected>R (0.67 µm)</option>
-                        <option value="i">i' (0.77 µm)</option>
-						<option value="G_RP">G_RP (0.78 µm)</option>
+                        <option value="i">i' (0.77 µm) </option>
                         <option value="I">I (0.87 µm)</option>
-                        <option value="z">z' (0.92 µm)</option>
+                        <option value="z">z' (0.92 µm) </option>
                         <option value="Y">Y (1.02 µm)</option>
                         <option value="J">J (1.25 µm)</option>
                         <option value="H">H (1.65 µm)</option>
@@ -104,9 +101,7 @@
 
             <tr>
                 <td colspan="3">
-                    <p align="right">
-                        <input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
-                    </p>
+                    <p align="right"><input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;"></p>
                 </td>
             </tr>
 

diff --git a/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCflamingos2.html b/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCflamingos2.html
@@ -78,20 +78,18 @@
             </tr>
 
             <tr>
-                <td colspan="3"><img src="/spacer.gif" height="40" width="1" style="opacity:0.0"/>with the above <b>brightness normalisation</b> applied in filter
+                <td colspan="3"><img src="/spacer.gif" height="40" width="1" style="opacity:0.0"/>
+                    with the above <b>brightness normalisation</b> applied in filter
                     <select name="WavebandDefinition" size="1">
                         <option value="U">U (0.36 µm)</option>
                         <option value="B">B (0.44 µm)</option>
-                        <option value="g">g' (0.48 µm)</option>
- 						<option value="G_BP">G_BP (0.51 µm)</option>
+                        <option value="g">g' (0.48 µm) </option>
                         <option value="V">V (0.55 µm)</option>
-                        <option value="r">r' (0.62 µm)</option>
- 						<option value="G">G (0.64 µm)</option>
+                        <option value="r">r' (0.62 µm) </option>
                         <option value="R">R (0.67 µm)</option>
-                        <option value="i">i' (0.77 µm)</option>
-						<option value="G_RP">G_RP (0.78 µm)</option>
+                        <option value="i">i' (0.77 µm) </option>
                         <option value="I">I (0.87 µm)</option>
-                        <option value="z">z' (0.92 µm)</option>
+                        <option value="z">z' (0.92 µm) </option>
                         <option value="Y">Y (1.02 µm)</option>
                         <option value="J">J (1.25 µm)</option>
                         <option value="H">H (1.65 µm)</option>
@@ -106,7 +104,7 @@
 
             <tr>
                 <td colspan="3">
-                    <p align="right">
+                    <p align="right"> <!--<input src="https://www.gemini.edu/sciops/instruments/itc/calcButton.gif" align="absbottom" border="0" height="24" type="image" width="78" /> -->
                         <input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
                     </p>
                 </td>

diff --git a/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCgmos.html b/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCgmos.html
@@ -80,16 +80,13 @@
 					<select name="WavebandDefinition" size="1">
 						<option value="U">U (0.36 µm)</option>
 						<option value="B">B (0.44 µm)</option>
-						<option value="g">g' (0.48 µm)</option>
-						<option value="G_BP">G_BP (0.51 µm)</option>
+						<option value="g">g' (0.48 µm) </option>
 						<option value="V">V (0.55 µm)</option>
-						<option value="r">r' (0.62 µm)</option>
-						<option value="G">G (0.64 µm)</option>
+						<option value="r">r' (0.62 µm) </option>
 						<option value="R" selected>R (0.67 µm)</option>
-						<option value="i">i' (0.77 µm)</option>
-						<option value="G_RP">G_RP (0.78 µm)</option>
+						<option value="i">i' (0.77 µm) </option>
 						<option value="I">I (0.87 µm)</option>
-						<option value="z">z' (0.92 µm)</option>
+						<option value="z">z' (0.92 µm) </option>
 						<option value="Y">Y (1.02 µm)</option>
 						<option value="J">J (1.25 µm)</option>
 						<option value="H">H (1.65 µm)</option>
@@ -104,9 +101,9 @@
 
 			<tr>
 				<td colspan="3">
-					<p align="right">
-						<input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
-					</p>
+				<p align="right"> <!--<input src="https://www.gemini.edu/sciops/instruments/itc/calcButton.gif" align="absbottom" border="0" height="24" type="image" width="78" /> -->
+					<input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
+				</p>
 				</td>
 			</tr>
 

diff --git a/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCgmosSouth.html b/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCgmosSouth.html
@@ -78,35 +78,33 @@
             <tr>
                 <td colspan="3"><img src="/spacer.gif" height="40" width="1" style="opacity:0.0"/>with the above <b>brightness normalisation</b> applied in filter
                     <select name="WavebandDefinition" size="1">
-                        <option value="U">U (0.36 µm)</option>
-                        <option value="B">B (0.44 µm)</option>
-                        <option value="g">g' (0.48 µm)</option>
-						<option value="G_BP">G_BP (0.51 µm)</option>
-                        <option value="V">V (0.55 µm)</option>
-                        <option value="r">r' (0.62 µm)</option>
-						<option value="G">G (0.64 µm)</option>
-                        <option value="R" selected>R (0.67 µm)</option>
-                        <option value="i">i' (0.77 µm)</option>
-						<option value="G_RP">G_RP (0.78 µm)</option>
-                        <option value="I">I (0.87 µm)</option>
-                        <option value="z">z' (0.92 µm)</option>
-                        <option value="Y">Y (1.02 µm)</option>
-                        <option value="J">J (1.25 µm)</option>
-                        <option value="H">H (1.65 µm)</option>
-                        <option value="K">K (2.2 µm)</option>
-                        <option value="L">L' (3.76 µm)</option>
-                        <option value="M">M' (4.77 µm)</option>
-                        <option value="N">N (10.5 µm)</option>
-                        <option value="Q">Q (20.1 µm)</option>
-                    </select> band
+                    <option value="U">U (0.36 µm)</option>
+                    <option value="B">B (0.44 µm)</option>
+                    <option value="g">g' (0.48 µm) </option>
+                    <option value="V">V (0.55 µm)</option>
+                    <option value="r">r' (0.62 µm) </option>
+                    <option value="R" selected>R (0.67 µm)</option>
+                    <option value="i">i' (0.77 µm) </option>
+                    <option value="I">I (0.87 µm)</option>
+                    <option value="z">z' (0.92 µm) </option>
+                    <option value="Y">Y (1.02 µm)</option>
+                    <option value="J">J (1.25 µm)</option>
+                    <option value="H">H (1.65 µm)</option>
+                    <option value="K">K (2.2 µm)</option>
+                    <option value="L">L' (3.76 µm)</option>
+                    <option value="M">M' (4.77 µm)</option>
+                    <option value="N">N (10.5 µm)</option>
+                    <option value="Q">Q (20.1 µm)</option>
+                </select> band
                 </td>
             </tr>
 
             <tr>
                 <td colspan="3">
-                    <p align="right">
-                        <input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
-                    </p>
+                <p align="right">
+                   <!-- <input src="https://www.gemini.edu/sciops/instruments/itc/calcButton.gif" align="absbottom" border="0" height="24" type="image" width="78" /> -->
+                    <input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
+                </p>
                 </td>
             </tr>
 

diff --git a/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCgnirs.html b/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCgnirs.html
@@ -84,16 +84,13 @@
 					<select name="WavebandDefinition" size="1">
 						<option value="U">U (0.36 µm)</option>
 						<option value="B">B (0.44 µm)</option>
-						<option value="g">g' (0.48 µm)</option>
-						<option value="G_BP">G_BP (0.51 µm)</option>
+						<option value="g">g' (0.48 µm) </option>
 						<option value="V">V (0.55 µm)</option>
-						<option value="r">r' (0.62 µm)</option>
-						<option value="G">G (0.64 µm)</option>
+						<option value="r">r' (0.62 µm) </option>
 						<option value="R">R (0.67 µm)</option>
-						<option value="i">i' (0.77 µm)</option>
-						<option value="G_RP">G_RP (0.78 µm)</option>
+						<option value="i">i' (0.77 µm) </option>
 						<option value="I">I (0.87 µm)</option>
-						<option value="z">z' (0.92 µm)</option>
+						<option value="z">z' (0.92 µm) </option>
 						<option value="Y">Y (1.02 µm)</option>
 						<option value="J">J (1.25 µm)</option>
 						<option value="H">H (1.65 µm)</option>
@@ -108,9 +105,9 @@
 
 			<tr>
 				<td colspan="3">
-					<p align="right">
-						<input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
-					</p>
+				<p align="right"> <!--<input src="https://www.gemini.edu/sciops/instruments/itc/calcButton.gif" align="absbottom" border="0" height="24" type="image" width="78" /> -->
+					<input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
+				</p>
 			</td>
 			</tr>
 

diff --git a/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCgsaoi.html b/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCgsaoi.html
@@ -83,16 +83,13 @@
 					<select name="WavebandDefinition" size="1">
 						<option value="U">U (0.36 µm)</option>
 						<option value="B">B (0.44 µm)</option>
-						<option value="g">g' (0.48 µm)</option>
- 						<option value="G_BP">G_BP (0.51 µm)</option>
+						<option value="g">g' (0.48 µm) </option>
 						<option value="V">V (0.55 µm)</option>
-						<option value="r">r' (0.62 µm)</option>
- 						<option value="G">G (0.64 µm)</option>
+						<option value="r">r' (0.62 µm) </option>
 						<option value="R">R (0.67 µm)</option>
-						<option value="i">i' (0.77 µm)</option>
-						<option value="G_RP">G_RP (0.78 µm)</option>
+						<option value="i">i' (0.77 µm) </option>
 						<option value="I">I (0.87 µm)</option>
-						<option value="z">z' (0.92 µm)</option>
+						<option value="z">z' (0.92 µm) </option>
 						<option value="Y">Y (1.02 µm)</option>
 						<option value="J">J (1.25 µm)</option>
 						<option value="H">H (1.65 µm)</option>
@@ -107,7 +104,7 @@
 
 			<tr>
 				<td colspan="3">
-					<p align="right">
+					<p align="right"> <!--<input src="https://www.gemini.edu/sciops/instruments/itc/calcButton.gif" align="absbottom" border="0" height="24" type="image" width="78" /> -->
 						<input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
 					</p>
 				</td>

diff --git a/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCmichelle.html b/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCmichelle.html
@@ -74,38 +74,35 @@
                         <option value="ERGS_FREQUENCY_PSA">erg/s/cm²/Hz/arcsec²</option>
                     </select> (e.g. 21.6 mag/arcsec²)
                 </td>
-			</tr>
 
-			<tr>
-				<td colspan="3"><img src="/spacer.gif" height="40" width="1" style="opacity:0.0"/>with the above <b>brightness normalisation</b> applied in filter
-					<select name="WavebandDefinition" size="1">
-						<option value="U">U (0.36 µm)</option>
-						<option value="B">B (0.44 µm)</option>
-						<option value="g">g' (0.48 µm)</option>
- 						<option value="G_BP">G_BP (0.51 µm)</option>
-						<option value="V">V (0.55 µm)</option>
-						<option value="r">r' (0.62 µm)</option>
- 						<option value="G">G (0.64 µm)</option>
-						<option value="R">R (0.67 µm)</option>
-						<option value="i">i' (0.77 µm)</option>
-						<option value="G_RP">G_RP (0.78 µm)</option>
-						<option value="I">I (0.87 µm)</option>
-						<option value="z">z' (0.92 µm)</option>
-						<option value="Y">Y (1.02 µm)</option>
-						<option value="J">J (1.25 µm)</option>
-						<option value="H">H (1.65 µm)</option>
-						<option value="K">K (2.2 µm)</option>
-						<option value="L">L' (3.76 µm)</option>
-						<option value="M">M' (4.77 µm)</option>
-						<option value="N">N (10.5 µm)</option>
-						<option value="Q">Q (20.1 µm)</option>
-					</select> band
-				</td>
 			</tr>
+			<tr>
+				<td colspan="3"><img src="/spacer.gif" height="40" width="1" style="opacity:0.0"/>with the above <b>brightness normalisation</b> applied in filter <select name="WavebandDefinition" size="1">
+
+                    <option value="U">U (0.36 µm)</option>
+                    <option value="B">B (0.44 µm)</option>
+                    <option value="g">g' (0.48 µm) </option>
+                    <option value="V">V (0.55 µm)</option>
+                    <option value="r">r' (0.62 µm) </option>
+                    <option value="R">R (0.67 µm)</option>
+                    <option value="i">i' (0.77 µm) </option>
+                    <option value="I">I (0.87 µm)</option>
+                    <option value="z">z' (0.92 µm) </option>
+					<option value="Y">Y (1.02 µm)</option>
+					<option value="J">J (1.25 µm)</option>
+                    <option value="H">H (1.65 µm)</option>
+                    <option value="K">K (2.2 µm)</option>
+                    <option value="L">L' (3.76 µm)</option>
+                    <option value="M">M' (4.77 µm)</option>
+                    <option value="N">N (10.5 µm)</option>
+                    <option value="Q">Q (20.1 µm)</option>
 
+				</select> band</td>
+
+			</tr>
 			<tr>
 				<td colspan="3">
-					<p align="right">
+					<p align="right"> <!--<input src="https://www.gemini.edu/sciops/instruments/itc/calcButton.gif" align="absbottom" border="0" height="24" type="image" width="78" /> -->
 						<input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
 					</p>
 				</td>

diff --git a/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCnifs.html b/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCnifs.html
@@ -81,16 +81,13 @@
 					<select name="WavebandDefinition" size="1">
 						<option value="U">U (0.36 µm)</option>
 						<option value="B">B (0.44 µm)</option>
-						<option value="g">g' (0.48 µm)</option>
- 						<option value="G_BP">G_BP (0.51 µm)</option>
+						<option value="g">g' (0.48 µm) </option>
 						<option value="V">V (0.55 µm)</option>
-						<option value="r">r' (0.62 µm)</option>
- 						<option value="G">G (0.64 µm)</option>
+						<option value="r">r' (0.62 µm) </option>
 						<option value="R">R (0.67 µm)</option>
-						<option value="i">i' (0.77 µm)</option>
-						<option value="G_RP">G_RP (0.78 µm)</option>
+						<option value="i">i' (0.77 µm) </option>
 						<option value="I">I (0.87 µm)</option>
-						<option value="z">z' (0.92 µm)</option>
+						<option value="z">z' (0.92 µm) </option>
 						<option value="Y">Y (1.02 µm)</option>
 						<option value="J">J (1.25 µm)</option>
 						<option value="H">H (1.65 µm)</option>
@@ -105,7 +102,7 @@
 
 			<tr>
 				<td colspan="3">
-					<p align="right">
+					<p align="right"> <!--<input src="https://www.gemini.edu/sciops/instruments/itc/calcButton.gif" align="absbottom" border="0" height="24" type="image" width="78" /> -->
 						<input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
 					</p>
 				</td>

diff --git a/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCniri.html b/bundle/edu.gemini.itc.web/src/main/resources/servlets/web/ITCniri.html
@@ -83,16 +83,13 @@
 					<select name="WavebandDefinition" size="1">
 						<option value="U">U (0.36 µm)</option>
 						<option value="B">B (0.44 µm)</option>
-						<option value="g">g' (0.48 µm)</option>
-						<option value="G_BP">G_BP (0.51 µm)</option>
+						<option value="g">g' (0.48 µm) </option>
 						<option value="V">V (0.55 µm)</option>
-						<option value="r">r' (0.62 µm)</option>
-						<option value="G">G (0.64 µm)</option>
+						<option value="r">r' (0.62 µm) </option>
 						<option value="R">R (0.67 µm)</option>
-						<option value="i">i' (0.77 µm)</option>
-						<option value="G_RP">G_RP (0.78 µm)</option>
+						<option value="i">i' (0.77 µm) </option>
 						<option value="I">I (0.87 µm)</option>
-						<option value="z">z' (0.92 µm)</option>
+						<option value="z">z' (0.92 µm) </option>
 						<option value="Y">Y (1.02 µm)</option>
 						<option value="J">J (1.25 µm)</option>
 						<option value="H">H (1.65 µm)</option>
@@ -107,7 +104,7 @@
 
 			<tr>
 				<td colspan="3">
-					<p align="right">
+					<p align="right"> <!--<input src="https://www.gemini.edu/sciops/instruments/itc/calcButton.gif" align="absbottom" border="0" height="24" type="image" width="78" /> -->
 						<input value="Calculate" type="submit" style="background-color: gold; padding: 3px 8px;">
 					</p>
 				</td>

diff --git a/bundle/edu.gemini.itc/src/main/scala/edu/gemini/itc/base/ZeroMagnitudeStar.scala b/bundle/edu.gemini.itc/src/main/scala/edu/gemini/itc/base/ZeroMagnitudeStar.scala
@@ -39,13 +39,9 @@ object ZeroMagnitudeStar {
     case `_i` => 93600000
     case `_z` => 79800000
 
-    // Gaia values derived from synphot:
-    case `GB` => 103400000
-    case `G`  =>  79500000
-    case `GR` =>  50390000
-
     // Other bands are not supported, in particular AP and UC
     case _ => sys.error("unsupported waveband " + band.name)
 
+
   }
 }