Merge pull request #30 from spice-herald/maintenance/qetpy_update

update for newest QETpy >= 1.7.2
spice-herald · Aug 30, 2024 · 90115f7 · 90115f7
2 parents 9e89c18 + 450a34f
commit 90115f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/detprocess/process/processing_data.py b/detprocess/process/processing_data.py
@@ -432,8 +432,8 @@ def instantiate_OF_base(self, processing_config, channel=None):
                 if nb_channels == 1:
                     self._OF_base_objs[key]['OF'].calc_phi(chan)
                 else:
-                    self._OF_base_objs[key]['OF'].calc_phi_mat(chan)
-                    self._OF_base_objs[key]['OF'].calc_weight_mat(chan)
+                    self._OF_base_objs[key]['OF'].calc_phi_matrix(chan)
+                    self._OF_base_objs[key]['OF'].calc_weight_matrix(chan)
 
 
         # remove duplicated
@@ -685,7 +685,6 @@ def update_signal_OF(self, weights=None):
                 self._OF_base_objs[key_tuple]['OF'].update_signal(
                     chan, trace,
                     calc_signal_filt=False,
-                    calc_q_vector= False,
                     calc_signal_filt_td=False,
                     calc_chisq_amp=False,
                 )
@@ -704,8 +703,8 @@ def update_signal_OF(self, weights=None):
                     self._OF_base_objs[key_tuple]['OF'].calc_signal_filt(chan)
                     self._OF_base_objs[key_tuple]['OF'].calc_chisq_amp(chan)
                 else:
-                    self._OF_base_objs[key_tuple]['OF'].calc_signal_filt_mat(chan)
-                    self._OF_base_objs[key_tuple]['OF'].calc_signal_filt_mat_td(chan)
+                    self._OF_base_objs[key_tuple]['OF'].calc_signal_filt_matrix(chan)
+                    self._OF_base_objs[key_tuple]['OF'].calc_signal_filt_matrix_td(chan)
 
 
     def get_event_admin(self, return_all=False):

diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@ def run(self):
 
 setup(
     name="detprocess",
-    version="0.4.5",
+    version="0.4.6",
     description="Detector Data Processing Package",
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -54,9 +54,9 @@ def run(self):
         'scipy',
         'matplotlib',
         'pyyaml',
-        'qetpy>=1.7.1',
+        'qetpy>=1.7.2',
         'pandas',
-        'pytesdaq>=0.4.0',
+        'pytesdaq>=0.4.1',
         'scikit-image',
         'iminuit>=2',
         'seaborn',