Merge pull request #45865 from felicepantaleo/newAssociators_inValida…

…tion_14_1_0_pre7

Redesign of the association maps, multivector manager, HGCAL Rechits and Validation with significant speedup of Phase-2 workflows

CommonTools/RecoAlgos/interface/MultiVectorManager.h

@@ -5,13 +5,13 @@
 #include <vector>
 #include <cassert>
 #include <algorithm>
-#include <iterator>
+#include <span>
 
 template <typename T>
 class MultiVectorManager {
 public:
-  void addVector(const std::vector<T>& vec) {
-    vectors.emplace_back(vec.begin(), vec.end());
+  void addVector(std::span<const T> vec) {
+    vectors.emplace_back(vec);
     offsets.push_back(totalSize);
     totalSize += vec.size();
   }
@@ -39,8 +39,6 @@ class MultiVectorManager {
     return offsets[vectorIndex] + localIndex;
   }
 
-  size_t size() const { return totalSize; }
-
   std::pair<size_t, size_t> getVectorAndLocalIndex(size_t globalIndex) const {
     assert(globalIndex < totalSize && "Global index out of range");
 
@@ -51,6 +49,8 @@ class MultiVectorManager {
     return {vectorIndex, localIndex};
   }
 
+  size_t size() const { return totalSize; }
+
   class Iterator {
   public:
     using iterator_category = std::forward_iterator_tag;
@@ -77,7 +77,7 @@ class MultiVectorManager {
   Iterator end() const { return Iterator(*this, totalSize); }
 
 private:
-  std::vector<std::vector<T>> vectors;
+  std::vector<std::span<const T>> vectors;
   std::vector<size_t> offsets;
   size_t totalSize = 0;
 };

DataFormats/HGCRecHit/interface/HGCRecHit.h

@@ -110,6 +110,17 @@ class HGCRecHit : public CaloRecHit {
   //added for validation
   uint32_t flagBits() const { return flagBits_; }
 
+  //define operator== for std::find
+  bool operator==(const HGCRecHit& hit) const { return id().rawId() == hit.id().rawId(); }
+  bool operator==(const DetId& otherid) const { return id().rawId() == otherid.rawId(); }
+
+  //define operator< for std::sort
+  bool operator<(const HGCRecHit& hit) const {
+    if (id().rawId() == hit.id().rawId())
+      return energy() < hit.energy();
+    return id().rawId() < hit.id().rawId();
+  }
+
 private:
   /// store rechit condition (see Flags enum) in a bit-wise way
   uint32_t flagBits_;

DataFormats/HGCRecHit/interface/HGCRecHitCollections.h

@@ -6,8 +6,9 @@
 #include "DataFormats/HGCRecHit/interface/HGCUncalibratedRecHit.h"
 #include "DataFormats/Common/interface/Ref.h"
 #include "DataFormats/Common/interface/RefVector.h"
+#include <vector>
 
-typedef edm::SortedCollection<HGCRecHit> HGCRecHitCollection;
+typedef std::vector<HGCRecHit> HGCRecHitCollection;
 typedef edm::Ref<HGCRecHitCollection> HGCRecHitRef;
 typedef edm::RefVector<HGCRecHitCollection> HGCRecHitRefs;
 typedef edm::RefProd<HGCRecHitCollection> HGCRecHitsRef;

DataFormats/HGCRecHit/src/classes.h

@@ -12,4 +12,3 @@
 #include "DataFormats/Common/interface/Ref.h"
 #include "DataFormats/Common/interface/DetSet.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include "DataFormats/HGCRecHit/interface/HGCRecHitComparison.h"

HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersPassThrough_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/hltFilteredLayerClustersRecovery_cfi.py

@@ -1,11 +1,11 @@
 import FWCore.ParameterSet.Config as cms
 
-hltFilteredLayerClustersPassthrough = cms.EDProducer("FilteredLayerClustersProducer",
+hltFilteredLayerClustersRecovery = cms.EDProducer("FilteredLayerClustersProducer",
     LayerClusters = cms.InputTag("hltHgcalMergeLayerClusters"),
     LayerClustersInputMask = cms.InputTag("hltTiclTrackstersCLUE3DHigh"),
     algo_number = cms.vint32(6, 7, 8),
     clusterFilter = cms.string('ClusterFilterBySize'),
-    iteration_label = cms.string('Passthrough'),
+    iteration_label = cms.string('Recovery'),
     max_cluster_size = cms.int32(9999),
     max_layerId = cms.int32(9999),
     mightGet = cms.optional.untracked.vstring,

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

@@ -38,7 +38,7 @@
     original_masks = cms.VInputTag("hltHgcalMergeLayerClusters:InitialLayerClustersMask"),
     propagator = cms.string('PropagatorWithMaterial'),
     regressionAndPid = cms.bool(True),
-    tracksters_collections = cms.VInputTag("hltTiclTrackstersCLUE3DHigh", "hltTiclTrackstersPassthrough")
+    tracksters_collections = cms.VInputTag("hltTiclTrackstersCLUE3DHigh", "hltTiclTrackstersRecovery")
 )
 
 

HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersPassthrough_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersRecovery_cfi.py

@@ -1,15 +1,15 @@
 import FWCore.ParameterSet.Config as cms
 
-hltTiclTrackstersPassthrough = cms.EDProducer("TrackstersProducer",
+hltTiclTrackstersRecovery = cms.EDProducer("TrackstersProducer",
     detector = cms.string('HGCAL'),
-    filtered_mask = cms.InputTag("hltFilteredLayerClustersPassthrough","Passthrough"),
-    itername = cms.string('PassThrough'),
+    filtered_mask = cms.InputTag("hltFilteredLayerClustersRecovery","Recovery"),
+    itername = cms.string('Recovery'),
     layer_clusters = cms.InputTag("hltHgcalMergeLayerClusters"),
     layer_clusters_hfnose_tiles = cms.InputTag("ticlLayerTileHFNose"),
     layer_clusters_tiles = cms.InputTag("hltTiclLayerTileProducer"),
     mightGet = cms.optional.untracked.vstring,
     original_mask = cms.InputTag("hltTiclTrackstersCLUE3DHigh"),
-    patternRecognitionBy = cms.string('Passthrough'),
+    patternRecognitionBy = cms.string('Recovery'),
     inferenceAlgo = cms.string('TracksterInferenceByDNN'),
     pluginPatternRecognitionByCA = cms.PSet(
         algo_verbosity = cms.int32(0),
@@ -64,9 +64,9 @@
         minNumLayerCluster = cms.int32(5),
         type = cms.string('FastJet')
     ),
-    pluginPatternRecognitionByPassthrough = cms.PSet(
+    pluginPatternRecognitionByRecovery = cms.PSet(
         algo_verbosity = cms.int32(0),
-        type = cms.string('Passthrough')
+        type = cms.string('Recovery')
     ),
 
     pluginInferenceAlgoTracksterInferenceByDNN = cms.PSet(

HLTrigger/Configuration/python/HLT_75e33/sequences/HLTIterTICLSequence_cfi.py

@@ -4,11 +4,11 @@
 from ..sequences.HLTTiclPFSequence_cfi import *
 from ..sequences.HLTTiclTracksterMergeSequence_cfi import *
 from ..sequences.HLTTiclTrackstersCLUE3DHighStepSequence_cfi import *
-from ..sequences.HLTTiclTrackstersPassthroughSequence_cfi import *
+from ..sequences.HLTTiclTrackstersRecoverySequence_cfi import *
 from ..sequences.HLTTiclTracksterLinksSequence_cfi import *
 from ..sequences.HLTTiclCandidateSequence_cfi import *
 
 HLTIterTICLSequence = cms.Sequence(HLTTiclLayerTileSequence+HLTTiclTrackstersCLUE3DHighStepSequence+HLTTiclTracksterMergeSequence+HLTTiclPFSequence)
 
 from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5
-ticl_v5.toReplaceWith(HLTIterTICLSequence, cms.Sequence(HLTTiclLayerTileSequence+HLTTiclTrackstersCLUE3DHighStepSequence+HLTTiclTrackstersPassthroughSequence+HLTTiclTracksterLinksSequence+HLTTiclCandidateSequence+HLTTiclPFSequence))
+ticl_v5.toReplaceWith(HLTIterTICLSequence, cms.Sequence(HLTTiclLayerTileSequence+HLTTiclTrackstersCLUE3DHighStepSequence+HLTTiclTrackstersRecoverySequence+HLTTiclTracksterLinksSequence+HLTTiclCandidateSequence+HLTTiclPFSequence))

HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTiclTrackstersRecoverySequence_cfi.py

@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from ..modules.hltFilteredLayerClustersRecovery_cfi import *
+from ..modules.hltTiclTrackstersRecovery_cfi import *
+
+HLTTiclTrackstersRecoverySequence = cms.Sequence(hltFilteredLayerClustersRecovery+hltTiclTrackstersRecovery)

RecoEgamma/EgammaElectronProducers/plugins/ElectronSeedProducer.cc

@@ -250,6 +250,7 @@ void ElectronSeedProducer::fillDescriptions(edm::ConfigurationDescriptions& desc
   psd4.add<edm::InputTag>("HGCEEInput", {"HGCalRecHit", "HGCEERecHits"});
   psd4.add<edm::InputTag>("HGCFHInput", {"HGCalRecHit", "HGCHEFRecHits"});
   psd4.add<edm::InputTag>("HGCBHInput", {"HGCalRecHit", "HGCHEBRecHits"});
+  psd4.add<edm::InputTag>("hgcalHitMap", {"recHitMapProducer", "hgcalRecHitMap"});
   desc.add<edm::ParameterSetDescription>("HGCalConfig", psd4);
 
   // r/z windows

RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cff.py

@@ -19,6 +19,10 @@
     endcapSuperClusters = 'particleFlowSuperClusterHGCal',
     allowHGCal = True,
 )
+phase2_hgcal.toModify(
+    ecalDrivenElectronSeeds.HGCalConfig,
+    hgcalHitMap = cms.InputTag("recHitMapProducer", "hgcalRecHitMap"),
+)
 
 from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive
 egamma_lowPt_exclusive.toModify(ecalDrivenElectronSeeds,

RecoEgamma/EgammaHLTProducers/plugins/HLTCaloObjInRegionsProducer.cc

@@ -35,7 +35,7 @@
 
 /**************************************************************
 / purpose: enable filtering of calo objects in eta/phi or deltaR
-/          regions around generic objects 
+/          regions around generic objects
 /
 / operation : accepts all objects with
 /             (dEta <dEtaMax  && dPhi < dPhiMax) || dR < dRMax
@@ -243,7 +243,7 @@ std::unique_ptr<CaloObjCollType> HLTCaloObjInRegionsProducer<CaloObjType, CaloOb
         }
       }
     }  //end check of empty regions
-  }    //end check of empty rec-hits
+  }  //end check of empty rec-hits
   return outputColl;
 }
 
@@ -342,7 +342,7 @@ DEFINE_FWK_MODULE(HLTHGCalDigisInRegionsProducer);
 
 // HGCAL RecHits
 #include "DataFormats/HGCRecHit/interface/HGCRecHit.h"
-using HLTHGCalRecHitsInRegionsProducer = HLTCaloObjInRegionsProducer<HGCRecHit>;
+using HLTHGCalRecHitsInRegionsProducer = HLTCaloObjInRegionsProducer<HGCRecHit, std::vector<HGCRecHit>>;
 DEFINE_FWK_MODULE(HLTHGCalRecHitsInRegionsProducer);
 #include "DataFormats/HGCRecHit/interface/HGCUncalibratedRecHit.h"
 using HLTHGCalUncalibratedRecHitsInRegionsProducer = HLTCaloObjInRegionsProducer<HGCUncalibratedRecHit>;

RecoHGCal/Configuration/python/RecoHGCal_EventContent_cff.py

@@ -1,9 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from RecoHGCal.TICL.iterativeTICL_cff import ticlIterLabelsMerge
+from RecoHGCal.TICL.iterativeTICL_cff import ticlIterLabels
 
-trackstersIters = ['keep *_ticlTracksters'+iteration+'_*_*' for iteration in ticlIterLabelsMerge]
-trackstersHLTIters = ['keep *_hltTiclTracksters'+iteration+'_*_*' for iteration in ticlIterLabelsMerge]
+trackstersIters = ['keep *_'+iteration+'_*_*' for iteration in ticlIterLabels]
 
 #AOD content
 TICL_AOD = cms.PSet(
@@ -22,11 +21,9 @@
        'keep *_ticlTrackstersHFNoseHAD_*_*',
        'keep *_ticlTrackstersHFNoseMerge_*_*',] +
       ['keep *_pfTICL_*_*'] +
-      ['keep CaloParticles_mix_*_*', 'keep SimClusters_mix_*_*'] +
-      ['keep *_layerClusterSimClusterAssociationProducer_*_*','keep *_layerClusterCaloParticleAssociationProducer_*_*', 'keep *_layerClusterSimTracksterAssociationProducer_*_*'] +
-      ['keep *_tracksterSimTracksterAssociationLinking_*_*' ,'keep *_tracksterSimTracksterAssociationPR_*_*'] +
-      ['keep *_tracksterSimTracksterAssociationLinkingPU_*_*' ,'keep *_tracksterSimTracksterAssociationPRPU_*_*'] +
-      ['keep *_tracksterSimTracksterAssociationLinkingbyCLUE3D_*_*', 'keep *_tracksterSimTracksterAssociationPRbyCLUE3D_*_*']
+      ['keep CaloParticles_mix_*_*', 'keep SimClusters_mix_*_*', 'keep *_SimClusterToCaloParticleAssociation*_*_*'] +
+      ['keep *_SimClusterToCaloParticleAssociation*_*_*', 'keep *_layerClusterSimClusterAssociationProducer_*_*','keep *_layerClusterCaloParticleAssociationProducer_*_*', 'keep *_layerClusterSimTracksterAssociationProducer_*_*'] +
+      ['keep *_tracksterSimTracksterAssociation*_*_*' , 'keep *_tracksterSimTracksterFromCPsAssociation*_*_*' ]
       )
     )
 
@@ -35,9 +32,10 @@
         [
             'drop *_ticlTracksters*_*_*',
             'keep *_ticlTrackstersCLUE3DHigh_*_*',
-            'keep *_ticlTracksterLinks_*_*',
+            'keep *_ticlTracksterLinks*_*_*',
             'keep *_ticlTracksterLinksSuperclustering*_*_*',
             'keep *_ticlCandidate_*_*',
+
         ]
     )
 )
@@ -61,17 +59,22 @@
       'keep *_ticlSimTracksters_*_*',
       'keep *_ticlSimTICLCandidates_*_*',
       'keep *_ticlSimTrackstersFromCP_*_*',
-      'keep *_tracksterSimTracksterAssociationLinkingSuperclustering_*_*',
-      'keep *_tracksterSimTracksterAssociationPRSuperclustering_*_*', 
+      'keep CaloParticles_mix_*_*', 'keep SimClusters_mix_*_*', 'keep *_SimClusterToCaloParticleAssociation*_*_*',
+      'keep *_SimClusterToCaloParticleAssociation*_*_*', 'keep *_layerClusterSimClusterAssociationProducer_*_*','keep *_layerClusterCaloParticleAssociationProducer_*_*', 'keep *_layerClusterSimTracksterAssociationProducer_*_*',
+      'keep *_allTrackstersToSimTrackstersAssociations*_*_*'
+
       )
     )
 
 TICLv5_FEVT.outputCommands.extend(TICLv5_RECO.outputCommands)
 
 TICL_FEVTHLT = cms.PSet(
     outputCommands = cms.untracked.vstring(
-            trackstersHLTIters +
-            ['keep *_hltPfTICL_*_*']
+            ['keep *_hltPfTICL_*_*',
+            'keep *_hltTiclTrackstersCLUE3D*_*_*',
+            'keep *_hltTiclTracksterLinks_*_*',
+            'keep *_hltTiclCandidate_*_*',
+            'keep *_hltPfTICL_*_*',]
     )
 )
 
@@ -107,12 +110,10 @@ def cleanOutputAndSet(outputModule, ticl_outputCommads):
                                             'keep *_layerClusterCaloParticleAssociationProducer_*_*',
                                             'keep *_randomEngineStateProducer_*_*',
                                             'keep *_layerClusterSimTracksterAssociationProducer_*_*',
-                                            'keep *_tracksterSimTracksterAssociationLinking_*_*',
-                                            'keep *_tracksterSimTracksterAssociationPR_*_*',
-                                            'keep *_tracksterSimTracksterAssociationLinkingPU_*_*',
-                                            'keep *_tracksterSimTracksterAssociationPRPU_*_*',
-                                            'keep *_tracksterSimTracksterAssociationLinkingbyCLUE3D_*_*',
-                                            'keep *_tracksterSimTracksterAssociationPRbyCLUE3D_*_*',
+                                            'keep *_tracksterSimTracksterAssociation*_*_*',
+                                            'keep *_tracksterSimTracksterFromCPsAssociation*_*_*',
+                                            'keep *_SimClusterToCaloParticleAssociation*_*_*',
+                                            'keep *_simClusterToCaloParticleAssociator*_*_*'
                                             ])
 
     if hasattr(process, 'FEVTDEBUGEventContent'):

RecoHGCal/TICL/plugins/PatternRecognitionPluginFactory.cc

@@ -2,7 +2,7 @@
 #include "PatternRecognitionbyCA.h"
 #include "PatternRecognitionbyCLUE3D.h"
 #include "PatternRecognitionbyFastJet.h"
-#include "PatternRecognitionbyPassthrough.h"
+#include "PatternRecognitionbyRecovery.h"
 #include "FWCore/ParameterSet/interface/ValidatedPluginFactoryMacros.h"
 #include "FWCore/ParameterSet/interface/ValidatedPluginMacros.h"
 
@@ -11,7 +11,5 @@ EDM_REGISTER_VALIDATED_PLUGINFACTORY(PatternRecognitionHFNoseFactory, "PatternRe
 DEFINE_EDM_VALIDATED_PLUGIN(PatternRecognitionFactory, ticl::PatternRecognitionbyCA<TICLLayerTiles>, "CA");
 DEFINE_EDM_VALIDATED_PLUGIN(PatternRecognitionFactory, ticl::PatternRecognitionbyCLUE3D<TICLLayerTiles>, "CLUE3D");
 DEFINE_EDM_VALIDATED_PLUGIN(PatternRecognitionFactory, ticl::PatternRecognitionbyFastJet<TICLLayerTiles>, "FastJet");
-DEFINE_EDM_VALIDATED_PLUGIN(PatternRecognitionFactory,
-                            ticl::PatternRecognitionbyPassthrough<TICLLayerTiles>,
-                            "Passthrough");
+DEFINE_EDM_VALIDATED_PLUGIN(PatternRecognitionFactory, ticl::PatternRecognitionbyRecovery<TICLLayerTiles>, "Recovery");
 DEFINE_EDM_VALIDATED_PLUGIN(PatternRecognitionHFNoseFactory, ticl::PatternRecognitionbyCA<TICLLayerTilesHFNose>, "CA");