gondola 0.12.3__tar.gz → 0.12.4__tar.gz

{gondola-0.12.3 → gondola-0.12.4}/Cargo.lock

@@ -1352,7 +1352,7 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "gondola-core"
-version = "0.12.3"
+version = "0.12.4"
 dependencies = [
  "cfg-if 1.0.0",
  "chrono",

{gondola-0.12.3 → gondola-0.12.4}/Cargo.toml

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

{gondola-0.12.3 → gondola-0.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gondola
-Version: 0.12.3
+Version: 0.12.4
 Requires-Dist: tqdm>=4.0
 Requires-Dist: numpy>=2.3
 Requires-Dist: matplotlib>=3.10
@@ -16,6 +16,9 @@ Author-email: "J.A.Stoessl, G.Tytus" <stoessl@hawaii.edu>
 License: GPLV3
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
+Project-URL: Homepage, https://github.com/GAPS-Collab/gaps-online-software
+Project-URL: Repository, https://github.com/GAPS-Collab/gaps-online-software
+Project-URL: Documentation, https://gaps-collab.github.io/gaps-online-software/
 
 # GONDOLA - python wrapper for gaps-online-software 
 

{gondola-0.12.3 → gondola-0.12.4}/pyproject.toml

@@ -1,6 +1,5 @@
 [project]
 name            = 'gondola'
-#version         = "0.11.1"
 dynamic         = ['version']
 description     = "GAPS Online and Offline Analysis software"
 authors         = [{ name = "J.A.Stoessl, G.Tytus", email = "stoessl@hawaii.edu" }]
@@ -24,6 +23,11 @@ dependencies = [
 requires      = ["maturin>=1.0,<2.0"]
 build-backend = "maturin"
 
+[project.urls]
+Homepage   = "https://github.com/GAPS-Collab/gaps-online-software"
+Repository = "https://github.com/GAPS-Collab/gaps-online-software" 
+Documentation = "https://gaps-collab.github.io/gaps-online-software/" 
+
 [tool.maturin]
 # "extension-module" tells pyo3 we want to build an extension module (skips linking against libpython.so)
 #features     = ["pyo3/extension-module"]

{gondola-0.12.3 → gondola-0.12.4}/python/gondola/tof/__init__.py

@@ -11,18 +11,46 @@ RBPaddleID.__module__ = __name__
 RBPaddleID.__name__   = "RBPaddleID"
 #RBPaddleID.__doc__    = _gc.tof.RBPaddleID.__doc__
 TofDetectorStatus   = _gc.tof.TofDetectorStatus
+TofDetectorStatus.__module__ = __name__ 
+TofDetectorStatus.__name__   = 'TofDetectorStatus' 
+
+# enums 
 TofCommandCode      = _gc.tof.TofCommandCode
-TofCommand          = _gc.tof.TofCommand
-TofOperationMode    = _gc.tof.TofOperationMode
 BuildStrategy       = _gc.tof.BuildStrategy
+TofOperationMode    = _gc.tof.TofOperationMode
+
+TofCommand          = _gc.tof.TofCommand
+TofCommand.__module__ = __name__ 
+TofCommand.__name__   = "TofCommand" 
+
 PreampBiasConfig    = _gc.tof.PreampBiasConfig
+PreampBiasConfig.__module__ = __name__ 
+PreampBiasConfig.__name__ = "PreampBiasConfig"
+
 RBChannelMaskConfig = _gc.tof.RBChannelMaskConfig
+RBChannelMaskConfig.__module__ = __name__ 
+RBChannelMaskConfig.__name__   = "RBChannelMaskConfig"
+
 TriggerConfig       = _gc.tof.TriggerConfig
+TriggerConfig.__module__ = __name__ 
+TriggerConfig.__name__   = "TriggerConfig" 
+
 TofRunConfig        = _gc.tof.TofRunConfig
+TofRunConfig.__module__ = __name__ 
+TofRunConfig.__name__   = "TofRunConfig" 
+
+
 TofCuts             = _gc.tof.TofCuts
+TofCuts.__module__  = __name__ 
+TofCuts.__name__    = 'TofCuts' 
+
 to_board_id_string  = _gc.tof.to_board_id_string
 TofAnalysis         = analysis.TofAnalysis
 
+MasterTrigger       = _gc.tof.MasterTrigger 
+MasterTrigger.__module__ = __name__
+MasterTrigger.__name__   = 'MasterTrigger'
+
 ## command factories
 #start_run            = _gc.tof.start_run 
 #start_run.__module__ = __name__

{gondola-0.12.3 → gondola-0.12.4}/src/constants.rs

@@ -71,7 +71,7 @@ pub const LIFTOF_LOGO_SHOW  : &str  = "
           >> with undying support from the Hawaiian islands \u{1f30a}\u{1f308}\u{1f965}\u{1f334}
 
           * Documentation
-          ==> GitHub   https://github.com/GAPS-Collab/gaps-online-software/tree/LELEWAA-0.11
+          ==> GitHub   https://github.com/GAPS-Collab/gaps-online-software/tree/PAKII-0.11
           ==> API docs https://gaps-collab.github.io/gaps-online-software/
 
   ";

{gondola-0.12.3 → gondola-0.12.4}/src/database.rs

@@ -11,9 +11,11 @@ use diesel::prelude::*;
 mod schema;
     
 use schema::tof_db_rat::dsl::*;
-//use schema::tof_db_dsicard::dsl::*;
 
+/// Low gain/LTB connections to paddle ID 
 pub type DsiJChPidMapping = HashMap<u8, HashMap<u8, HashMap<u8, (u8, u8)>>>;
+/// RB ID and RB Ch to paddle ID mapping 
+pub type RbChPidMapping = HashMap<u8, HashMap<u8, u8>>;
 
 /// Connect to a database at a given location
 pub fn connect_to_db_path(db_path : &str) -> Result<diesel::SqliteConnection, ConnectionError> {
@@ -138,6 +140,81 @@ pub fn get_linkid_rbid_map(rbs : &Vec<ReadoutBoard>) -> HashMap<u8, u8>{
 
 //---------------------------------------------------------------------
 
+/// Create a map for rbid, ch -> paddle id. This is only for the A 
+/// side and will not have an entry in case the given RB channel
+/// is connected to the B side of the paddle
+pub fn get_rb_ch_pid_a_map() -> Option<RbChPidMapping> {
+  let paddles = TofPaddle::all()?;
+  let mut mapping = RbChPidMapping::new();
+  for rbid  in 1..51 {
+    let mut chmap = HashMap::<u8, u8>::new();
+    for ch in 1..9 {
+      chmap.insert(ch,0);
+    }
+    mapping.insert(rbid,chmap);
+  }
+  for pdl in paddles {
+    let rb_id = pdl.rb_id  as u8;
+    let ch_a  = pdl.rb_chA as u8;
+    let pid   = pdl.paddle_id as u8;
+    *mapping.get_mut(&rb_id).unwrap().get_mut(&ch_a).unwrap() = pid;
+  }
+  Some(mapping)
+}
+
+//---------------------------------------------------------------------
+
+/// Create a map for rbid, ch -> paddle id. This is only for the B 
+/// side and will not have an entry in case the given RB channel
+/// is connected to the A side of the paddle
+pub fn get_rb_ch_pid_b_map() -> Option<RbChPidMapping> {
+  let mut mapping = RbChPidMapping::new();
+  let paddles = TofPaddle::all()?;
+  for rbid  in 1..51 {
+    let mut chmap = HashMap::<u8, u8>::new();
+    for ch in 1..9 {
+      chmap.insert(ch,0);
+    }
+    mapping.insert(rbid,chmap);
+  }
+
+  for pdl in paddles {
+    let rb_id = pdl.rb_id  as u8;
+    let ch_b  = pdl.rb_chB as u8;
+    let pid   = pdl.paddle_id as u8;
+    *mapping.get_mut(&rb_id).unwrap().get_mut(&ch_b).unwrap() = pid;
+  }
+  Some(mapping)
+}
+
+//---------------------------------------------------------------------
+
+/// Create a map for rbid, ch -> paddle id. 
+///
+/// This version is oblivious to the paddle ends 
+pub fn get_rb_ch_pid() -> Option<RbChPidMapping> {
+  let paddles = TofPaddle::all()?;
+  let mut mapping = RbChPidMapping::new();
+  for rbid  in 1..51 {
+    let mut chmap = HashMap::<u8, u8>::new();
+    for ch in 1..9 {
+      chmap.insert(ch,0);
+    }
+    mapping.insert(rbid,chmap);
+  }
+  for pdl in paddles {
+    let rb_id = pdl.rb_id  as u8;
+    let ch_a  = pdl.rb_chA as u8;
+    let ch_b  = pdl.rb_chB as u8;
+    let pid   = pdl.paddle_id as u8;
+    *mapping.get_mut(&rb_id).unwrap().get_mut(&ch_a).unwrap() = pid;
+    *mapping.get_mut(&rb_id).unwrap().get_mut(&ch_b).unwrap() = pid;
+  }
+  Some(mapping)
+}
+
+//---------------------------------------------------------------------
+
 /// Get all rb ids from paddles which are stored in the 
 /// database
 #[cfg_attr(feature="pybindings", pyfunction)]

{gondola-0.12.3 → gondola-0.12.4}/src/errors.rs

@@ -23,7 +23,8 @@ pub enum SerializationError {
   TomlDecodingError,
   Disconnected,
   ObjectNotFound,
-  UnsupportedVersion
+  UnsupportedVersion,
+  WrongProtocolVersion
 }
 
 impl SerializationError { 
@@ -45,6 +46,7 @@ impl SerializationError {
       SerializationError::Disconnected             => "Disconnected",
       SerializationError::ObjectNotFound           => "ObjectNotFound",
       SerializationError::UnsupportedVersion       => "UnsupportedVersion",
+      SerializationError::WrongProtocolVersion     => "WrongProtoclVersion",
     }
   }
 }

{gondola-0.12.3 → gondola-0.12.4}/src/events/rb_waveform.rs

@@ -3,6 +3,8 @@
 
 use crate::prelude::*;
 
+use std::mem;
+
 /// Waveform container for Tof waveforms
 /// This holds the waveforms for both 
 /// paddle ends. Fields are available to 
@@ -220,24 +222,28 @@ impl TofPackable for RBWaveform {
 impl Serialization for RBWaveform {
   const HEAD               : u16    = 43690; //0xAAAA
   const TAIL               : u16    = 21845; //0x5555
-  
+  const SIZE               : usize  = 13 + (4*NWORDS);
+
   fn from_bytestream(stream : &Vec<u8>, pos : &mut usize)
     -> Result<Self, SerializationError> {
+    Self::verify_fixed(stream, pos)?;
     let mut wf           = RBWaveform::new();
-    if parse_u16(stream, pos) != Self::HEAD {
-      error!("The given position {} does not point to a valid header signature of {}", pos, Self::HEAD);
-      return Err(SerializationError::HeadInvalid {});
-    }
+    //if parse_u16(stream, pos) != Self::HEAD {
+    //  error!("The given position {} does not point to a valid header signature of {}", pos, Self::HEAD);
+    //  return Err(SerializationError::HeadInvalid {});
+    //}
     wf.event_id          = parse_u32(stream, pos);
-    wf.rb_id             = parse_u8 (stream, pos);
-    wf.rb_channel_a      = parse_u8 (stream, pos);
-    wf.rb_channel_b      = parse_u8 (stream, pos);
+    wf.rb_id             = parse_u8(stream, pos);
+    wf.rb_channel_a      = parse_u8(stream, pos);
+    wf.rb_channel_b      = parse_u8(stream, pos);
     wf.stop_cell         = parse_u16(stream, pos);
     wf.paddle_id         = parse_u8 (stream, pos);
     if stream.len() < *pos+2*NWORDS {
       return Err(SerializationError::StreamTooShort);
     }
     let data_a           = &stream[*pos..*pos+2*NWORDS];
+    //println!("{} data_a stack size", mem::sizeof(data_a));
+
     wf.adc_a             = u8_to_u16(data_a);
     *pos += 2*NWORDS;
     if stream.len() < *pos+2*NWORDS {
@@ -250,6 +256,7 @@ impl Serialization for RBWaveform {
       error!("The given position {} does not point to a tail signature of {}", pos, Self::TAIL);
       return Err(SerializationError::TailInvalid);
     }
+    *pos +=2;
     Ok(wf)
   }
 
@@ -467,11 +474,11 @@ impl FromRandom for RBWaveform {
     let mut wf      = Self::new();
     let mut rng     = rand::rng();
     wf.event_id     = rng.random::<u32>();
-    wf.rb_id        = rng.random::<u8>();
-    wf.rb_channel_a = rng.random::<u8>();
-    wf.rb_channel_b = rng.random::<u8>();
-    wf.stop_cell    = rng.random::<u16>();
-    wf.paddle_id    = rng.random::<u8>();
+    wf.rb_id        = rng.random_range(1..50);
+    wf.rb_channel_a = rng.random_range(1..9);
+    wf.rb_channel_b = rng.random_range(1..9);
+    wf.stop_cell    = rng.random_range(0..1024);
+    //wf.paddle_id    = rng.random::<u8>();
     let random_numbers_a: Vec<u16> = (0..NWORDS).map(|_| rng.random()).collect();
     wf.adc_a        = random_numbers_a;
     let random_numbers_b: Vec<u16> = (0..NWORDS).map(|_| rng.random()).collect();