fixes after review

Author: nicHoch

stixcore/io/product_processors/fits/processors.py

@@ -739,7 +739,7 @@ def generate_primary_header(cls, filename, product, *, version=0):
             ("DATAMIN", product.dmin, "Minimum valid physical value"),
             ("DATAMAX", product.dmax, "Maximum valid physical value"),
             ("BUNIT", product.bunit, "Units of physical value, after application of BSCALE, BZERO"),
-            ("XPOSURE", product.exposure, "[s] shortest exposure time"),
+            ("XPOSURE", product.min_exposure, "[s] shortest exposure time"),
             ("XPOMAX", product.max_exposure, "[s] maximum exposure time"),
         )
 
@@ -783,7 +783,7 @@ def generate_primary_header(self, filename, product, *, version=0):
             ("DATAMIN", empty_if_nan(product.dmin), "Minimum valid physical value"),
             ("DATAMAX", empty_if_nan(product.dmax), "Maximum valid physical value"),
             ("BUNIT", product.bunit, "Units of physical value, after application of BSCALE, BZERO"),
-            ("XPOSURE", empty_if_nan(product.exposure), "[s] shortest exposure time"),
+            ("XPOSURE", empty_if_nan(product.min_exposure), "[s] shortest exposure time"),
             ("XPOMAX", empty_if_nan(product.max_exposure), "[s] maximum exposure time"),
         )
 
@@ -999,7 +999,7 @@ def generate_primary_header(self, filename, product, *, version=0):
             ("DATAMIN", empty_if_nan(product.dmin), "Minimum valid physical value"),
             ("DATAMAX", empty_if_nan(product.dmax), "Maximum valid physical value"),
             ("BUNIT", product.bunit, "Units of physical value, after application of BSCALE, BZERO"),
-            ("XPOSURE", empty_if_nan(product.exposure), "[s] shortest exposure time"),
+            ("XPOSURE", empty_if_nan(product.min_exposure), "[s] shortest exposure time"),
             ("XPOMAX", empty_if_nan(product.max_exposure), "[s] maximum exposure time"),
         )
 

stixcore/io/product_processors/tests/test_processors.py

@@ -192,10 +192,10 @@ def test_count_data_mixin(p_file):
     p = Product(p_file)
 
     if isinstance(p.data["timedel"], SCETimeDelta):
-        assert p.exposure == p.data["timedel"].as_float().min().to_value("s")
+        assert p.min_exposure == p.data["timedel"].as_float().min().to_value("s")
         assert p.max_exposure == p.data["timedel"].as_float().max().to_value("s")
     else:
-        assert p.exposure == p.data["timedel"].min().to_value("s")
+        assert p.min_exposure == p.data["timedel"].min().to_value("s")
         assert p.max_exposure == p.data["timedel"].max().to_value("s")
 
     assert p.dmin == p.data["counts"].min().value
@@ -204,7 +204,7 @@ def test_count_data_mixin(p_file):
     test_data = {
         "DATAMAX": p.dmax,
         "DATAMIN": p.dmin,
-        "XPOSURE": p.exposure,
+        "XPOSURE": p.min_exposure,
         "XPOMAX": p.max_exposure,
         "BUNIT": "counts",
     }
@@ -264,7 +264,7 @@ def test_level1_processor_generate_primary_header(product, soop_manager):
     product.dmax = 1
     product.dunit = ""
     product.max_exposure = 1
-    product.exposure = 1
+    product.min_exposure = 1
     product.service_type = 1
     product.service_subtype = 2
     product.ssid = 3

stixcore/processing/tests/test_publish.py

@@ -146,7 +146,7 @@ def test_publish_fits_to_esa_incomplete(product, out_dir):
         product.date_obs = beg.to_datetime()
         product.date_beg = beg.to_datetime()
         product.date_end = end.to_datetime()
-        product.exposure = 2
+        product.min_exposure = 2
         product.max_exposure = 3
         product.dmin = 2
         product.dmax = 3
@@ -257,7 +257,7 @@ def test_fits_incomplete_switch_over(out_dir):
             product.date_obs = beg.to_datetime()
             product.date_beg = beg.to_datetime()
             product.date_end = end.to_datetime()
-            product.exposure = 2
+            product.min_exposure = 2
             product.max_exposure = 3
             product.dmin = 2
             product.dmax = 3
@@ -398,7 +398,7 @@ def test_publish_fits_to_esa(product, out_dir):
     product.date_obs = beg.to_datetime()
     product.date_beg = beg.to_datetime()
     product.date_end = end.to_datetime()
-    product.exposure = 2
+    product.min_exposure = 2
     product.max_exposure = 3
     product.dmin = 2
     product.dmax = 3

stixcore/products/level3/flarelist.py

@@ -515,7 +515,7 @@ def dmax(self):
         return (self.data["lc_peak"].sum(axis=1)).max().value if len(self.data) > 0 else np.nan
 
     @property
-    def exposure(self):
+    def min_exposure(self):
         return self.data["duration"].min().to_value("s") if len(self.data) > 0 else np.nan
 
     @property
@@ -649,7 +649,7 @@ def dmax(self):
         return (self.data["lc_peak"].sum(axis=1)).max().value if len(self.data) > 0 else np.nan
 
     @property
-    def exposure(self):
+    def min_exposure(self):
         return self.data["duration"].min().to_value("s") if len(self.data) > 0 else np.nan
 
     @property

stixcore/products/product.py

@@ -263,13 +263,13 @@ def __call__(self, *args, **kwargs):
                 if level not in ["LB", "LL01"] and "timedel" in data.colnames and "time" in data.colnames:
                     # select the time format based on available header keywords
                     offset = None
-                    if "TIMESYS" in pri_header and pri_header["TIMESYS"] == "UTC":
+                    if pri_header.get("TIMESYS", "") == "UTC":
                         try:
                             offset = Time(pri_header["DATE-OBS"])
-                        except Exception:
+                        except ValueError:
                             offset = None
 
-                    # fallback to OBT_BEG if no TIMESYS=UTC or DATE-OBS is present or not parseable
+                    # fallback to OBT_BEG if no TIMESYS=UTC or DATE-OBS is present or can not be parsed
                     if offset is None:
                         offset = SCETime.from_float(pri_header["OBT_BEG"] * u.s)
                         data["timedel"] = SCETimeDelta(data["timedel"])
@@ -589,7 +589,7 @@ def bunit(self):
         return " "
 
     @property
-    def exposure(self):
+    def min_exposure(self):
         # default for FITS HEADER
         return 0.0
 
@@ -890,7 +890,7 @@ def bunit(self):
         return "counts"
 
     @property
-    def exposure(self):
+    def min_exposure(self):
         if isinstance(self.data["timedel"], SCETimeDelta):
             return self.data["timedel"].as_float().min().to_value("s")
         else:
@@ -962,8 +962,8 @@ def utc_timerange(self):
             self.scet_timerange.to_timerange()
         else:
             return TimeRange(
-                (self.data["time"][0] - self.data["timedel"][0] / 2).datetime,
-                (self.data["time"][-1] + self.data["timedel"][-1] / 2).datetime,
+                (self.data["time"][0] - self.data["timedel"][0] / 2),
+                (self.data["time"][-1] + self.data["timedel"][-1] / 2),
             )
 
     @classmethod

stixcore/soop/manager.py

@@ -529,6 +529,8 @@ def add_soop_file_to_index(self, path, *, rebuild_index=True, **args):
             all_soop_file = Path(CONFIG.get("SOOP", "soop_files_download")) / f"{plan}.{version}.all.json"
 
             if not all_soop_file.exists():
+                # TODO reactivate when API is back
+                return
                 self.download_all_soops_from_api(plan, version, all_soop_file)
 
             with open(all_soop_file) as f_all: