Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions floatcsep/infrastructure/repositories.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from csep.core.catalogs import CSEPCatalog
from csep.core.forecasts import GriddedForecast, CatalogForecast
from csep.models import EvaluationResult
from csep.utils.time_utils import decimal_year
from csep.utils.time_utils import decimal_year, datetime_to_utc_epoch

from floatcsep.infrastructure.registries import (
ExperimentRegistry,
Expand Down Expand Up @@ -233,9 +233,9 @@ def get_input_cat(self, tstring: str) -> CSEPCatalog:
"""
start, end = str2timewindow(tstring)
cfg = self.input_cat_config
filters = [f"origin_time < {start.timestamp() * 1000}"]
filters = [f"origin_time < {datetime_to_utc_epoch(start)}"]
if cfg["start_date"]:
filters.append(f"origin_time >= {cfg['start_date'].timestamp() * 1000}")
filters.append(f"origin_time >= {datetime_to_utc_epoch(cfg['start_date'])}")
if cfg["mag_min"] is not None:
filters.append(f"magnitude >= {cfg['mag_min']}")
if cfg["mag_max"] is not None:
Expand Down Expand Up @@ -283,8 +283,8 @@ def set_test_cats(self, tstring: str, fmt: str = "json") -> None:
)
start, end = str2timewindow(tstring)
filters = [
f"origin_time < {end.timestamp() * 1000}",
f"origin_time >= {start.timestamp() * 1000}",
f"origin_time < {datetime_to_utc_epoch(end)}",
f"origin_time >= {datetime_to_utc_epoch(start)}",
f"magnitude >= {self.mag_min}",
f"magnitude < {self.mag_max}",
]
Expand Down
Loading