Merge branch 'release/v10_14_02_02'

kjplows · kjplows · commit d5369b4ca907 · 2026-01-28T12:33:13.000-06:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbncode VERSION 10.14.02.01 LANGUAGES CXX)
+project(sbncode VERSION 10.14.02.02 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 
diff --git a/sbncode/EventGenerator/MeVPrtl/Tools/BNBKaonGen_tool.cc b/sbncode/EventGenerator/MeVPrtl/Tools/BNBKaonGen_tool.cc
@@ -311,7 +311,7 @@ simb::MCFlux BNBKaonGen::MakeMCFlux(const bsim::BooNe &boone) {
                                       << std::endl;
   }
 
-  flux.fFluxType = simb::kDk2Nu;
+  flux.fFluxType = simb::kNtuple;
   flux.fnimpwt   = fBooneNtp.beamwgt;
   flux.fvx       = fBooneNtp.ini_pos[0][0]; //0
   flux.fvy       = fBooneNtp.ini_pos[0][1]; //0
diff --git a/sbncode/SBNEventWeight/Calculators/BNBFlux/FluxCalcPrep.cxx b/sbncode/SBNEventWeight/Calculators/BNBFlux/FluxCalcPrep.cxx
@@ -224,7 +224,7 @@ namespace sbn {
       }
 
       //or do the above 3 lines in one line
-//      auto const& mclist = *e.getValidHandle<std::vector<simb::MCTruth>>(fGeneratorModuleLabel);
+      auto const& mclist = *e.getValidHandle<std::vector<simb::MCTruth>>(fGeneratorModuleLabel);
 
       // If no neutrinos in this event, gives 0 weight;
       int NUni = fParameterSet.fNuniverses;
@@ -264,8 +264,8 @@ namespace sbn {
         }
 
         // Collect neutrino energy; mclist is replaced with fluxlist.
-//        double enu= mclist[inu].GetNeutrino().Nu().E();
         double enu= fluxlist[inu].fnenergyn;
+        if ( enu == -1 ) enu= mclist[inu].GetNeutrino().Nu().E(); //For MeVPrtl generator, not all MCFlux result in a neutrino, so equivalent neutrino energy is computed and saved as MCTruth
 
         //Let's make a weights based on the calculator you have requested 
 
diff --git a/ups/product_deps b/ups/product_deps
@@ -252,10 +252,10 @@ libdir	fq_dir		lib
 #
 ####################################
 product			version		qual	flags		<table_format=2>
-genie_xsec		v3_06_00	-
+genie_xsec		v3_06_02_sbn2	-
 larcv2			v2_2_6		-
 larsoft			v10_14_02_01	-
-sbnalg		        v10_14_02	-
+sbnalg		        v10_14_02_01	-
 sbndaq_artdaq_core	v1_10_06	-
 sbndata			v01_08		-
 systematicstools	v01_04_04	-
@@ -317,10 +317,10 @@ end_product_list
 #
 ####################################
 qualifier	larsoft		sbnalg		sbndaq_artdaq_core  genie_xsec              sbndata  larcv2           systematicstools  nusystematics   geant4reweight    notes
-c14:debug	c14:debug	c14:debug	c14:s131:debug     AR2320i00000:e1000:k250  -nq-     c14:debug:p3915  c14:debug	        c14:debug       c14:debug:s131	  -nq-
-c14:prof	c14:prof	c14:prof	c14:s131:prof      AR2320i00000:e1000:k250  -nq-     c14:p3915:prof   c14:prof          c14:prof	    c14:prof:s131     -nq-
-e26:debug	e26:debug	e26:debug	e26:s131:debug     AR2320i00000:e1000:k250  -nq-     debug:e26:p3915  e26:debug	        e26:debug	    e26:debug:s131    -nq-
-e26:prof	e26:prof	e26:prof	e26:s131:prof      AR2320i00000:e1000:k250  -nq-     e26:p3915:prof   e26:prof	        e26:prof	    e26:prof:s131     -nq-
+c14:debug	c14:debug	c14:debug	c14:s131:debug     AR2520i00000:e1000:k250  -nq-     c14:debug:p3915  c14:debug	        c14:debug       c14:debug:s131	  -nq-
+c14:prof	c14:prof	c14:prof	c14:s131:prof      AR2520i00000:e1000:k250  -nq-     c14:p3915:prof   c14:prof          c14:prof	    c14:prof:s131     -nq-
+e26:debug	e26:debug	e26:debug	e26:s131:debug     AR2520i00000:e1000:k250  -nq-     debug:e26:p3915  e26:debug	        e26:debug	    e26:debug:s131    -nq-
+e26:prof	e26:prof	e26:prof	e26:s131:prof      AR2520i00000:e1000:k250  -nq-     e26:p3915:prof   e26:prof	        e26:prof	    e26:prof:s131     -nq-
 end_qualifier_list
 ####################################
 

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ simb::MCFlux BNBKaonGen::MakeMCFlux(const bsim::BooNe &boone) {`
`311`	`311`	`<< std::endl;`
`312`	`312`	`}`
`313`	`313`
`314`		`- flux.fFluxType = simb::kDk2Nu;`
	`314`	`+ flux.fFluxType = simb::kNtuple;`
`315`	`315`	`flux.fnimpwt = fBooneNtp.beamwgt;`
`316`	`316`	`flux.fvx = fBooneNtp.ini_pos[0][0]; //0`
`317`	`317`	`flux.fvy = fBooneNtp.ini_pos[0][1]; //0`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ namespace sbn {`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`//or do the above 3 lines in one line`
`227`		`-// auto const& mclist = *e.getValidHandle<std::vector<simb::MCTruth>>(fGeneratorModuleLabel);`
	`227`	`+ auto const& mclist = *e.getValidHandle<std::vector<simb::MCTruth>>(fGeneratorModuleLabel);`
`228`	`228`
`229`	`229`	`// If no neutrinos in this event, gives 0 weight;`
`230`	`230`	`int NUni = fParameterSet.fNuniverses;`
`@@ -264,8 +264,8 @@ namespace sbn {`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`// Collect neutrino energy; mclist is replaced with fluxlist.`
`267`		`-// double enu= mclist[inu].GetNeutrino().Nu().E();`
`268`	`267`	`double enu= fluxlist[inu].fnenergyn;`
	`268`	`+ if ( enu == -1 ) enu= mclist[inu].GetNeutrino().Nu().E(); //For MeVPrtl generator, not all MCFlux result in a neutrino, so equivalent neutrino energy is computed and saved as MCTruth`
`269`	`269`
`270`	`270`	`//Let's make a weights based on the calculator you have requested`
`271`	`271`