use "TOF timing resolution" keyword for hroot as well

UCL · Jan 6, 2024 · 21eb434 · 21eb434
1 parent b6fc7fc
commit 21eb434
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/examples/samples/root_header.hroot b/examples/samples/root_header.hroot
@@ -11,6 +11,12 @@ Default bin size (cm)                    := 0.208626
 Maximum number of non-arc-corrected bins := 344
 Default number of arc-corrected bins 	 := 344
 View offset (degrees)					 := 0
+
+; TOF information (optional)
+Maximum number of (unmashed) TOF time bins := 5
+Size of unmashed TOF time bins (ps)        := 820.0
+TOF timing resolution (ps)                 := 400.0
+
 ; optional keywords to create "virtual" crystals to accomodate for gaps between blocks
 ; if you do not specify these, the STIR defaults (determined by the "originating system")
 ; will be used (which are zero for a User_defined_scanner)

diff --git a/recon_test_pack/root_header.hroot b/recon_test_pack/root_header.hroot
@@ -11,9 +11,9 @@ Default bin size (cm)                    := 0.208626
 Maximum number of non-arc-corrected bins := 501
 Default number of arc-corrected bins 	 := 501
 View offset (degrees)					 := 0
-Number of TOF time bins := 5
-Size of timing bin (ps) := 820.00
-Timing resolution (ps) := 400.0
+Maximum number of (unmashed) TOF time bins := 5
+Size of unmashed TOF time bins (ps)        := 820.0
+TOF timing resolution (ps)                 := 400.0
 
 GATE scanner type := GATE_Cylindrical_PET
 GATE_Cylindrical_PET Parameters :=

diff --git a/src/listmode_buildblock/CListModeDataROOT.cxx b/src/listmode_buildblock/CListModeDataROOT.cxx
@@ -33,7 +33,7 @@ START_NAMESPACE_STIR
 
 constexpr static char max_num_timing_bins_keyword[] = "Maximum number of (unmashed) TOF time bins";
 constexpr static char size_timing_bin_keyword[] = "Size of unmashed TOF time bins (ps)";
-constexpr static char timing_resolution_keyword[] = "Timing resolution (ps)";
+constexpr static char timing_resolution_keyword[] = "TOF timing resolution (ps)";
 
 CListModeDataROOT::
 CListModeDataROOT(const std::string& hroot_filename)
@@ -77,7 +77,9 @@ CListModeDataROOT(const std::string& hroot_filename)
     this->parser.add_alias_key(size_timing_bin_keyword, "Size of timing bin (ps)");
 #endif
     this->parser.add_key(timing_resolution_keyword, &this->timing_resolution);
-
+#if STIR_VERSION < 070000
+    this->parser.add_alias_key(timing_resolution_keyword, "timing resolution (ps)");
+#endif
     this->parser.add_key("TOF mashing factor", &this->tof_mash_factor);
 #if STIR_VERSION < 070000
     this->parser.add_alias_key("TOF mashing factor", "%TOF mashing factor");