Merge pull request #120 from Vidushi-GitHub/vidushi/location

Support a list or a single number in localization
nasa-gcn · Feb 23, 2024 · b33fa02 · b33fa02
2 parents e7e35d4 + 18ad741
commit b33fa02
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 34 deletions.
diff --git a/gcn/notices/core/Localization.example.json b/gcn/notices/core/Localization.example.json
@@ -2,10 +2,7 @@
   "$schema": "https://gcn.nasa.gov/schema/main/gcn/notices/core/Localization.schema.json",
   "ra": 120,
   "dec": 45,
-  "uncertainty_shape": "ellipse",
-  "ra_uncertainty": [-0.1, 0.05],
-  "dec_uncertainity": [-0.2, 0.5],
-  "position_angle": 0,
+  "ra_dec_error": [0.5, 0.8, 0],
   "containment_probability": 0.95,
   "systematic_included": true,
   "instrument_phi": 90,

diff --git a/gcn/notices/core/Localization.schema.json b/gcn/notices/core/Localization.schema.json
@@ -13,25 +13,22 @@
       "type": "number",
       "description": "ICRS declination [deg], utilizes the J2000 epoch and an equatorial coordinate system"
     },
-    "uncertainty_shape": {
-      "enum": ["circle", "ellipse", "rectangle"],
-      "description": "In what manner are the errors in RA and Dec defined - as circular, elliptical, or rectangular shapes",
-      "default": "circle"
-    },
-    "ra_uncertainty": {
-      "type": "array",
-      "maxItems": 2,
-      "description": "Uncertainty in RA [deg] with optional asymmetric errors, measured from the RA in the schema; respective ex: [r], [r1], [l1-, l1+]. For ellipse, ra axis is r1 or semi-major axis."
-    },
-    "dec_uncertainty": {
-      "type": "array",
-      "maxItems": 2,
-      "description": "Uncertainty in Dec [deg] with optional asymmetric errors, measured from the Dec in the schema; respective ex: [r2], [l2-, l2+]. Not reported if circular and Dec axis is r2 or semi-minor axis for ellipse."
-    },
-    "position_angle": {
-      "type": "number",
-      "description": "Anti-clockwise position angle from RA axis [deg]. Used if uncertainty_shape ellipse or rectangle is tilted w.r.t. standard (RA, Dec) coordinate.",
-      "default": 0
+    "ra_dec_error": {
+      "anyOf": [
+        {
+          "type": "number",
+          "description": "Uncertainty region described as a circle with a radius [deg]."
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "number"
+          },
+          "minItems": 3,
+          "maxItems": 3,
+          "description": "An array of up to three values that describe the localization region as an ellipse: length of the semi-major axis, length of the semi-minor axis (default is the same as the semi-major axis), and astronomical position angle of the semi-major axis (measured from North through East, default is zero)."
+        }
+      ]
     },
     "containment_probability": {
       "type": "number",

diff --git a/gcn/notices/icecube/lvk_nu_track_search.example.json b/gcn/notices/icecube/lvk_nu_track_search.example.json
@@ -17,8 +17,7 @@
       "localization": {
         "ra": 17.48,
         "dec": 16.15,
-        "uncertainty_shape": "circle",
-        "ra_uncertainty": [0.43],
+        "ra_dec_error": 0.5,
         "containment_probability": 0.9,
         "systematic_included": false
       },
@@ -30,8 +29,7 @@
       "localization": {
         "ra": 13.82,
         "dec": 18.66,
-        "uncertainty_shape": "circle",
-        "ra_uncertainty": [0.88],
+        "ra_dec_error": 0.5,
         "containment_probability": 0.9,
         "systematic_included": false
       },

diff --git a/gcn/notices/icecube/test/gold_bronze.update.example.json b/gcn/notices/icecube/test/gold_bronze.update.example.json
@@ -7,10 +7,7 @@
   "alert_type": "update",
   "ra": 345.82,
   "dec": 9.01,
-  "uncertainty_shape": "rectangle",
-  "position_angle": 0,
-  "ra_uncertainty": [-1.5, 1.4],
-  "dec_uncertainty": [-1.2, 1.3],
+  "ra_dec_error": 0.5,
   "containment_probability": 0.9,
   "systematic_included": false,
   "healpix_url": "https://roc.icecube.wisc.edu/public/",

diff --git a/gcn/notices/icecube/test/gold_bronze_track_alerts.example.json b/gcn/notices/icecube/test/gold_bronze_track_alerts.example.json
@@ -6,8 +6,7 @@
   "alert_type": "initial",
   "ra": 345.82,
   "dec": 9.01,
-  "uncertainty_shape": "circle",
-  "ra_uncertainty": [0.51],
+  "ra_dec_error": 0.5,
   "containment_probability": 0.9,
   "systematic_included": false,
   "trigger_time": "2023-04-16T05:22:26.150574Z",

diff --git a/gcn/notices/swift/bat/guano.loc_arc_min.example.json b/gcn/notices/swift/bat/guano.loc_arc_min.example.json
@@ -10,7 +10,7 @@
   "trigger_time": "2022-12-31T21:46:05.13Z",
   "ra": 336.26,
   "dec": 25.139,
-  "ra_uncertainty": [0.05],
+  "ra_dec_error": 0.5,
   "containment_probability": 0.9,
   "systematic_included": true,
   "rate_snr": 15.8,