Merge branch 'develop' into revert-897-feature/pandora_electron_merge

Author: nathanielerowe

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"

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
 }
 

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
 }
 

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"

sbndcode/LArSoftConfigurations/gen/genie_sbnd.fcl

@@ -232,29 +232,29 @@ sbnd_flux_bnb_nu_Lv1_test1: {
 #
 # Booster Neutrino Beam, FHC mode, g4bnb 1.1.0, A
 #
-sbnd_flux_g4bnb_1_0_0_fhc: {
+sbnd_flux_g4bnb_1_1_1_fhc: {
   FluxType:         "dk2nu"
   DetectorLocation: "SBND"
   FluxCopyMethod:   "DIRECT"
   FluxSearchPaths: "/cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash/fluxFiles/bnb/G4BNB/v1.1.1/fhc/a/"
   FluxFiles: [ "NuBeam_production_BooNE_50m_I174000A_*.dk2nu.root" ]
 }
 
-sbnd_flux_g4bnb_1_0_0_fhc_test1: {
-  @table::sbnd_flux_g4bnb_1_0_0_fhc
+sbnd_flux_g4bnb_1_1_1_fhc_test1: {
+  @table::sbnd_flux_g4bnb_1_1_1_fhc
   FluxFiles: [ "NuBeam_production_BooNE_50m_I174000A_9998.dk2nu.root" ]
 }
 
 #
 # Booster Neutrino Beam, FHC mode, DIRT, g4bnb 1.1.0, A
 #
-sbnd_flux_g4bnb_1_0_0_fhc_dirt: {
-  @table::sbnd_flux_g4bnb_1_0_0_fhc
+sbnd_flux_g4bnb_1_1_1_fhc_dirt: {
+  @table::sbnd_flux_g4bnb_1_1_1_fhc
   DetectorLocation: "SBND-Dirt"
 }
 
-sbnd_flux_g4bnb_1_0_0_fhc_dirt_test1: {
-  @table::sbnd_flux_g4bnb_1_0_0_fhc_dirt
+sbnd_flux_g4bnb_1_1_1_fhc_dirt_test1: {
+  @table::sbnd_flux_g4bnb_1_1_1_fhc_dirt
   FluxFiles: [ "NuBeam_production_BooNE_50m_I174000A_9998.dk2nu.root" ]
 }
 
@@ -283,19 +283,32 @@ sbnd_flux_g4bnb_1_0_0_beamdump: {
 }
 
 
+#
+# Booster Neutrino Beam, beam-dump mode, G4BNB v1.1.1, A
+#
+sbnd_flux_g4bnb_1_1_1_beamdump: {
+  FluxType:         "dk2nu"
+  DetectorLocation: "SBND"
+  FluxCopyMethod:   "DIRECT"
+  FluxSearchPaths: "/cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash/fluxFiles/bnb/G4BNB/v1.1.1/beamdump/a/"
+  FluxFiles: [ "NuBeam_production_offTarg_BooNE_50m_offtarg_wires_al2O3_srbbs_I174000A_*.dk2nu.root" ]
+}
+
+
+
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #
 # Booster Neutrino Beam, neutrino mode, "default" configuration
 #
-sbnd_flux_bnb_nu: @local::sbnd_flux_g4bnb_1_0_0_fhc
-sbnd_flux_bnb_nu_test1: @local::sbnd_flux_g4bnb_1_0_0_fhc_test1
+sbnd_flux_bnb_nu: @local::sbnd_flux_g4bnb_1_1_1_fhc
+sbnd_flux_bnb_nu_test1: @local::sbnd_flux_g4bnb_1_1_1_fhc_test1
 
 #
 # Booster Neutrino Beam, interaction from dirt
 #
-sbnd_flux_bnb_dirt: @local::sbnd_flux_g4bnb_1_0_0_fhc_dirt
-sbnd_flux_bnb_dirt_test1: @local::sbnd_flux_g4bnb_1_0_0_fhc_dirt_test1
+sbnd_flux_bnb_dirt: @local::sbnd_flux_g4bnb_1_1_1_fhc_dirt
+sbnd_flux_bnb_dirt_test1: @local::sbnd_flux_g4bnb_1_1_1_fhc_dirt_test1
 
 #
 # Booster Neutrino Beam, RHC mode, "default" configuration
@@ -305,7 +318,7 @@ sbnd_flux_bnb_nu_rhc: @local::sbnd_flux_g4bnb_1_0_0_rhc
 #
 # Booster Neutrino Beam, beam-dump mode, "default" configuration
 #
-sbnd_flux_bnb_nu_beamdump: @local::sbnd_flux_g4bnb_1_0_0_beamdump
+sbnd_flux_bnb_nu_beamdump: @local::sbnd_flux_g4bnb_1_1_1_beamdump
 
 
 #

sbndcode/LightPropagationCorrection/LightPropagationCorrection_module.cc

@@ -442,16 +442,16 @@ void sbnd::LightPropagationCorrection::GetPropagationTimeCorrectionPerChannel()
             double dy = fSpacePointY[sp] - _opDetY;
             double dz = fSpacePointZ[sp] - _opDetZ;
             double distanceToOpDet = std::sqrt(dx*dx + dy*dy + dz*dz);
-            //double spToCathode = abs(fSpacePointX[sp]); // Distance from space point to cathode in mm
-            //double cathodeToOpDet = std::sqrt(_opDetX*_opDetX + dy*dy + dz*dz); // Distance from cathode to OpDet in mm
-            //float lightPropTimeVIS = spToCathode/fVGroupVUV + cathodeToOpDet/fVGroupVIS; // Speed
-
             double cathodeToOpDet = std::sqrt(_opDetX*_opDetX + (dy/2)*(dy/2) + (dz/2)*(dz/2)); // Distance from cathode to OpDet in mm
             double spToCathode = std::sqrt( fSpacePointX[sp]*fSpacePointX[sp] + (dy/2)*(dy/2) + (dz/2)*(dz/2)); // Distance from space point to cathode in mm
 
             float lightPropTimeVIS = spToCathode/fVGroupVUV + cathodeToOpDet/fVGroupVIS; // Speed
             float lightPropTimeVUV = distanceToOpDet / fVGroupVUV; // Speed of light in mm/ns for VUV
-            float lightPropTime = std::min(lightPropTimeVIS, lightPropTimeVUV);
+            float lightPropTime = 0;
+            if(fPDSMap.pdType(opdet)=="pmt_coated" || fPDSMap.pdType(opdet)=="xarapuca_vuv")
+                lightPropTime = std::min(lightPropTimeVIS, lightPropTimeVUV);
+            else if(fPDSMap.pdType(opdet)=="pmt_uncoated" || fPDSMap.pdType(opdet)=="xarapuca_vis")
+                lightPropTime = lightPropTimeVIS;
             float partPropTime = std::sqrt((fSpacePointX[sp]-fRecoVx)*(fSpacePointX[sp]-fRecoVx) + (fSpacePointY[sp]-fRecoVy)*(fSpacePointY[sp]-fRecoVy) + (fSpacePointZ[sp]-fRecoVz)*(fSpacePointZ[sp]-fRecoVz))/fSpeedOfLight;
             float PropTime = lightPropTime + partPropTime;
             if(PropTime < minPropTime) minPropTime = PropTime;

sbndcode/LightPropagationCorrection/LightPropagationCorrection_module.hh

@@ -145,7 +145,7 @@ private:
 
 
     geo::WireReadoutGeom const& fWireReadout = art::ServiceHandle<geo::WireReadout>()->Get();
-
+    opdet::sbndPDMapAlg fPDSMap;
     //Flash finder manager
     ::lightana::FlashFinderManager _mgr;
     ::lightana::FlashFinderManager _mgr_tpc0;

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