dttlib 0.7.7__tar.gz → 0.8.0__tar.gz

{dttlib-0.7.7 → dttlib-0.8.0}/Cargo.lock

@@ -1408,7 +1408,7 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
 name = "dtt_macros"
-version = "0.7.7"
+version = "0.8.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1417,7 +1417,7 @@ dependencies = [
 
 [[package]]
 name = "dttlib"
-version = "0.7.7"
+version = "0.8.0"
 dependencies = [
  "bindgen",
  "dtt_macros",
@@ -2969,7 +2969,7 @@ dependencies = [
 [[package]]
 name = "nds-cache-rs"
 version = "0.1.0"
-source = "git+https://git.ligo.org/cds/software/cr_tools/nds-cache-rs.git?tag=dev_15#9c24c21a129d5eb3f803ca1431578e682d3d4d00"
+source = "git+https://git.ligo.org/cds/software/cr_tools/nds-cache-rs.git?tag=dev_18#7fc14bd2ad2cf4c027cb212ab171752c9cc5b46c"
 dependencies = [
  "arrakis",
  "bitcode",
@@ -3008,7 +3008,7 @@ dependencies = [
 
 [[package]]
 name = "nds_test"
-version = "0.7.7"
+version = "0.8.0"
 dependencies = [
  "dttlib",
  "eframe",
@@ -3572,7 +3572,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pipeline_macros"
-version = "0.7.7"
+version = "0.8.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3581,7 +3581,7 @@ dependencies = [
 
 [[package]]
 name = "pipelines"
-version = "0.7.7"
+version = "0.8.0"
 dependencies = [
  "futures",
  "num-complex",
@@ -4770,11 +4770,12 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 [[package]]
 name = "ts-tree-rs"
 version = "0.1.0"
-source = "git+https://git.ligo.org/cds/software/cr_tools/ts-tree-rs.git?tag=dev_0#820b9e90eb407bea60044531c2745a7cc0654872"
+source = "git+https://git.ligo.org/cds/software/cr_tools/ts-tree-rs.git?tag=dev_1#5d55d4d1fa6bbb8299fc68c98e64ce43f7539c61"
 dependencies = [
  "intrusive-collections",
  "itertools 0.13.0",
  "ligo_hires_gps_time",
+ "log",
  "serde",
 ]
 
@@ -4860,7 +4861,7 @@ dependencies = [
 
 [[package]]
 name = "user_messages"
-version = "0.7.7"
+version = "0.8.0"
 dependencies = [
  "log",
  "pretty_env_logger",

{dttlib-0.7.7 → dttlib-0.8.0}/Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Erik von Reis <erik.vonreis@ligo.org>"]
 edition = "2024"
 homepage = "https://git.ligo.org/cds/software/cr-tools/dtt_rust"
 repository = "https://git.ligo.org/cds/software/cr-tools/dtt_rust"
-version = "0.7.7"
+version = "0.8.0"
 
 [package]
 name = "dttlib"
@@ -82,7 +82,7 @@ num-rational = {version = "0.4"}
 
 # ligo
 nds2_client_rs = { git="https://git.ligo.org/erik.vonreis/nds_client_rs.git", tag = "dev_0", optional = true }
-nds-cache-rs = { git = "https://git.ligo.org/cds/software/cr_tools/nds-cache-rs.git", tag = "dev_15"}
+nds-cache-rs = { git = "https://git.ligo.org/cds/software/cr_tools/nds-cache-rs.git", tag = "dev_18"}
 ligo_hires_gps_time = {workspace = true}
 
 # workspace

{dttlib-0.7.7 → dttlib-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dttlib
-Version: 0.7.7
+Version: 0.8.0
 License-File: COPYING
 License-File: COPYING-GPL-3
 Summary: Advanced LIGO core library for online and offline frequency-domain diagnostics tool.

{dttlib-0.7.7 → dttlib-0.8.0}/dttlib.pyi

@@ -49,7 +49,7 @@ class Channel:
     @property
     def channel_type(self) -> ChannelType: ...
     @property
-    def rate_hz(self) -> builtins.float: ...
+    def period(self) -> PipDuration: ...
     @property
     def dcu_id(self) -> typing.Optional[builtins.int]: ...
     @property
@@ -76,8 +76,10 @@ class Channel:
     def online(self) -> builtins.bool: ...
     @property
     def testpoint(self) -> builtins.bool: ...
+    @property
+    def rate_hz(self) -> builtins.float: ...
     def __new__(
-        cls, name: builtins.str, data_type: NDSDataType, rate_hz: builtins.float
+        cls, name: builtins.str, data_type: NDSDataType, period: PipDuration
     ) -> Channel: ...
 
 class ChannelId:

dttlib-0.8.0/pypi_build/py_versions.sh

@@ -0,0 +1,2 @@
+
+export PYVERS="3.9 3.10 3.11 3.12 3.13"

{dttlib-0.7.7 → dttlib-0.8.0}/src/analysis/graph/analysis.rs

@@ -21,6 +21,7 @@ use crate::params::channel_params::ChannelSettings;
 use crate::params::channel_params::channel::Channel;
 use crate::params::channel_params::nds_data_type::NDSDataType::Float32;
 use crate::run_context::RunContext;
+use ligo_hires_gps_time::PipDuration;
 use petgraph::algo::{connected_components, toposort};
 use petgraph::data::DataMap;
 use petgraph::graph::NodeIndex;
@@ -795,9 +796,19 @@ pub(crate) fn test_schemes<'a>(
     check_duplicate_names("per-channel scheme", per_channel_scheme)?;
     check_duplicate_names("cross-channel scheme", cross_channel_scheme)?;
 
-    let a_chan = Channel::new("a_channel".to_string(), Float32, 0.0).into();
-
-    let b_chan = Channel::new("b_channel".to_string(), Float32, 0.0).into();
+    let a_chan = Channel::new(
+        "a_channel".to_string(),
+        Float32,
+        PipDuration::from_seconds(1.0),
+    )
+    .into();
+
+    let b_chan = Channel::new(
+        "b_channel".to_string(),
+        Float32,
+        PipDuration::from_seconds(1.0),
+    )
+    .into();
 
     let channels = vec![a_chan, b_chan];
 

{dttlib-0.7.7 → dttlib-0.8.0}/src/data_source/dummy.rs

@@ -128,7 +128,7 @@ impl Dummy {
     }
 
     fn gen_data_for_channel(channel: &Channel, start: PipInstant, span: PipDuration) -> Buffer {
-        let count = (span / PipDuration::freq_hz_to_period(channel.rate_hz)) as usize;
+        let count = (span / channel.period) as usize;
 
         match channel.data_type {
             NDSDataType::Int16 => {
@@ -137,7 +137,7 @@ impl Dummy {
                 nds_cache_rs::buffer::Buffer::Int16(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -148,7 +148,7 @@ impl Dummy {
                 nds_cache_rs::buffer::Buffer::Int32(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -159,7 +159,7 @@ impl Dummy {
                 nds_cache_rs::buffer::Buffer::Int64(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -170,7 +170,7 @@ impl Dummy {
                 nds_cache_rs::buffer::Buffer::Float32(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -181,7 +181,7 @@ impl Dummy {
                 nds_cache_rs::buffer::Buffer::Float64(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -192,7 +192,7 @@ impl Dummy {
                 nds_cache_rs::buffer::Buffer::Complex32(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -203,7 +203,7 @@ impl Dummy {
                 nds_cache_rs::buffer::Buffer::UInt32(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()

{dttlib-0.7.7 → dttlib-0.8.0}/src/data_source/random.rs

@@ -135,7 +135,7 @@ impl RandomSource {
     }
 
     fn gen_data_for_channel(channel: &Channel, start: PipInstant, span: PipDuration) -> Buffer {
-        let count = (span / PipDuration::freq_hz_to_period(channel.rate_hz)) as usize;
+        let count = (span / channel.period) as usize;
 
         let mut rng = rand::rng();
 
@@ -145,7 +145,7 @@ impl RandomSource {
                 nds_cache_rs::buffer::Buffer::Int16(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -155,7 +155,7 @@ impl RandomSource {
                 nds_cache_rs::buffer::Buffer::Int32(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -165,7 +165,7 @@ impl RandomSource {
                 nds_cache_rs::buffer::Buffer::Int64(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -175,7 +175,7 @@ impl RandomSource {
                 nds_cache_rs::buffer::Buffer::Float32(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -185,7 +185,7 @@ impl RandomSource {
                 nds_cache_rs::buffer::Buffer::Float64(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -197,7 +197,7 @@ impl RandomSource {
                 nds_cache_rs::buffer::Buffer::Complex32(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()
@@ -207,7 +207,7 @@ impl RandomSource {
                 nds_cache_rs::buffer::Buffer::UInt32(TimeSeries::new(
                     channel.clone().into(),
                     start,
-                    PipDuration::freq_hz_to_period(channel.rate_hz),
+                    channel.period,
                     v,
                 ))
                 .into()

{dttlib-0.7.7 → dttlib-0.8.0}/src/params/channel_params/channel.rs

@@ -22,7 +22,7 @@ pub struct Channel {
     pub name: String,
     pub data_type: NDSDataType,
     pub channel_type: ChannelType,
-    pub rate_hz: f64,
+    pub period: PipDuration,
     pub dcu_id: Option<i64>,
     pub channel_number: Option<i64>,
     pub calibration: Option<i64>,
@@ -58,7 +58,7 @@ impl Hash for Channel {
 
         // rate
         // get period in pips_per_sec
-        let period_pips = PipDuration::freq_hz_to_period(self.rate_hz);
+        let period_pips = self.period;
         period_pips.hash(state);
 
         // type
@@ -73,8 +73,8 @@ impl Hash for Channel {
 impl PartialEq<Self> for Channel {
     /// always update hash and PartialEq::eq to use the same data subset
     fn eq(&self, other: &Self) -> bool {
-        let self_period_pips = PipDuration::freq_hz_to_period(self.rate_hz);
-        let other_period_pips = PipDuration::freq_hz_to_period(other.rate_hz);
+        let self_period_pips = self.period;
+        let other_period_pips = self.period;
 
         (self.name == other.name)
             && (self_period_pips == other_period_pips)
@@ -89,11 +89,12 @@ impl Eq for Channel {}
 #[cfg(feature = "nds")]
 impl From<Channel> for nds2_client_rs::Channel {
     fn from(value: Channel) -> Self {
+        let sample_rate = value.rate_hz();
         Self {
             name: value.name,
             channel_type: value.channel_type.into(),
             data_type: value.data_type.into(),
-            sample_rate: value.rate_hz,
+            sample_rate,
             gain: value.gain.unwrap_or(1.0) as f32,
             slope: value.slope.unwrap_or(1.0) as f32,
             offset: value.offset.unwrap_or(0.0) as f32,
@@ -108,7 +109,7 @@ impl From<Channel> for nds_cache_rs::buffer::Channel {
             value.name,
             nds_cache_rs::buffer::ChannelType::Raw,
             value.data_type.into(),
-            value.rate_hz,
+            value.period,
             value.gain.unwrap_or(1.0) as f32,
             value.slope.unwrap_or(1.0) as f32,
             value.offset.unwrap_or(0.0) as f32,
@@ -145,7 +146,7 @@ impl TryFrom<nds_cache_rs::buffer::Channel> for Channel {
             name,
             data_type: value.data_type().into(),
             channel_type: value.channel_type().into(),
-            rate_hz: value.sample_rate().into(),
+            period: value.period(),
             gain: Some(value.gain() as f64),
             offset: Some(value.offset() as f64),
             slope: Some(value.slope() as f64),
@@ -185,9 +186,9 @@ impl PartialOrd for Channel {
             Some(Ordering::Less)
         } else if self.name > other.name {
             Some(Ordering::Greater)
-        } else if self.rate_hz < other.rate_hz {
+        } else if self.period > other.period {
             Some(Ordering::Less)
-        } else if self.rate_hz > other.rate_hz {
+        } else if self.period < other.period {
             Some(Ordering::Greater)
         } else if self.data_type == other.data_type {
             Some(Ordering::Equal)
@@ -201,11 +202,11 @@ impl PartialOrd for Channel {
 #[cfg_attr(any(feature = "python", feature = "python-pipe"), pymethods)]
 impl Channel {
     #[new]
-    pub fn new(name: String, data_type: NDSDataType, rate_hz: f64) -> Self {
+    pub fn new(name: String, data_type: NDSDataType, period: PipDuration) -> Self {
         Channel {
             name,
             data_type,
-            rate_hz,
+            period,
             ..Default::default()
         }
     }
@@ -220,4 +221,9 @@ impl Channel {
     pub fn testpoint(&self) -> bool {
         self.channel_type == ChannelType::TestPoint
     }
+
+    #[getter]
+    pub fn rate_hz(&self) -> f64 {
+        self.period.period_to_freq_hz()
+    }
 }

{dttlib-0.7.7 → dttlib-0.8.0}/src/params/channel_params/channel_settings.rs

@@ -17,6 +17,7 @@ use crate::run_context::RunContext;
 use crate::timeline::Timeline;
 #[cfg(not(any(feature = "python", feature = "python-pipe")))]
 use dtt_macros::{getter, new};
+use ligo_hires_gps_time::PipDuration;
 use pipelines::complex::{c64, c128};
 use pipelines::{PipeDataPrimitive, PipelineSubscriber};
 #[cfg(any(feature = "python", feature = "python-pipe"))]
@@ -77,8 +78,8 @@ impl Hash for ChannelSettings {
 #[cfg_attr(any(feature = "python", feature = "python-pipe"), pymethods)]
 impl ChannelSettings {
     #[new]
-    pub fn new(channel_name: String, data_type: NDSDataType, rate_hz: f64) -> Self {
-        let channel = Channel::new(channel_name, data_type, rate_hz);
+    pub fn new(channel_name: String, data_type: NDSDataType, period: PipDuration) -> Self {
+        let channel = Channel::new(channel_name, data_type, period);
         Self {
             channel,
             ..Self::default()
@@ -97,7 +98,7 @@ impl ChannelSettings {
 
     #[getter]
     pub fn rate_hz(&self) -> f64 {
-        self.channel.rate_hz
+        self.channel.rate_hz()
     }
 }
 
@@ -119,7 +120,7 @@ impl ChannelSettings {
             if is_complex {
                 self.raw_decimation_params = DecimationParameters::new(
                     DecimationFilter::FirLS3,
-                    self.channel.rate_hz,
+                    self.channel.rate_hz(),
                     heterodyned_sample_rate_hz,
                 )?;
 
@@ -131,7 +132,7 @@ impl ChannelSettings {
                 // decimation down to the raw sample rate first, but don't time shift.
                 self.raw_decimation_params = DecimationParameters::new(
                     DecimationFilter::FirLS3,
-                    self.channel.rate_hz,
+                    self.channel.rate_hz(),
                     sample_max_hz,
                 )?;
 
@@ -146,7 +147,7 @@ impl ChannelSettings {
             // not heterodyned
             self.raw_decimation_params = DecimationParameters::new(
                 DecimationFilter::FirLS1,
-                self.channel.rate_hz,
+                self.channel.rate_hz(),
                 sample_max_hz,
             )?;
             self.heterodyned_decimation_params = DecimationParameters::default();
@@ -158,7 +159,7 @@ impl ChannelSettings {
 
         self.decimation_delays = DecimationDelays::new(
             remove_delay,
-            self.channel.rate_hz,
+            self.channel.rate_hz(),
             total_decs,
             self.raw_decimation_params.filter,
         );

{dttlib-0.7.7 → dttlib-0.8.0}/src/run.rs

@@ -165,7 +165,7 @@ mod tests {
     use crate::tokio_setup::tokio_init;
     use crate::user::{DTT, UserOutputReceiver};
     use lazy_static::lazy_static;
-    use ligo_hires_gps_time::PipInstant;
+    use ligo_hires_gps_time::{PipDuration, PipInstant};
     use tokio::time::Duration;
 
     fn test_parameters(num_chans: usize, averages: u64) -> TestParams {
@@ -175,7 +175,11 @@ mod tests {
 
                 ChannelParams {
                     active: true,
-                    channel: Channel::new(channel_name, NDSDataType::Float64, 2048.0),
+                    channel: Channel::new(
+                        channel_name,
+                        NDSDataType::Float64,
+                        PipDuration::freq_hz_to_period(2048.0),
+                    ),
                 }
             })
             .collect();

{dttlib-0.7.7 → dttlib-0.8.0}/src/user/mod.rs

@@ -704,7 +704,7 @@ mod tests {
                         name: "X1:NOT-A_CHANNEL".to_string(),
                         channel_type: ChannelType::Unknown,
                         data_type: NDSDataType::Float64,
-                        rate_hz: 16384.0,
+                        period: PipDuration::freq_hz_to_period(16384.0),
                         dcu_id: None,
                         channel_number: None,
                         calibration: None,

dttlib-0.7.7/pypi_build/py_versions.sh

@@ -1,2 +0,0 @@
-
-export PYVERS="3.9 3.10 3.11 3.12"