Skip to content

Commit 72cf2bb

Browse files
committed
Merge branch 'feature/mdeltutt_fluxweight_g4bnb' of github.com:SBNSoftware/sbncode into feature/mdeltutt_fluxweight_g4bnb
2 parents 2a55bc4 + c822bec commit 72cf2bb

79 files changed

Lines changed: 4807 additions & 2561 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
1717

1818
find_package(cetmodules 3.20.00 REQUIRED)
19-
project(sbncode VERSION 10.06.00.01 LANGUAGES CXX)
19+
project(sbncode VERSION 10.14.00 LANGUAGES CXX)
2020

2121
message(STATUS "\n\n ========================== ${PROJECT_NAME} ==========================")
2222

@@ -40,6 +40,7 @@ cet_report_compiler_flags(REPORT_THRESHOLD VERBOSE)
4040

4141
# these are minimum required versions, not the actual product versions
4242
find_package( art REQUIRED )
43+
find_package( Eigen3 REQUIRED)
4344
find_package( messagefacility REQUIRED )
4445
find_package( art_root_io REQUIRED )
4546
find_package( nusimdata REQUIRED )
@@ -77,6 +78,7 @@ find_package( CLHEP REQUIRED )
7778
find_package( ROOT REQUIRED )
7879
find_package( Geant4 REQUIRED )
7980
find_package( Boost COMPONENTS system filesystem REQUIRED )
81+
find_package( geant4reweight REQUIRED )
8082

8183
# macros for dictionary and simple_plugin
8284
include(ArtDictionary)

fcl/caf/cafmaker_common_defs.fcl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "eventweight_geant4_sbn.fcl"
12
#include "eventweight_genie_sbn.fcl"
23
#include "eventweight_flux_sbn.fcl"
34

@@ -15,6 +16,7 @@ cafmaker_common_producers: {
1516
rns: { module_type: "RandomNumberSaver" }
1617
genieweight: @local::sbn_eventweight_genie
1718
fluxweight: @local::sbn_eventweight_flux
19+
geant4weight: @local::sbn_eventweight_geant4
1820
}
1921

2022
END_PROLOG

0 commit comments

Comments
 (0)