From 0c773259665ccf97bbfcf97ca853a3bcd0c5ed1b Mon Sep 17 00:00:00 2001
From: BenVK <BenVanKuiken@gmail.com>
Date: Fri, 10 Mar 2023 12:58:29 +0100
Subject: [PATCH] added centroid method selection as a class attribute
---
src/toolbox_scs/detectors/hrixs.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/toolbox_scs/detectors/hrixs.py b/src/toolbox_scs/detectors/hrixs.py
index 297cb90..1523757 100644
--- a/src/toolbox_scs/detectors/hrixs.py
+++ b/src/toolbox_scs/detectors/hrixs.py
@@ -234,12 +234,16 @@ class hRIXS:
self.Y_RANGE = np.s_[:]
# centroid
+ self.C_METHOD='manual'
self.THRESHOLD = None # pixel counts above which a hit candidate is assumed
self.STD_THRESHOLD = 3.5 # same as THRESHOLD, in standard deviations
- self.DBL_THRESHOLD = 0.1 # factor used for double hits in centroid_one
+ self.DBL_THRESHOLD = 5 # factor used for double hits in centroid_one
+
+
self.CURVE_A = 0 # curvature parameters as determined elsewhere
self.CURVE_B = 0
+
# integral
self.BINS = 100
@@ -442,7 +446,7 @@ class hRIXS:
dres.append((mx, my))
return res, dres
- def centroid(self, data, bins=None, method='auto'):
+ def centroid(self, data, bins=None, method=None):
"""calculate a spectrum by finding the centroid of individual photons
This takes the `xarray.Dataset` `data` and returns a copy of it, with
@@ -462,6 +466,8 @@ class hRIXS:
"""
if bins is None:
bins = self.BINS
+ if method is None:
+ method = self.C_METHOD
ret = np.zeros((len(data["hRIXS_det"]), bins))
retd = np.zeros((len(data["hRIXS_det"]), bins))
total_hits = np.zeros((len(data["hRIXS_det"])))
--
GitLab