gondola 0.11.37__tar.gz → 0.11.39__tar.gz

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

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

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

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

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

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

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

@@ -137,15 +137,16 @@ class TofAnalysis:
 
     def _nhit_plots(self):
         nhit_plots = {
-          'hit'      : d.histogram.hist1d(self.NHIT_BINS),
-          'nhit_cbe' : d.histogram.hist1d(self.NHIT_BINS),
-          'nhit_umb' : d.histogram.hist1d(self.NHIT_BINS),
-          'nhit_cor' : d.histogram.hist1d(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),
+          'hit'        : d.histogram.hist1d(self.NHIT_BINS),
+          'nhit_cbe'   : d.histogram.hist1d(self.NHIT_BINS),
+          '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)),
+          'thit'       : d.histogram.hist1d(self.NHIT_BINS),
+          'rblink'     : d.histogram.hist1d(self.NHIT_BINS),
+          'miss_hit'   : d.histogram.hist1d(self.PID_BINS),
           # these are non causal hits
-          'nc_pdls'  : d.histogram.hist1d(self.PID_BINS),
+          'nc_pdls'    : d.histogram.hist1d(self.PID_BINS),
         }
         return nhit_plots
 
@@ -445,9 +446,11 @@ class TofAnalysis:
         if self._analysis.hit_cache_len >= self.event_cache_size: 
             # hit statistics
             self.nhit_plots['hit'     ].fill(self._analysis.c_hit) 
-            self.nhit_plots['nhit_umb'].fill(self._analysis.c_hit) 
-            self.nhit_plots['nhit_cor'].fill(self._analysis.c_hit) 
-            self.nhit_plots['nhit_cbe'].fill(self._analysis.c_hit) 
+            self.nhit_plots['nhit_umb'].fill(self._analysis.c_hit_umb) 
+            self.nhit_plots['nhit_cor'].fill(self._analysis.c_hit_cor) 
+            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['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) 

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

@@ -1157,6 +1157,39 @@ impl TofAnalysis {
     return Ok(py_array);
   }
   
+  /// This is the number of hits/event for each seen event
+  #[pyo3(name="c_hit_cbe")]
+  #[getter]
+  fn c_hit_cbe_py<'py>(&'py self, py: Python<'py>) -> PyResult<Bound<'py, PyArray1<u8>>> {
+    let slice = &self.c_hit_cbe[..];
+    // this is supposed to be readonly
+    // FIXME - check this!
+    let py_array = PyArray1::from_slice(py, slice);
+    return Ok(py_array);
+  }
+  
+  /// This is the number of hits/event for each seen event
+  #[pyo3(name="c_hit_umb")]
+  #[getter]
+  fn c_hit_umb_py<'py>(&'py self, py: Python<'py>) -> PyResult<Bound<'py, PyArray1<u8>>> {
+    let slice = &self.c_hit_umb[..];
+    // this is supposed to be readonly
+    // FIXME - check this!
+    let py_array = PyArray1::from_slice(py, slice);
+    return Ok(py_array);
+  }
+  
+  /// This is the number of hits/event for each seen event
+  #[pyo3(name="c_hit_cor")]
+  #[getter]
+  fn c_hit_cor_py<'py>(&'py self, py: Python<'py>) -> PyResult<Bound<'py, PyArray1<u8>>> {
+    let slice = &self.c_hit_cor[..];
+    // this is supposed to be readonly
+    // FIXME - check this!
+    let py_array = PyArray1::from_slice(py, slice);
+    return Ok(py_array);
+  }
+  
   /// This is the number of TRIGGER hits/event for each seen event
   #[pyo3(name="c_thit")]
   #[getter]