gondola 0.11.39__tar.gz → 0.11.41__tar.gz

{gondola-0.11.39 → gondola-0.11.41}/Cargo.lock

@@ -1361,7 +1361,7 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "gondola-core"
-version = "0.11.39"
+version = "0.11.41"
 dependencies = [
  "cfg-if 1.0.0",
  "chrono",

{gondola-0.11.39 → gondola-0.11.41}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gondola-core"
-version = "0.11.39"
+version = "0.11.41"
 edition = "2024"
 readme = "README.md"
 

{gondola-0.11.39 → gondola-0.11.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gondola
-Version: 0.11.39
+Version: 0.11.41
 Requires-Dist: tqdm>=4.0
 Requires-Dist: numpy>=2.3
 Requires-Dist: matplotlib>=3.10

{gondola-0.11.39 → gondola-0.11.41}/python/gondola/tof/analysis.py

@@ -129,6 +129,9 @@ class TofAnalysis:
         plots['edep_umb'] = d.histogram.hist1d(self.EDEP_BINS)
         plots['edep_cbe'] = d.histogram.hist1d(self.EDEP_BINS)
         plots['edep_cor'] = d.histogram.hist1d(self.EDEP_BINS)
+        plots['umb_vs_cor_edep'] = d.histogram.hist2d((self.EDEP_BINS, self.EDEP_BINS)),
+        plots['cbe_vs_cor_edep'] = d.histogram.hist2d((self.EDEP_BINS, self.EDEP_BINS)),
+        plots['cbe_vs_umb_edep'] = d.histogram.hist2d((self.EDEP_BINS, self.EDEP_BINS)),
         cache = dict()
         for k in plots.keys():
             cache[k] = []
@@ -142,6 +145,9 @@ class TofAnalysis:
           'nhit_umb'   : d.histogram.hist1d(self.NHIT_BINS),
           'nhit_cor'   : d.histogram.hist1d(self.NHIT_BINS),
           'i_vs_o_nhit': d.histogram.hist2d((self.NHIT_BINS, self.NHIT_BINS)),
+          'umb_vs_cor_nhit': d.histogram.hist2d((self.NHIT_BINS, self.NHIT_BINS)),
+          'cbe_vs_umb_nhit': d.histogram.hist2d((self.NHIT_BINS, self.NHIT_BINS)),
+          'cbe_vs_cor_nhit': d.histogram.hist2d((self.NHIT_BINS, self.NHIT_BINS)),
           'thit'       : d.histogram.hist1d(self.NHIT_BINS),
           'rblink'     : d.histogram.hist1d(self.NHIT_BINS),
           'miss_hit'   : d.histogram.hist1d(self.PID_BINS),
@@ -451,6 +457,9 @@ class TofAnalysis:
             self.nhit_plots['nhit_cbe'].fill(self._analysis.c_hit_cbe) 
             outer_n_hit = [self._analysis.c_hit_umb[k] + self._analysis.c_hit_cor[k] for k in range(len(self._analysis.c_hit_cor))]
             self.nhit_plots['i_vs_o_nhit'].fill((self._analysis.c_hit_cbe, outer_n_hit))
+            self.nhit_plots['umb_vs_cor_nhit'].fill((self._analysis.c_hit_umb, self._analysis.c_hit_cor))
+            self.nhit_plots['cbe_vs_umb_nhit'].fill((self._analysis.c_hit_cbe, self._analysis.c_hit_umb))
+            self.nhit_plots['cbe_vs_cor_nhit'].fill((self._analysis.c_hit_cbe, self._analysis.c_hit_cbe))
             self.nhit_plots['thit'    ].fill(self._analysis.c_thit) 
             self.nhit_plots['rblink'  ].fill(self._analysis.c_rblink) 
             self.nhit_plots['miss_hit'].fill(self._analysis.c_miss_hit) 
@@ -474,10 +483,29 @@ class TofAnalysis:
                     else:
                         self.tmg_plots[k].fill(self._analysis.cache.get_f32_data(k))
                 for k in self.edep_plots:
-                    if not k in ['edep', 'edep_cor', 'edep_cbe', 'edep_cor']:
-                        pnl = int(k[8:])
+                    if not k in ['umb_vs_cor_edep', 'cbe_vs_cor_edep', 'cbe_vs_umb_edep', 'edep', 'edep_cor', 'edep_cbe', 'edep_cor']:
+                        try:
+                            pnl = int(k[8:])
+                        except Exception as e:
+                            print (f'(can not get panel edep for {k}')
+                            continue
                         self.edep_plots[k].fill(self._analysis.cache.get_f32_data_panel("edep", pnl))
                         continue
+                    if k == 'umb_vs_cor_edep':
+                        self.edep_plots[k].fill(\
+                                self._analysis.cache.get_f32_data("edep_umb"),
+                                self._analysis.cache.get_f32_data("edep_cor"))
+                        continue
+                    if k == 'cbe_vs_cor_edep':
+                        self.edep_plots[k].fill(\
+                                self._analysis.cache.get_f32_data("edep_cbe"),
+                                self._analysis.cache.get_f32_data("edep_cor"))
+                        continue
+                    if k == 'cbe_vs_umb_edep':
+                        self.edep_plots[k].fill(\
+                                self._analysis.cache.get_f32_data("edep_cbe"),
+                                self._analysis.cache.get_f32_data("edep_umb"))
+                        continue
                     self.edep_plots[k].fill(self._analysis.cache.get_f32_data(k))
                 self._analysis.cache.clear()
 

{gondola-0.11.39 → gondola-0.11.41}/src/tof/analysis.rs

@@ -1118,6 +1118,9 @@ impl TofAnalysis {
 
   fn add_other_hit_cache(&mut self, other :  &TofAnalysis) {
     self.c_hit     .extend_from_slice(&other.c_hit);
+    self.c_hit_umb .extend_from_slice(&other.c_hit_umb);
+    self.c_hit_cor .extend_from_slice(&other.c_hit_cor);
+    self.c_hit_cbe .extend_from_slice(&other.c_hit_cbe);
     self.c_thit    .extend_from_slice(&other.c_thit);
     self.c_rblink  .extend_from_slice(&other.c_rblink);
     self.c_miss_hit.extend_from_slice(&other.c_miss_hit);