gondola 0.11.8__tar.gz → 0.12.1__tar.gz

{gondola-0.11.8 → gondola-0.12.1}/Cargo.lock

@@ -1352,7 +1352,7 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "gondola-core"
-version = "0.11.8"
+version = "0.12.1"
 dependencies = [
  "cfg-if 1.0.0",
  "chrono",
@@ -4813,6 +4813,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 [[package]]
 name = "tof-control"
 version = "0.9.5"
+source = "git+https://github.com/GAPS-Collab/tof-control.git?branch=minimal#23ab243acf48c4c71a994964dee0b612b8cb6132"
 dependencies = [
  "bindgen",
  "cc",

{gondola-0.11.8 → gondola-0.12.1}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gondola-core"
-version = "0.11.8"
+version = "0.12.1"
 edition = "2024"
 readme = "README.md"
 
@@ -44,6 +44,12 @@ root                = ["oxyroot", "root-io"]
 # will be required for the build of liftof
 tof-liftof          = ["signal-hook"]
 
+[dependencies.tof-control]
+version  = "0.9"
+optional = true
+git      = "https://github.com/GAPS-Collab/tof-control.git"
+branch   = "minimal"
+
 [dependencies.pyo3]
 version  = "0.25"
 features = ["extension-module", "multiple-pymethods", "abi3-py311", "chrono"]
@@ -109,5 +115,3 @@ libsqlite3-sys = { version = "0.35", features = ["bundled"] }
 
 # for testing / features
 rand   = { version = "0.9", optional = true}
-# Takeru's tof-control
-tof-control = {path = "../../../resources/extern/tof-control", optional = true, version = "0.9", features=[] }

{gondola-0.11.8 → gondola-0.12.1}/PKG-INFO

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

{gondola-0.11.8 → gondola-0.12.1}/src/calibration/tof.rs

@@ -9,7 +9,7 @@ use crate::prelude::*;
 /// to the beginning by a given offset.
 /// 
 /// This is similar to 
-/// https://numpy.org/doc/2.2/reference/generated/numpy.roll.html
+/// <https://numpy.org/doc/2.2/reference/generated/numpy.roll.html>
 ///
 /// # Arguments:
 ///   * `vec`   : The vector to be rolled over. It will 
@@ -1782,6 +1782,7 @@ impl RBCalibrations {
   }
 }
 
+#[cfg(feature = "pybindings")]
 pythonize_packable_no_new!(RBCalibrations);
 
 #[cfg(feature = "random")]

{gondola-0.11.8 → gondola-0.12.1}/src/events/rb_waveform.rs

@@ -13,13 +13,16 @@ use crate::prelude::*;
 pub struct RBWaveform {
   pub event_id      : u32,
   pub rb_id         : u8,
-  /// FIXME - this is form 0-8, but should it be from 1-9?
+  ///// FIXME - this is form 0-8, but should it be from 1-9?
   pub rb_channel_a  : u8,
   pub rb_channel_b  : u8,
   /// DRS4 stop cell
   pub stop_cell     : u16,
   pub adc_a         : Vec<u16>,
   pub adc_b         : Vec<u16>,
+  // FIXME - to be compatible with Antarctica data from 
+  // 2024/25, we do not serialize the paddle id in this version
+  // HOWEVER, let's change that in v0.12
   pub paddle_id     : u8,
   pub voltages_a    : Vec<f32>,
   pub nanoseconds_a : Vec<f32>,
@@ -237,6 +240,9 @@ impl Serialization for RBWaveform {
     let data_a           = &stream[*pos..*pos+2*NWORDS];
     wf.adc_a             = u8_to_u16(data_a);
     *pos += 2*NWORDS;
+    if stream.len() < *pos+2*NWORDS {
+      return Err(SerializationError::StreamTooShort);
+    }
     let data_b           = &stream[*pos..*pos+2*NWORDS];
     wf.adc_b             = u8_to_u16(data_b);
     *pos += 2*NWORDS;

{gondola-0.11.8 → gondola-0.12.1}/src/io/parsers.rs

@@ -134,7 +134,7 @@ pub fn parse_string<T: AsRef<[u8]>>(stream : &T, pos : &mut usize) -> String {
 /// representation of u32 (neither le or be, but 
 /// shuffled)
 /// 
-/// <div class="warning>
+/// <div class="warning">
 /// This assumes an underlying representation of 
 /// an atomic unit of 16bit instead of 8.
 /// This is a non-convetional byte respresentation

{gondola-0.11.8 → gondola-0.12.1}/src/monitoring.rs

@@ -475,7 +475,8 @@ macro_rules! moniseries {
       //  return self.max_size;
       //}
     }
-
+    
+    #[cfg(feature="pybindings")]
     pythonize_display!($name);
   }
 }

{gondola-0.11.8 → gondola-0.12.1}/src/packets/tof_packet.rs

@@ -304,6 +304,12 @@ impl TofPacket {
     }
   }
 
+  #[getter]
+  #[pyo3(name="payload")]
+  fn get_payload_py(&self) -> Vec<u8> {
+    self.payload.clone()
+  }
+
   #[pyo3(name="unpack")]
   fn unpack_py(&self,py: Python) -> PyResult<Py<PyAny>> {
     match self.packet_type {

{gondola-0.11.8 → gondola-0.12.1}/src/python.rs

@@ -68,7 +68,7 @@ macro_rules! pythonize_telemetry {
       fn from_telemetrypacket(packet : TelemetryPacket) -> PyResult<Self> {
         //if packet.telemetry_header.packet_type !=
         match Self::from_bytestream(&packet.payload, &mut 0) {
-          Ok(mut tl) => {
+          Ok(tl) => {
             return Ok(tl);
           }
           Err(err) => {

{gondola-0.11.8 → gondola-0.12.1}/src/stats.rs

@@ -20,7 +20,7 @@ use numpy::{
 
 /// Calculates the standard deviation of a vector.
 ///
-/// This function returns an Option<f32> because the standard deviation is
+/// This function returns an `Option<f32>` because the standard deviation is
 /// undefined for an empty vector or a vector with a single element.
 pub fn standard_deviation(data: &Vec<f32>) -> Option<f32> {
   // The standard deviation is not defined for vectors with less than 2 elements.

{gondola-0.11.8 → gondola-0.12.1}/src/tof/algorithms.rs

@@ -66,10 +66,10 @@ pub fn get_max_value_idx_py<'_py>(value : Bound<'_py,PyArray1<f32>>,
 ///                   within the bin 
 ///   * idx         : Together with size define a range for the search for 
 ///                   the bin which should have the implementation applied 
-///                   to [voltages[idx], voltages[idx + size]]
+///                   to \[voltages\[idx\], voltages\[idx + size\]\]
 ///   * size        : Together with idx define a range for the search for 
 ///                   the bin which should have the implementation applied 
-///                   to [voltages[idx], voltages[idx + size]]
+///                   to \[voltages\[idx\], voltages\[idx + size\]\]
 pub fn interpolate_time<T : AsRef<[f32]>> (volts         : &T,
                                            times         : &T, 
                                            mut threshold : f32,
@@ -105,6 +105,7 @@ pub fn interpolate_time<T : AsRef<[f32]>> (volts         : &T,
 }
 
 
+#[cfg(feature = "pybindings")]
 #[pyfunction]
 #[pyo3(name="interpolate_time")]
 /// Linear interpolation of the time within a single bin of a TOF waveform
@@ -116,10 +117,10 @@ pub fn interpolate_time<T : AsRef<[f32]>> (volts         : &T,
 ///                   within the bin 
 ///   * idx         : Together with size define a range for the search for 
 ///                   the bin which should have the implementation applied 
-///                   to [voltages[idx], voltages[idx + size]]
+///                   to \[voltages\[idx\], voltages\[idx + size\]\]
 ///   * size        : Together with idx define a range for the search for 
 ///                   the bin which should have the implementation applied 
-///                   to [voltages[idx], voltages[idx + size]]
+///                   to \[voltages\[idx\], voltages\[idx + size\]\]
 pub fn interpolate_time_py(voltages    : PyReadonlyArray1<f32>,
                            nanoseconds : PyReadonlyArray1<f32>,
                            threshold   : f32,
@@ -280,8 +281,7 @@ pub fn cfd_simple(voltages    : &Vec<f32>,
 /// * max_peaks      : stop algorithm after max_peaks are
 ///                    found, the rest will be ignored
 /// #Returns:
-/// 
-/// Vec<(peak_begin_bin, peak_end_bin)>
+///    `Vec<(peak_begin_bin, peak_end_bin)>`
 ///
 pub fn find_peaks(voltages       : &Vec<f32>,
                   nanoseconds    : &Vec<f32>,

{gondola-0.11.8 → gondola-0.12.1}/src/tof/cuts.rs

@@ -394,6 +394,7 @@ impl TofCuts {
   /// and update the counters. 
   /// If cleanings are enabled, this will 
   /// change the event in-place!
+  #[cfg(feature="database")]
   pub fn accept(&mut self, ev : &mut TofEvent) -> bool {
     if self.is_void() {
       return true;
@@ -696,6 +697,7 @@ impl TofCuts {
     self.clear_stats();
   }
 
+  #[cfg(feature="database")]
   #[pyo3(name="accept")]
   fn accept_py(&mut self, event : &mut TofEvent) -> bool {
     self.accept(event)

{gondola-0.11.8 → gondola-0.12.1}/src/tof/master_trigger.rs

@@ -849,7 +849,7 @@ pub fn master_trigger(mt_address     : &str,
   }
 }
 
-
+#[cfg(feature = "pybindings")]
 #[pyfunction]
 #[pyo3(name="prescale_to_u32")]
 /// Convert a prescale value in range from 0-1.0 to 
@@ -863,12 +863,14 @@ pub fn wrap_prescale_to_u32(prescale : f32) -> u32 {
 //---------------------------------------
 // PORT from pybidings/master_trigger.rs 
 
+#[cfg(feature="pybindings")]
 #[pyclass]
 #[pyo3(name = "MasterTrigger")]
 pub struct PyMasterTrigger {
   ipbus : IPBus,
 }
 
+#[cfg(feature="pybindings")]
 #[pymethods]
 impl PyMasterTrigger {
   #[new]

{gondola-0.11.8 → gondola-0.12.1}/src/tof.rs

@@ -28,6 +28,7 @@ pub mod thread_control;
 pub use thread_control::ThreadControl;
 #[cfg(feature="tof-liftof")]
 pub mod master_trigger;
+#[cfg(feature="tof-liftof")]
 pub use master_trigger::*;
 #[cfg(feature="tof-liftof")]
 pub use master_trigger::control::*;