From 6135a6f5f3a9bf618f02b995e234de2c353703cd Mon Sep 17 00:00:00 2001 From: Nicky Hochmuth Date: Mon, 2 Mar 2026 17:52:16 +0100 Subject: [PATCH 1/3] L1 should not be file with range --- stixcore/io/product_processors/fits/processors.py | 6 +++++- stixcore/products/level1/quicklookL1.py | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/stixcore/io/product_processors/fits/processors.py b/stixcore/io/product_processors/fits/processors.py index dedf8634..03dd8a5c 100644 --- a/stixcore/io/product_processors/fits/processors.py +++ b/stixcore/io/product_processors/fits/processors.py @@ -763,7 +763,11 @@ def generate_filename(cls, product, *, version=0, status="", header=True): f"{product.utc_timerange.center.strftime('%Y%m%dT000000')}-" + f"{product.utc_timerange.center.strftime('%Y%m%dT235959')}" ) - elif product.type not in ["sci", "flarelist", "cal"] or product.name == "burst-aspect": + elif ( + product.type not in ["sci", "flarelist"] + or (product.name == "burst-aspect") + or (product.type == "cal" and product.level == "CAL") + ): date_range = product.utc_timerange.center.strftime("%Y%m%d") return FitsProcessor.generate_filename( diff --git a/stixcore/products/level1/quicklookL1.py b/stixcore/products/level1/quicklookL1.py index 2288326c..6265c506 100644 --- a/stixcore/products/level1/quicklookL1.py +++ b/stixcore/products/level1/quicklookL1.py @@ -225,6 +225,10 @@ def __init__( def is_datasource_for(cls, *, service_type, service_subtype, ssid, **kwargs): return kwargs["level"] == EnergyCalibration.LEVEL and service_type == 21 and service_subtype == 6 and ssid == 41 + @property + def fits_daily_file(self): + return True + @classmethod def from_level0(cls, l0product, parent=""): l1 = cls( From c6b0a3ec766fd93da54c275f0294261c95bb8e25 Mon Sep 17 00:00:00 2001 From: Nicky Hochmuth Date: Mon, 2 Mar 2026 20:37:16 +0100 Subject: [PATCH 2/3] L1 should not be file with range but CAL --- stixcore/io/product_processors/fits/processors.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stixcore/io/product_processors/fits/processors.py b/stixcore/io/product_processors/fits/processors.py index 03dd8a5c..e8a1351a 100644 --- a/stixcore/io/product_processors/fits/processors.py +++ b/stixcore/io/product_processors/fits/processors.py @@ -763,10 +763,8 @@ def generate_filename(cls, product, *, version=0, status="", header=True): f"{product.utc_timerange.center.strftime('%Y%m%dT000000')}-" + f"{product.utc_timerange.center.strftime('%Y%m%dT235959')}" ) - elif ( - product.type not in ["sci", "flarelist"] - or (product.name == "burst-aspect") - or (product.type == "cal" and product.level == "CAL") + elif (product.type not in ["sci", "flarelist"] or (product.name == "burst-aspect")) and not ( + product.type == "cal" and product.level == "CAL" ): date_range = product.utc_timerange.center.strftime("%Y%m%d") From be1bfa80e97ff2b7399d20b85e88d95e5e85b780 Mon Sep 17 00:00:00 2001 From: Nicky Hochmuth Date: Mon, 2 Mar 2026 20:39:03 +0100 Subject: [PATCH 3/3] cleanup --- stixcore/products/CAL/energy.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/stixcore/products/CAL/energy.py b/stixcore/products/CAL/energy.py index b8803ae3..e24a8b03 100644 --- a/stixcore/products/CAL/energy.py +++ b/stixcore/products/CAL/energy.py @@ -411,6 +411,4 @@ def from_level1(cls, l1product, parent="", idlprocessor=None, ecc_manager=None): products.append(cal) # end of for each spectrum - if len(products) > 1: - pass return products