Merge branch 'develop' into feature/acastill_lightprop_bugfix

nathanielerowe · web-flow · commit 1f043abda437 · 2026-02-02T15:33:52.000-06:00
diff --git a/CMakeLists.txt b/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)
diff --git a/sbndcode/Calibration/TPCCalorimetry/NormalizeYZ_tool.cc b/sbndcode/Calibration/TPCCalorimetry/NormalizeYZ_tool.cc
@@ -1,3 +1,5 @@
+// Author : Shweta Yadav (sxy1439@mavs.uta.edu)
+// University of Texas at Arlington
 
 // Framework Includes
 #include "art/Framework/Core/EDProducer.h"
diff --git a/sbndcode/Calibration/TPCCalorimetry/normtools_sbnd.fcl b/sbndcode/Calibration/TPCCalorimetry/normtools_sbnd.fcl
@@ -11,13 +11,13 @@ driftnorm_sql: {
 
 yznorm_hist_data: {
   tool_type: NormalizeYZ
-  FileName: "YZmaps/yz_correction_map_data1e20.root"
+  FileName: "YZmaps/yz_data2025_v10_14_02.root"
   Verbose: false
 }
 
 yznorm_hist_mc: {
   tool_type: NormalizeYZ
-  FileName: "YZmaps/yz_correction_map_mcp2025b5e18.root"
+  FileName: "YZmaps/yz_mc2025_v10_14_02.root"
   Verbose: false
 }
 
diff --git a/sbndcode/Calibration/configurations/calibration_database_GlobalTags_sbnd.fcl b/sbndcode/Calibration/configurations/calibration_database_GlobalTags_sbnd.fcl
@@ -4,7 +4,7 @@
 BEGIN_PROLOG
 
 SBND_Calibration_GlobalTags: {
-  @table::TPC_CalibrationTags_Nov2025
+  @table::TPC_CalibrationTags_Jan2026
   @table::PDS_CalibrationTags_Nov2025
 }
 
diff --git a/sbndcode/Calibration/configurations/calibration_database_TPC_TagSets_sbnd.fcl b/sbndcode/Calibration/configurations/calibration_database_TPC_TagSets_sbnd.fcl
@@ -7,6 +7,12 @@ BEGIN_PROLOG
 ## r1: SBND Full Run 1 with light trigger, run number 18250-18618
 
 ## First one for 2025 Fall, only with etau tag
+TPC_CalibrationTags_Jan2026: {
+
+  tpc_elifetime_data: "v4r1"
+
+}
+
 TPC_CalibrationTags_Nov2025: {
 
   tpc_elifetime_data: "v2r1"
diff --git a/sbndcode/Commissioning/CMakeLists.txt b/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()
 
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_and_fluxwgt_and_g4rw.fcl b/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" ]
diff --git a/sbndcode/JobConfigurations/standard/reco/config/drops_reco1.fcl b/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
 ]
 
diff --git a/sbndcode/SBNDPandora/scripts/PandoraSettings_Neutrino_SBND.xml b/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>
diff --git a/sbndcode/TPCPMTBarycenterMatching/TPCPMTBarycenterMatching_module.cc b/sbndcode/TPCPMTBarycenterMatching/TPCPMTBarycenterMatching_module.cc
@@ -59,6 +59,10 @@
 #include "lardataobj/RecoBase/PFParticleMetadata.h"
 #include "sbnobj/Common/Reco/TPCPMTBarycenterMatch.h"
 
+// Calibration database includes
+#include "sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabase.h"
+#include "sbndcode/Calibration/PDSDatabaseInterface/IPMTCalibrationDatabaseService.h"
+
 //ROOT includes
 #include <Eigen/Dense>
 #include <vector>
@@ -231,7 +235,6 @@ class TPCPMTBarycenterMatchProducer : public art::EDProducer {
   bool                      fCollectionOnly;       ///< Only use TPC spacepoints from the collection plane
   double                    fDistanceCandidateFlashes; ///< Maximum distance between candidate flashes to be considered for matching (cm)
   std::vector<double>       fCalAreaConst;         /// Calibration area constants for wire plane
-  std::vector<int>          fSkipChannelList;
   double                    fOpDetCoVUVEff;           // Efficiencies for PMT detection (Coated PMT VUV)
   double                    fOpDetCoVISEff;           // Efficiencies for PMT detection (Coated PMT VIS)
   double                    fOpDetUncoVISEff;           // Efficiencies for PMT detection (Uncoated PMT VIS)
@@ -294,6 +297,9 @@ class TPCPMTBarycenterMatchProducer : public art::EDProducer {
   fhicl::ParameterSet _vis_params;
   std::shared_ptr<phot::OpticalPath> _optical_path_tool;
 
+  sbndDB::PMTCalibrationDatabase const* fPMTCalibrationDatabaseService;
+
+
 };
 
 
@@ -391,6 +397,9 @@ TPCPMTBarycenterMatchProducer::TPCPMTBarycenterMatchProducer(fhicl::ParameterSet
   _vis_params = p.get<fhicl::ParameterSet>("VIVHits");
   _optical_path_tool = std::shared_ptr<phot::OpticalPath>(art::make_tool<phot::OpticalPath>(p.get<fhicl::ParameterSet>("OpticalPathTool")));
   _semi_model = std::make_unique<phot::SemiAnalyticalModel>(_vuv_params, _vis_params, _optical_path_tool, true, false);
+
+  //Load PMT Calibration Database
+  fPMTCalibrationDatabaseService = lar::providerFrom<sbndDB::IPMTCalibrationDatabaseService const>();
 }
 
 void TPCPMTBarycenterMatchProducer::produce(art::Event& e)
@@ -892,7 +901,7 @@ double TPCPMTBarycenterMatchProducer::GetFlashLight(double flash_pe, std::vector
   double tot_visibility=0;
 
   for(size_t ch=0; ch<dir_visibility.size(); ch++){
-    if (std::find(fSkipChannelList.begin(), fSkipChannelList.end(), ch) != fSkipChannelList.end()) continue;
+    if(!fPMTCalibrationDatabaseService->getReconstructChannel(ch)) continue; // Skip channels not reconstructed
     if(fOpDetType[ch]==0) tot_visibility += fOpDetCoVUVEff*dir_visibility[ch] + fOpDetCoVISEff*ref_visibility[ch];
     else if(fOpDetType[ch]==1) tot_visibility += fOpDetUncoVISEff*ref_visibility[ch];
     else continue; // skip other types
diff --git a/ups/product_deps b/ups/product_deps
@@ -253,9 +253,9 @@ 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	-	
+sbnd_data	v01_42_00	-	
 sbndutil        v10_06_01    -       optional
 fhiclpy		v4_03_05    -
 end_product_list

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Author : Shweta Yadav (sxy1439@mavs.uta.edu)`
	`2`	`+// University of Texas at Arlington`
`1`	`3`
`2`	`4`	`// Framework Includes`
`3`	`5`	`#include "art/Framework/Core/EDProducer.h"`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,13 @@ driftnorm_sql: {`
`11`	`11`
`12`	`12`	`yznorm_hist_data: {`
`13`	`13`	`tool_type: NormalizeYZ`
`14`		`- FileName: "YZmaps/yz_correction_map_data1e20.root"`
	`14`	`+ FileName: "YZmaps/yz_data2025_v10_14_02.root"`
`15`	`15`	`Verbose: false`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`yznorm_hist_mc: {`
`19`	`19`	`tool_type: NormalizeYZ`
`20`		`- FileName: "YZmaps/yz_correction_map_mcp2025b5e18.root"`
	`20`	`+ FileName: "YZmaps/yz_mc2025_v10_14_02.root"`
`21`	`21`	`Verbose: false`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`BEGIN_PROLOG`
`5`	`5`
`6`	`6`	`SBND_Calibration_GlobalTags: {`
`7`		`- @table::TPC_CalibrationTags_Nov2025`
	`7`	`+ @table::TPC_CalibrationTags_Jan2026`
`8`	`8`	`@table::PDS_CalibrationTags_Nov2025`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ sbnd_reco1_drops: [`
`16`	`16`	`, "drop _fasthit__*"`
`17`	`17`	`, "drop recob::Wires__wiener_" #drop wiener wires`
`18`	`18`	`, "drop recob::Wires__gauss_"`
	`19`	`+ , "drop ints_opdaq_MonPulseSizes_DetSim"`
	`20`	`+ , "drop ints_opdaq_MonPulses_DetSim"`
`19`	`21`	`, @sequence::sbnd_reco1_ml_drops`
`20`	`22`	`]`
`21`	`23`