imap-processing 0.19.3__py3-none-any.whl → 1.0.0__py3-none-any.whl

imap_processing/cdf/config/imap_codice_l1b_variable_attrs.yaml

@@ -411,16 +411,16 @@ hi-counters-aggregated-mst:
     FIELDNAM: Multi Start
     LABLAXIS: "events"
 
-hi-counters-aggregated-reserved2:
+hi-counters-aggregated-ssdo:
     <<: *events
-    CATDESC: Reserved 2
-    FIELDNAM: Reserved 2
+    CATDESC: Singles - Start
+    FIELDNAM: Singles - Start
     LABLAXIS: "events"
 
-hi-counters-aggregated-reserved3:
+hi-counters-aggregated-stssd:
     <<: *events
-    CATDESC: Reserved 3
-    FIELDNAM: Reserved 3
+    CATDESC: Singles - Stop
+    FIELDNAM: Singles - Stop
     LABLAXIS: "events"
 
 hi-counters-aggregated-reserved4:
@@ -1145,56 +1145,56 @@ lo-sw-angular-hplus:
     <<: *counters
     CATDESC: Sunward H+ Species
     FIELDNAM: SW - H+
-    DEPEND_1: inst_az
-    DEPEND_2: spin_sector
-    DEPEND_3: esa_step
-    LABL_PTR_1: inst_az_label
-    LABL_PTR_2: spin_sector_label
-    LABL_PTR_3: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: inst_az
+    DEPEND_3: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: inst_az_label
+    LABL_PTR_3: spin_sector_label
 
 lo-sw-angular-heplusplus:
     <<: *counters
     CATDESC: Sunward He++ Species
     FIELDNAM: SW - He++
-    DEPEND_1: inst_az
-    DEPEND_2: spin_sector
-    DEPEND_3: esa_step
-    LABL_PTR_1: inst_az_label
-    LABL_PTR_2: spin_sector_label
-    LABL_PTR_3: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: inst_az
+    DEPEND_3: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: inst_az_label
+    LABL_PTR_3: spin_sector_label
 
 lo-sw-angular-oplus6:
     <<: *counters
     CATDESC: Sunward O+6 Species
     FIELDNAM: SW - O+6
-    DEPEND_1: inst_az
-    DEPEND_2: spin_sector
-    DEPEND_3: esa_step
-    LABL_PTR_1: inst_az_label
-    LABL_PTR_2: spin_sector_label
-    LABL_PTR_3: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: inst_az
+    DEPEND_3: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: inst_az_label
+    LABL_PTR_3: spin_sector_label
 
 lo-sw-angular-fe_loq:
     <<: *counters
     CATDESC: Sunward Fe lowQ Species
     FIELDNAM: SW - Fe lowQ
-    DEPEND_1: inst_az
-    DEPEND_2: spin_sector
-    DEPEND_3: esa_step
-    LABL_PTR_1: inst_az_label
-    LABL_PTR_2: spin_sector_label
-    LABL_PTR_3: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: inst_az
+    DEPEND_3: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: inst_az_label
+    LABL_PTR_3: spin_sector_label
 
 lo-nsw-angular-heplusplus:
     <<: *counters
     CATDESC: Non-sunward He++ Species
     FIELDNAM: NSW - He++
-    DEPEND_1: inst_az
-    DEPEND_2: spin_sector
-    DEPEND_3: esa_step
-    LABL_PTR_1: inst_az_label
-    LABL_PTR_2: spin_sector_label
-    LABL_PTR_3: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: inst_az
+    DEPEND_3: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: inst_az_label
+    LABL_PTR_3: spin_sector_label
 
 # lo-sw-priority
 lo-sw-priority-p0_tcrs:
@@ -1266,217 +1266,218 @@ lo-sw-species-hplus:
     <<: *counters
     CATDESC: H+ Sunward Species
     FIELDNAM: SW - H+
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-heplusplus:
     <<: *counters
     CATDESC: He++ Sunward Species
     FIELDNAM: SW - He++
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-cplus4:
     <<: *counters
     CATDESC: C+4 Sunward Species
     FIELDNAM: SW - C+4
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-cplus5:
     <<: *counters
     CATDESC: C+5 Sunward Species
     FIELDNAM: SW - C+5
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-cplus6:
     <<: *counters
     CATDESC: C+6 Sunward Species
     FIELDNAM: SW - C+6
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-oplus5:
     <<: *counters
     CATDESC: O+5 Sunward Species
     FIELDNAM: SW - O+5
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-oplus6:
     <<: *counters
     CATDESC: O+6 Sunward Species
     FIELDNAM: SW - O+6
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-oplus7:
     <<: *counters
     CATDESC: O+7 Sunward Species
     FIELDNAM: SW - O+7
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-oplus8:
     <<: *counters
     CATDESC: O+8 Sunward Species
     FIELDNAM: SW - O+8
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-ne:
     <<: *counters
     CATDESC: Ne Sunward Species
     FIELDNAM: SW - Ne
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
+
 lo-sw-species-mg:
     <<: *counters
     CATDESC: Mg Sunward Species
     FIELDNAM: SW - Mg
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-si:
     <<: *counters
     CATDESC: Si Sunward Species
     FIELDNAM: SW - Si
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-fe_loq:
     <<: *counters
     CATDESC: Fe lowQ Sunward Species
     FIELDNAM: SW - Fe lowQ
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-fe_hiq:
     <<: *counters
     CATDESC: Fe highQ Sunward Species
     FIELDNAM: SW - Fe highQ
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-heplus:
     <<: *counters
     CATDESC: He+ Pickup Ion Sunward Species
     FIELDNAM: SW - He+ (PUI)
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-sw-species-cnoplus:
     <<: *counters
     CATDESC: CNO+ Pickup Ion Sunward Species
     FIELDNAM: SW - CNO+ (PUI)
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 # lo-nsw-species
 lo-nsw-species-hplus:
     <<: *counters
     CATDESC: H+ Non-sunward Species
     FIELDNAM: NSW - H+
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-nsw-species-heplusplus:
     <<: *counters
     CATDESC: He++ Non-sunward Species
     FIELDNAM: NSW - He++
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-nsw-species-c:
     <<: *counters
     CATDESC: C Non-sunward Species
     FIELDNAM: NSW - C
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-nsw-species-o:
     <<: *counters
     CATDESC: O Non-sunward Species
     FIELDNAM: NSW - O
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-nsw-species-ne_si_mg:
     <<: *counters
     CATDESC: Ne-Si-Mg Non-sunward Species
     FIELDNAM: NSW - Ne_Si_Mg
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-nsw-species-fe:
     <<: *counters
     CATDESC: Fe Non-sunward Species
     FIELDNAM: NSW - Fe
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-nsw-species-heplus:
     <<: *counters
     CATDESC: He+ Non-sunward Species
     FIELDNAM: NSW - He+
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 lo-nsw-species-cnoplus:
     <<: *counters
     CATDESC: CNO+ Non-sunward Species
     FIELDNAM: NSW - CNO+
-    DEPEND_1: spin_sector
-    DEPEND_2: esa_step
-    LABL_PTR_1: spin_sector_label
-    LABL_PTR_2: esa_step_label
+    DEPEND_1: esa_step
+    DEPEND_2: spin_sector
+    LABL_PTR_1: esa_step_label
+    LABL_PTR_2: spin_sector_label
 
 # lo-ialirt
 lo-ialirt-heplusplus:

imap_processing/cdf/config/imap_constant_attrs.yaml

@@ -19,7 +19,7 @@ epoch:
   TIME_SCALE: Terrestrial Time
   REFERENCE_POSITION: Rotating Earth Geoid
   RESOLUTION: ' '
-  DICT_KEY: "SPASE>Support>SupportQantity:Temporal"
+  DICT_KEY: "SPASE>Support>SupportQuantity:Temporal"
 
 
 # <=== Data Variables ===>

imap_processing/cdf/config/imap_enamaps_l2-common_variable_attrs.yaml

@@ -54,15 +54,6 @@ energy_label:
   FORMAT: A16
   DEPEND_1: energy
 
-epoch_delta:
-  <<: *default_int64
-  CATDESC: Number of nanoseconds covered by data included in this map product.
-  FIELDNAM: epoch_delta
-  UNITS: ns
-  VAR_TYPE: support_data
-  DISPLAY_TYPE: no_plot
-  TIME_SCALE: Terrestrial Time
-
 energy_delta_minus:
   <<: *default_float32
   VAR_TYPE: support_data
@@ -87,29 +78,37 @@ energy_delta_plus:
   LABL_PTR_1: energy_label
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:Energy,Qualifier:Uncertainty
 
+epoch_delta:
+  <<: *default_int64
+  CATDESC: Number of nanoseconds covered by data included in this map product.
+  FIELDNAM: epoch_delta
+  UNITS: ns
+  VAR_TYPE: support_data
+  DISPLAY_TYPE: no_plot
+  TIME_SCALE: Terrestrial Time
+  DICT_KEY: SPASE>Support>SupportQuantity:Temporal
+
 # These two coordinates will be treated differently in the
 # HEALPix and rectangular tilings. They will be substantially overridden
 # in the tiling-specific YAML files.
 longitude:
   <<: *default_float32
-  CATDESC: Pixel center longitude in range [0, 360].
-  FIELDNAM: Longitude
-  LABLAXIS: Longitude
+  CATDESC: "Pixel center longitude in {frame} reference frame in the range [0, 360]."
+  FIELDNAM: "{frame} Longitude"
+  LABLAXIS: "{frame} Longitude"
   UNITS: degrees
   VAR_TYPE: support_data
-  DISPLAY_TYPE: no_plot
   VALIDMIN: 0
   VALIDMAX: 360
   DICT_KEY: SPASE>Support>SupportQuantity:Orientation,Qualifier:DirectionAngle.AzimuthAngle,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
 latitude:
   <<: *default_float32
-  CATDESC: Pixel center latitude in range [-90, 90].
-  FIELDNAM: Latitude
-  LABLAXIS: Latitude
+  CATDESC: "Pixel center latitude in {frame} reference frame in the range [-90, 90]."
+  FIELDNAM: "{frame} Latitude"
+  LABLAXIS: "{frame} Latitude"
   UNITS: degrees
   VAR_TYPE: support_data
-  DISPLAY_TYPE: no_plot
   VALIDMIN: -90
   VALIDMAX: 90
   DICT_KEY: SPASE>Support>SupportQuantity:Orientation,Qualifier:DirectionAngle.ElevationAngle,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
@@ -122,23 +121,23 @@ ena_intensity:
   CATDESC: Mono-energetic ENA intensity.
   FIELDNAM: Intensity
   UNITS: counts/(s * cm^2 * Sr * KeV)
-  DELTA_MINUS_VAR: ena_intensity_stat_unc
-  DELTA_PLUS_VAR: ena_intensity_stat_unc
+  DELTA_MINUS_VAR: ena_intensity_stat_uncert
+  DELTA_PLUS_VAR: ena_intensity_stat_uncert
   DEPEND_0: epoch
   VAR_TYPE: data
   LABLAXIS: Intensity
-  DISPLAY_TYPE: image
+  DISPLAY_TYPE: map_image
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Incident,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
-ena_intensity_stat_unc:
+ena_intensity_stat_uncert:
   <<: *default_float32
   CATDESC: ENA intensity statistical uncertainty.
   FIELDNAM: Intensity stat unc
   UNITS: counts/(s * cm^2 * Sr * KeV)
   DEPEND_0: epoch
-  VAR_TYPE: data
+  VAR_TYPE: support_data
   LABLAXIS: Statistical Unc
-  DISPLAY_TYPE: image
+  DISPLAY_TYPE: map_image
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Uncertainty,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
 ena_intensity_sys_err:
@@ -147,9 +146,9 @@ ena_intensity_sys_err:
   FIELDNAM: Intensity non-stat error
   UNITS: counts/(s * cm^2 * Sr * KeV)
   DEPEND_0: epoch
-  VAR_TYPE: data
+  VAR_TYPE: support_data
   LABLAXIS: Non-Statistical Err
-  DISPLAY_TYPE: image
+  DISPLAY_TYPE: map_image
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Uncertainty,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
 ena_rate:
@@ -160,10 +159,10 @@ ena_rate:
   DEPEND_0: epoch
   VAR_TYPE: data
   LABLAXIS: Rate
-  DISPLAY_TYPE: image
+  DISPLAY_TYPE: map_image
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Incident,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
-background_rates:
+bg_rate:
   <<: *default_float32
   CATDESC: Estimated background count rate.
   FIELDNAM: Background Rate
@@ -171,7 +170,7 @@ background_rates:
   DEPEND_0: epoch
   VAR_TYPE: data
   LABLAXIS: Rate
-  DISPLAY_TYPE: image
+  DISPLAY_TYPE: map_image
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Incident,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
 ena_count:
@@ -182,18 +181,17 @@ ena_count:
   DEPEND_0: epoch
   VAR_TYPE: data
   LABLAXIS: Count
-  DISPLAY_TYPE: image
+  DISPLAY_TYPE: map_image
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Incident,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
 sensitivity:
   <<: *default_float32
-  CATDESC: Calibration/sensitivity factor calculated from multiple pointing sets.
-  FIELDNAM: sensitivity
-  UNITS: cm^-3
-  DEPEND_0: epoch
-  VAR_TYPE: data
+  CATDESC: Averaged instrument sensitive area.
+  FIELDNAM: Sensitivity
+  UNITS: cm^2
+  VAR_TYPE: support_data
   LABLAXIS: sensitivity
-  DISPLAY_TYPE: image
+  DISPLAY_TYPE: no_plot
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:GeometricFactor,Qualifier:Directional,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
 exposure_factor: &exposure_factor
@@ -205,48 +203,44 @@ exposure_factor: &exposure_factor
   VAR_TYPE: data
   LABLAXIS: Exposure
   DISPLAY_TYPE: no_plot
-  DICT_KEY: SPASE>TemporalDescription:Exposure,Qualifier:Directional,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
+  DICT_KEY: SPASE>Support>SupportQuantity:Temporal
 
 geometric_function:
   <<: *default_float32
-  CATDESC: The geometric function calculated from multiple pointing sets.
-  FIELDNAM: geometric_function
+  CATDESC: Averaged aperture area as seen by the backstop.
+  FIELDNAM: Geometric Function
   UNITS: cm^2 sr
-  DEPEND_0: epoch
-  VAR_TYPE: data
-  LABLAXIS: Geometric Factor
+  VAR_TYPE: support_data
+  LABLAXIS: Geometric Function
   DISPLAY_TYPE: no_plot
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:GeometricFactor,Qualifier:Directional,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
 efficiency:
   <<: *default_float32
-  CATDESC: Event efficiency calculated from multiple pointing sets.
-  FIELDNAM: efficiency
+  CATDESC: Efficiency of the instrument in converting ENAs to valid events.
+  FIELDNAM: Efficiency
   UNITS: " "
-  DEPEND_0: epoch
-  VAR_TYPE: data
+  VAR_TYPE: support_data
   LABLAXIS: Efficiency
   DISPLAY_TYPE: no_plot
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:Other
 
 positional_uncert_theta:
   <<: *default_float32
-  CATDESC: Positional uncertainty in theta direction calculated from multiple pointing sets.
-  FIELDNAM: positional_uncertainty_theta
+  CATDESC: Averaged position uncertainty along the theta dimension of the instrument.
+  FIELDNAM: Positional Uncertainty Theta
   UNITS: degrees
-  DEPEND_0: epoch
-  VAR_TYPE: data
+  VAR_TYPE: support_data
   LABLAXIS: Position Uncertainty Theta
   DISPLAY_TYPE: no_plot
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:ArrivalDirection,Qualifier:Uncertainty,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
 positional_uncert_phi:
   <<: *default_float32
-  CATDESC: Positional uncertainty in phi direction calculated from multiple pointing sets.
-  FIELDNAM: positional_uncertainty_phi
+  CATDESC: Averaged position uncertainty along the phi dimension of the instrument.
+  FIELDNAM: Positional Uncertainty Phi
   UNITS: degrees
-  DEPEND_0: epoch
-  VAR_TYPE: data
+  VAR_TYPE: support_data
   LABLAXIS: Position Uncertainty Phi
   DISPLAY_TYPE: no_plot
   DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:ArrivalDirection,Qualifier:Uncertainty,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
@@ -258,9 +252,9 @@ obs_date: &obs_date
   FIELDNAM: J2000 Nanoseconds
   UNITS: ns
   DEPEND_0: epoch
-  VAR_TYPE: data
+  VAR_TYPE: support_data
   LABLAXIS: epoch
-  DISPLAY_TYPE: image
+  DISPLAY_TYPE: no_plot
   DICT_KEY: SPASE>TemporalDescription:TimeSpan,Qualifier:Directional,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
 
 obs_date_range:
@@ -270,10 +264,11 @@ obs_date_range:
   FIELDNAM: Observation date range
   UNITS: ns
   DEPEND_0: epoch
-  VAR_TYPE: data
+  VAR_TYPE: support_data
   LABLAXIS: epoch
-  DISPLAY_TYPE: image
+  DISPLAY_TYPE: no_plot
   TIME_SCALE: Terrestrial Time
+  DICT_KEY: SPASE>Support>SupportQuantity:Temporal
 
 # These copied metadata vars will allow for variables
 # to be either energy-dependent or independent.
@@ -289,12 +284,11 @@ obs_date_range_energy_independent:
 
 solid_angle:
   <<: *default_float32
-  VAR_TYPE: support_data
   CATDESC: Solid angle subtended by each pixel.
   FIELDNAM: Solid Angle
   DEPEND_0: epoch
+  VAR_TYPE: support_data
   UNITS: sr
-  VAR_TYPE: data
   LABLAXIS: Solid Angle
-  DISPLAY_TYPE: image
+  DISPLAY_TYPE: no_plot
   DICT_KEY: SPASE>Support>SupportQuantity:Other