diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ccpi0_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ccpi0_overlay_detvar.sh
index 86986ab32..35079d57b 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ccpi0_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ccpi0_overlay_detvar.sh
@@ -115,23 +115,23 @@ horncur=""
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	flag_reboone="true"
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_intrinsic_nue_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_intrinsic_nue_overlay_detvar.sh
index 70d7dcb5e..1e233c46e 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_intrinsic_nue_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_intrinsic_nue_overlay_detvar.sh
@@ -108,33 +108,33 @@ fi
 sample_type='intrinsic_nue'
 flag_SaveLeeWeights="true"
 flag_numi="false"
-flag_redk2nu="false"
+flag_reboone="false"
 beam="bnb"
 horncur=""
 
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
-	flag_redk2nu="true"
+	flag_reboone="true"
 	echo "WARNING: Unable to establish DetVar type."
         echo "Setting this to tbe the CV sample."
         echo "Please check fhicls to ensure this is correct."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ncdelta_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ncdelta_overlay_detvar.sh
index d4dd22ef6..e210c81e6 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ncdelta_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ncdelta_overlay_detvar.sh
@@ -115,23 +115,23 @@ horncur=""
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	flag_reboone="true"
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ncpi0_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ncpi0_overlay_detvar.sh
index 73f7a9490..2acd34143 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ncpi0_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_ncpi0_overlay_detvar.sh
@@ -115,23 +115,23 @@ horncur=""
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
         flag_reboone="true"
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nu_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nu_overlay_detvar.sh
index 76e02ff9b..519eee62c 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nu_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nu_overlay_detvar.sh
@@ -115,23 +115,23 @@ horncur=""
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
         flag_reboone="true"
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nuwro_fakedata.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nuwro_fakedata.sh
index 422a1bafc..791ea6f71 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nuwro_fakedata.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_nuwro_fakedata.sh
@@ -122,8 +122,6 @@ 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.TimeBetweenBuckets: 18.936
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_single_photon_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_single_photon_overlay_detvar.sh
index e57a49502..4a0528c1c 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_single_photon_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_bnb_single_photon_overlay_detvar.sh
@@ -115,23 +115,23 @@ horncur=""
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
         flag_reboone="true"
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ccncpi0_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ccncpi0_overlay_detvar.sh
index 729789e8b..13088c80a 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ccncpi0_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ccncpi0_overlay_detvar.sh
@@ -114,23 +114,23 @@ horncur="_fhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ccpi0_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ccpi0_overlay_detvar.sh
index 412734f7d..7b8e0caae 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ccpi0_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ccpi0_overlay_detvar.sh
@@ -104,7 +104,7 @@ fi
 
 
 
-sample_type='ncpi0_overlay'
+sample_type='ccpi0_overlay'
 flag_SaveLeeWeights="false"
 flag_numi="true"
 flag_redk2nu="false"
@@ -114,23 +114,23 @@ horncur="_fhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_intrinsic_nue_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_intrinsic_nue_overlay_detvar.sh
index e1984f3cd..074643b49 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_intrinsic_nue_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_intrinsic_nue_overlay_detvar.sh
@@ -114,23 +114,23 @@ horncur="_fhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_kdar_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_kdar_overlay_detvar.sh
index 82e8e4627..f04b257c1 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_kdar_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_kdar_overlay_detvar.sh
@@ -114,23 +114,23 @@ horncur="_fhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ncpi0_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ncpi0_overlay_detvar.sh
index 412734f7d..ed4e2f194 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ncpi0_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_ncpi0_overlay_detvar.sh
@@ -114,23 +114,23 @@ horncur="_fhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nu_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nu_overlay_detvar.sh
index e2d2f3ea5..ff17a0ae7 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nu_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_fhc_nu_overlay_detvar.sh
@@ -114,23 +114,23 @@ horncur="_fhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ccncpi0_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ccncpi0_overlay_detvar.sh
index a59de91b7..a120e0d7e 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ccncpi0_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ccncpi0_overlay_detvar.sh
@@ -114,23 +114,23 @@ horncur="_rhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ccpi0_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ccpi0_overlay_detvar.sh
index 5e7e07397..640646e8e 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ccpi0_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ccpi0_overlay_detvar.sh
@@ -104,7 +104,7 @@ fi
 
 
 
-sample_type='ncpi0_overlay'
+sample_type='ccpi0_overlay'
 flag_SaveLeeWeights="false"
 flag_numi="true"
 flag_redk2nu="false"
@@ -114,23 +114,23 @@ horncur="_rhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_intrinsic_nue_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_intrinsic_nue_overlay_detvar.sh
index a446386c5..8b05fef72 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_intrinsic_nue_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_intrinsic_nue_overlay_detvar.sh
@@ -114,23 +114,23 @@ horncur="_rhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_kdar_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_kdar_overlay_detvar.sh
index 4151cdc86..fda4f9dac 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_kdar_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_kdar_overlay_detvar.sh
@@ -114,23 +114,23 @@ horncur="_rhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ncpi0_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ncpi0_overlay_detvar.sh
index 5e7e07397..31bfc682e 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ncpi0_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_ncpi0_overlay_detvar.sh
@@ -114,23 +114,23 @@ horncur="_rhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nu_overlay_detvar.sh b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nu_overlay_detvar.sh
index 19f764dde..9854ddc74 100755
--- a/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nu_overlay_detvar.sh
+++ b/ubana/MicroBooNEWireCell/utils/def_filetype_numi_rhc_nu_overlay_detvar.sh
@@ -114,23 +114,23 @@ horncur="_rhc"
 
 
 detvar_type="cv"
-if ls *reg4_SCE*.fcl 1> /dev/null 2>&1; then
+if ls *reg4_SCE*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_SCE" Stage0.fcl 2> /dev/null; then
 	detvar_type="SCE"
-elif ls *reg4_recombination*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_recombination*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_recombination" Stage0.fcl 2> /dev/null; then
         detvar_type="recombination"
-elif ls *wiremod_ScaleX*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleX*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleX" Stage0.fcl 2> /dev/null; then
         detvar_type="WMX"
-elif ls *wiremod_ScaleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMYZ"
-elif ls *wiremod_ScaleAngleYZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleYZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleYZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaYZ"
-elif ls *wiremod_ScaleAngleXZ*.fcl 1> /dev/null 2>&1; then
+elif ls *wiremod_ScaleAngleXZ*.fcl* 1> /dev/null 2>&1 || grep -ql "wiremod_ScaleAngleXZ" Stage0.fcl 2> /dev/null; then
         detvar_type="WMThetaXZ"
-elif ls *reg4_LY_reyliegh*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_reyliegh*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_reyliegh" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_reyliegh"
-elif ls *reg4_LY_suppression75*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_suppression75*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_suppression75" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_down"
-elif ls *reg4_LY_attenuation8m*.fcl 1> /dev/null 2>&1; then
+elif ls *reg4_LY_attenuation8m*.fcl* 1> /dev/null 2>&1 || grep -ql "reg4_LY_attenuation8m" Stage0.fcl 2> /dev/null; then
         detvar_type="LY_attenuation"
 else
 	echo "WARNING: Unable to establish DetVar type."
diff --git a/ubana/MicroBooNEWireCell/utils/fully_unified_reco2_wirecell.sh b/ubana/MicroBooNEWireCell/utils/fully_unified_reco2_wirecell.sh
index 36cde28aa..f30a64f0a 100755
--- a/ubana/MicroBooNEWireCell/utils/fully_unified_reco2_wirecell.sh
+++ b/ubana/MicroBooNEWireCell/utils/fully_unified_reco2_wirecell.sh
@@ -27,7 +27,7 @@ elif ls celltreeOVERLAY*.root 1> /dev/null 2>&1; then
       	isOVERLAY=1
 	data_type='OVERLAY'
         image_fail_check=2 #needed to recover the truth info for these events 
-        if ls *numi*.fcl 1> /dev/null 2>&1; then
+        if ls *numi*.fcl* 1> /dev/null 2>&1 || grep -ql "numi" Stage0.fcl 2> /dev/null; then
                 isNuMI=1
         fi
 else
diff --git a/ubana/MicroBooNEWireCell/utils/update_wcpf_port.sh b/ubana/MicroBooNEWireCell/utils/update_wcpf_port.sh
index 145a24f45..c8f82605a 100755
--- a/ubana/MicroBooNEWireCell/utils/update_wcpf_port.sh
+++ b/ubana/MicroBooNEWireCell/utils/update_wcpf_port.sh
@@ -32,7 +32,7 @@ flag_numi="false"
 if ls Physics*numi*.root 1> /dev/null 2>&1 || ls Beam*numi*.root 1> /dev/null 2>&1 ; then
         flag_numi="true"
         echo Running NuMI fhcl
-elif ls *numi*.fcl 1> /dev/null 2>&1; then
+elif ls *numi*.fcl* 1> /dev/null 2>&1 || grep -ql "numi" Stage0.fcl 2> /dev/null; then
         flag_numi="true"
         echo Running NuMI fhcl
 else