Jet hypo nomds: update Trigger ART ref files, remove unused variable from...

Jet hypo nomds: update Trigger ART ref files, remove unused variable from TrigHLTJetHypo/python/chainDict2jetLabel.py

Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py

@@ -106,6 +106,8 @@ def _make_fbdjnoshared_label(chain_parts, leg_label):
     assert scenario.startswith('f')
     args = _args_from_scenario(scenario)
 
+    # arg res tuples constain a regex, and a counter
+    # to count the number of matches.
     arg_res = [
         [re.compile(r'(?P<lo>\d*)(?P<key>fbet)(?P<hi>\d*)'), 0],
         [re.compile(r'(?P<lo>\d*)(?P<key>mass)(?P<hi>\d*)'), 0],
@@ -119,11 +121,6 @@ def _make_fbdjnoshared_label(chain_parts, leg_label):
         'fbet0': ('501', 'inf'),
     }
 
-    # n_et: counter for the min et of the jets particpating in
-    # the dijet. There are two such et min values in the scenario
-    # string
-
-    n_et = 0  
     argvals = {}
     assert len(args) == len(arg_res) + 1  # +1 because et occurs twice.
     while args:

Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

@@ -673,9 +673,9 @@ HLT_e20_lhmedium_e15_idperf_Zee_L12EM3:
   stepFeatures:
     0: 176
     1: 715
-    2: 331
-    3: 159
-    4: 115
+    2: 330
+    3: 158
+    4: 114
 HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3:
   eventCount: 0
   stepCounts:
@@ -1003,9 +1003,9 @@ HLT_e5_idperf_L1EM3:
     3: 20
   stepFeatures:
     0: 176
-    1: 166
-    2: 331
-    3: 160
+    1: 165
+    2: 330
+    3: 159
 HLT_e5_lhloose_L1EM3:
   eventCount: 6
   stepCounts:
@@ -1086,7 +1086,7 @@ HLT_e5_lhtight_gsf_L1EM3:
     4: 4
   stepFeatures:
     0: 57
-    1: 128
+    1: 129
     2: 74
     3: 43
     4: 5
@@ -1614,20 +1614,20 @@ HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20:
     0: 1
   stepFeatures:
     0: 5
-HLT_j0_fbdjshared_L1J20:
+HLT_j0_fbdjnosharedSEP10etSEP20etSEP34massSEP50fbet_L1J20:
   eventCount: 7
   stepCounts:
     0: 7
   stepFeatures:
-    0: 179
-HLT_j0_perf_L1J12_EMPTY:
-  eventCount: 0
-HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20:
+    0: 176
+HLT_j0_fbdjshared_L1J20:
   eventCount: 7
   stepCounts:
     0: 7
   stepFeatures:
-    0: 176
+    0: 179
+HLT_j0_perf_L1J12_EMPTY:
+  eventCount: 0
 HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100:
   eventCount: 0
   stepCounts:

Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref

@@ -754,6 +754,12 @@ HLT_j0_aggSEP1000htSEP30etSEP0eta320_L1J20:
   eventCount: 0
 HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20:
   eventCount: 0
+HLT_j0_fbdjnosharedSEP10etSEP20etSEP34massSEP50fbet_L1J20:
+  eventCount: 1
+  stepCounts:
+    0: 1
+  stepFeatures:
+    0: 9
 HLT_j0_fbdjshared_L1J20:
   eventCount: 1
   stepCounts:
@@ -766,12 +772,6 @@ HLT_j0_perf_L1J12_EMPTY:
     0: 8
   stepFeatures:
     0: 127
-HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20:
-  eventCount: 1
-  stepCounts:
-    0: 1
-  stepFeatures:
-    0: 9
 HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100:
   eventCount: 0
 HLT_j260_320eta490_L1J20: