diff --git a/ubana/CombinedReco/run_combinedrecotree_overlay_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_overlay_nuwro.fcl
new file mode 100644
index 000000000..48569f6d9
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_overlay_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_overlay.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_overlay_sce_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_overlay_sce_nuwro.fcl
new file mode 100644
index 000000000..07584eca9
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_overlay_sce_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_overlay_sce.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run1_overlay_numi_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run1_overlay_numi_nuwro.fcl
new file mode 100644
index 000000000..2cd49e115
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run1_overlay_numi_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run1_overlay_numi.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run1_overlay_numi_sce_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run1_overlay_numi_sce_nuwro.fcl
new file mode 100644
index 000000000..73f08685a
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run1_overlay_numi_sce_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run1_overlay_numi_sce.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run3_altLArPIDWeights_overlay_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run3_altLArPIDWeights_overlay_nuwro.fcl
new file mode 100644
index 000000000..4baa0b7a9
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run3_altLArPIDWeights_overlay_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run3_altLArPIDWeights_overlay.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run3_altLArPIDWeights_overlay_sce_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run3_altLArPIDWeights_overlay_sce_nuwro.fcl
new file mode 100644
index 000000000..dd2a4e2a8
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run3_altLArPIDWeights_overlay_sce_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run3_altLArPIDWeights_overlay_sce.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run3_normLArPIDWeights_overlay_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run3_normLArPIDWeights_overlay_nuwro.fcl
new file mode 100644
index 000000000..bbdf2b60d
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run3_normLArPIDWeights_overlay_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run3_normLArPIDWeights_overlay.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run3_normLArPIDWeights_overlay_sce_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run3_normLArPIDWeights_overlay_sce_nuwro.fcl
new file mode 100644
index 000000000..c890a3da1
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run3_normLArPIDWeights_overlay_sce_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run3_normLArPIDWeights_overlay_sce.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run3_overlay_numi_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run3_overlay_numi_nuwro.fcl
new file mode 100644
index 000000000..42ad7f4fe
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run3_overlay_numi_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run3_overlay_numi.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run3_overlay_numi_sce_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run3_overlay_numi_sce_nuwro.fcl
new file mode 100644
index 000000000..5a0349944
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run3_overlay_numi_sce_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run3_overlay_numi_sce.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run3_overlay_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run3_overlay_nuwro.fcl
new file mode 100644
index 000000000..4af1a85e9
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run3_overlay_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run3_overlay.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run3_overlay_sce_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run3_overlay_sce_nuwro.fcl
new file mode 100644
index 000000000..29d61b50e
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run3_overlay_sce_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run3_overlay_sce.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run4_overlay_numi_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run4_overlay_numi_nuwro.fcl
new file mode 100644
index 000000000..516fa2d16
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run4_overlay_numi_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run4_overlay_numi.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/CombinedReco/run_combinedrecotree_run4_overlay_nuwro.fcl b/ubana/CombinedReco/run_combinedrecotree_run4_overlay_nuwro.fcl
new file mode 100644
index 000000000..1676cf3aa
--- /dev/null
+++ b/ubana/CombinedReco/run_combinedrecotree_run4_overlay_nuwro.fcl
@@ -0,0 +1,4 @@
+#include "run_combinedrecotree_run4_overlay.fcl"
+physics.filters.nuselection.AnalysisTools.default.ignoreMCFlux: true
+physics.filters.nuselection.AnalysisTools.default.ignoreGTruth: true
+physics.filters.singlephotonana.isTextGen: true
diff --git a/ubana/MicroBooNEWireCell/WireCellAnaTree_module.cc b/ubana/MicroBooNEWireCell/WireCellAnaTree_module.cc
index 2b9e35b2c..c0ab929af 100644
--- a/ubana/MicroBooNEWireCell/WireCellAnaTree_module.cc
+++ b/ubana/MicroBooNEWireCell/WireCellAnaTree_module.cc
@@ -259,6 +259,7 @@ class WireCellAnaTree : public art::EDAnalyzer {
   bool f_get_spill_time;
   bool f_get_redk2nu_time;
   bool f_get_reboone_time;
+  bool f_no_mcflux;
 
   // LArPID and MC backtracking (from LANTERN) options:
   bool fRunLArPID; //run LArPID network over reco particles
@@ -2066,6 +2067,7 @@ void WireCellAnaTree::reconfigure(fhicl::ParameterSet const& pset)
   f_get_spill_time = pset.get<bool>("get_spill_time", false);
   f_get_reboone_time = pset.get<bool>("get_reboone_time", false);
   f_get_redk2nu_time = pset.get<bool>("get_redk2nu_time", false);
+  f_no_mcflux = pset.get<bool>("no_mcflux", false);
   fTimeBetweenBuckets     = pset.get<float>("TimeBetweenBuckets",1e9/53.103e6);
   fBucketTimeSigma        = pset.get<float>("BucketTimeSigma",0.750);
   fNBucketsPerBatch       = pset.get<int>("NBucketsPerBatch",84);
@@ -4998,13 +5000,13 @@ void WireCellAnaTree::analyze(art::Event const& e)
             }
           }//f_get_reboone_time
 
-          else if(f_get_spill_time){  
+          else if(f_get_spill_time && !f_no_mcflux){ 
             propegation_time = (f_mcflux_dk2gen+f_mcflux_gen2vtx+f_mcflux_vx/100)*100*0.033356;
           }
 
           f_cor_nu_time = propegation_time + decay_time + spill_time;
-	        f_cor_nu_time_nospill = propegation_time + decay_time;
-	        f_cor_nu_time_spill = spill_time;
+	  f_cor_nu_time_nospill = propegation_time + decay_time;
+	  f_cor_nu_time_spill = spill_time;
           f_cor_nu_deltatime = f_cor_nu_time - f_truth_nu_pos[3];
 
           std::cout<<"Origional nu time "<<f_truth_nu_pos[3]<<" Corrected nu Time: "<<f_cor_nu_time<<"  spill time: "<<spill_time<<"  decay time: "<<decay_time<<"  propegation time: "<<propegation_time<<std::endl;
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nuwro_fakedata.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nuwro_fakedata.sh
index f813068f3..422a1bafc 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nuwro_fakedata.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nuwro_fakedata.sh
@@ -59,11 +59,12 @@ echo $run_number
 
 
 FT_STREAM="run1"
-
+BucketTimeSigma='1.3'
 if [ "$run_number" -ge "3420"  ] && [  "8316" -ge "$run_number"  ];    # in the run1 run number interval
 then
         echo "run run1 fhicl"
         FT_STREAM="run1"
+        BucketTimeSigma="2.8"
 elif [ "$run_number" -ge "0008317"  ] && [  "0011048" -ge "$run_number"  ];   # in the run2 run number interval
 then
         echo "run run2a fhicl"
@@ -123,6 +124,15 @@ physics.analyzers.wcpselection.ssmBDT:               ${flag_numi}
 
 physics.analyzers.wcpselection.get_redk2nu_time:     ${flag_numi}
 
+physics.analyzers.wcpselection.no_mcflux:     true
+physics.analyzers.wcpselection.get_spill_time:     true
+physics.analyzers.wcpselection.TimeBetweenBuckets: 18.936
+physics.analyzers.wcpselection.BucketTimeSigma: ${BucketTimeSigma}
+physics.analyzers.wcpselection.NBucketsPerBatch: 84
+physics.analyzers.wcpselection.NFilledBucketsPerBatch: 81
+physics.analyzers.wcpselection.BatchIntensities: [1]
+
+
 physics.analyzers.wcpselection.SaveLeeWeights:       ${flag_SaveLeeWeights}
 physics.analyzers.wcpweights.SaveLeeWeights:         ${flag_SaveLeeWeights}
 
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nu_overlay.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nu_overlay.sh
index f6094546c..edcddaa49 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nu_overlay.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nu_overlay.sh
@@ -116,7 +116,8 @@ physics.analyzers.wcpweights.IsNuMI:                 ${flag_numi}
 
 physics.analyzers.wcpselection.ssmBDT:               ${flag_numi}
 
-physics.analyzers.wcpselection.get_redk2nu_time:     ${flag_numi}
+physics.analyzers.wcpselection.no_mcflux: true
+physics.analyzers.wcpselection.get_spill_time: true
 
 physics.analyzers.wcpselection.SaveLeeWeights:       ${flag_SaveLeeWeights}
 physics.analyzers.wcpweights.SaveLeeWeights:         ${flag_SaveLeeWeights}
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nuwro_fakedata.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nuwro_fakedata.sh
index af02d2d6a..14c391f7a 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nuwro_fakedata.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nuwro_fakedata.sh
@@ -121,7 +121,8 @@ physics.analyzers.wcpweights.IsNuMI:                 ${flag_numi}
 
 physics.analyzers.wcpselection.ssmBDT:               ${flag_numi}
 
-physics.analyzers.wcpselection.get_redk2nu_time:     ${flag_numi}
+physics.analyzers.wcpselection.no_mcflux:     true
+physics.analyzers.wcpselection.get_spill_time:     true
 
 physics.analyzers.wcpselection.SaveLeeWeights:       ${flag_SaveLeeWeights}
 physics.analyzers.wcpweights.SaveLeeWeights:         ${flag_SaveLeeWeights}
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nu_overlay.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nu_overlay.sh
index 5f6fef134..2de7d4c1f 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nu_overlay.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nu_overlay.sh
@@ -118,6 +118,9 @@ physics.analyzers.wcpselection.ssmBDT:               ${flag_numi}
 
 physics.analyzers.wcpselection.get_redk2nu_time:     ${flag_numi}
 
+physics.analyzers.wcpselection.no_mcflux: true
+physics.analyzers.wcpselection.get_spill_time: true
+
 physics.analyzers.wcpselection.SaveLeeWeights:       ${flag_SaveLeeWeights}
 physics.analyzers.wcpweights.SaveLeeWeights:         ${flag_SaveLeeWeights}
 
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nuwro_fakedata.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nuwro_fakedata.sh
index 2c040c034..11bd285c5 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nuwro_fakedata.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nuwro_fakedata.sh
@@ -121,7 +121,8 @@ physics.analyzers.wcpweights.IsNuMI:                 ${flag_numi}
 
 physics.analyzers.wcpselection.ssmBDT:               ${flag_numi}
 
-physics.analyzers.wcpselection.get_redk2nu_time:     ${flag_numi}
+physics.analyzers.wcpselection.no_mcflux:     true
+physics.analyzers.wcpselection.get_spill_time:     true
 
 physics.analyzers.wcpselection.SaveLeeWeights:       ${flag_SaveLeeWeights}
 physics.analyzers.wcpweights.SaveLeeWeights:         ${flag_SaveLeeWeights}
diff --git a/ubana/searchingfornues/Selection/AnalysisTools/DefaultAnalysis_tool.cc b/ubana/searchingfornues/Selection/AnalysisTools/DefaultAnalysis_tool.cc
index cec3d231a..9c3d12271 100755
--- a/ubana/searchingfornues/Selection/AnalysisTools/DefaultAnalysis_tool.cc
+++ b/ubana/searchingfornues/Selection/AnalysisTools/DefaultAnalysis_tool.cc
@@ -130,6 +130,7 @@ class DefaultAnalysis : public AnalysisToolBase
 
   bool fMakeNuMINtuple;
   bool fIgnoreMCFlux;
+  bool fIgnoreGTruth;
 
   const int k_nu_e_other = 1;
   const int k_nu_e_cc0pi0p = 10;
@@ -374,6 +375,7 @@ DefaultAnalysis::DefaultAnalysis(const fhicl::ParameterSet &p)
 
   fMakeNuMINtuple = p.get<bool>("makeNuMINtuple", false);
   fIgnoreMCFlux = p.get<bool>("ignoreMCFlux", false);
+  fIgnoreGTruth = p.get<bool>("ignoreGTruth", false);
   NuMIOpFilterProd = p.get<std::string>("NuMIOpFiltProcName","");
   NuMISWTrigProd   = p.get<std::string>("NuMISWTriggerProcName","" );
 }
@@ -1470,7 +1472,11 @@ void DefaultAnalysis::SaveTruth(art::Event const &e)
 {
 
   // load GTruth
-  auto const &gt_h = e.getValidHandle<std::vector<simb::GTruth>>(fMCTproducer);
+  if(!fIgnoreGTruth){
+    auto const &gt_h = e.getValidHandle<std::vector<simb::GTruth>>(fMCTproducer);
+    auto gt = gt_h->at(0);
+    _resid = gt.fResNum;
+  }  
 
   // load MCTruth
   auto const &mct_h = e.getValidHandle<std::vector<simb::MCTruth>>(fMCTproducer);
@@ -1529,9 +1535,6 @@ void DefaultAnalysis::SaveTruth(art::Event const &e)
     }// if flux handle is valid
   }// if ignore MCFlux is false
   
-  auto gt = gt_h->at(0);
-  _resid = gt.fResNum;
-
   auto mct = mct_h->at(0);
   if (mct.NeutrinoSet()){ // NeutrinoSet(): whether the neutrino information has been set
     auto neutrino = mct.GetNeutrino();