Merge pull request #30702 from kpedro88/Phase2-WF61

remove phase2_hgcalV9 modifier

Configuration/Eras/python/Era_Phase2C9_cff.py

@@ -1,9 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Eras.Era_Phase2_cff import Phase2
-from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
 from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11
 
-Phase2C9 = cms.ModifierChain(Phase2, phase2_hgcalV9, phase2_hgcalV10, phase2_hgcalV11)
+Phase2C9 = cms.ModifierChain(Phase2, phase2_hgcalV10, phase2_hgcalV11)
 

Configuration/Geometry/python/dict2026Geometry.py

@@ -304,7 +304,7 @@
             'from Geometry.EcalMapping.EcalMapping_cfi import *',
             'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
         ],
-        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11",
+        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11",
     },
     "C10" : {
         1 : [
@@ -389,7 +389,7 @@
             'from Geometry.EcalMapping.EcalMapping_cfi import *',
             'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
         ],
-        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hfnose",
+        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hfnose",
     },
     "C11" : {
         1 : [
@@ -462,7 +462,7 @@
             'from Geometry.EcalMapping.EcalMapping_cfi import *',
             'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
         ],
-        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12",
+        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12",
     },
     "C12" : {
         1 : [
@@ -547,7 +547,7 @@
             'from Geometry.EcalMapping.EcalMapping_cfi import *',
             'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
         ],
-        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12, phase2_hfnose",
+        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12, phase2_hfnose",
     },
     "C13" : {
         1 : [
@@ -621,7 +621,7 @@
             'from Geometry.EcalMapping.EcalMapping_cfi import *',
             'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
         ],
-        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12, phase2_hfnose",
+        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12, phase2_hfnose",
     },
 
 }

Configuration/StandardSequences/python/Eras.py

@@ -55,7 +55,7 @@ def __init__(self):
                            'phase1Pixel', 'run3_GEM', 'run2_GEM_2017',
                            'run2_CSC_2018',
                            'phase2_common', 'phase2_tracker',
-                           'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_hgcalV9', 'phase2_hfnose', 'phase2_hgcalV10', 'phase2_hgcalV11', 'phase2_hgcalV12',
+                           'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_hfnose', 'phase2_hgcalV10', 'phase2_hgcalV11', 'phase2_hgcalV12',
                            'phase2_timing_layer', 'phase2_hcal', 'phase2_ecal',
                            'phase2_trigger',
                            'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', 'trackingPhase2PU140','highBetaStar_2018',

Geometry/HGCalGeometry/python/hgcalTestNeighbor_cfi.py

@@ -6,10 +6,4 @@
     detector = cms.string("HGCalHESiliconSensitive"))
 
 hgcalHEBTestNeighbor = hgcalEETestNeighbor.clone(
-    detector = cms.string("HCal"))
-
-from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
-
-phase2_hgcalV9.toModify(hgcalHEBTestNeighbor,
-                        detector = cms.string("HGCalHEScintillatorSensitive")
-                        )
+    detector = cms.string("HGCalHEScintillatorSensitive"))

L1Trigger/L1THGCal/python/egammaIdentification.py

@@ -1,6 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
 from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11
 
@@ -209,15 +208,6 @@ def __init__(self, eta_min, eta_max, pt_min, pt_max):
         WorkingPoints=cms.vdouble([wps[eff] for wps,eff in zip(working_points_histomax['v8_352'],tight_wp)]),
         )
 
-# Era Modification for HGCal v9: use correct training and WPs
-phase2_hgcalV9.toModify(egamma_identification_histomax,
-        Inputs=cms.vstring(input_features_histomax['v9_394']),
-        Weights=cms.vstring(bdt_weights_histomax['v9_394']),
-        WorkingPoints=cms.vdouble(
-                [wps[eff] for wps,eff in zip(working_points_histomax['v9_394'],tight_wp)]
-                )
-        )
-
 phase2_hgcalV10.toModify(egamma_identification_histomax,
         Inputs=cms.vstring(input_features_histomax['v10_3151']),
         Weights=cms.vstring(bdt_weights_histomax['v10_3151']),

L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py

@@ -6,7 +6,7 @@
 import RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi as recocalibparam
 from . import hgcalLayersCalibrationCoefficients_cfi as layercalibparam
 
-from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
+from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
 
 c2d_calib_pset = cms.PSet(calibSF_cluster=cms.double(1.),
                           layerWeights=layercalibparam.TrgLayer_weights,
@@ -17,11 +17,11 @@
                                clustering_threshold_silicon=cms.double(2.),
                                clustering_threshold_scintillator=cms.double(2.))
 
-# V9 samples have a different defintiion of the dEdx calibrations. To account for it
-# we reascale the thresholds for the clustering
+# V9 samples have a different definition of the dEdx calibrations. To account for it
+# we rescale the thresholds for the clustering
 # (see https://indico.cern.ch/event/806845/contributions/3359859/attachments/1815187/2966402/19-03-20_EGPerf_HGCBE.pdf
 # for more details)
-phase2_hgcalV9.toModify(c2d_thresholds_pset,
+phase2_hgcalV10.toModify(c2d_thresholds_pset,
                         seeding_threshold_silicon=3.75,
                         seeding_threshold_scintillator=3.75,
                         clustering_threshold_silicon=1.5,
@@ -30,7 +30,7 @@
 
 # we still don't have layer calibrations for V9 geometry. Switching this off we
 # use the dEdx calibrated energy of the TCs
-phase2_hgcalV9.toModify(c2d_calib_pset,
+phase2_hgcalV10.toModify(c2d_calib_pset,
                         applyLayerCalibration=False
                         )
 

L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py

@@ -4,7 +4,6 @@
                                                     egamma_identification_drnn_dbscan, \
                                                     egamma_identification_histomax
 
-from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
 from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11
 from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose
@@ -101,11 +100,11 @@
                                )
 
 
-# V9 samples have a different defintion of the dEdx calibrations. To account for it
-# we reascale the thresholds of the clustering seeds
+# V9 samples have a different definition of the dEdx calibrations. To account for it
+# we rescale the thresholds of the clustering seeds
 # (see https://indico.cern.ch/event/806845/contributions/3359859/attachments/1815187/2966402/19-03-20_EGPerf_HGCBE.pdf
 # for more details)
-phase2_hgcalV9.toModify(histoMax_C3d_seeding_params,
+phase2_hgcalV10.toModify(histoMax_C3d_seeding_params,
                         threshold_histo_multicluster=7.5,  # MipT
                         )
 

L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py

@@ -144,12 +144,12 @@
 
 
 
-from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
-# V9 samples have a different defintiion of the dEdx calibrations. To account for it
-# we reascale the thresholds of the FE selection
+from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
+# V9 samples have a different definition of the dEdx calibrations. To account for it
+# we rescale the thresholds of the FE selection
 # (see https://indico.cern.ch/event/806845/contributions/3359859/attachments/1815187/2966402/19-03-20_EGPerf_HGCBE.pdf
 # for more details)
-phase2_hgcalV9.toModify(threshold_conc_proc,
+phase2_hgcalV10.toModify(threshold_conc_proc,
                         threshold_silicon=1.35,  # MipT
                         threshold_scintillator=1.35,  # MipT
                         )

L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py

@@ -31,8 +31,5 @@
 hgcalTriggerGeometryESProducer = cms.ESProducer(
     'HGCalTriggerGeometryESProducer',
     TriggerGeometry = geometry,
-    isV9Geometry = cms.bool(False)
+    isV9Geometry = cms.bool(True)
 )
-
-from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
-phase2_hgcalV9.toModify(hgcalTriggerGeometryESProducer, isV9Geometry = True)

L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py

@@ -18,11 +18,11 @@
 phase2_hfnose.toReplaceWith(
         hgcalTriggerPrimitivesTask, _hfnose_hgcalTriggerPrimitivesTask )
 
-from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
+from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
 from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11
 from L1Trigger.L1THGCal.customTriggerGeometry import custom_geometry_decentralized_V9, custom_geometry_decentralized_V11
 from L1Trigger.L1THGCal.customCalibration import  custom_cluster_calibration_global
-modifyHgcalTriggerPrimitivesWithV9Geometry_ = (phase2_hgcalV9 & ~phase2_hgcalV11).makeProcessModifier(custom_geometry_decentralized_V9)
+modifyHgcalTriggerPrimitivesWithV9Geometry_ = (phase2_hgcalV10 & ~phase2_hgcalV11).makeProcessModifier(custom_geometry_decentralized_V9)
 modifyHgcalTriggerPrimitivesWithV11Geometry_ = phase2_hgcalV11.makeProcessModifier(custom_geometry_decentralized_V11)
 
 from Configuration.ProcessModifiers.convertHGCalDigisSim_cff import convertHGCalDigisSim

L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cff.py

@@ -4,8 +4,8 @@
 
 hgcalTriggerNtuples = cms.Sequence(hgcalTriggerNtuplizer)
 
-from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
+from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
 from L1Trigger.L1THGCalUtilities.customNtuples import custom_ntuples_V9
-modifyHgcalTriggerNtuplesWithV9Geometry_ = phase2_hgcalV9.makeProcessModifier(custom_ntuples_V9)
+modifyHgcalTriggerNtuplesWithV9Geometry_ = phase2_hgcalV10.makeProcessModifier(custom_ntuples_V9)