Merging bug fixes and changes from arthur

HenryDayHall · Dec 1, 2023 · 22a9609 · 22a9609
2 parents eecdab2 + ff5776a
commit 22a9609
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/jet_tools/CompareClusters.py b/jet_tools/CompareClusters.py
@@ -1858,10 +1858,10 @@ def merge_jets_by_params(all_cols, variable_cols, score_cols, table):
     for name in variable_cols:
         values = table[name].values
         distinct_values.append(np.array(TypeTools.generic_sort(set(values))))
-    import itertools
     for i in range(old_table_length):
         if recorded_row[i]:
             continue
+        #import ipdb; ipdb.set_trace()
         close_filter[:] = True
         variable_values = []
         for name in variable_cols:
@@ -2082,6 +2082,7 @@ def plot_scan_triangles(eventWise, jet_name_base, jet_PS_mask=None,
             # generate and fill data
             show_here = show_names[var_index1], show_names[var_index2]
             print_best = (var_index1 == 1) * (var_index2 == 0)
+            #import ipdb; ipdb.set_trace()
             (image_sg, image_bg, image_mult, combined,
              show_here, show_mappings) =\
                      project_2d(show_here, best_slice,

diff --git a/jet_tools/ParallelFormJets.py b/jet_tools/ParallelFormJets.py
@@ -1246,6 +1246,23 @@ def run_list(eventWise_path, end_time, class_list, param_list, name_list):
                  'Cutoff': [0.0005, 0.001, 0.005, 0.01, 0.015],
                  'WeightExponent': [0., 1.]}
 
+scan_CALEv2_8 = {'Sigma': [0.01, 0.05, 0.1, 0.2],
+                 'Cutoff': [0., 0.0005, 0.001, 0.005, 0.01],
+                 'WeightExponent': [0., 1.]}
+
+
+scan_CALEv2_9 = {'Sigma': [0.1, 0.2, 0.3, 0.4],
+                 'Cutoff': [0.0001, 0.0005, 0.001, 0.005, 0.01],
+                 'WeightExponent': [0., 1.]}
+
+fix_CALEv3_1 = {'SeedGenerator': 'PtCenter',
+                'SeedIncrement': 1,
+                'ToAffinity': 'exp'}
+
+scan_CALEv3_1 = {'Sigma': [0.1, 0.2, 0.3, 0.4, 0.5],
+                 'Cutoff': [0.001, 0.01, 0.02, 0.1, 0.2, 0.5],
+                 'WeightExponent': [0., 1.]}
+
 def tabulate_fragments(eventWise_paths):
     """ Makes the assumption that jets with the same name are the same jet"""
     if isinstance(eventWise_paths, Components.EventWise):