cleanup after review

Author: nicHoch

stixcore/processing/tests/test_end2end.py

@@ -73,7 +73,7 @@ def test_complete(orig_fits, current_fits):
         raise ValueError(f"{error_c} errors out of {len(orig_fits)}\nnumber of fits files differ")
 
 
-# @pytest.mark.end2end
+@pytest.mark.end2end
 @pytest.mark.remote_data
 def test_identical(orig_fits, current_fits):
     error_c = 0

stixcore/products/CAL/energy.py

@@ -81,7 +81,7 @@ def bunit(self):
         return "keV"
 
     @property
-    def exposure(self):
+    def min_exposure(self):
         # default for FITS HEADER
         return self.control["integration_time"].min().to_value(u.s)
 

stixcore/products/product.py

@@ -3,7 +3,6 @@
 from itertools import chain
 
 import numpy as np
-import pytz
 from sunpy.time.timerange import TimeRange
 from sunpy.util.datatype_factory_base import (
     BasicRegistrationFactory,
@@ -50,7 +49,7 @@
 
 # date when the min integration time was changed from 1.0s to 0.5s needed to fix count and time
 # offset issue
-MIN_INT_TIME_CHANGE = datetime(2021, 9, 6, 13, tzinfo=pytz.UTC)
+MIN_INT_TIME_CHANGE = datetime(2021, 9, 6, 13, tzinfo=datetime.timezone.utc)
 
 
 def read_qtable(file, hdu, hdul=None):
@@ -1029,7 +1028,7 @@ class L2Mixin(FitsHeaderMixin):
     @property
     def utc_timerange(self):
         if isinstance(self.data["time"], SCETime):
-            self.scet_timerange.to_timerange()
+            return self.scet_timerange.to_timerange()
         else:
             return TimeRange(
                 (self.data["time"][0] - self.data["timedel"][0] / 2).datetime,

stixcore/util/scripts/end2end_testing.py

@@ -169,19 +169,6 @@ def end2end_pipeline(indir, fitsdir):
 
 
 if __name__ == "__main__":
-    p_scet = Product(Path("/data/stix/out/test/e2e/orig/solo_L1_stix-ql-variance_20210626_V02U.fits"))
-    p_utc = Product(
-        Path("/data/stix/out/test/e2e/orig/solo_L1_stix-ql-variance_20210626_V02U.fits"),
-        get_timeformat_from_TIMESYS=True,
-    )
-
-    end2end_pipeline(
-        indir=Path("/data/stix/out/test/e2e/orig"),
-        fitsdir=Path("/data/stix/out/test/e2e/current"),
-    )
-
-    quit()
-
     if len(sys.argv) > 2:
         zippath = Path(sys.argv[1])
         datapath = Path(sys.argv[2])