Merge pull request #621 from SBNSoftware/bugfix/fluxweight_for_mevprtl

kjplows · web-flow · commit 546ecf47d290 · 2026-01-28T19:38:49.000+02:00
Bugfix for FluxWeight and MeVPrtl
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 
 

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`