Merge branch 'release/v10_14_02_01'

Author: nathanielerowe

CMakeLists.txt

@@ -15,7 +15,7 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.14.02)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.14.02.01)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
@@ -88,11 +88,8 @@ find_package( Eigen3 REQUIRED )
 find_package( Geant4 REQUIRED )
 find_package( Boost COMPONENTS system REQUIRED )
 find_package( ROOT REQUIRED )
-
-if(DEFINED ENV{HEP_HPC_DIR} )
-  find_ups_product( hdf5 )
-  find_ups_product( hep_hpc )
-endif()
+find_package( hdf5 REQUIRED )
+find_package( hep_hpc REQUIRED )
 
 # macros for dictionary and simple_plugin
 include(ArtDictionary)

sbndcode/Commissioning/CMakeLists.txt

@@ -50,6 +50,7 @@ cet_build_plugin(HitDumper art::module SOURCE HitDumper_module.cc LIBRARIES ${MO
 cet_build_plugin(MuonTrackFilter art::module SOURCE MuonTrackFilter_module.cc LIBRARIES ${MODULE_LIBRARIES})
 cet_build_plugin(MuonTrackProducer art::module SOURCE MuonTrackProducer_module.cc LIBRARIES ${MODULE_LIBRARIES})
 cet_build_plugin(OnlineEvd art::module SOURCE OnlineEvd_module.cc LIBRARIES ${MODULE_LIBRARIES})
+target_include_directories(sbndcode_Commissioning_OnlineEvd_module PRIVATE $ENV{HEP_HPC_INC})
 
 install_source()
 

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_and_fluxwgt_and_g4rw.fcl

@@ -0,0 +1,4 @@
+#include "cafmakerjob_sbnd_sce.fcl"
+
+physics.runprod: [rns, fluxweight, geant4weight, @sequence::physics.runprod]
+physics.producers.cafmaker.SystWeightLabels: [ "fluxweight", "geant4weight" ]

sbndcode/JobConfigurations/standard/reco/config/drops_reco1.fcl

@@ -16,6 +16,8 @@ sbnd_reco1_drops: [
   , "drop *_fasthit_*_*"
   , "drop recob::Wires_*_wiener_*"  #drop wiener wires
   , "drop recob::Wires_*_gauss_*"
+  , "drop *ints_opdaq_MonPulseSizes_DetSim*"
+  , "drop *ints_opdaq_MonPulses_DetSim*"
   , @sequence::sbnd_reco1_ml_drops
 ]
 

sbndcode/SBNDPandora/scripts/PandoraSettings_Neutrino_SBND.xml

@@ -457,6 +457,39 @@
     <VertexListName>DaughterVertices3D</VertexListName>
   </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>
+
   <!-- Output list management -->
   <algorithm type = "LArPostProcessing">
     <PfoListNames>NeutrinoParticles3D TrackParticles3D ShowerParticles3D</PfoListNames>

ups/product_deps

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