Merge pull request #463 from SBNSoftware/trj64bittimestamp_April29_2024

increase precision of timestamp calculation to 64 bits -- was 32 bits

Author: bear-is-asleep

sbndcode/Decoders/TPC/SBNDTPCDecoder_module.cc

@@ -49,16 +49,16 @@ tpcAnalysis::TPCDecodeAna daq::SBNDTPCDecoder::Fragment2TPCDecodeAna(art::Event
   ret.crate = (frag.fragmentID() >> 8) & 0xF;  
   ret.slot = raw_header->getSlot();
   ret.event_number = raw_header->getEventNum();
-  // ret.frame_number = raw_header->getFrameNum();
+  //std::cout << "TPC decoder frame, sample: " << raw_header->getFrameNum() << " " << raw_header->get2mhzSample() << std::endl;
   ret.checksum = raw_header->getChecksum();
 
   ret.adc_word_count = raw_header->getADCWordCount();
   // ret.trig_frame_number = raw_header->getTrigFrame();
 
   // formula for getting unix timestamp from nevis frame number:
   // timestamp = frame_number * (timesize + 1) + trigger_sample
-  ret.timestamp = (raw_header->getFrameNum() * (_config.timesize + 1) + raw_header->get2mhzSample()) * _config.frame_to_dt;
-
+  ret.timestamp = (raw_header->getFrameNum() * ( (ULong64_t) _config.timesize + 1) + raw_header->get2mhzSample()) * ( (double)  _config.frame_to_dt);
+  //std::cout << "timestamp: " << ret.timestamp << std::endl;
   ret.index = raw_header->getSlot() - _config.min_slot_no;
 
   return ret;

sbndcode/Decoders/TPC/TPCDecodeAna.h

@@ -18,7 +18,7 @@ class TPCDecodeAna {
   uint8_t slot; //!< Index of "slot" of readout board 
   uint32_t event_number; //!< Event number for this header 
   uint32_t checksum; //!< checksum associated with header
-  uint32_t timestamp; //!< timestamp for this header
+  ULong64_t timestamp; //!< timestamp for this header
   uint32_t adc_word_count; //!< word count of ADC counts associated with this header
 
   unsigned index; //!< Globally usable index for this header information. 

sbndcode/Decoders/TPC/classes_def.xml

@@ -1,5 +1,6 @@
 <lcgdict>
-  <class name="tpcAnalysis::TPCDecodeAna" ClassVersion="10">
+  <class name="tpcAnalysis::TPCDecodeAna" ClassVersion="11">
+   <version ClassVersion="11" checksum="3638395479"/>
    <version ClassVersion="10" checksum="3825172703"/>
   </class>
   <class name="std::vector<tpcAnalysis::TPCDecodeAna>"/>