gondola 0.12.0__tar.gz → 0.12.1__tar.gz

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

@@ -1352,7 +1352,7 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "gondola-core"
-version = "0.12.0"
+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.12.0 → gondola-0.12.1}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gondola-core"
-version = "0.12.0"
+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.12.0 → gondola-0.12.1}/PKG-INFO

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

{gondola-0.12.0 → 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.12.0 → 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.12.0 → 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::*;