g4reweight bugfix and temporary parameter storage

* Placeholder for sampled parameter storage, for CAF compatibility.
* Renamed fcl for consistency

Author: mastbaum

fcl/caf/cafmaker_common_defs.fcl

@@ -1,3 +1,4 @@
+#include "eventweight_geant4_sbn.fcl"
 #include "eventweight_genie_sbn.fcl"
 #include "eventweight_flux_sbn.fcl"
 
@@ -15,6 +16,7 @@ cafmaker_common_producers: {
   rns: { module_type: "RandomNumberSaver" }
   genieweight: @local::sbn_eventweight_genie
   fluxweight: @local::sbn_eventweight_flux  
+  geant4weight: @local::sbn_eventweight_geant4
 }
 
 END_PROLOG

sbncode/SBNEventWeight/Calculators/Geant4/Geant4WeightCalc.cxx

@@ -165,6 +165,8 @@ void Geant4WeightCalc::Configure(fhicl::ParameterSet const& p,
   std::vector<double> FitParSigmas;
   std::map<std::string, double> theNominals;
 
+  fParameterSet.Configure(GetFullName(), mode, fNsims);
+
   for (size_t i_parset=0; i_parset<n_parsets; ++i_parset){
     fhicl::ParameterSet theSet = FitParSets.at(i_parset);
     std::string theName = theSet.get<std::string>("Name");
@@ -176,6 +178,8 @@ void Geant4WeightCalc::Configure(fhicl::ParameterSet const& p,
     FitParSigmas.push_back(theSigma);
 
     theNominals[theName] = theNominal;
+
+    fParameterSet.AddParameter(theName, theSigma);
   }
 
   if (mode=="pm1sigma"){
@@ -240,7 +244,7 @@ std::vector<float> Geant4WeightCalc::GetWeight(art::Event& e, size_t itruth ) {
 
   // Initialize weight vector for this MCTruth
   weight.clear();
-  weight.resize(1.0);
+  weight.resize(fNsims, 1.0);
 
   // Loop over MCParticles in the event
   auto const& mcparticles = truthParticles.at(itruth);
@@ -431,7 +435,6 @@ std::vector<float> Geant4WeightCalc::GetWeight(art::Event& e, size_t itruth ) {
         ParMaker->SetNewVals(UniverseVals.at(j));
         theReweighter->SetNewHists(ParMaker->GetFSHists());
         theReweighter->SetNewElasticHists(ParMaker->GetElasticHist());
-
         //Get the weight from the G4ReweightTraj
         w = theReweighter->GetWeight( &theTraj );
         // Total weight is the product of track weights in the event

…/jobs/geant4/eventweight_g4rwt_reint.fcl …t/jobs/geant4/eventweight_geant4_sbn.fclsbncode/SBNEventWeight/jobs/geant4/eventweight_g4rwt_reint.fcl renamed to sbncode/SBNEventWeight/jobs/geant4/eventweight_geant4_sbn.fcl sbncode/SBNEventWeight/jobs/geant4/eventweight_g4rwt_reint.fcl renamed to sbncode/SBNEventWeight/jobs/geant4/eventweight_geant4_sbn.fcl

@@ -15,7 +15,9 @@
 #include "piminus_reweight_parameters.fcl"
 #include "proton_reweight_parameters.fcl"
 
-geant4weight_sbn: {
+BEGIN_PROLOG
+
+sbn_eventweight_geant4: {
   module_type: "SBNEventWeight"
   AllowMissingTruth: true
   min_weight: 0.0
@@ -97,3 +99,5 @@ geant4weight_sbn: {
 #   variation)
 ###
 
+END_PROLOG
+