move check earlier

2 files changed, 12 insertions, 10 deletions

diff --git a/utils/chi2 b/utils/chi2
index f86eb35..bd848ba 100755
--- a/utils/chi2
+++ b/utils/chi2
@@ -526,6 +526,12 @@ if __name__ == '__main__':
     for filename in args.mc:
         ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, mc=True))
     ev_mc = pd.concat([ev_mc for ev_mc in ev_mcs if len(ev_mc) > 0]).reset_index()
+
+    if (~rhdr.run.isin(ev_mc.run)).any():
+        print_warning("Error! The following runs have no Monte Carlo: %s" % \
+            np.unique(rhdr.run[~rhdr.run.isin(ev_mc.run)].values))
+        sys.exit(1)
+
     muon_mc = get_events(args.muon_mc, merge_fits=True, nhit_thresh=args.nhit_thresh, mc=True)
     weights = pd.concat([read_hdf(filename, "weights") for filename in args.weights],ignore_index=True)
 
@@ -624,11 +630,6 @@ 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" % \
-            np.unique(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)]
 
diff --git a/utils/dm-search b/utils/dm-search
index b0812f0..b553035 100755
--- a/utils/dm-search
+++ b/utils/dm-search
@@ -605,6 +605,12 @@ if __name__ == '__main__':
     for filename in args.mc:
         ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, mc=True))
     ev_mc = pd.concat([ev_mc for ev_mc in ev_mcs if len(ev_mc) > 0]).reset_index()
+
+    if (~rhdr.run.isin(ev_mc.run)).any():
+        print_warning("Error! The following runs have no Monte Carlo: %s" % \
+            np.unique(rhdr.run[~rhdr.run.isin(ev_mc.run)].values))
+        sys.exit(1)
+
     muon_mc = get_events(args.muon_mc, merge_fits=True, nhit_thresh=args.nhit_thresh, mc=True)
     weights = pd.concat([read_hdf(filename, "weights") for filename in args.weights],ignore_index=True)
 
@@ -690,11 +696,6 @@ 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" % \
-            np.unique(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)]