dttlib 0.9.0__tar.gz → 0.9.1__tar.gz

{dttlib-0.9.0 → dttlib-0.9.1}/Cargo.lock

@@ -1408,7 +1408,7 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
 name = "dtt_macros"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1417,7 +1417,7 @@ dependencies = [
 
 [[package]]
 name = "dttlib"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
  "bindgen",
  "dtt_macros",
@@ -3008,7 +3008,7 @@ dependencies = [
 
 [[package]]
 name = "nds_test"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
  "dttlib",
  "eframe",
@@ -3572,7 +3572,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pipeline_macros"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3581,7 +3581,7 @@ dependencies = [
 
 [[package]]
 name = "pipelines"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
  "futures",
  "num-complex",
@@ -4861,7 +4861,7 @@ dependencies = [
 
 [[package]]
 name = "user_messages"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
  "log",
  "pretty_env_logger",

{dttlib-0.9.0 → dttlib-0.9.1}/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.9.0"
+version = "0.9.1"
 
 [package]
 name = "dttlib"

{dttlib-0.9.0 → dttlib-0.9.1}/PKG-INFO

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

{dttlib-0.9.0 → dttlib-0.9.1}/src/scope_view/view_set.rs

@@ -23,6 +23,11 @@ pub struct ViewSet {
     /// Index map by of expected channel name to source channel name that's not resolved.
     unresolved_chans: HashSet<ChannelHeader>,
 
+    /// look up table from analysisheaderid (from requests) to AnalysisId (to results)
+    /// When all channels are resolved, the is table will be complete, and
+    /// incoming channel data can be connected to the analysis pipelines
+    lookup_analysis_id: HashMap<AnalysisHeaderId, AnalysisId>,
+
     /// these include any pipeline analysis requests
     //analysis_requests: HashSet<AnalysisRequestId>,
     full_requests: HashSet<AnalysisHeaderId>,
@@ -48,6 +53,7 @@ impl From<Vec<Channel>> for ViewSet {
             unresolved_chans: HashSet::new(),
             //analysis_requests: HashSet::new(),
             full_requests: HashSet::new(),
+            lookup_analysis_id: HashMap::new(),
         }
     }
 }
@@ -64,6 +70,7 @@ impl From<Vec<ChannelId>> for ViewSet {
             members: HashSet::new(),
             unresolved_chans,
             full_requests: HashSet::new(),
+            lookup_analysis_id: HashMap::new(),
         }
     }
 }
@@ -85,6 +92,7 @@ impl From<HashSet<AnalysisRequestId>> for ViewSet {
             members: HashSet::new(),
             unresolved_chans,
             full_requests,
+            lookup_analysis_id: HashMap::new(),
         }
     }
 }
@@ -142,7 +150,6 @@ impl ViewSet {
     /// Change any unresolved channel names to resolved channels.
     pub(super) async fn resolve_channels(&mut self, block: DataBlock) -> Option<DataBlock> {
         debug!("resolve channels on a block");
-        let mut lookup = HashMap::new();
         for channel in block.keys() {
             debug!(
                 "looking for channel {}:{}",
@@ -157,7 +164,7 @@ impl ViewSet {
                 let header_id = AnalysisHeaderId::Simple {
                     channel: header.clone(),
                 };
-                lookup.insert(header_id, real_id.clone());
+                self.lookup_analysis_id.insert(header_id, real_id.clone());
                 self.members.insert(real_id);
             }
         }
@@ -165,15 +172,15 @@ impl ViewSet {
         if self.has_unresolved_channels() {
             None
         } else {
-            self.populate_compound_members(lookup);
+            self.populate_compound_members();
             Some(block)
         }
     }
 
-    fn populate_compound_members(&mut self, mut lookup: HashMap<AnalysisHeaderId, AnalysisId>) {
+    fn populate_compound_members(&mut self) {
         for id in &self.full_requests {
             self.members
-                .insert(populate_compound_member(id, &mut lookup));
+                .insert(populate_compound_member(id, &mut self.lookup_analysis_id));
         }
     }
 
@@ -235,7 +242,7 @@ fn populate_compound_member(
     }
 
     let new_id = match header_id {
-        AnalysisHeaderId::Simple { channel } => panic!("found unbound channel {}", channel.name),
+        AnalysisHeaderId::Simple { channel } => panic!("found unbound channel {:?}", channel),
         AnalysisHeaderId::Compound { name, args } => {
             let new_args = args
                 .iter()