From 9de01b78d98773e9740a992b33b27f9e6ed9d74b Mon Sep 17 00:00:00 2001
From: dachengx <dx2227@columbia.edu>
Date: Mon, 17 Feb 2025 14:57:57 -0600
Subject: [PATCH 1/2] Be compatible with
 https://github.com/XENONnT/straxen/pull/1563

---
 axidence/dtypes.py                           |  2 ++
 axidence/plugins/salting/event_building.py   | 10 +++++++++-
 axidence/plugins/salting/event_combine.py    |  1 +
 axidence/plugins/salting/peak_correlation.py |  9 ++++++++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/axidence/dtypes.py b/axidence/dtypes.py
index a8eaa33..7cd83ee 100644
--- a/axidence/dtypes.py
+++ b/axidence/dtypes.py
@@ -68,6 +68,8 @@ def positioned_peak_dtype(n_channels=straxen.n_tpc_pmts):
     ]
 
 peak_misc_fields = list(strax.to_numpy_dtype(som_additional_fields).names) + [
+    "ambience_1d_score",
+    "ambience_2d_score",
     "n_competing",
     "n_competing_left",
 ]
diff --git a/axidence/plugins/salting/event_building.py b/axidence/plugins/salting/event_building.py
index ee30c01..19e855a 100644
--- a/axidence/plugins/salting/event_building.py
+++ b/axidence/plugins/salting/event_building.py
@@ -12,7 +12,14 @@
 class EventsSalted(Events, ExhaustPlugin):
     __version__ = "0.2.0"
     child_plugin = True
-    depends_on = ("peaks_salted", "peak_proximity_salted", "peak_basics", "peak_proximity")
+    depends_on = (
+        "peaks_salted",
+        "peak_proximity_salted",
+        "peak_ambience__salted",
+        "peak_basics",
+        "peak_proximity",
+        "peak_ambience_",
+    )
     provides = "events_salted"
     data_kind = "events_salted"
     save_when = strax.SaveWhen.EXPLICIT
@@ -146,6 +153,7 @@ class EventBasicsSOMSalted(EventBasicsSOM, ExhaustPlugin):
         "events_salted",
         "peaks_salted",
         "peak_proximity_salted",
+        "peak_ambience__salted",
         "peak_basics",
         "peak_proximity",
         "peak_positions",
diff --git a/axidence/plugins/salting/event_combine.py b/axidence/plugins/salting/event_combine.py
index d0795de..0207c9b 100644
--- a/axidence/plugins/salting/event_combine.py
+++ b/axidence/plugins/salting/event_combine.py
@@ -10,6 +10,7 @@ class EventsCombine(ExhaustPlugin):
         "event_basics_salted",
         "event_shadow_salted",
         "event_ambience_salted",
+        "event_ambience__salted",
         "event_nearest_triggering_salted",
         "event_se_score_salted",
     )
diff --git a/axidence/plugins/salting/peak_correlation.py b/axidence/plugins/salting/peak_correlation.py
index 3f6bebe..8497689 100644
--- a/axidence/plugins/salting/peak_correlation.py
+++ b/axidence/plugins/salting/peak_correlation.py
@@ -87,7 +87,14 @@ def compute(self, peaks_salted, lone_hits, peaks):
 class PeakNearestTriggeringSalted(PeakNearestTriggering):
     __version__ = "0.0.0"
     child_plugin = True
-    depends_on = ("peaks_salted", "peak_proximity_salted", "peak_basics", "peak_proximity")
+    depends_on = (
+        "peaks_salted",
+        "peak_proximity_salted",
+        "peak_ambience__salted",
+        "peak_basics",
+        "peak_proximity",
+        "peak_ambience_",
+    )
     provides = "peak_nearest_triggering_salted"
     data_kind = "peaks_salted"
     save_when = strax.SaveWhen.EXPLICIT

From 44fb69771c75546dbcbd8b54f0284604d5be8546 Mon Sep 17 00:00:00 2001
From: dachengx <dx2227@columbia.edu>
Date: Tue, 18 Feb 2025 21:25:48 -0600
Subject: [PATCH 2/2] Use 2D score

---
 axidence/plugins/salting/events_salting.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/axidence/plugins/salting/events_salting.py b/axidence/plugins/salting/events_salting.py
index 84275c8..bc98714 100644
--- a/axidence/plugins/salting/events_salting.py
+++ b/axidence/plugins/salting/events_salting.py
@@ -26,9 +26,7 @@ class EventsSalting(ExhaustPlugin, DownChunkingPlugin, EventPositions, EventBasi
     salting_rate = straxen.URLConfig(
         default=10,
         type=(int, float, list, tuple),
-        help=(
-            "Rate of salting in Hz, " "if list or tuple, they are the factor for 2 and 3+ hits S1",
-        ),
+        help="Rate of salting in Hz, if list or tuple, they are the factor for 2 and 3+ hits S1",
     )
 
     s1_area_range = straxen.URLConfig(
@@ -123,7 +121,7 @@ def setup(self):
         if isinstance(self.salting_rate, (list, tuple)):
             if len(self.salting_rate) != 2:
                 raise ValueError(
-                    "The length of salting_rate should be 2 " "if provided list or tuple!"
+                    "The length of salting_rate should be 2 if provided list or tuple!"
                 )
             self.hits_salting_rate = list(self.salting_rate)
         else: