Merge branch 'develop' into bugfix/yz_nonuniformity

Author: nathanielerowe

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl

@@ -24,6 +24,8 @@ physics.producers.pandoraTrackRange.TrackLabel: "pandoraSCETrack"
 
 physics.producers.cafmaker.FlashMatchOpDetSuffixes: ["", "op", "ara", "opara"]
 physics.producers.cafmaker.FlashMatchSCECryoSuffixes: ["SCE"]
+physics.producers.cafmaker.TrackHitFillRRStartCut: 1000
+physics.producers.cafmaker.TrackHitFillRREndCut: 1000
 
 physics.producers.pandoraShowerSelectionVars.PandoraLabel: "pandoraSCE"
 physics.producers.pandoraShowerSelectionVars.ShowerLabel:  "pandoraSCEShowerSBN"

sbndcode/TPCPMTBarycenterMatching/CMakeLists.txt

@@ -1,12 +1,16 @@
 set(	MODULE_LIBRARIES
  			sbnobj::Common_Trigger
+			sbndcode_OpDetSim
             larcorealg::Geometry
 			larcore::Geometry_Geometry_service
 			lardataobj::RecoBase
 			lardataobj::Simulation
 			larcoreobj::SummaryData
 			larana::OpticalDetector_OpHitFinder
 			larreco::Calorimetry
+			larsim::PhotonPropagation
+            larsim::PhotonPropagation_PhotonVisibilityService_service
+			larsim::OpticalPath
 			lardata::Utilities
 			nusimdata::SimulationBase
 			nurandom::RandomUtils_NuRandomService_service
@@ -31,6 +35,7 @@ set(	MODULE_LIBRARIES
 			ROOT::FFTW
 			ROOT::Core
             ROOT::Tree
+			Eigen3::Eigen
 )
 
 cet_build_plugin(TPCPMTBarycenterMatchProducer art::module SOURCE TPCPMTBarycenterMatching_module.cc LIBRARIES ${MODULE_LIBRARIES})