Removed TIMESTAMP_FORMAT (#242)

## Summary of changes Removed the constant `TIMESTAMP_FORMAT` from nexus-writer, and replaced its usage with `to_rfc3339()`. ## Instruction for review/testing Ensure changes to code are as described above.
STFC-ICD-Research-and-Design · Sep 2, 2024 · bde39f7 · bde39f7
1 parent 20984f8
commit bde39f7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/nexus-writer/src/nexus/hdf5_file/run_file_components/event_run_file.rs b/nexus-writer/src/nexus/hdf5_file/run_file_components/event_run_file.rs
@@ -1,6 +1,6 @@
 use crate::nexus::{
     hdf5_file::{add_attribute_to, add_new_group_to, create_resizable_dataset},
-    nexus_class as NX, NexusSettings, TIMESTAMP_FORMAT,
+    nexus_class as NX, NexusSettings,
 };
 use chrono::{DateTime, Duration, Utc};
 use hdf5::{types::VarLenUnicode, Dataset, Group};
@@ -145,11 +145,7 @@ impl EventRun {
                 debug!("Offset found");
                 timestamp - offset
             } else {
-                add_attribute_to(
-                    &self.event_time_zero,
-                    "offset",
-                    &timestamp.format(TIMESTAMP_FORMAT).to_string(),
-                )?;
+                add_attribute_to(&self.event_time_zero, "offset", &timestamp.to_rfc3339())?;
                 self.offset = Some(timestamp);
                 debug!("New offset set");
                 Duration::zero()

diff --git a/nexus-writer/src/nexus/hdf5_file/run_file_components/timeseries_file.rs b/nexus-writer/src/nexus/hdf5_file/run_file_components/timeseries_file.rs
@@ -12,7 +12,7 @@ use supermusr_streaming_types::{
 };
 use tracing::{debug, trace};
 
-use crate::nexus::{hdf5_file::hdf5_writer::add_attribute_to, TIMESTAMP_FORMAT};
+use crate::nexus::hdf5_file::hdf5_writer::add_attribute_to;
 
 pub(super) type Slice1D = SliceInfo<[SliceInfoElem; 1], Dim<[usize; 1]>, Dim<[usize; 1]>>;
 
@@ -71,9 +71,7 @@ fn write_generic_logdata_slice_to_dataset<T: H5Type>(
 impl<'a> TimeSeriesDataSource<'a> for f144_LogData<'a> {
     #[tracing::instrument(skip(self))]
     fn write_initial_timestamp(&self, target: &Dataset) -> anyhow::Result<()> {
-        let time = DateTime::<Utc>::from_timestamp_nanos(self.timestamp())
-            .format(TIMESTAMP_FORMAT)
-            .to_string();
+        let time = DateTime::<Utc>::from_timestamp_nanos(self.timestamp()).to_rfc3339();
         add_attribute_to(target, "Start", &time)?;
         add_attribute_to(target, "Units", "second")?;
         Ok(())
@@ -185,9 +183,7 @@ where
 impl<'a> TimeSeriesDataSource<'a> for se00_SampleEnvironmentData<'a> {
     #[tracing::instrument(skip(self))]
     fn write_initial_timestamp(&self, target: &Dataset) -> anyhow::Result<()> {
-        let time = DateTime::<Utc>::from_timestamp_nanos(self.packet_timestamp())
-            .format(TIMESTAMP_FORMAT)
-            .to_string();
+        let time = DateTime::<Utc>::from_timestamp_nanos(self.packet_timestamp()).to_rfc3339();
         add_attribute_to(target, "Start", &time)?;
         add_attribute_to(target, "Units", "second")?;
         Ok(())

diff --git a/nexus-writer/src/nexus/mod.rs b/nexus-writer/src/nexus/mod.rs
@@ -7,7 +7,6 @@ pub(crate) use engine::{NexusEngine, NexusSettings};
 pub(crate) use run::Run;
 pub(crate) use run_parameters::RunParameters;
 
-pub(crate) const TIMESTAMP_FORMAT: &str = "%Y-%m-%dT%H:%M:%S%.f%z";
 pub(crate) const DATETIME_FORMAT: &str = "%Y-%m-%dT%H:%M:%S%z";
 
 pub(crate) mod nexus_class {