diff --git a/data_matching/result/Compare_BJpsi_default.root b/data_matching/result/Compare_BJpsi_default.root
new file mode 100644
index 0000000..77dc41e
Binary files /dev/null and b/data_matching/result/Compare_BJpsi_default.root differ
diff --git a/data_matching/result/Compare_BJpsi_default2filter.root b/data_matching/result/Compare_BJpsi_default2filter.root
new file mode 100644
index 0000000..ae40618
Binary files /dev/null and b/data_matching/result/Compare_BJpsi_default2filter.root differ
diff --git a/data_matching/result/PrChecker_BJpsi_default.root b/data_matching/result/PrChecker_BJpsi_default.root
new file mode 100644
index 0000000..370022b
Binary files /dev/null and b/data_matching/result/PrChecker_BJpsi_default.root differ
diff --git a/data_matching/result/PrChecker_BJpsi_default2filter.root b/data_matching/result/PrChecker_BJpsi_default2filter.root
new file mode 100644
index 0000000..19613f8
Binary files /dev/null and b/data_matching/result/PrChecker_BJpsi_default2filter.root differ
diff --git a/moore_options/get_calo_data.py b/moore_options/get_calo_data.py
index ad17bc4..aa5d4b9 100644
--- a/moore_options/get_calo_data.py
+++ b/moore_options/get_calo_data.py
@@ -126,8 +126,8 @@ def standalone_hlt2_fastest_reco():
         track_type: hlt2_tracks[track_type] for track_type in out_track_types["Best"]
     }
 
-    # data = [calo_long, calo_matched_seeds, electron_matched_seeds, shower_matched_seeds]
-    data = [shower_matched_seeds]
+    data = [calo_long, calo_matched_seeds, electron_matched_seeds, shower_matched_seeds]
+    # data = [shower_matched_seeds]
     types_and_locations_for_checkers = {
         "Forward": hlt2_tracks["Forward"],
         "Seed": hlt2_tracks["Seed"],
diff --git a/moore_options/get_calo_data_reproduce.py b/moore_options/get_calo_data_reproduce.py
index 0833225..57f33d7 100644
--- a/moore_options/get_calo_data_reproduce.py
+++ b/moore_options/get_calo_data_reproduce.py
@@ -43,15 +43,26 @@ def standalone_hlt2_fastest_reco():
     hlt2_tracks = make_hlt2_tracks(light_reco=True, fast_reco=False, use_pr_kf=True)
 
     digisEcal = make_digits(calo_raw_bank=False)["digitsEcal"]
+    ecalClusters = make_clusters(digisEcal)
     tracks_v3, trackrels = convert_tracks_to_v3_from_v1(
         hlt2_tracks["Seed"]["v1"],
         track_types=["Ttrack"],
     )
     # track acceptances
     tracks_incalo = make_acceptance(tracks_v3)
+    tcmatches = make_track_cluster_matching(ecalClusters, tracks_incalo)
+    PhElOutput = make_photons_and_electrons(
+        ecalClusters, tcmatches["combined"], make_all_pvs()["v3"]
+    )
+    photons = PhElOutput["photons"]
+    electrons = PhElOutput["electrons"]
 
     eshower = make_trackbased_eshower(tracks_incalo, digisEcal)
 
+    tcmatches_e = make_track_electron_and_brem_matching(
+        tracks_incalo, tcmatches, digisEcal, electrons, photons
+    )
+
     # should be best; shape of shower etc; E/p statt chi2; DLL even better? GET(1)
     # Cut=F.FILTER(F.ALL)).Output
     shower_matched_seeds = PrFilterTracks2ElectronShower(
@@ -78,9 +89,16 @@ def standalone_hlt2_fastest_reco():
         SeedTracksLocation=matched_seeds["v1"],
     ).OutputTracksLocation
 
+    out_track_types = get_default_out_track_types_for_light_reco()
+    best_tracks = {
+        track_type: hlt2_tracks[track_type] for track_type in out_track_types["Best"]
+    }
+
     data = [calo_long, shower_matched_seeds]
     types_and_locations_for_checkers = {
-        "Match": match_tracks,
+        "Forward": hlt2_tracks["Forward"],
+        "Seed": hlt2_tracks["Seed"],
+        "Match": match_tracks,  # hlt2_tracks["Match"],
     }
     data += get_track_checkers(types_and_locations_for_checkers)
     # data += get_fitted_tracks_checkers(best_tracks)