diff options
| -rwxr-xr-x | utils/chi2 | 15 | ||||
| -rwxr-xr-x | utils/dm-search | 15 |
2 files changed, 16 insertions, 14 deletions
@@ -560,6 +560,14 @@ 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) + + if not args.pull and not args.coverage: + 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] @@ -742,13 +750,6 @@ 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']) diff --git a/utils/dm-search b/utils/dm-search index cbc4f8c..2679d53 100755 --- a/utils/dm-search +++ b/utils/dm-search @@ -631,6 +631,14 @@ 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) + + if not args.pull and not args.test: + 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] @@ -766,13 +774,6 @@ 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)] - limits, best_fit, discovery_array = get_limits(DM_MASSES,data,muon,data_mc,atmo_scale_factor,muon_scale_factor,bins,args.steps,args.print_nll,args.walkers,args.thin) fig = plt.figure() |