Merge branch 'develop' into feature/hlay_crt_blobs

Author: nathanielerowe

sbndcode/Decoders/XARAPUCA/SBNDXARAPUCADecoder_module.cc

@@ -33,13 +33,18 @@ xarapucadecoder:
     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: 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.
     # - 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_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: false                                      # (De)activates trigger jittering information printing.
     # - Verbose option.
     verbose: false                                              # (De)activates verbosity.
 }

sbndcode/Decoders/XARAPUCA/xarapucadecoder.fcl

@@ -4,5 +4,6 @@ FILE(GLOB fcl_files *.fcl)
 install_source(EXTRAS  ${fcl_files} )
 
 add_subdirectory(detector_variations)
-add_subdirectory(legacy)
+# LegacyLArG4 is not supported when using geant4 4.11
+##add_subdirectory(legacy)
 

sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt

@@ -7,4 +7,5 @@ add_subdirectory(recomb_variations)
 add_subdirectory(crt_filter)
 add_subdirectory(optical_sim)
 
-add_subdirectory(legacy)
+# LegacyLArG4 is not supported when using geant4 4.11
+##add_subdirectory(legacy)

sbndcode/JobConfigurations/standard/g4/CMakeLists.txt

@@ -447,6 +447,39 @@
     <DaughterListNames>TrackParticles3D ShowerParticles3D DaughterVertices3D ClustersU ClustersV ClustersW TrackClusters3D ShowerClusters3D</DaughterListNames>
   </algorithm>
 
+  <!-- Shower Merging -->
+  <algorithm type = "LArShowerMergingPfoMopUp">
+    <InputPfoListNames>TrackParticles3D ShowerParticles3D</InputPfoListNames>
+    <DaughterListNames>TrackParticles3D ShowerParticles3D DaughterVertices3D ClustersU ClustersV ClustersW TrackClusters3D ShowerClusters3D</DaughterListNames>
+  </algorithm>
+
+  <!-- Re-run the PFO Characterisation to recalculate the scores after primary electron merging -->
+  <algorithm type = "LArBdtPfoCharacterisation">
+    <TrackPfoListName>TrackParticles3D</TrackPfoListName>
+    <ShowerPfoListName>ShowerParticles3D</ShowerPfoListName>
+    <UseThreeDInformation>true</UseThreeDInformation>
+    <MvaFileName>PandoraMVAs/PandoraBdt_SBND.xml</MvaFileName>
+    <MvaName>PfoCharBDT2</MvaName>
+    <MvaFileNameNoChargeInfo>PandoraMVAs/PandoraBdt_SBND.xml</MvaFileNameNoChargeInfo>
+    <MvaNameNoChargeInfo>PfoCharBDTNoChargeInfo2</MvaNameNoChargeInfo>
+    <MinProbabilityCut>0.51</MinProbabilityCut>
+    <PersistFeatures>true</PersistFeatures>
+    <FeatureTools>
+      <tool type = "LArThreeDLinearFitFeatureTool"/>
+      <tool type = "LArThreeDVertexDistanceFeatureTool"/>
+      <tool type = "LArThreeDPCAFeatureTool"/>
+      <tool type = "LArThreeDOpeningAngleFeatureTool"/>
+      <tool type = "LArThreeDChargeFeatureTool"/>
+      <tool type = "LArConeChargeFeatureTool"/>
+    </FeatureTools>
+    <FeatureToolsNoChargeInfo>
+      <tool type = "LArThreeDLinearFitFeatureTool"/>
+      <tool type = "LArThreeDVertexDistanceFeatureTool"/>
+      <tool type = "LArThreeDPCAFeatureTool"/>
+      <tool type = "LArThreeDOpeningAngleFeatureTool"/>
+    </FeatureToolsNoChargeInfo>
+  </algorithm>
+
   <algorithm type = "LArNeutrinoProperties">
     <NeutrinoPfoListName>NeutrinoParticles3D</NeutrinoPfoListName>
   </algorithm>

sbndcode/LArG4/legacy_largeantmodules_sbnd.fcl

@@ -46,13 +46,14 @@ if [[ -n "$MRB_BUILDDIR" ]]; then
   fi
 fi
 
-if [[ -n "$MRB_SOURCE" ]]; then
-  SourceFHiCLdir="${MRB_SOURCE}/sbndcode/sbndcode/JobConfigurations"
-  if [[ -d "$SourceFHiCLdir" ]]; then
-    echo "Will test the job configuration directory in MRB source area ('${SourceFHiCLdir}')"
-    TestDirs+=( "$SourceFHiCLdir" )
-  fi
-fi
+# DO NOT test files that are not installed
+#if [[ -n "$MRB_SOURCE" ]]; then
+#  SourceFHiCLdir="${MRB_SOURCE}/sbndcode/sbndcode/JobConfigurations"
+#  if [[ -d "$SourceFHiCLdir" ]]; then
+#    echo "Will test the job configuration directory in MRB source area ('${SourceFHiCLdir}')"
+#    TestDirs+=( "$SourceFHiCLdir" )
+#  fi
+#fi
 
 if [[ "${#TestDirs[@]}]" == 0 ]]; then
   echo "FATAL: no suitable FHiCL directory found to be tested!" >&2

sbndcode/LArG4/legacy_simulationservices_sbnd.fcl

@@ -253,7 +253,7 @@ wpdir   product_dir     wire-cell-cfg
 #
 ####################################
 product		version		qual	flags		<table_format=2>
-sbncode		v10_14_02_02       -
+sbncode		v10_15_00       -
 cetmodules	v3_24_01	-	only_for_build
 sbnd_data	v01_42_00	-	
 sbndutil        v10_06_01    -       optional