icecube · JannisNe · May 21, 2024 · Jun 6, 2024 · Jul 31, 2024 · Aug 1, 2024
diff --git a/flarestack/core/llh.py b/flarestack/core/llh.py
@@ -702,7 +702,6 @@ def calculate_test_statistic(self, params, weights, **kwargs):
         return 2.0 * np.sum(llh_value)
 
 
-@LLH.register_subclass("standard")
 class StandardLLH(FixedEnergyLLH):
     fit_energy = True
 
@@ -1063,7 +1062,6 @@ def return_injected_parameters(mh_dict):
         return res_dict
 
 
-@LLH.register_subclass("standard_kde_enabled")
 class StandardKDEEnabledLLH(StandardLLH):
     def create_kwargs(self, data, pull_corrector, weight_f=None):
         kwargs = dict()

diff --git a/flarestack/core/minimisation.py b/flarestack/core/minimisation.py
@@ -359,8 +359,6 @@ class FixedWeightMinimisationHandler(MinimisationHandler):
     compatible_llh = [
         "spatial",
         "fixed_energy",
-        "standard",
-        "standard_kde_enabled",
         "standard_overlapping",
         "standard_matrix",
         "std_matrix_kde_enabled",
@@ -1271,7 +1269,7 @@ def add_injector(self, season, sources):
 
 @MinimisationHandler.register_subclass("fit_weights")
 class FitWeightMinimisationHandler(FixedWeightMinimisationHandler):
-    compatible_llh = ["spatial", "fixed_energy", "standard", "standard_kde_enabled"]
+    compatible_llh = ["spatial", "fixed_energy", "standard_matrix", "std_matrix_kde_enabled"]
     compatible_negative_n_s = False
 
     def __init__(self, mh_dict):
@@ -1487,7 +1485,7 @@ def corner_likelihood_scan(
 
 @MinimisationHandler.register_subclass("flare")
 class FlareMinimisationHandler(FixedWeightMinimisationHandler):
-    compatible_llh = ["spatial", "fixed_energy", "standard"]
+    compatible_llh = ["spatial", "fixed_energy", "standard_matrix"]
     compatible_negative_n_s = False
 
     def __init__(self, mh_dict):

diff --git a/tests/test_full_analysis_chain.py b/tests/test_full_analysis_chain.py
@@ -35,7 +35,7 @@ def test_full_chain(self):
                 }
 
                 llh_dict = {
-                    "llh_name": "standard",
+                    "llh_name": "standard_matrix",
                     "llh_sig_time_pdf": {"time_pdf_name": "steady"},
                     "llh_bkg_time_pdf": {
                         "time_pdf_name": "steady",

diff --git a/tests/test_likelihood_standard.py b/tests/test_likelihood_standard.py
diff --git a/tests/test_mh_fit_weights.py b/tests/test_mh_fit_weights.py
@@ -11,7 +11,7 @@
 # Initialise Injectors/LLHs
 
 llh_dict = {
-    "llh_name": "standard",
+    "llh_name": "standard_matrix",
     "llh_sig_time_pdf": {"time_pdf_name": "steady"},
     "llh_bkg_time_pdf": {
         "time_pdf_name": "steady",

diff --git a/tests/test_mh_fixed_weights.py b/tests/test_mh_fixed_weights.py
@@ -10,7 +10,7 @@
 # Initialise Injectors/LLHs
 
 llh_dict = {
-    "llh_name": "standard",
+    "llh_name": "standard_matrix",
     "llh_sig_time_pdf": {"time_pdf_name": "steady"},
     "llh_bkg_time_pdf": {
         "time_pdf_name": "steady",

diff --git a/tests/test_mh_flare.py b/tests/test_mh_flare.py
@@ -20,7 +20,7 @@
 llh_time = {"time_pdf_name": "custom_source_box"}
 
 unblind_llh = {
-    "llh_name": "standard",
+    "llh_name": "standard_matrix",
     "llh_sig_time_pdf": llh_time,
     "llh_bkg_time_pdf": {"time_pdf_name": "steady"},
     "llh_energy_pdf": llh_energy,

diff --git a/tests/test_negative_ns.py b/tests/test_negative_ns.py
@@ -11,7 +11,7 @@
 # Initialise Injectors/LLHs
 
 llh_dict = {
-    "llh_name": "standard",
+    "llh_name": "standard_matrix",
     "llh_sig_time_pdf": {"time_pdf_name": "steady"},
     "llh_bkg_time_pdf": {
         "time_pdf_name": "steady",

diff --git a/tests/test_submitter.py b/tests/test_submitter.py
@@ -33,7 +33,7 @@
 llh_energy = injection_energy
 
 llh_kwargs = {
-    "llh_name": "standard",
+    "llh_name": "standard_matrix",
     "llh_energy_pdf": llh_energy,
     "llh_sig_time_pdf": llh_time,
     "llh_bkg_time_pdf": {"time_pdf_name": "steady"},

diff --git a/tests/test_time_pdfs.py b/tests/test_time_pdfs.py
@@ -43,7 +43,7 @@ def test_declination_sensitivity(self):
 
         for i, t_pdf_dict in enumerate(time_pdfs):
             llh_dict = {
-                "llh_name": "standard",
+                "llh_name": "standard_matrix",
                 "llh_sig_time_pdf": t_pdf_dict,
                 "llh_bkg_time_pdf": {
                     "time_pdf_name": "steady",

diff --git a/tests/test_util_custom_dataset.py b/tests/test_util_custom_dataset.py
@@ -22,7 +22,7 @@ def test_custom_dataset(self):
         logging.info("Testing custom_dataset util function.")
 
         llh_dict = {
-            "llh_name": "standard",
+            "llh_name": "standard_matrix",
             "llh_sig_time_pdf": {
                 "time_pdf_name": "box",
                 "pre_window": 0.0,