Merge branch 'fix_peaklet_merging_bias' of https://github.com/XENONnT…

…/straxen into fix_peaklet_merging_bias
JoranAngevaare · Aug 11, 2021 · 02eb069 · 02eb069
2 parents 271e7cf + a8513a1
commit 02eb069
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/extra_requirements/requirements-tests.txt b/extra_requirements/requirements-tests.txt
@@ -12,6 +12,8 @@ holoviews==1.14.5
 ipywidgets==7.6.3
 hypothesis==6.14.5
 jupyter-client==6.1.12                          # for ipywidgets
+matplotlib==3.4.2
+multihist==0.6.4
 npshmex==0.2.1                                  # Strax dependency
 numba==0.53.1                                   # Strax dependency
 numpy==1.19.5

diff --git a/straxen/common.py b/straxen/common.py
@@ -298,7 +298,7 @@ def get_secret(x):
 @export
 def download_test_data():
     """Downloads strax test data to strax_test_data in the current directory"""
-    blob = get_resource('https://raw.githubusercontent.com/XENONnT/strax_auxiliary_files/11929e7595e178dd335d59727024847efde530fb/strax_test_data_straxv0.9.tar',
+    blob = get_resource('https://raw.githubusercontent.com/XENONnT/strax_auxiliary_files/609b492e1389369734c7d2cbabb38059f14fc05e/strax_files/strax_test_data_straxv0.9.tar',  #  noqa
                         fmt='binary')
     f = io.BytesIO(blob)
     tf = tarfile.open(fileobj=f)

diff --git a/straxen/plugins/double_scatter.py b/straxen/plugins/double_scatter.py
@@ -48,7 +48,8 @@ class EventInfoDouble(strax.MergeOnlyPlugin):
     """
     __version__ = '0.1.0'
     depends_on = ['event_info', 'distinct_channels']
-
+    save_when = strax.SaveWhen.EXPLICIT
+
     @staticmethod
     def rename_field(orig_name):
         special_cases = {'alt_cs1': 'cs1_b',

diff --git a/straxen/rundb.py b/straxen/rundb.py
@@ -241,7 +241,7 @@ def find_several(self, keys: typing.List[strax.DataKey], **kwargs):
         if self.runid_field == 'name':
             run_query = {'name': {'$in': [key.run_id for key in keys]}}
         else:
-            run_query = {f'{self.runid_field}': {'$in': [int(key.run_id) for key in keys]}}
+            run_query = {f'{self.runid_field}': {'$in': [int(key.run_id) for key in keys if not key.run_id.startswith('_')]}}
         dq = self._data_query(keys[0])
 
         # dict.copy is sometimes not sufficient for nested dictionary