From 878af8cac7c838134d9bf0846507889f712458bb Mon Sep 17 00:00:00 2001
From: Jack Christopher Hutchinson Rolph <jack.rolph@desy.de>
Date: Tue, 30 Nov 2021 14:15:30 +0100
Subject: [PATCH] Update PeakOTron.py
---
PeakOTron.py | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/PeakOTron.py b/PeakOTron.py
index 8e4c289..d4d6717 100644
--- a/PeakOTron.py
+++ b/PeakOTron.py
@@ -217,7 +217,7 @@ class PeakOTron:
"Gamma",
"gamma",
"Delta",
- "delta",
+# "delta",
"Epsilon",
"epsilon",
"Zeta",
@@ -1347,7 +1347,7 @@ class PeakOTron:
self.scaler = RobustScaler()
data_s = np.squeeze(self.scaler.fit_transform(data.reshape(-1,1)))
- if(bw is None):
+ if(bw is None):
ppf = self.EmpiricalPPF(data_s)
@@ -1385,20 +1385,7 @@ class PeakOTron:
bins_s = data_s.min() + bw_s * np.arange(nbins_s + 1)
- else:
-
- bw_s = bw/self.scaler.scale_[0]
-
- nbins = np.ceil((data.max() - data.min()) / bw)
- nbins = max(1, nbins)
- bins = data.min() + bw * np.arange(nbins + 1)
-
- nbins_s = np.ceil((data_s.max() - data_s.min()) / bw_s)
- nbins_s = max(1, nbins_s)
- bins_s = data_s.min() + bw_s * np.arange(nbins_s + 1)
-
-
-
+
if(nbins<50):
print("Binning with bw = {:3.3E} produced only {:d} bins, less than limit of 50 bins. Setting fit fail status and continuing...".format(bw, nbins))
--
GitLab