aboutsummaryrefslogtreecommitdiff
path: root/utils/chi2
diff options
context:
space:
mode:
Diffstat (limited to 'utils/chi2')
-rwxr-xr-xutils/chi216
1 files changed, 7 insertions, 9 deletions
diff --git a/utils/chi2 b/utils/chi2
index d493741..1e7400e 100755
--- a/utils/chi2
+++ b/utils/chi2
@@ -560,18 +560,9 @@ if __name__ == '__main__':
#muon = ev[ev.muon & ev.prompt & ~ev.atm]
#muon_atm = ev[ev.muon & ev.prompt & ev.atm]
- if (~rhdr.run.isin(ev_mc.run)).any():
- print_warning("Error! The following runs have no Monte Carlo: %s" % \
- rhdr.run[~rhdr.run.isin(ev_mc.run)].values)
- sys.exit(1)
-
- ev_mc = ev_mc[ev_mc.run.isin(rhdr.run)]
-
data_mc = ev_mc[ev_mc.signal & ev_mc.prompt & ~ev_mc.atm]
data_atm_mc = ev_mc[ev_mc.signal & ev_mc.prompt & ev_mc.atm]
- data_mc = ev_mc[ev_mc.signal & ev_mc.prompt & ~ev_mc.atm]
-
bins = np.logspace(np.log10(20),np.log10(10e3),21)
atmo_scale_factor = 100.0
@@ -751,6 +742,13 @@ if __name__ == '__main__':
sys.exit(0)
+ if (~rhdr.run.isin(ev_mc.run)).any():
+ print_warning("Error! The following runs have no Monte Carlo: %s" % \
+ rhdr.run[~rhdr.run.isin(ev_mc.run)].values)
+ sys.exit(1)
+
+ data_mc = data_mc[data_mc.run.isin(rhdr.run)]
+
xopt, universe, samples = do_fit(data,muon,data_mc,weights,atmo_scale_factor,muon_scale_factor,bins,args.steps,args.print_nll,args.walkers,args.thin)
data_mc_with_weights = pd.merge(data_mc,weights[weights.universe == universe],how='left',on=['run','evn'])