Merge pull request #1515 from Caltech-IPAC/IRSA-5732-wise-yr10-update

IRSA-5732 UI update for WISE year10 data release

Author: wmiipac

src/firefly/java/edu/caltech/ipac/astro/ibe/datasource/WiseIbeDataSource.java

@@ -413,8 +413,8 @@ private String processConstraints(Map<String, String> queryInfo) {
             }
 
             if (mergeImageSet.contains(DataProduct.NEOWISER_1B.dataset)) {
-                if (n>0) imageSetConstraint += ",6,7,8,9,10,11,12,13,14";
-                else imageSetConstraint += ",6,7,8,9,10,11,12,13,14";
+                if (n>0) imageSetConstraint += ",6,7,8,9,10,11,12,13,14,15";
+                else imageSetConstraint += ",6,7,8,9,10,11,12,13,14,15";
                 n++;
             }
 

src/firefly/java/edu/caltech/ipac/firefly/data/WiseRequest.java

@@ -73,8 +73,9 @@ public class WiseRequest extends TableServerRequest {
     public final static String NEOWISER_YR6 = "neowiser_yr6";
     public final static String NEOWISER_YR7 = "neowiser_yr7";
     public final static String NEOWISER_YR8 = "neowiser_yr8";
-    public final static String NEOWISER_YR9 = "neowiser_yr9";       //yr9  neowiser going public
-    public final static String NEOWISER_YR10 = "neowiser_yr10";
+    public final static String NEOWISER_YR9 = "neowiser_yr9";
+    public final static String NEOWISER_YR10 = "neowiser_yr10";     //yr10 going public Mar.2024
+    public final static String NEOWISER_YR11 = "neowiser_yr11";     //yr11 ongoing ingestion
     public final static String PASS2_4BAND = "pass2-4band";
     public final static String PASS2_3BAND = "pass2-3band";
     public final static String PASS2_2BAND = "pass2-2band";
@@ -101,9 +102,9 @@ public class WiseRequest extends TableServerRequest {
             put(NEOWISER_YR6,"neowiser_p1bs_psd");
             put(NEOWISER_YR7,"neowiser_p1bs_psd");
             put(NEOWISER_YR8,"neowiser_p1bs_psd");
-            put(NEOWISER_YR9,"neowiser_p1bs_psd");   //yr9  neowiser going public
-            put(NEOWISER_YR10,"neowiser_i1bs_psd");  //yr10 internal ongoing ingestion
-
+            put(NEOWISER_YR9,"neowiser_p1bs_psd");
+            put(NEOWISER_YR10,"neowiser_p1bs_psd");  //yr10 going public Mar. 2024
+            put(NEOWISER_YR11,"neowiser_i1bs_psd");  //yr1 internal ongoing ingestion
         }
     };
     private final static Map<String,String> IMAGE_SET_DESC = new HashMap<String,String>(){
@@ -190,10 +191,10 @@ public class WiseRequest extends TableServerRequest {
             put(NEOWISER_YR4 +"|1b", new String[]{"yr4_p1bm_frm", "yr4_p1bs_psd"});
             put(NEOWISER_YR5 +"|1b", new String[]{"yr5_p1bm_frm", "yr5_p1bs_psd"});
             put(NEOWISER_YR6 +"|1b", new String[]{"yr6_p1bm_frm", "yr6_p1bs_psd"});
-            put(NEOWISER_YR7 +"|1b", new String[]{"yr7_p1bm_frm", "yr7_p1bs_psd"});  //  yr7 goes public March 2021
-            put(NEOWISER_YR8 +"|1b", new String[]{"yr8_i1bm_frm", "yr8_i1bs_psd"});  //  yr8 internal for iwise
-            put(NEOWISER_YR9 +"|1b", new String[]{"yr9_i1bm_frm", "yr9_i1bs_psd"});  //  yr9 internal for iwise
-            put(NEOWISER_YR10 +"|1b", new String[]{"yr10_i1bm_frm", "yr10_i1bs_psd"});  //  yr10 internal for iwise
+            put(NEOWISER_YR7 +"|1b", new String[]{"yr7_p1bm_frm", "yr7_p1bs_psd"});
+            put(NEOWISER_YR8 +"|1b", new String[]{"yr8_p1bm_frm", "yr8_p1bs_psd"});
+            put(NEOWISER_YR9 +"|1b", new String[]{"yr9_p1bm_frm", "yr9_p1bs_psd"});
+            put(NEOWISER_YR10 +"|1b", new String[]{"yr10_p1bm_frm", "yr10_p1bs_psd"});  //  yr10 going public Mar. 2024
             put(MERGE_INT+"|1b", new String[]{"merge_i1bm_frm", "merge_i1bs_psd"});
             put(MERGE_INT+"|3a", new String[]{"merge_p3am_cdd", "merge_p3as_psd"});
             put(PASS2_4BAND+"|1b", new String[]{"4band_i1bm_frm", "4band_i1bs_psd"});
@@ -233,8 +234,8 @@ public class WiseRequest extends TableServerRequest {
             put(NEOWISER_YR7, new Integer[]{12254, 23446}); // 12254r is the first scan for yr7, 23446r is the last scan
             put(NEOWISER_YR8, new Integer[]{23447, 34601}); // 23447r is the first scan for yr8, 34601r is the last scan
             put(NEOWISER_YR9, new Integer[]{34601, 45803}); // 34601s is the first scan for yr9, 45803r is the last scan
-            put(NEOWISER_YR10, new Integer[]{45804, 99999}); // 45804r is the first scan for yr10
-
+            put(NEOWISER_YR10, new Integer[]{45804, 57041}); // 45804r is the first scan for yr10, 57041r is the last scan
+            put(NEOWISER_YR11, new Integer[]{57042, 99999}); // 57042r is the first scan for yr11
         }
     };
 

src/firefly/java/edu/caltech/ipac/firefly/server/query/wise/QueryWise.java

@@ -393,7 +393,8 @@ private String processConstraints(WiseRequest req) throws EndUserException {
                 else imageSetConstraint += "2";
                 n++;
             }
-            if (imageSets.contains(WiseRequest.NEOWISER_YR1)) {
+            // commented out the internal wise image set (iwise gwt version)
+            /*if (imageSets.contains(WiseRequest.NEOWISER_YR1)) {
                 if (n>0) imageSetConstraint += ",6";
                 else imageSetConstraint += "6";
                 n++;
@@ -437,11 +438,11 @@ private String processConstraints(WiseRequest req) throws EndUserException {
                 if (n>0) imageSetConstraint += ",14";
                 else imageSetConstraint += "14";
                 n++;
-            }
+            }*/
 
-            if (imageSets.contains(WiseRequest.NEOWISER)) {    // public merge upto yr9
-                if (n > 0) imageSetConstraint += ",6,7,8,9,10,11,12,13,14";
-                else imageSetConstraint += "6,7,8,9,10,11,12,13,14";
+            if (imageSets.contains(WiseRequest.NEOWISER)) {    // public merge upto yr10
+                if (n > 0) imageSetConstraint += ",6,7,8,9,10,11,12,13,14,15";
+                else imageSetConstraint += "6,7,8,9,10,11,12,13,14,15";
                 n++;
             }