Merge pull request #48701 from mmasciov/morefollowupCMSHLT3534-151X

Adapt ClusterTPAssociationProducer to deal with two strip cluster product IDs

Author: cmsbuild

HLTriggerOffline/Egamma/python/HLTmultiTrackValidatorGsfTracks_cff.py

@@ -1,6 +1,17 @@
 import FWCore.ParameterSet.Config as cms
 
-from Validation.RecoTrack.HLTmultiTrackValidator_cfi import *
+from Validation.RecoTrack.associators_cff import hltTPClusterProducer, hltTrackAssociatorByHits
+from Validation.RecoTrack.HLTmultiTrackValidator_cfi import hltMultiTrackValidator
+from Validation.RecoTrack.TrackValidation_cff import trackingParticlesElectron
+
+hltTPClusterOnDemandProducer = hltTPClusterProducer.clone(
+    stripClusterSrc = "hltSiStripRawToClustersFacilityOnDemand"
+)
+
+hltGsfTrackAssociatorByHits = hltTrackAssociatorByHits.clone(
+    cluster2TPSrc = "hltTPClusterOnDemandProducer"
+)
+
 hltGsfTrackValidator = hltMultiTrackValidator.clone(
     label = [
         "hltEgammaGsfTracks",
@@ -20,6 +31,7 @@
     ),
     maxRapidityTP =  3.0,
     minRapidityTP = -3.0,
+    associators = ['hltGsfTrackAssociatorByHits']
 )
 
 def _modifyForPhase2(trackvalidator):
@@ -28,11 +40,10 @@ def _modifyForPhase2(trackvalidator):
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
 phase2_common.toModify(hltGsfTrackValidator, _modifyForPhase2)
 
-from Validation.RecoTrack.TrackValidation_cff import trackingParticlesElectron
 hltMultiTrackValidationGsfTracksTask = cms.Task(
-   hltTPClusterProducer
-   , hltTrackAssociatorByHits
-   , trackingParticlesElectron
+    hltTPClusterOnDemandProducer,
+    hltGsfTrackAssociatorByHits,
+    trackingParticlesElectron
  )
 hltMultiTrackValidationGsfTracks = cms.Sequence(
     hltGsfTrackValidator,

SimTracker/TrackerHitAssociation/interface/ClusterTPAssociation.h

@@ -4,7 +4,6 @@
 #include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/HandleBase.h"
 #include "DataFormats/TrackerRecHit2D/interface/OmniClusterRef.h"
-#include "FWCore/Utilities/interface/VecArray.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h"
 
@@ -86,7 +85,7 @@ class ClusterTPAssociation {
   }
 
   map_type map_;
-  edm::VecArray<edm::ProductID, 2> keyProductIDs_;
+  std::vector<edm::ProductID> keyProductIDs_;
   edm::ProductID mappedProductId_;
 };
 

SimTracker/TrackerHitAssociation/plugins/ClusterTPAssociationProducer.cc

@@ -68,6 +68,8 @@ class ClusterTPAssociationProducer final : public edm::global::EDProducer<> {
   edm::EDGetTokenT<edm::DetSetVector<PixelDigiSimLink> > siphase2OTSimLinksToken_;
   edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > pixelClustersToken_;
   edm::EDGetTokenT<edmNew::DetSetVector<SiStripCluster> > stripClustersToken_;
+  const edm::InputTag otherStripClusterTag_;
+  edm::EDGetTokenT<edmNew::DetSetVector<SiStripCluster> > stripClustersOtherToken_;
   edm::EDGetTokenT<edmNew::DetSetVector<Phase2TrackerCluster1D> > phase2OTClustersToken_;
   edm::EDGetTokenT<TrackingParticleCollection> trackingParticleToken_;
   bool throwOnMissingCollections_;
@@ -84,6 +86,8 @@ ClusterTPAssociationProducer::ClusterTPAssociationProducer(const edm::ParameterS
           consumes<edmNew::DetSetVector<SiPixelCluster> >(cfg.getParameter<edm::InputTag>("pixelClusterSrc"))),
       stripClustersToken_(
           consumes<edmNew::DetSetVector<SiStripCluster> >(cfg.getParameter<edm::InputTag>("stripClusterSrc"))),
+      otherStripClusterTag_(cfg.getParameter<edm::InputTag>("stripClusterOtherSrc")),
+      stripClustersOtherToken_(consumes<edmNew::DetSetVector<SiStripCluster> >(otherStripClusterTag_)),
       phase2OTClustersToken_(consumes<edmNew::DetSetVector<Phase2TrackerCluster1D> >(
           cfg.getParameter<edm::InputTag>("phase2OTClusterSrc"))),
       trackingParticleToken_(
@@ -100,6 +104,7 @@ void ClusterTPAssociationProducer::fillDescriptions(edm::ConfigurationDescriptio
   desc.add<edm::InputTag>("phase2OTSimLinkSrc", edm::InputTag("simSiPixelDigis", "Tracker"));
   desc.add<edm::InputTag>("pixelClusterSrc", edm::InputTag("siPixelClusters"));
   desc.add<edm::InputTag>("stripClusterSrc", edm::InputTag("siStripClusters"));
+  desc.add<edm::InputTag>("stripClusterOtherSrc", edm::InputTag(""));
   desc.add<edm::InputTag>("phase2OTClusterSrc", edm::InputTag("siPhase2Clusters"));
   desc.add<edm::InputTag>("trackingParticleSrc", edm::InputTag("mix", "MergedTrackTruth"));
   desc.add<bool>("throwOnMissingCollections", true);
@@ -115,6 +120,12 @@ void ClusterTPAssociationProducer::produce(edm::StreamID, edm::Event& iEvent, co
   edm::Handle<edmNew::DetSetVector<SiStripCluster> > stripClusters;
   bool foundStripClusters = iEvent.getByToken(stripClustersToken_, stripClusters);
 
+  // Strip Cluster (other product, if there)
+  bool foundOtherStripClusters = false;
+  edm::Handle<edmNew::DetSetVector<SiStripCluster> > stripClustersOther;
+  if (otherStripClusterTag_ != edm::InputTag(""))
+    foundOtherStripClusters = iEvent.getByToken(stripClustersOtherToken_, stripClustersOther);
+
   // Phase2 Cluster
   edm::Handle<edmNew::DetSetVector<Phase2TrackerCluster1D> > phase2OTClusters;
   bool foundPhase2OTClusters = iEvent.getByToken(phase2OTClustersToken_, phase2OTClusters);
@@ -129,9 +140,10 @@ void ClusterTPAssociationProducer::produce(edm::StreamID, edm::Event& iEvent, co
   }
 
   // SiStrip DigiSimLink
+  bool foundAnyStripClusters = (foundStripClusters || foundOtherStripClusters);
   edm::Handle<edm::DetSetVector<StripDigiSimLink> > sistripSimLinks;
   auto stripSimLinksFound = iEvent.getByToken(sistripSimLinksToken_, sistripSimLinks);
-  if (not throwOnMissingCollections_ and foundStripClusters and not stripSimLinksFound) {
+  if (not throwOnMissingCollections_ and foundAnyStripClusters and not stripSimLinksFound) {
     auto clusterTPList = std::make_unique<ClusterTPAssociation>();
     iEvent.put(std::move(clusterTPList));
     return;
@@ -244,6 +256,43 @@ void ClusterTPAssociationProducer::produce(edm::StreamID, edm::Event& iEvent, co
     }
   }
 
+  if (foundOtherStripClusters) {
+    // Strip Clusters (other product, if there)
+    clusterTPList->addKeyID(stripClustersOther.id());
+    for (edmNew::DetSetVector<SiStripCluster>::const_iterator iter = stripClustersOther->begin(false),
+                                                              eter = stripClustersOther->end(false);
+         iter != eter;
+         ++iter) {
+      if (!(*iter).isValid())
+        continue;
+      uint32_t detid = iter->id();
+      DetId detId(detid);
+      edmNew::DetSet<SiStripCluster> link_strip = (*iter);
+      for (edmNew::DetSet<SiStripCluster>::const_iterator di = link_strip.begin(); di != link_strip.end(); di++) {
+        const SiStripCluster& cluster = (*di);
+        edm::Ref<edmNew::DetSetVector<SiStripCluster>, SiStripCluster> c_ref =
+            edmNew::makeRefTo(stripClustersOther, di);
+
+        simTkIds.clear();
+        int first = cluster.firstStrip();
+        int last = first + cluster.amplitudes().size();
+
+        for (int istr = first; istr < last; ++istr) {
+          trkid.clear();
+          getSimTrackId<StripDigiSimLink>(trkid, sistripSimLinks, detId, istr);
+          simTkIds.insert(trkid.begin(), trkid.end());
+        }
+        for (auto iset = simTkIds.begin(); iset != simTkIds.end(); iset++) {
+          auto ipos = mapping.find(*iset);
+          if (ipos != mapping.end()) {
+            //std::cout << "cluster in detid: " << detid << " from tp: " << ipos->second.key() << " " << iset->first << std::endl;
+            clusterTPList->emplace_back(OmniClusterRef(c_ref), ipos->second);
+          }
+        }
+      }
+    }
+  }
+
   if (foundPhase2OTClusters) {
     // Phase2 Clusters
     clusterTPList->addKeyID(phase2OTClusters.id());

Validation/RecoVertex/python/HLTmultiPVvalidator_cff.py

@@ -10,13 +10,20 @@
     trackAssociatorMap    = "trackingParticleRecoTrackAsssociation",
     vertexAssociator      = "VertexAssociatorByPositionAndTracks"
 )
-from Validation.RecoTrack.associators_cff import hltTrackAssociatorByHits, tpToHLTpixelTrackAssociation
+from Validation.RecoTrack.associators_cff import hltTPClusterProducer, hltTrackAssociatorByHits, tpToHLTpixelTrackAssociation
 from SimTracker.VertexAssociation.VertexAssociatorByPositionAndTracks_cfi import VertexAssociatorByPositionAndTracks as _VertexAssociatorByPositionAndTracks
 vertexAssociatorByPositionAndTracks4pixelTracks = _VertexAssociatorByPositionAndTracks.clone(
     trackAssociation = "tpToHLTpixelTrackAssociation"
 )
+hltOtherTPClusterProducer = hltTPClusterProducer.clone(
+    stripClusterOtherSrc = "hltSiStripRawToClustersFacilityOnDemand"
+)
+hltOtherTrackAssociatorByHits = hltTrackAssociatorByHits.clone(
+    cluster2TPSrc = cms.InputTag("hltOtherTPClusterProducer")
+)
 tpToHLTpfMuonMergingTrackAssociation = tpToHLTpixelTrackAssociation.clone(
-    label_tr = "hltPFMuonMerging"
+    label_tr = "hltPFMuonMerging",
+    associator = cms.InputTag('hltOtherTrackAssociatorByHits')
 )
 vertexAssociatorByPositionAndTracks4pfMuonMergingTracks = _VertexAssociatorByPositionAndTracks.clone(
     trackAssociation = "tpToHLTpfMuonMergingTrackAssociation"
@@ -62,7 +69,9 @@ def _modifyFullPVanalysisForPhase2(pvanalysis):
 phase2_tracker.toModify(hltPVanalysis, _modifyFullPVanalysisForPhase2)
 
 hltMultiPVAssociations = cms.Task(
+    hltOtherTPClusterProducer,
     hltTrackAssociatorByHits,
+    hltOtherTrackAssociatorByHits,
     tpToHLTpixelTrackAssociation,
     vertexAssociatorByPositionAndTracks4pixelTracks,
     tpToHLTpfMuonMergingTrackAssociation,