Add warning for some unexpected types of fragments and fix fragments indexing. Improve jittering application.

Author: aliciavr

sbndcode/Decoders/XARAPUCA/SBNDXARAPUCADecoder_module.cc

@@ -541,23 +541,7 @@ void sbndaq::SBNDXARAPUCADecoder::decode_fragment(uint64_t timestamp, uint64_t&
       }
 
       // - Computation of the difference between TTTs difference and the length of the fragment in ns (to detect jittering between fragments).
-      //int32_t J = TTT_dif - frag_length;
-
-      // - Combination boolean variable.
-      //bool dump_comb_wvfms = true;
-        /*   if (is_nominal) { // Nominal fragment
-          if (!is_first && (TTT_dif <= (frag_length - fallowed_jittering))) {
-            std::cout << "\t\t WARNING: NOMINAL fragment too close to previous one! TTT_dif: " << TTT_dif << " ns, fragment idx: " << fragment_indices[board_idx] << ", board idx: " << board_idx << " (slot " << fboard_id_list[board_idx] << "), " << num_samples_per_wvfm << " samples. Skipping this fragment..." << std::endl;
-          }
-        } else { // Extended fragment
-          if (std::abs(J) <= fallowed_jittering) {
-            dump_comb_wvfms = false;
-          } else if (TTT_dif <= (frag_length - fallowed_jittering)) {
-            dump_comb_wvfms = false;
-            std::cout << "\t\t WARNING: EXTENDED fragment too close to previous one! TTT_dif: " << TTT_dif << " ns, fragment idx: " << fragment_indices[board_idx] << ", board idx: " << board_idx << " (slot " << fboard_id_list[board_idx] << "), " << num_samples_per_wvfm << " samples. Skipping this fragment..." << std::endl;
-          }
-        }*/
-
+      int32_t J = TTT_dif - frag_length;
 
       bool dump_comb_wvfms = !is_first && (is_nominal || (!is_nominal && (TTT_dif > (frag_length + fallowed_jittering))));
 
@@ -573,19 +557,43 @@ void sbndaq::SBNDXARAPUCADecoder::decode_fragment(uint64_t timestamp, uint64_t&
         first_frag_idx = fragment_indices[board_idx];
         first_TTT = TTT_end_ns;
         first_frag_timestamp = frag_timestamp;
+        if (fdebug_jittering) std::cout << "NC - ";
+      } else {
+        if (fdebug_jittering) std::cout << "C -  ";
       }
       append_waveforms(wvfms, fragment_wvfms, num_channels);
 
       if (last_one) {
         if (fdebug_extended_fragments) std::cout << "\t\t LAST fragment " << std::endl;
-        fragment_indices[board_idx]++;  
         shift_time(TTT_ticks, first_TTT, first_frag_timestamp, timestamp, num_nominal_samples_per_wvfm, ini_wvfm_timestamp, end_wvfm_timestamp);
         dump_waveforms(prod_wvfms, wvfms, first_frag_idx, board_idx, num_channels, ini_wvfm_timestamp, end_wvfm_timestamp);
       }
 
+      if (fdebug_jittering) {
+        if (is_first) {
+          std::cout << "\t\t FIRST ";
+        }
+        if (is_nominal) {
+          int32_t TTT_ini_ns = TTT_end_ns - static_cast<int32_t>(num_nominal_samples_per_wvfm * fns_per_sample);
+          std::cout << "NOMINAL fragment " << fboard_id_list[board_idx] << " - " << fragment_indices[board_idx] << " (" << num_samples_per_wvfm << "): [" << TTT_ini_ns << ", " << TTT_end_ns << "] diff with prev: " << TTT_dif << " ns, length: " << frag_length << " ns, diff_with_length (jitt): " <<  J << std::endl;
+        } else {
+          int32_t TTT_ini_ns = TTT_end_ns - static_cast<int32_t>(num_nominal_samples_per_wvfm * fns_per_sample);
+          std::cout << "EXTENDED fragment " << fboard_id_list[board_idx] << " - " << fragment_indices[board_idx] << " (" << num_samples_per_wvfm << "): [" << TTT_ini_ns << ", " << TTT_end_ns << "] diff with prev: " << TTT_dif << " ns, length: " << frag_length << " ns, diff_with_length (jitt): " <<  J << std::endl;
+        }
+      }
+
+      // WARNINGS
+      if (TTT_dif < frag_length - fallowed_jittering) {
+        if (!is_first) {
+          if (!is_nominal) std::cout << "\t\t WARNING: EXTENDED fragment too close! This fragment is being combined." << std::endl;
+          if (is_nominal) std::cout << "\t\t WARNING: NOMINAL fragment too close! This fragment is not being combined." << std::endl;
+        }
+      }
+
       prev_TTT = TTT_end_ns;
 
     } else { // Combination of extended fragments disabled.
+      first_frag_idx = fragment_indices[board_idx];
       shift_time(TTT_ticks, TTT_end_ns, frag_timestamp, timestamp, num_samples_per_wvfm, ini_wvfm_timestamp, end_wvfm_timestamp);
       dump_waveforms(prod_wvfms, fragment_wvfms, first_frag_idx, board_idx, num_channels, ini_wvfm_timestamp, end_wvfm_timestamp);
     }

sbndcode/Decoders/XARAPUCA/xarapucadecoder.fcl

@@ -32,7 +32,7 @@ xarapucadecoder:
     # - Output data product instance name.
     waveforms_instance_name: "XARAPUCAChannels"                 # Name for the instance product containing the raw decoded waveforms.
     timing_ref_instance_name: ""                                # Name for the instance product containing the timing reference information.
-    store_debug_waveforms: -1                                   # Number of waveforms to store (0: none, -1: all, n: first n waveforms).
+    store_debug_waveforms: 0                                    # Number of waveforms to store (0: none, -1: all, n: first n waveforms).
     # Combination of extended fragments.
     combine_ext_frag: true                                      # (De)activates the combination of extended fragments into a single raw::OpDetWaveform object.
     allowed_jittering: 64                                       # Allowed jittering (in ns) between fragments to be combined.
@@ -44,9 +44,9 @@ xarapucadecoder:
     debug_buffer: false                                         # (De)activates buffer status printing.
     debug_waveforms: false                                      # (De)activates waveforms decoding printing.
     debug_extended_fragments: false                             # (De)activates extended fragments information printing.
-    debug_jittering: true                                      # (De)activates trigger jittering information printing.
+    debug_jittering: false                                      # (De)activates trigger jittering information printing.
     # - Verbose option.
-    verbose: true                                              # (De)activates verbosity.
+    verbose: false                                              # (De)activates verbosity.
 }
 
 END_PROLOG