Merge branch 'develop' into lnguyen/frame_shift_pr_dev

Author: nathanielerowe

sbndcode/Decoders/XARAPUCA/SBNDXARAPUCADecoder_module.cc

@@ -1,5 +1,6 @@
 #include "xarapucadecoder.fcl"
 #include "spectdc_decoder_sbnd.fcl"
+#include "SBNDPTBDecoderDefaults.fcl"
 
 process_name: XARAPUCADecoder
 
@@ -9,20 +10,22 @@ services: {
 
 source: {
     module_type: RootInput
-    maxEvents:   -1       
+    maxEvents:   -1                                 # Number of events to be processed, -1 = all events.
 }
 
 outputs: {
     out1: {
         module_type: RootOutput
         fileName:    "xarapucadecoder-art.root"     # Output file containing the module products.
+        dataTier:  "decoded-raw"
     }
 }
 
 physics: {
 
     producers: {
         tdcdecoder: @local::spec_tdc_decoder_sbnd
+        ptbdecoder: @local::SBNDPTBDecoderDefaults
         xarapucadecoder: @local::xarapucadecoder    
     }
 
@@ -31,7 +34,7 @@ physics: {
     analyzers:{}
 
 
-    reco: [tdcdecoder, xarapucadecoder]
+    reco: [tdcdecoder, ptbdecoder, xarapucadecoder]
 
 
     # Defines the output stream, there could be more than one if using filters.

sbndcode/Decoders/XARAPUCA/run_xarapucadecoder.fcl

@@ -14,23 +14,30 @@ xarapucadecoder:
     fragment_id_offset: 41216                                   # Offset to be applied to the fragment IDs (0xA100).
     board_id_list: [7, 13, 16, 19]                              # Slots where the boards are installed.
     # - Timing configuration.
-    timing_priority: 0                                          # 0 SPEC-TDC ETT, 1 CAEN-only.
+    timing_priority: 0                                          # 0 SPEC-TDC ETRIG, 1 PTB HLT (1-5, 14,15), 2 CAEN-only. 
     ns_per_sample: 16                                           # Nanoseconds per sample.
+    # - RAW timestamp configuration:
+    raw_event_header_product_name: "daq"                        # Label identifying the module that created the artdaq::detail::RawEventHeader data product.
+    raw_trig_max_diff: 3000000                                  # Maximum difference (in ns) allowed between trigger timestamps and raw timestamp.
+    raw_timestamp_correction: 367000                            # Correction (in ns) to be applied to the raw timestamp.
     # - SPEC-TDC access configuration
-    spectdc_product_name:  "tdcdecoder"                         # Name for getting SPEC-TDC Decoder products.
+    spectdc_product_name:  "tdcdecoder"                         # Name for getting SPEC-TDC Decoder products (if any).
     spectdc_ftrig_ch: 3                                         # Channel assigned to flash triggers.
-    spectdc_etrig_ch: 4                                         # Channel assigned to event triggers.
+    spectdc_etrig_ch: 4                                         # Channel assigned to ETT (Event Trigger Timestamp) triggers.
+    # - PTB access configuration
+    ptb_product_name: "ptbdecoder"                              # Name for getting PTB Decoder products (if any).
+    allowed_hl_triggers: [1, 2, 3, 4, 5, 14, 15]                # List of allowed HLT trigger types (1-5, 14, 15).
 
     # OUTPUT configuration:
     # - Output data product instance name.
     waveforms_instance_name: "XARAPUCAChannels"                 # Name for the instance product containing the raw decoded waveforms.
-    timing_instance_name: ""                                    # Name for the instance product containing the timing reference information.
+    timing_ref_instance_name: ""                                # Name for the instance product containing the timing reference information.
     store_debug_waveforms: 0                                    # Number of waveforms to store (0: none, -1: all, n: first n waveforms).
     # - Debug options.
-    debug_all: false                                            # (De)activates all debug options.
     debug_tdc_handle: false                                     # (De)activates SPEC-TDC art::Handle information printing.
+    debug_ptb_handle: false                                     # (De)activates PTB art::Handle information printing.
     debug_fragments_handle: false                               # (De)activates V1740B CAEN fragments art::Handle information printing.
-    debug_timing: false                                         # (De)activates timing data printing. 
+    debug_timing: false                                         # (De)activates timing data printing.
     debug_buffer: false                                         # (De)activates buffer status printing.
     debug_waveforms: false                                      # (De)activates waveforms decoding printing.
     # - Verbose option.

sbndcode/Decoders/XARAPUCA/xarapucadecoder.fcl

@@ -15,6 +15,7 @@ class SimEnergyDepFakeTriggerFilter : public art::EDFilter {
   const double fBeamTimeMin;   // Minimum time of beam window [us]
   const double fBeamTimeMax;   // Maximum time of beam window [us]
   const double fEnergyDeposit; // Minimum energy deposit in TPC for trigger [MeV]
+  const double fMaxEnergyDeposit; // Maximum energy deposit in TPC for trigger [MeV]
 
   const std::string fSimEnergyDepModuleName;
 };
@@ -24,6 +25,7 @@ SimEnergyDepFakeTriggerFilter::SimEnergyDepFakeTriggerFilter(fhicl::ParameterSet
     , fBeamTimeMin(pset.get<double>("BeamTimeMin"))
     , fBeamTimeMax(pset.get<double>("BeamTimeMax"))
     , fEnergyDeposit(pset.get<double>("EnergyDeposit"))
+    , fMaxEnergyDeposit(pset.get<double>("MaxEnergyDeposit", std::numeric_limits<double>::max()))
     , fSimEnergyDepModuleName(pset.get<std::string>("SimEnergyDepModuleName"))
 {
 }
@@ -46,7 +48,7 @@ bool SimEnergyDepFakeTriggerFilter::filter(art::Event& e)
   }
 
   // If the energy deposit within the beam time is greater than some limit then trigger the event
-  return energy > fEnergyDeposit;
+  return (energy > fEnergyDeposit) & (energy < fMaxEnergyDeposit);
 }
 
 DEFINE_ART_MODULE(SimEnergyDepFakeTriggerFilter)

sbndcode/Filters/SimEnergyDepFakeTriggerFilter_module.cc

@@ -7,7 +7,7 @@ sbnd_simenergydepfaketriggerfilter:
   # Select the beam spill time to match that in sbnd_filtergenintime
   BeamTimeMin:    -0.2        # Minimum time of beam window [us]
   BeamTimeMax:     1.9        # Maximum time of beam window [us]
-  EnergyDeposit:   100        # Minimum energy deposit in TPC for trigger [MeV]
+  EnergyDeposit:   1          # Minimum energy deposit in TPC for trigger [MeV]
 
   # By default, take only the energy deposits within the TPC active volume
   SimEnergyDepModuleName: "largeant:LArG4DetectorServicevolTPCActive" # Name of SimEnergyDeposit producer module

sbndcode/Filters/fcls/simenergydepfaketriggerfilter.fcl

@@ -157,6 +157,7 @@ physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatching
 
 # Overwrite weight_functions label:
 physics.producers.fluxweight.weight_functions: @local::physics.producers.fluxweight.weight_functions_flux
+physics.producers.geant4weight.weight_functions: @local::physics.producers.geant4weight.weight_functions_reint
 
 # input art file.
 physics.producers.cafmaker.SystWeightLabels: []

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl

@@ -1,3 +1,3 @@
 #include "cafmakerjob_sbnd_data_base.fcl"
 
-physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbinfo"
+physics.producers.cafmaker.BNBPOTDataLabel: "bnbinfo"

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnblight.fcl

@@ -1,3 +1,3 @@
 #include "cafmakerjob_sbnd_data_base.fcl"
 
-physics.producers.cafmaker.OffbeamBNBCountDataLabel: "sbndbnbextinfo"
+physics.producers.cafmaker.OffbeamBNBCountDataLabel: "bnbextinfo"

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_offbeamlight.fcl

@@ -1,3 +1,3 @@
 #include "cafmakerjob_sbnd_data_sce.fcl"
 
-physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbinfo"
+physics.producers.cafmaker.BNBPOTDataLabel: "bnbinfo"

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce_bnblight.fcl

@@ -1,3 +1,3 @@
 #include "cafmakerjob_sbnd_data_sce.fcl"
 
-physics.producers.cafmaker.OffbeamBNBCountDataLabel: "sbndbnbextinfo"
+physics.producers.cafmaker.OffbeamBNBCountDataLabel: "bnbextinfo"