Merge branch 'master' of ssh://github.com/HenryDayHall/jetTools

jet_tools/CompareClusters.py

@@ -33,6 +33,8 @@ def get_best(eventWise, jet_class):
         name of the best_scoring jet
 
     """
+    # AveSignalMassRatio is less than one, higher is better
+    # AveBGMassRatio is less than one, lower is better
     scored_names = [name.split('_', 1)[0] for name in eventWise.hyperparameter_columns
                     if jet_class in name and name.endswith("AveSignalMassRatio")]
     score = np.fromiter((getattr(eventWise, name+"_AveSignalMassRatio")
@@ -624,13 +626,17 @@ def get_detectable_comparisons(eventWise, jet_name, jet_idxs, append=False):
     content[jet_name + "_DistancePT"] = np.abs(pt_distance)
     content[jet_name + "_DistancePhi"] = np.abs(phi_distance)
     tag_mass_in = np.sqrt(ak.from_iter(tag_mass2_in))
+    # Less than one, higher is better
     content[jet_name + "_SignalMassRatio"] = \
         tag_mass_in/eventWise.DetectableTag_Mass
     bg_mass_in = np.sqrt(ak.from_iter(bg_mass2_in))
+    # Less than one, lower is better
     content[jet_name + "_BGMassRatio"] = bg_mass_in/eventWise.DetectableBG_Mass
     content[jet_name + "_PercentFound"] = ak.from_iter(percent_found)
     signal_distance = np.abs(tag_mass_in - eventWise.DetectableTag_Mass)
+    # Positive, lower is better
     content[jet_name + "_DistanceSignal"] = signal_distance
+    # Positive, lower is better
     content[jet_name + "_DistanceBG"] = bg_mass_in
     content[jet_name + "_SeperateJets"] = ak.from_iter(seperate_jets)
     content[jet_name + "_SeperateMask"] = ak.from_iter(mask)
@@ -1034,8 +1040,10 @@ def quality_filter_table(all_cols, variable_cols, score_cols, table):
         and each column is a hyperparameter
 
     """
+    # AveDistanceSignal is positive, smaller is better
     signal_gap = table[:, all_cols.index("AveDistanceSignal")]
     table = table[signal_gap < 33.]
+    # AveDistanceBG is positive, smaller is better
     background_gap = table[:, all_cols.index("AveDistanceBG")]
     table = table[background_gap < 33.]
     return all_cols, variable_cols, score_cols, table
@@ -1677,6 +1685,7 @@ def project_2d(show_params, best_slice, all_cols, variable_cols, score_cols,
         values = table[s]
         distinct_values.append(np.array(TypeTools.generic_sort(values.unique())))
 
+    # SepertateAveDistanceBG/Signal is positive, smaller is better
     bg_col = "SeperateAveDistanceBG"
     sg_col = "SeperateAveDistanceSignal"
     mult_col = "AveSeperateJets"

jet_tools/TrueTag.py

@@ -346,11 +346,7 @@ def add_tags(eventWise, jet_name, max_angle, batch_length=100, min_tracks=None,
             num_tracks = []
             valid_jets = []
         else:
-            # note this actually counts num pesudojets,
-            # but for more than 2 that is sufficient
-            num_tracks = \
-                Components.apply_array_func(len, getattr(eventWise,
-                                                         jet_name+"_PT"))
+            num_tracks = ak.sum(getattr(eventWise, jet_name+"_Child1") != -1, axis=1)
             valid_jets = np.where(num_tracks > min_tracks-0.1)[0]
         jets_tags = [[] for _ in jet_pt]
         if len(tags) > 0 and len(valid_jets) > 0:

test/test_TrueTag.py

@@ -93,6 +93,7 @@ def test_add_tags_particles():
     # event 0
     params['Jet_Label'] = [ak.from_iter([])]
     params['Jet_Parent'] = [ak.from_iter([])]
+    params['Jet_Child1'] = [ak.from_iter([])]
     params['Jet_Phi'] = [ak.from_iter([])]
     params['Jet_Rapidity'] = [ak.from_iter([])]
     params['Jet_Energy'] = [ak.from_iter([])]
@@ -106,6 +107,7 @@ def test_add_tags_particles():
     # event 1
     params['Jet_Label'] += [ak.from_iter([[0, 1, 2], [3, 4, 5]])]
     params['Jet_Parent'] += [ak.from_iter([[1, -1, 1], [1, -1, 1]])]
+    params['Jet_Child1'] += [ak.from_iter([[-1, 0, -1], [-1, 0, -1]])]
     params['Jet_Phi'] += [ak.from_iter([[0., 1., 1.], [1., np.pi, 1.]])]
     params['Jet_Rapidity'] += [ak.from_iter([[0., 1., 1.], [1., 2., 1.]])]
     params['Jet_Energy'] += [ak.from_iter([[1., 1., 1.], [1., 1., 1.]])]