TICL-barrel validation @ HLT

DataFormats/ParticleFlowReco/src/classes_def_2.xml

@@ -69,10 +69,11 @@
 
   <class name="std::vector<reco::PFRecHit>"/>
   <class name="edm::Wrapper<std::vector<reco::PFRecHit> >"/>
+  <class name="edm::RefProd<vector<reco::PFRecHit> >"/>
   <class name="edm::Ref< std::vector<reco::PFRecHit>, reco::PFRecHit, edm::refhelper::FindUsingAdvance<std::vector<reco::PFRecHit>,reco::PFRecHit>  >"/>
-
   <class name="edm::RefVector<std::vector<reco::PFRecHit>,reco::PFRecHit,edm::refhelper::FindUsingAdvance<std::vector<reco::PFRecHit>,reco::PFRecHit> >"/>
-
+  <class name="edm::Wrapper<std::vector<edm::RefProd<std::vector<reco::PFRecHit> > > >"/>
+  <class name="std::vector<edm::RefProd<std::vector<reco::PFRecHit> > >"/>
 
 
   <class name="reco::PFTrack" ClassVersion="11">

HLTrigger/Configuration/python/HLT_75e33/modules/hltBarrelLayerClustersEBL1Seeded_cfi.py

@@ -4,7 +4,7 @@
   recHits = cms.InputTag("hltParticleFlowRecHitECALL1Seeded"),
   plugin = cms.PSet(
     outlierDeltaFactor = cms.double(2.7 * 0.0175),
-    kappa = cms.double(3.5),
+    kappa = cms.double(1),
     maxLayerIndex = cms.int32(0),
     deltac = cms.double(1.8 * 0.0175),
     fractionCutoff = cms.double(0.0),

HLTrigger/Configuration/python/HLT_75e33/modules/hltBarrelLayerClustersHB_cfi.py

@@ -3,10 +3,10 @@
 hltBarrelLayerClustersHB = cms.EDProducer('BarrelLayerClusterProducer',
   recHits = cms.InputTag("hltParticleFlowRecHitHBHE"),
   plugin = cms.PSet(
-    outlierDeltaFactor = cms.double(2.7 * 0.0175),
-    kappa = cms.double(3.5),
+    outlierDeltaFactor = cms.double(5 * 0.087),
+    kappa = cms.double(0),
     maxLayerIndex = cms.int32(4),
-    deltac = cms.double(1.8 * 0.0175),
+    deltac = cms.double(3 * 0.087),
     fractionCutoff = cms.double(0.0),
     doSharing = cms.bool(False),
     type = cms.string('HBCLUE')

HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py

@@ -17,6 +17,7 @@
 from HLTriggerOffline.Egamma.HLTpostProcessorGsfTracker_cfi import *
 from Validation.HGCalValidation.HLTHGCalPostProcessor_cff import *
 from Validation.HLTrigger.HLTGenValidationHarvesting_cff import *
+from Validation.HGCalValidation.BarrelPostProcessor_cff import *
 
 hltpostvalidation = cms.Sequence( 
     postProcessorHLTtrackingSequence
@@ -64,6 +65,11 @@
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
 phase2_common.toReplaceWith(hltpostvalidation, _phase2_hltpostvalidation)
 
+_phase2_hltpostvalidation_WithBarrel = _phase2_hltpostvalidation.copy()
+_phase2_hltpostvalidation_WithBarrel += barrelValidatorPostProcessor
+from Configuration.ProcessModifiers.ticl_barrel_cff import ticl_barrel
+ticl_barrel.toReplaceWith(hltpostvalidation, _phase2_hltpostvalidation_WithBarrel)
+
 # fastsim customs
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
 fastSim.toReplaceWith(hltpostvalidation, hltpostvalidation.copyAndExclude([

HLTriggerOffline/Common/python/HLTValidation_cff.py

@@ -20,6 +20,7 @@
 from Validation.SiTrackerPhase2V.HLTPhase2TrackerValidationFirstStep_cff import *
 # Gen-level Validation
 from Validation.HLTrigger.HLTGenValidation_cff import *
+from Validation.Configuration.globalValidation_cff import *
 
 # HGCAL Rechit Calibration
 from Validation.HGCalValidation.hgcalHitCalibrationDefault_cfi import hgcalHitCalibrationDefault as _hgcalHitCalibrationDefault
@@ -60,6 +61,7 @@
 
 # Temporary Phase-2 config
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+from Configuration.ProcessModifiers.ticl_barrel_cff import ticl_barrel
 
 # Create the modified sequence for phase 2
 _phase2_hltassociation = hltassociation.copyAndExclude([
@@ -98,9 +100,7 @@
     +hltHCALdigisAnalyzer+hltHCALRecoAnalyzer+hltHCALNoiseRates # HCAL
 )
 
-# Temporary Phase-2 config
 # Exclude everything except Muon and JetMET for now. Add HGCAL Hit Calibration
-from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
 _hltvalidationWithMC_Phase2 = hltvalidationWithMC.copyAndExclude([#HLTMuonVal,
   HLTTauVal,
   egammaValidationSequence,
@@ -129,6 +129,41 @@
     hltvalidationWithData
 )
 
+# from Configuration.StandardSequences.Validation_cff import prevalidation
+# ImportError: cannot import name 'prevalidation' from partially initialized module 'Configuration.StandardSequences.Validation_cff' (most likely due to a circular import)
+hltprevalidation = cms.Sequence( cms.SequencePlaceholder("mix") * globalPrevalidation * hltassociation * metPreValidSeq * jetPreValidSeq )
+phase2_common.toReplaceWith(hltprevalidation, hltprevalidation.copyAndExclude([cms.SequencePlaceholder("mix"),globalPrevalidation,metPreValidSeq,jetPreValidSeq]))
+
+from Validation.Configuration.hltHGCalSimValid_cff import hltRecHitMapProducer as _hltRecHitMapProducer
+hltprevalidation.insert(-1, _hltRecHitMapProducer)
+
+from Validation.Configuration import hltHGCalSimValid_cff as _hltHGCalSimValid
+_hltprevalidation_Phase2 = hltprevalidation.copy()
+_hltprevalidation_Phase2.insert(-1, _hltHGCalSimValid.hltHgcalPrevalidation)
+phase2_common.toReplaceWith(hltprevalidation, _hltprevalidation_Phase2)
+
+from Validation.Configuration.hltBarrelSimValid_cff import *
+_hltprevalidation_Phase2_WithBarrel = _hltprevalidation_Phase2.copy()
+_hltprevalidation_Phase2_WithBarrel.insert(-1, hltBarrelPrevalidation)
+ticl_barrel.toReplaceWith(hltprevalidation, _hltprevalidation_Phase2_WithBarrel)
+
+hltvalidationCommon = hltvalidationCommon.copy()
+hltvalidationWithMC = hltvalidationWithMC.copy()
+hltvalidationWithData = hltvalidationWithData.copy()
+_hltvalidationWithMC_Phase2 = _hltvalidationWithMC_Phase2.copy()
+phase2_common.toReplaceWith(hltvalidationWithMC, _hltvalidationWithMC_Phase2)
+
+from Validation.HGCalValidation.HLTBarrelValidator_cff import hltBarrelValidator
+_hltvalidationWithMC_Phase2_WithBarrel = _hltvalidationWithMC_Phase2.copy()
+_hltvalidationWithMC_Phase2_WithBarrel.insert(-1, hltBarrelValidator)
+ticl_barrel.toReplaceWith(hltvalidationWithMC, _hltvalidationWithMC_Phase2_WithBarrel)
+
+hltvalidation = cms.Sequence(
+    hltvalidationCommon * # HCAL RecHit analyzer
+    hltvalidationWithMC *
+    hltvalidationWithData
+)
+
 # some hlt collections have no direct fastsim equivalent
 # remove the dependent modules for now
 # probably it would be rather easy to add or fake these collections

HLTriggerOffline/Common/test/hltHarvesting_cfg.py

@@ -47,7 +47,6 @@
 '/store/relval/CMSSW_3_0_0_pre7/RelValTTbar/GEN-SIM-RECO/STARTUP_30X_v1/0002/0AB7BC40-87E9-DD11-8CCF-003048767D51.root'
 )
 
-
 process.load("HLTriggerOffline.Common.HLTValidation_cff")
 
 #extra config needed in standalone

RecoHGCal/TICL/python/HLTSimTracksters_cff.py

@@ -20,8 +20,8 @@
 )
 
 hltTiclSimTracksters = _simTrackstersProducer.clone(
-    layerClusterCaloParticleAssociator = cms.InputTag("hltLayerClusterCaloParticleAssociationProducer"),
-    layerClusterSimClusterAssociator = cms.InputTag("hltLayerClusterSimClusterAssociationProducer"),
+    layerClusterCaloParticleAssociator = cms.InputTag("hltHGCalLayerClusterCaloParticleAssociation"),
+    layerClusterSimClusterAssociator = cms.InputTag("hltHGCalLayerClusterSimClusterAssociation"),
     filtered_mask = cms.InputTag("hltFilteredLayerClustersSimTracksters","hltTiclSimTracksters"),
     layer_clusters = cms.InputTag("hltMergeLayerClusters"),
     time_layerclusters = cms.InputTag("hltMergeLayerClusters","timeLayerCluster"),

SimCalorimetry/HGCalAssociatorProducers/plugins/LCToSCAssociatorByEnergyScoreImpl.cc

@@ -78,9 +78,10 @@ ticl::association LCToSCAssociatorByEnergyScoreImplT<HIT, CLUSTER>::makeConnecti
     if constexpr (std::is_same_v<HIT, HGCRecHit>)
       hits_and_fractions = simClusters[scId].filtered_hits_and_fractions(
           [this](const DetId& detid) { return !recHitTools_->isBarrel(detid); });
-    else
+    else {
       hits_and_fractions = simClusters[scId].filtered_hits_and_fractions(
           [this](const DetId& detid) { return recHitTools_->isBarrel(detid); });
+    }
     for (const auto& it_haf : hits_and_fractions) {
       const auto hitid = (it_haf.first);
       unsigned int scLayerId = recHitTools_->getLayer(hitid);

SimCalorimetry/HGCalAssociatorProducers/python/hltLCToCPAssociation_cfi.py

@@ -0,0 +1,25 @@
+import FWCore.ParameterSet.Config as cms
+
+from SimCalorimetry.HGCalAssociatorProducers.barrelLCToCPAssociatorByEnergyScoreProducer_cfi import barrelLCToCPAssociatorByEnergyScoreProducer as _barrelLCToCPAssociatorByEnergyScoreProducer
+hltBarrelLCToCPAssociatorByEnergyScoreProducer = _barrelLCToCPAssociatorByEnergyScoreProducer.clone(
+    hitMapTag = 'hltRecHitMapProducer:barrelRecHitMap',
+    hits = 'hltRecHitMapProducer:RefProdVectorPFRecHitCollection'
+)
+
+from SimCalorimetry.HGCalSimProducers.hgcHitAssociation_cfi import lcAssocByEnergyScoreProducer as _lcAssocByEnergyScoreProducer
+hltHGCalLCToCPAssociatorByEnergyScoreProducer = _lcAssocByEnergyScoreProducer.clone(
+    hitMapTag = 'hltRecHitMapProducer:hgcalRecHitMap',
+    hits = 'hltRecHitMapProducer:RefProdVectorHGCRecHitCollection'
+)
+
+from SimCalorimetry.HGCalAssociatorProducers.LCToCPAssociation_cfi import barrelLayerClusterCaloParticleAssociation as _barrelLayerClusterCaloParticleAssociation
+hltBarrelLayerClusterCaloParticleAssociation = _barrelLayerClusterCaloParticleAssociation.clone(
+    associator = 'hltBarrelLCToCPAssociatorByEnergyScoreProducer',
+    label_lc = 'hltMergeLayerClusters'
+)
+
+from SimCalorimetry.HGCalAssociatorProducers.LCToCPAssociation_cfi import layerClusterCaloParticleAssociation as _layerClusterCaloParticleAssociation
+hltHGCalLayerClusterCaloParticleAssociation = _layerClusterCaloParticleAssociation.clone(
+    associator = 'hltHGCalLCToCPAssociatorByEnergyScoreProducer',
+    label_lc = 'hltMergeLayerClusters'
+)

SimCalorimetry/HGCalAssociatorProducers/python/hltLCToSCAssociation_cfi.py

@@ -0,0 +1,24 @@
+import FWCore.ParameterSet.Config as cms
+
+from SimCalorimetry.HGCalAssociatorProducers.barrelLCToSCAssociatorByEnergyScoreProducer_cfi import *
+hltBarrelLCToSCAssociatorByEnergyScoreProducer = barrelLCToSCAssociatorByEnergyScoreProducer.clone(
+    hitMapTag = 'hltRecHitMapProducer:barrelRecHitMap',
+    hits = 'hltRecHitMapProducer:RefProdVectorPFRecHitCollection'
+)
+
+from SimCalorimetry.HGCalSimProducers.hgcHitAssociation_cfi import scAssocByEnergyScoreProducer
+hltHGCalLCToSCAssociatorByEnergyScoreProducer = scAssocByEnergyScoreProducer.clone(
+    hitMapTag = 'hltRecHitMapProducer:hgcalRecHitMap',
+    hits = 'hltRecHitMapProducer:RefProdVectorHGCRecHitCollection'
+)
+
+from SimCalorimetry.HGCalAssociatorProducers.LCToSCAssociation_cfi import barrelLayerClusterSimClusterAssociation as _barrelLayerClusterSimClusterAssociation
+hltBarrelLayerClusterSimClusterAssociation = _barrelLayerClusterSimClusterAssociation.clone(
+    associator = 'hltBarrelLCToSCAssociatorByEnergyScoreProducer',
+    label_lcl = 'hltMergeLayerClusters'
+)
+from SimCalorimetry.HGCalAssociatorProducers.LCToSCAssociation_cfi import layerClusterSimClusterAssociation as _layerClusterSimClusterAssociation
+hltHGCalLayerClusterSimClusterAssociation = _layerClusterSimClusterAssociation.clone(
+    associator = 'hltHGCalLCToSCAssociatorByEnergyScoreProducer',
+    label_lcl = 'hltMergeLayerClusters'
+)

Validation/Configuration/python/autoValidation.py

@@ -15,7 +15,7 @@
                    'miniAODValidation' : ['prevalidationMiniAOD','validationMiniAOD','validationHarvestingMiniAOD'],
                    'standardValidation' : ['prevalidation','validation','validationHarvesting'],
                    'standardValidationNoHLT' : ['prevalidationNoHLT','validationNoHLT','validationHarvestingNoHLT'],
-                   'hltValidation' : ['prevalidation','hltvalidation','validationHarvesting'],
+                   'hltValidation' : ['hltprevalidation','hltvalidation','validationHarvesting'],
                    'standardValidationHiMix' : ['prevalidation','validationHiMix','validationHarvesting'],
                    'standardValidationNoHLTHiMix' : ['prevalidationNoHLT','validationNoHLTHiMix','validationHarvestingNoHLT'],
                    'HGCalValidation' : ['globalPrevalidationHGCal', 'globalValidationHGCal', 'hgcalValidatorPostProcessor'],
@@ -26,6 +26,7 @@
                  }
 
 _phase2_allowed = ['baseValidation','trackingValidation','muonOnlyValidation','JetMETOnlyValidation', 'electronOnlyValidation', 'photonOnlyValidation','bTagOnlyValidation', 'tauOnlyValidation', 'hcalValidation', 'HGCalValidation', 'BarrelValidation', 'MTDValidation', 'ecalValidation_phase2', 'TrackerPhase2Validation', 'hltValidation']
+
 autoValidation['phase2Validation'] = ['','','']
 for i in range(0,3):
     autoValidation['phase2Validation'][i] = '+'.join([_f for _f in [autoValidation[m][i] for m in _phase2_allowed] if _f])

Validation/Configuration/python/hltBarrelSimValid_cff.py

@@ -0,0 +1,20 @@
+import FWCore.ParameterSet.Config as cms
+
+from RecoLocalCalo.HGCalRecProducers.recHitMapProducer_cff import recHitMapProducer as _recHitMapProducer
+barrel_hits = ["hltParticleFlowRecHitECALUnseeded", "hltParticleFlowRecHitHBHE"]
+hltBarrelRecHitMapProducer = _recHitMapProducer.clone(
+    hits = barrel_hits,
+    hgcalOnly = False,
+)
+
+from SimCalorimetry.HGCalAssociatorProducers.hltLCToCPAssociation_cfi import (hltBarrelLCToCPAssociatorByEnergyScoreProducer,
+                                                                              hltBarrelLayerClusterCaloParticleAssociation)
+from SimCalorimetry.HGCalAssociatorProducers.hltLCToSCAssociation_cfi import (hltBarrelLCToSCAssociatorByEnergyScoreProducer,
+                                                                              hltBarrelLayerClusterSimClusterAssociation)
+
+hltBarrelPrevalidation = cms.Sequence(
+    hltBarrelLCToCPAssociatorByEnergyScoreProducer *
+    hltBarrelLCToSCAssociatorByEnergyScoreProducer *
+    hltBarrelLayerClusterCaloParticleAssociation *
+    hltBarrelLayerClusterSimClusterAssociation
+)