Merge pull request #133 from FRIBDAQ:1.0.0

1.0.0
FRIBDAQ · Sep 27, 2023 · 143b7ac · 143b7ac
2 parents 7dcb7bb + 32bbd0a
commit 143b7ac
Show file tree

Hide file tree

Showing 9 changed files with 176 additions and 76 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustogramer"
-version = "0.4.1"
+version = "1.0.0"
 edition = "2021"
 authors = ["Ron Fox [email protected]"]
 description="A generic histogramer intended for nuclear science data from the FRIB"

diff --git a/restclients/Tcl/SpecTclRestCommand.tcl b/restclients/Tcl/SpecTclRestCommand.tcl
@@ -1612,12 +1612,17 @@ namespace eval spectrum {
 
         set result [list]
         foreach s $raw {
-            set item [list                                              \
-                0 [dict get $s name] [dict get $s type]                        \
+            if {[dict exists $s id]} {
+                set item [dict get $s id]
+            } else {
+                set item 0
+            }
+            lappend item \                                              \
+                [dict get $s name] [dict get $s type]                        \
                 [dict get $s parameters]                                       \
                 [::SpecTclRestCommand::_axesDictToAxesList [dict get $s axes]]  \
                 [dict get $s chantype]                                         \
-            ]
+            carggo 
             if {$showgates} {
                 lappend item [dict get $s gate]
             }

diff --git a/restclients/Tcl/restclient.tcl b/restclients/Tcl/restclient.tcl
@@ -1303,6 +1303,7 @@ snit::type SpecTclRestClient {
     # @param pattern - The pattern (which can include Glob wildcard characters),
     #                  this defaults to "*" which matches all spectra.
     # @return List of dicts that contain:
+    #        -   id - id of the spectrum (only present if REST defines it).
     #        -   name - spectrum name.
     #        -   type - spectrum type.
     #        -   parameter - list of parameters needed by the spectrum.