Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ubana/CombinedReco/run_combinedrecotree_overlay_nuwro.fcl
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions ubana/CombinedReco/run_combinedrecotree_overlay_sce_nuwro.fcl
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
8 changes: 5 additions & 3 deletions ubana/MicroBooNEWireCell/WireCellAnaTree_module.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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","" );
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down