Improve low-mass dielectron lines

• Remove "Noip" from the dielectron lines since, after splitting the line up to allow more targetted pre-scaling, some sub-lines end up having an implicit ip cut.
• Cut on track IPchi2 not vertex IPchi2 (which is just pointing-angle)
• Remove the prompt_vertex_evaluator dependence of the code to put the selection in one place

(this will need Moore!2626 (merged) to be merged at the 'same' time given the change in HLT1 line names here that that MR then filters on)

configuration/python/AllenConf/HLT1.py

@@ -12,7 +12,7 @@ from AllenConf.hlt1_inclusive_hadron_lines import make_track_mva_line, make_two_
 from AllenConf.hlt1_charm_lines import make_d2kk_line, make_d2pipi_line, make_two_track_mva_charm_xsec_line, make_two_ks_line
 from AllenConf.hlt1_calibration_lines import make_d2kpi_line, make_passthrough_line, make_rich_1_line, make_rich_2_line, make_displaced_dimuon_mass_line, make_di_muon_mass_align_line
 from AllenConf.hlt1_muon_lines import make_one_muon_track_line, make_single_high_pt_muon_line, make_single_high_pt_muon_no_muid_line, make_low_pt_muon_line, make_di_muon_mass_line, make_di_muon_soft_line, make_low_pt_di_muon_line, make_track_muon_mva_line, make_di_muon_no_ip_line, make_di_muon_drell_yan_line
-from AllenConf.hlt1_electron_lines import make_track_electron_mva_line, make_single_high_pt_electron_line, make_lowmass_noip_dielectron_line, make_displaced_dielectron_line, make_displaced_leptons_line, make_single_high_et_line
+from AllenConf.hlt1_electron_lines import make_track_electron_mva_line, make_single_high_pt_electron_line, make_lowmass_dielectron_line, make_displaced_dielectron_line, make_displaced_leptons_line, make_single_high_et_line
 from AllenConf.hlt1_monitoring_lines import (
     make_beam_line, make_velo_micro_bias_line, make_odin_event_type_line,
     make_odin_event_and_orbit_line, make_beam_gas_line,
@@ -178,7 +178,7 @@ def default_physics_lines(reconstructed_objects, with_calo, with_muon):
             for label, limits in line_slices_mass.items():
                 prescale_os = 0.3 if subSample == "prompt" else 1.0
                 lines.append(
-                    make_lowmass_noip_dielectron_line(
+                    make_lowmass_dielectron_line(
                         long_tracks,
                         secondary_vertices,
                         calo_matching_objects,
@@ -188,14 +188,14 @@ def default_physics_lines(reconstructed_objects, with_calo, with_muon):
                         minPTdisplaced=0.,
                         minIPChi2Threshold=2,
                         selectPrompt=True if subSample == "prompt" else False,
-                        name="Hlt1LowMassNoipDielectron_massSlice{}_{}".format(
+                        name="Hlt1LowMassDiElectron_massSlice{}_{}".format(
                             label, subSample),
                         pre_scaler_hash_string=
-                        "lowmass_noip_dielectron_massSlice{}_{}_pre".format(
+                        "lowmass_dielectron_massSlice{}_{}_pre".format(
                             label, subSample),
                         pre_scaler=prescale_os))
                 lines.append(
-                    make_lowmass_noip_dielectron_line(
+                    make_lowmass_dielectron_line(
                         long_tracks,
                         secondary_vertices,
                         calo_matching_objects,
@@ -206,15 +206,15 @@ def default_physics_lines(reconstructed_objects, with_calo, with_muon):
                         minPTdisplaced=0.,
                         minIPChi2Threshold=2,
                         selectPrompt=True if subSample == "prompt" else False,
-                        name="Hlt1LowMassNoipDielectron_SS_massSlice{}_{}".
-                        format(label, subSample),
+                        name="Hlt1LowMassDiElectron_SS_massSlice{}_{}".format(
+                            label, subSample),
                         pre_scaler_hash_string=
-                        "lowmass_noip_dielectron_SS_massSlice{}_{}_pre".format(
+                        "lowmass_dielectron_SS_massSlice{}_{}_pre".format(
                             label, subSample),
                         pre_scaler=0.02,
                         post_scaler_hash_string=
-                        "lowmass_noip_dielectron_SS_massSlice{}_{}_post".
-                        format(label, subSample)))
+                        "lowmass_dielectron_SS_massSlice{}_{}_post".format(
+                            label, subSample)))
 
     return [line_maker(line) for line in lines]