Merge branch 'develop' into feature/hjscott1

Author: bear-is-asleep

CMakeLists.txt

@@ -15,12 +15,12 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.93.01)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.93.01.01)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
 # for CI:
-# project(sbndcode VERSION 09.93.01)
+# project(sbndcode VERSION 09.93.01.01)
 
 message(STATUS "\n")
 message(STATUS "=================================   ${PROJECT_NAME}   =================================")

sbndcode/CMakeLists.txt

@@ -21,6 +21,8 @@ add_subdirectory(OpT0Finder)
 add_subdirectory(ShowerAna)
 add_subdirectory(Commissioning)
 add_subdirectory(Trigger)
+add_subdirectory(Timing)
+add_subdirectory(PTBAna)
 
 # subdirectory for gallery stuff
 add_subdirectory(gallery)

sbndcode/Decoders/CMakeLists.txt

@@ -3,5 +3,6 @@ add_subdirectory(PTB)
 add_subdirectory(SPECTDC)
 add_subdirectory(PMT)
 add_subdirectory(CRT)
+add_subdirectory(XARAPUCA)
 
-install_fhicl()
+install_fhicl()

sbndcode/Decoders/PMT/CMakeLists.txt

@@ -1,17 +1,20 @@
-art_make(
-	MODULE_LIBRARIES 
+cet_build_plugin( SBNDPMTDecoder art::module
+    SOURCE SBNDPMTDecoder_module.cc	
+    LIBRARIES 
 	sbndaq_artdaq_core::sbndaq-artdaq-core_Overlays_SBND
 	sbnobj::SBND_Timing
-
+    lardata::Utilities
+    canvas::canvas
     lardataobj::RecoBase
-  
+    lardataobj::RawData
+    lardataobj::headers
     art_root_io::TFileService_service
     art_root_io::tfile_support
 	artdaq_core::artdaq-core_Data
-
     ROOT::Core
     ROOT::Tree
-
 )
 
 install_fhicl()
+install_headers()
+install_source()

sbndcode/Decoders/PMT/SBNDPMTDecoder_module.cc

@@ -13,36 +13,46 @@ pmtdecoder:
 
     # configure CAEN inputs 
     caen_fragment_name: [ "CAENV1730", "ContainerCAENV1730" ]
-    ignore_fragid: [8]     # boards to ignore for testing purposes, fragid==8 is the timing board, this is 0-indexed!
+    ignore_fragid: []     # boards to ignore for testing purposes, fragid==8 is the timing board, this is 0-indexed!
     nominal_length: 5000     # expected waveform length
+    raw_ts_correction: 367000 # ns, correction to the rawheader timestamp
 
     # configure SPEC TDC inputs 
     spectdc_product_name: "tdcdecoder" # used if the tdc decoder has been run 
-    spectdc_ftrig_ch: 3 # this should be the channel number of the spec tdc that stores the flash trigger 
-    spectdc_etrig_ch: 4 # this should be the channel number of the spec tdc that stores the event trigger
+    spectdc_ftrig_ch: 3 # channel number of the spec tdc that stores the flash trigger 
+    spectdc_etrig_ch: 4 # channel number of the spec tdc that stores the event trigger
 
-    # configure PTB inputs 
+    # configure PTB inputs; the HLT with the smallest trigger word will be used (within some range to the rawheader timestamp)
     ptb_product_name: "ptbdecoder"
-    ptb_etrig_trigword: 0x0000000000000000
+    ptb_etrig_trigword_min: 1   # minimum trigger word (in decimal) 
+    ptb_etrig_trigword_max: 100000 # maximum trigger word (in decimal)
     ptb_etrig_wordtype: 2
+    ptb_trig_raw_diff_max: 3000000 # the maximum allowed time difference in ns
 
     # configure output options
+    # use time difference between reference + CAEN used to determine rollover and/or weirdness
+    allowed_time_diff: 3000 # us!! not nanoseconds
     # configure the output data product instance names
     pmtInstanceName: "PMTChannels"
     ftrigInstanceName: "FTrigChannels"
+    timingInstanceName: "TimingChannels"
     output_ftrig_wvfm: true # whether or not to output the ftrig as an opdetwaveform (artroot data product)
+    output_timing_wvfm: true # whether or not to output the timing caen wvfms as an opdetwaveform (artroot data product)
+    ignore_timing_ch: [4,5,6,7,8,9,10,11,12,13,14] # only ch0=BES, ch1=RWM, ch2=ETRIG, ch3=MSUM, ch15=FTRIG
 
     # more detailed configurables
     n_maxflashes:    30 # maximum number of flashes anticipated, this is used for memory allocation
-    n_caenboards:    8  # number of caen boards; this is used for memory allocation
+    n_caenboards:    9 # number of caen boards; this is used for memory allocation
+                       # 1-8 = PMT caens, 9th = timing caen 
     threshold_ftrig: 16350 # the threshold for the flash trigger channel
 
     fragid_offset:   40960 # the offset to subtract to get single digit fragids; if use_set_map is true, should set this to 0
     hist_evt:        1  # the # of the event used to generate the histograms, 1st event by default 
 
-    # for when the fragIDs are mapped to the old configuration...
-    set_fragid_map: [3,7,5,9,11,13,15,17,19] # digitizers 0-8 are mapped to these fragids
+    # for when the fragIDs are mapped to the old configuration or you need to hardcode fragids...
+    ## to use this, must set `fragid_offset` to 0!!!
     use_set_map: false
+    set_fragid_map: [3,7,5,9,11,13,15,17,19] # use if `use_set_map` is true: digitizers 0-8 are mapped to these fragids
 
     # ordered in sets of 15 by increasing fragID
     # the PMT_to_Digitizers.txt file in the same directory is the reference for this
@@ -54,7 +64,8 @@ pmtdecoder:
              173,172,227,226,197,196,171,170,225,224,169,168,223,222,167, # digitizer 4
              195,194,221,220,165,164,219,218,193,192,163,162,217,216,166, # digitizer 5
              251,250,305,304,275,274,249,248,303,302,247,246,301,300,245, # digitizer 6
-             273,272,299,298,243,242,297,296,271,270,241,240,295,294,244] # digitizer 7
+             273,272,299,298,243,242,297,296,271,270,241,240,295,294,244, # digitizer 7
+             900,901,902,903,904,905,906,907,908,909,910,911,912,913,914] # digitizer 8 (TIMING CAEN)
 }
 
 END_PROLOG

sbndcode/Decoders/PMT/pmtdecoder.fcl

@@ -78,10 +78,7 @@ SBNDPTBDecoder::SBNDPTBDecoder(fhicl::ParameterSet const & p)
 
 void SBNDPTBDecoder::produce(art::Event & evt)
 {
-
-
   // look first for container fragments and then non-container fragments
-
   std::vector<raw::ptb::sbndptb> sbndptbs;
 
   art::InputTag itag1(fInputLabel, fInputContainerInstance);
@@ -117,6 +114,61 @@ void SBNDPTBDecoder::produce(art::Event & evt)
   evt.put(std::make_unique<std::vector<raw::ptb::sbndptb>>(std::move(sbndptbs)),fOutputInstance);
 }
 
+
+void print_fragment_words(const artdaq::Fragment& frag, size_t wordNum, size_t bitsPerWord ) {
+  
+  const __uint8_t* data_ptr = reinterpret_cast<const __uint8_t*>(frag.dataBegin());
+  size_t wordCount = frag.dataSizeBytes() / (bitsPerWord / 8);
+  for (size_t w = 0; w < wordCount; w++) {
+    // Check if the current word index matches the specified word index
+    if (w == wordNum) {
+        // Print the bits for the specified n-bit word
+      for (int i = (bitsPerWord-1); i >= 0; --i) {
+            // Calculate the byte index and bit index
+	size_t byteIndex = w * (bitsPerWord / 8) + (i / 8);
+	int bitIndex = (i % 8); // Get the correct bit position in the byte
+	// Print the bit
+	std::cout << static_cast<int>((data_ptr[byteIndex] >> bitIndex) & 1);
+	if (i % 8 == 0) {
+	  std::cout << " "; 
+	}
+      }
+      std::cout << std::endl; // New line after printing the word
+    }
+  }      
+}
+
+
+//Copied from Lines 1382-1406 from     sbndaq-artdaq/sbndaq-artdaq/ArtModules/SBND/EventAna_module.cc
+
+ /*******************************************
+  * Note: Below for the Timestamp conversion,
+  *       The PTB TS is in UTC seconds since the Unix epoch in 50MHz clock ticks.
+  *       This means to recover seconds since the Unix epoch use: sec_since_epoch = TS / 50e6
+  *       and of course nanosec_since_epoch = (TS / 50e6) * 1e9 = TS * 20
+  *
+  * Note: The `CTBFragment` constructor grabs the chunk of memory the artDAQ fragment occupies.
+  *       Since we know a priori the number of PTB words (from the TCP header) and the size (128b for all words)
+  *       we can loop over the memory addresses, casting each 128b into the correct word type given by each word's `type`.
+  *
+  * There are 5 word types with the following bit arrangement:
+  *       Feeback        = | 3b Word Type | 61b Payload | 64b Timestamp | (here Payload is split into code, source, payload1, payload2)
+  *       LLT, HLT       = | 3b Word Type | 61b Payload | 64b Timestamp |
+  *       Channel Status = | 3b Word Type | 64b Payload | 61b Timestamp | (Larger Payload to fit all input channels)
+  *
+  * Word Type:
+  *       - 0x0 = Feedback/Error Word -> Errors from the firmware, should abort the run
+  *       - 0x1 = Low Level Trigger (LLT) -> Holds a record of any asserted LLTs
+  *       - 0x2 = High Level Trigger (HLT) -> Holds a record of any asserted HLTs
+  *       - 0x3 = Channel status -> Holds a record of any asserted inputs
+  *       - 0x7 = Timestamp Word -> No payload just a timestamp, these are periodic
+  *
+  * Note: Payload AND'd with mask the size of the expected number of bits just
+  *       to make sure we don't get any unexpected garbage bits since we aren't using
+  *       the full bits of the variable type e.g. uint64_t, unint16_t..
+  **************************************/
+
+
 void SBNDPTBDecoder::_process_PTB_AUX(const artdaq::Fragment& frag, ptbsv_t &sout)
 {
   sbndaq::CTBFragment ctbfrag(frag);   // somehow the name CTBFragment stuck
@@ -145,8 +197,19 @@ void SBNDPTBDecoder::_process_PTB_AUX(const artdaq::Fragment& frag, ptbsv_t &sou
 	  tstruct.timestamp = ctbfrag.Trigger(iword)->timestamp;
 	  if (ctbfrag.Trigger(iword)->IsHLT()) 
 	    {
+	      
+	      if (*(frag.metadata<int>()) == 2){ //If data is taken with 192b PTB words
+		tstruct.prev_timestamp = ctbfrag.PTBWord(iword)->prevTS;
+		tstruct.gate_counter = ctbfrag.Trigger(iword)->gate_counter;
+              }
+              else if (*(frag.metadata<int>()) != 2){ //If data is taken with 128b PTB words
+		tstruct.prev_timestamp = 0;
+		tstruct.gate_counter = 0;
+	      }
+
 	      ix = sout.HLTrigs.size();
 	      sout.HLTrigs.push_back(tstruct);
+
 	      if (fDebugLevel > 0)
 		{
 		  std::cout << "SBNDPTBDecoder_module: found HLT: " << wt << " " << ix << std::endl;

sbndcode/Decoders/PTB/SBNDPTBDecoder_module.cc

@@ -5,16 +5,20 @@
 -->
 
 <lcgdict>
-  <class name="raw::ptb::Trigger" ClassVersion="10">
+  <class name="raw::ptb::Trigger" ClassVersion="11">
+   <version ClassVersion="11" checksum="1173933314"/>
    <version ClassVersion="10" checksum="983962440"/>
   </class>
-  <class name="raw::ptb::ChStatus" ClassVersion="10">
+  <class name="raw::ptb::ChStatus" ClassVersion="11">
+   <version ClassVersion="11" checksum="1302570871"/>
    <version ClassVersion="10" checksum="2716777827"/>
   </class>
-  <class name="raw::ptb::Feedback" ClassVersion="10">
+  <class name="raw::ptb::Feedback" ClassVersion="11">
+   <version ClassVersion="11" checksum="2612286493"/>
    <version ClassVersion="10" checksum="404427229"/>
   </class>
-  <class name="raw::ptb::Misc" ClassVersion="10">
+  <class name="raw::ptb::Misc" ClassVersion="11">
+   <version ClassVersion="11" checksum="686355011"/>
    <version ClassVersion="10" checksum="1110799137"/>
   </class>
   <class name="raw::ptb::WordIndex" ClassVersion="10">

sbndcode/Decoders/PTB/classes_def.xml

@@ -18,12 +18,15 @@ namespace raw {
   namespace ptb {
 
     struct Trigger {
+      ULong64_t prev_timestamp;
       ULong64_t timestamp;
       ULong64_t trigger_word;
+      uint32_t gate_counter;
       uint32_t word_type;
     };
 
     struct ChStatus {
+      ULong64_t prev_timestamp;
       ULong64_t timestamp;
       uint32_t beam;
       uint32_t crt;
@@ -35,6 +38,7 @@ namespace raw {
     };
 
     struct Feedback {
+      ULong64_t prev_timestamp;
       ULong64_t timestamp;
       uint32_t code;
       uint32_t source;
@@ -43,6 +47,7 @@ namespace raw {
     };
 
     struct Misc {
+      ULong64_t prev_timestamp;
       ULong64_t timestamp;
       ULong64_t payload;
       uint32_t word_type;

sbndcode/Decoders/PTB/sbndptb.h

@@ -0,0 +1,17 @@
+art_make(
+	MODULE_LIBRARIES 
+	sbndaq_artdaq_core::sbndaq-artdaq-core_Overlays_SBND
+	sbnobj::SBND_Timing
+
+    lardataobj::RecoBase
+  
+    art_root_io::TFileService_service
+    art_root_io::tfile_support
+	artdaq_core::artdaq-core_Data
+
+    ROOT::Core
+    ROOT::Tree
+
+)
+
+install_fhicl()