Skip to content

Fix conflicts with new larsim version #817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asanchezcastillo merged 2 commits into from
Sep 16, 2025
Merged

Fix conflicts with new larsim version #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cda7c1
Fix conflicts with new larsim version
asanchezcastillo Sep 16, 2025
960984e
Merge branch 'develop' into bugfix/acastill_bfm_larsim
asanchezcastillo Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sbndcode/TPCPMTBarycenterMatching/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ set( MODULE_LIBRARIES
larreco::Calorimetry
larsim::PhotonPropagation
larsim::PhotonPropagation_PhotonVisibilityService_service
larsim::OpticalPath
lardata::Utilities
nusimdata::SimulationBase
nurandom::RandomUtils_NuRandomService_service
Expand Down
7 changes: 5 additions & 2 deletions sbndcode/TPCPMTBarycenterMatching/TPCPMTBarycenterMatching_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Principal/Run.h"
#include "art/Framework/Principal/SubRun.h"
#include "art/Utilities/make_tool.h"
#include "canvas/Utilities/InputTag.h"
#include "fhiclcpp/ParameterSet.h"
#include "messagefacility/MessageLogger/MessageLogger.h"
Expand All @@ -40,6 +41,7 @@
#include "larcore/Geometry/WireReadout.h"
#include "larcorealg/Geometry/GeometryCore.h"
#include "larsim/PhotonPropagation/SemiAnalyticalModel.h"
#include "larsim/PhotonPropagation/OpticalPathTools/OpticalPath.h"
#include "larcore/CoreUtils/ServiceUtil.h"
#include "sbndcode/OpDetSim/sbndPDMapAlg.hh"

Expand Down Expand Up @@ -289,6 +291,7 @@ class TPCPMTBarycenterMatchProducer : public art::EDProducer {
std::unique_ptr<phot::SemiAnalyticalModel> _semi_model;
fhicl::ParameterSet _vuv_params;
fhicl::ParameterSet _vis_params;
std::shared_ptr<phot::OpticalPath> _optical_path_tool;

};

Expand Down Expand Up @@ -384,8 +387,8 @@ TPCPMTBarycenterMatchProducer::TPCPMTBarycenterMatchProducer(fhicl::ParameterSet

_vuv_params = p.get<fhicl::ParameterSet>("VUVHits");
_vis_params = p.get<fhicl::ParameterSet>("VIVHits");
_semi_model = std::make_unique<phot::SemiAnalyticalModel>(_vuv_params, _vis_params, true, false);

_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);
}

void TPCPMTBarycenterMatchProducer::produce(art::Event& e)
Expand Down
2 changes: 2 additions & 0 deletions sbndcode/TPCPMTBarycenterMatching/job/sbnd_tpcpmt3dbarycentermatching_config.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "opticalsimparameterisations_sbnd.fcl"
#include "digi_pmt_sbnd.fcl"
#include "calorimetry_sbnd.fcl"
#include "sbndopticalpath_tool.fcl"

BEGIN_PROLOG

Expand All @@ -24,6 +25,7 @@ TPCPMTBarycenterMatchProducer:
ZError: 23 // cm
AngleError: 27 // deg
FlashVetoWindow: [-1500000,1500000] // ns
OpticalPathTool: @local::SBNDOpticalPath
module_type: "TPCPMTBarycenterMatchProducer"
}

Expand Down