gondola 0.11.38__tar.gz → 0.11.40__tar.gz

{gondola-0.11.38 → gondola-0.11.40}/Cargo.lock

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

{gondola-0.11.38 → gondola-0.11.40}/Cargo.toml

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

{gondola-0.11.38 → gondola-0.11.40}/PKG-INFO

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

{gondola-0.11.38 → gondola-0.11.40}/python/gondola/tof/analysis.py

@@ -475,7 +475,11 @@ class TofAnalysis:
                         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:])
+                        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
                     self.edep_plots[k].fill(self._analysis.cache.get_f32_data(k))

{gondola-0.11.38 → gondola-0.11.40}/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);   
@@ -1157,6 +1160,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]