From 60e16af129f9f001e9c9cb07e18061b6295b7cf8 Mon Sep 17 00:00:00 2001
From: Kevin Milner <kmilner@usgs.gov>
Date: Thu, 12 Feb 2026 11:09:27 -0800
Subject: [PATCH] refactoring coinciding with upstream opensha pr 198

---
 .../kevin/BayAreaRegionalGroundMotionCalc.java        |  6 +++---
 .../pointSources/SuperSamplingResolutionTests.java    |  4 ++--
 .../java/scratch/kevin/prvi25/GMMTreeCalcDebug.java   | 11 ++++++-----
 .../scratch/kevin/prvi25/GmmInputCacheBenchmark.java  |  4 ++--
 .../kevin/prvi25/HazardCurveDifferenceDebug.java      |  6 +++---
 .../scratch/kevin/prvi25/SiteHazCompNSHMPHaz.java     |  4 ++--
 .../kevin/prvi25/SubductionHazardBenchmark.java       |  4 ++--
 .../figures/SiteHazardInvestigationsPageGen.java      |  4 ++--
 .../simCompare/SiteHazardCurveComarePageGen.java      |  4 ++--
 .../simulators/hazard/HazardMapComparePlotter.java    |  6 +++---
 .../java/scratch/kevin/ucerf3/FSS_HazardDemo.java     |  2 +-
 .../scratch/kevin/ucerf3/eal/UCERF3_EAL_Combiner.java |  2 +-
 12 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/main/java/scratch/kevin/BayAreaRegionalGroundMotionCalc.java b/src/main/java/scratch/kevin/BayAreaRegionalGroundMotionCalc.java
index 8f28a4cc..421819a2 100644
--- a/src/main/java/scratch/kevin/BayAreaRegionalGroundMotionCalc.java
+++ b/src/main/java/scratch/kevin/BayAreaRegionalGroundMotionCalc.java
@@ -52,9 +52,9 @@
 import org.opensha.commons.util.io.archive.ArchiveOutput;
 import org.opensha.commons.util.io.archive.ArchiveOutput.ParallelZipFileOutput;
 import org.opensha.sha.calc.HazardCurveCalculator;
-import org.opensha.sha.calc.params.filters.FixedDistanceCutoffFilter;
-import org.opensha.sha.calc.params.filters.SourceFilterManager;
-import org.opensha.sha.calc.params.filters.SourceFilters;
+import org.opensha.sha.calc.sourceFilters.FixedDistanceCutoffFilter;
+import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
+import org.opensha.sha.calc.sourceFilters.SourceFilters;
 import org.opensha.sha.earthquake.AbstractERF;
 import org.opensha.sha.earthquake.DistCachedERFWrapper;
 import org.opensha.sha.earthquake.DistCachedERFWrapper.DistCacheWrapperRupture;
diff --git a/src/main/java/scratch/kevin/pointSources/SuperSamplingResolutionTests.java b/src/main/java/scratch/kevin/pointSources/SuperSamplingResolutionTests.java
index caf19154..1b7e6360 100644
--- a/src/main/java/scratch/kevin/pointSources/SuperSamplingResolutionTests.java
+++ b/src/main/java/scratch/kevin/pointSources/SuperSamplingResolutionTests.java
@@ -28,8 +28,8 @@
 import org.opensha.commons.util.ComparablePairing;
 import org.opensha.commons.util.DataUtils.MinMaxAveTracker;
 import org.opensha.sha.calc.HazardCurveCalculator;
-import org.opensha.sha.calc.params.filters.SourceFilterManager;
-import org.opensha.sha.calc.params.filters.SourceFilters;
+import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
+import org.opensha.sha.calc.sourceFilters.SourceFilters;
 import org.opensha.sha.earthquake.faultSysSolution.FaultSystemSolution;
 import org.opensha.sha.earthquake.faultSysSolution.modules.GridSourceList;
 import org.opensha.sha.earthquake.faultSysSolution.util.FaultSysTools;
diff --git a/src/main/java/scratch/kevin/prvi25/GMMTreeCalcDebug.java b/src/main/java/scratch/kevin/prvi25/GMMTreeCalcDebug.java
index 5ca70a3f..136e9015 100644
--- a/src/main/java/scratch/kevin/prvi25/GMMTreeCalcDebug.java
+++ b/src/main/java/scratch/kevin/prvi25/GMMTreeCalcDebug.java
@@ -21,9 +21,10 @@
 import org.opensha.commons.logicTree.LogicTreeLevel;
 import org.opensha.commons.logicTree.LogicTreeNode;
 import org.opensha.sha.calc.HazardCurveCalculator;
-import org.opensha.sha.calc.params.filters.SourceFilter;
-import org.opensha.sha.calc.params.filters.SourceFilterManager;
-import org.opensha.sha.calc.params.filters.SourceFilters;
+import org.opensha.sha.calc.sourceFilters.SourceFilter;
+import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
+import org.opensha.sha.calc.sourceFilters.SourceFilterUtils;
+import org.opensha.sha.calc.sourceFilters.SourceFilters;
 import org.opensha.sha.earthquake.AbstractERF;
 import org.opensha.sha.earthquake.ERF;
 import org.opensha.sha.earthquake.EqkRupture;
@@ -323,11 +324,11 @@ private static void rateBasedHazardCalc(Site site, AbstractERF erf, ScalarIMR gm
 		LightFixedXFunc exceedProbs = new LightFixedXFunc(curve.getXVals(), new double[curve.size()]);
 		
 		for (ProbEqkSource source : erf) {
-			if (HazardCurveCalculator.canSkipSource(filters, source, site))
+			if (SourceFilterUtils.canSkipSource(filters, source, site))
 				continue;
 			for (int rupID=0; rupID<source.getNumRuptures(); rupID++) {
 				ProbEqkRupture rup = source.getRupture(rupID);
-				if (HazardCurveCalculator.canSkipRupture(filters, rup, site))
+				if (SourceFilterUtils.canSkipRupture(filters, rup, site))
 					continue;
 				
 				double rate;
diff --git a/src/main/java/scratch/kevin/prvi25/GmmInputCacheBenchmark.java b/src/main/java/scratch/kevin/prvi25/GmmInputCacheBenchmark.java
index f61a023f..316a8d85 100644
--- a/src/main/java/scratch/kevin/prvi25/GmmInputCacheBenchmark.java
+++ b/src/main/java/scratch/kevin/prvi25/GmmInputCacheBenchmark.java
@@ -13,8 +13,8 @@
 import org.opensha.commons.geo.Location;
 import org.opensha.commons.logicTree.LogicTree;
 import org.opensha.commons.util.modules.ModuleContainer;
-import org.opensha.sha.calc.params.filters.SourceFilterManager;
-import org.opensha.sha.calc.params.filters.SourceFilters;
+import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
+import org.opensha.sha.calc.sourceFilters.SourceFilters;
 import org.opensha.sha.earthquake.faultSysSolution.hazard.mpj.AbstractSitewiseThreadedLogicTreeCalc;
 import org.opensha.sha.earthquake.faultSysSolution.modules.SolutionLogicTree;
 import org.opensha.sha.earthquake.param.IncludeBackgroundOption;
diff --git a/src/main/java/scratch/kevin/prvi25/HazardCurveDifferenceDebug.java b/src/main/java/scratch/kevin/prvi25/HazardCurveDifferenceDebug.java
index dcc2d3c5..52e3c42d 100644
--- a/src/main/java/scratch/kevin/prvi25/HazardCurveDifferenceDebug.java
+++ b/src/main/java/scratch/kevin/prvi25/HazardCurveDifferenceDebug.java
@@ -27,9 +27,9 @@
 import org.opensha.commons.param.Parameter;
 import org.opensha.commons.util.ClassUtils;
 import org.opensha.sha.calc.HazardCurveCalculator;
-import org.opensha.sha.calc.params.filters.FixedDistanceCutoffFilter;
-import org.opensha.sha.calc.params.filters.SourceFilterManager;
-import org.opensha.sha.calc.params.filters.SourceFilters;
+import org.opensha.sha.calc.sourceFilters.FixedDistanceCutoffFilter;
+import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
+import org.opensha.sha.calc.sourceFilters.SourceFilters;
 import org.opensha.sha.earthquake.AbstractERF;
 import org.opensha.sha.earthquake.ProbEqkSource;
 import org.opensha.sha.earthquake.faultSysSolution.FaultSystemSolution;
diff --git a/src/main/java/scratch/kevin/prvi25/SiteHazCompNSHMPHaz.java b/src/main/java/scratch/kevin/prvi25/SiteHazCompNSHMPHaz.java
index 4fdbc21d..99526e7f 100644
--- a/src/main/java/scratch/kevin/prvi25/SiteHazCompNSHMPHaz.java
+++ b/src/main/java/scratch/kevin/prvi25/SiteHazCompNSHMPHaz.java
@@ -20,8 +20,8 @@
 import org.opensha.commons.gui.plot.PlotUtils;
 import org.opensha.commons.util.FileNameUtils;
 import org.opensha.sha.calc.HazardCurveCalculator;
-import org.opensha.sha.calc.params.filters.SourceFilterManager;
-import org.opensha.sha.calc.params.filters.SourceFilters;
+import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
+import org.opensha.sha.calc.sourceFilters.SourceFilters;
 import org.opensha.sha.earthquake.ProbEqkRupture;
 import org.opensha.sha.earthquake.ProbEqkSource;
 import org.opensha.sha.earthquake.faultSysSolution.FaultSystemRupSet;
diff --git a/src/main/java/scratch/kevin/prvi25/SubductionHazardBenchmark.java b/src/main/java/scratch/kevin/prvi25/SubductionHazardBenchmark.java
index 7e8a37ac..d6ee33eb 100644
--- a/src/main/java/scratch/kevin/prvi25/SubductionHazardBenchmark.java
+++ b/src/main/java/scratch/kevin/prvi25/SubductionHazardBenchmark.java
@@ -12,8 +12,8 @@
 import org.opensha.commons.geo.GriddedRegion;
 import org.opensha.commons.geo.Region;
 import org.opensha.sha.calc.HazardCurveCalculator;
-import org.opensha.sha.calc.params.filters.SourceFilterManager;
-import org.opensha.sha.calc.params.filters.SourceFilters;
+import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
+import org.opensha.sha.calc.sourceFilters.SourceFilters;
 import org.opensha.sha.earthquake.faultSysSolution.FaultSystemSolution;
 import org.opensha.sha.earthquake.param.IncludeBackgroundOption;
 import org.opensha.sha.earthquake.param.IncludeBackgroundParam;
diff --git a/src/main/java/scratch/kevin/prvi25/figures/SiteHazardInvestigationsPageGen.java b/src/main/java/scratch/kevin/prvi25/figures/SiteHazardInvestigationsPageGen.java
index 3a5f3809..67c10169 100644
--- a/src/main/java/scratch/kevin/prvi25/figures/SiteHazardInvestigationsPageGen.java
+++ b/src/main/java/scratch/kevin/prvi25/figures/SiteHazardInvestigationsPageGen.java
@@ -43,8 +43,8 @@
 import org.opensha.sha.calc.disaggregation.DisaggregationCalculator.EpsilonCategories;
 import org.opensha.sha.calc.disaggregation.DisaggregationPlotData;
 import org.opensha.sha.calc.disaggregation.chart3d.PureJavaDisaggPlotter;
-import org.opensha.sha.calc.params.filters.SourceFilterManager;
-import org.opensha.sha.calc.params.filters.SourceFilters;
+import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
+import org.opensha.sha.calc.sourceFilters.SourceFilters;
 import org.opensha.sha.earthquake.AbstractERF;
 import org.opensha.sha.earthquake.ProbEqkRupture;
 import org.opensha.sha.earthquake.ProbEqkSource;
diff --git a/src/main/java/scratch/kevin/simCompare/SiteHazardCurveComarePageGen.java b/src/main/java/scratch/kevin/simCompare/SiteHazardCurveComarePageGen.java
index 4b4f703b..cf171f0d 100644
--- a/src/main/java/scratch/kevin/simCompare/SiteHazardCurveComarePageGen.java
+++ b/src/main/java/scratch/kevin/simCompare/SiteHazardCurveComarePageGen.java
@@ -29,8 +29,8 @@
 import org.opensha.sha.calc.disaggregation.DisaggregationCalculator;
 import org.opensha.sha.calc.disaggregation.DisaggregationCalculatorAPI;
 import org.opensha.sha.calc.hazardMap.HazardDataSetLoader;
-import org.opensha.sha.calc.params.filters.SourceFilter;
-import org.opensha.sha.calc.params.filters.SourceFiltersParam;
+import org.opensha.sha.calc.sourceFilters.SourceFilter;
+import org.opensha.sha.calc.sourceFilters.params.SourceFiltersParam;
 import org.opensha.sha.earthquake.AbstractERF;
 import org.opensha.sha.imr.AttenRelRef;
 import org.opensha.sha.imr.ScalarIMR;
diff --git a/src/main/java/scratch/kevin/simulators/hazard/HazardMapComparePlotter.java b/src/main/java/scratch/kevin/simulators/hazard/HazardMapComparePlotter.java
index b3b67cb4..5ddae36a 100644
--- a/src/main/java/scratch/kevin/simulators/hazard/HazardMapComparePlotter.java
+++ b/src/main/java/scratch/kevin/simulators/hazard/HazardMapComparePlotter.java
@@ -72,9 +72,9 @@
 import org.opensha.sha.calc.disaggregation.DisaggregationCalculatorAPI;
 import org.opensha.sha.calc.hazardMap.BinaryHazardCurveReader;
 import org.opensha.sha.calc.hazardMap.HazardDataSetLoader;
-import org.opensha.sha.calc.params.filters.SourceFilter;
-import org.opensha.sha.calc.params.filters.SourceFilterManager;
-import org.opensha.sha.calc.params.filters.SourceFilters;
+import org.opensha.sha.calc.sourceFilters.SourceFilter;
+import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
+import org.opensha.sha.calc.sourceFilters.SourceFilters;
 import org.opensha.sha.earthquake.AbstractERF;
 import org.opensha.sha.earthquake.faultSysSolution.FaultSystemSolution;
 import org.opensha.sha.earthquake.param.IncludeBackgroundOption;
diff --git a/src/main/java/scratch/kevin/ucerf3/FSS_HazardDemo.java b/src/main/java/scratch/kevin/ucerf3/FSS_HazardDemo.java
index e81d2118..03b38fd5 100644
--- a/src/main/java/scratch/kevin/ucerf3/FSS_HazardDemo.java
+++ b/src/main/java/scratch/kevin/ucerf3/FSS_HazardDemo.java
@@ -11,7 +11,7 @@
 import org.opensha.commons.geo.Location;
 import org.opensha.commons.param.Parameter;
 import org.opensha.sha.calc.HazardCurveCalculator;
-import org.opensha.sha.calc.params.MaxDistanceParam;
+import org.opensha.sha.calc.sourceFilters.params.MaxDistanceParam;
 import org.opensha.sha.earthquake.faultSysSolution.FaultSystemSolution;
 import org.opensha.sha.earthquake.param.IncludeBackgroundOption;
 import org.opensha.sha.earthquake.param.IncludeBackgroundParam;
diff --git a/src/main/java/scratch/kevin/ucerf3/eal/UCERF3_EAL_Combiner.java b/src/main/java/scratch/kevin/ucerf3/eal/UCERF3_EAL_Combiner.java
index e711bc22..19cdc870 100644
--- a/src/main/java/scratch/kevin/ucerf3/eal/UCERF3_EAL_Combiner.java
+++ b/src/main/java/scratch/kevin/ucerf3/eal/UCERF3_EAL_Combiner.java
@@ -29,7 +29,7 @@
 import org.opensha.commons.util.ClassUtils;
 import org.opensha.commons.util.DataUtils;
 import org.opensha.commons.util.DataUtils.MinMaxAveTracker;
-import org.opensha.sha.calc.params.MagDistCutoffParam;
+import org.opensha.sha.calc.sourceFilters.params.MagDistCutoffParam;
 import org.opensha.sha.earthquake.faultSysSolution.FaultSystemRupSet;
 import org.opensha.sha.earthquake.faultSysSolution.erf.BaseFaultSystemSolutionERF;
 import org.opensha.sha.earthquake.faultSysSolution.modules.GridSourceProvider;