Merge pull request #48114 from cms-ngt-hlt/mm_HGCalHLTValidation

Fixes for HGCal validation at HLT

Author: cmsbuild

Configuration/ProcessModifiers/python/ngtScouting_cff.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier is for running ngt scouting menu validation
+
+ngtScouting = cms.Modifier()

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -1976,10 +1976,12 @@ def condition(self, fragment, stepList, key, hasHarvest):
 )
 upgradeWFs['NGTScouting'].step2 = {
     '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:NGTScouting,VALIDATION:@hltValidation',
+    '--procModifiers': 'ngtScouting',
     '--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
     '--eventcontent':'FEVTDEBUGHLT,DQMIO'
 }
 upgradeWFs['NGTScouting'].step3 = {
+    '--procModifiers': 'ngtScouting',
     '-s':'HARVESTING:@hltValidation'
 }
 

SimCalorimetry/HGCalAssociatorProducers/plugins/AllHitToTracksterAssociatorsProducer.cc

@@ -53,6 +53,15 @@ void AllHitToTracksterAssociatorsProducer::produce(edm::StreamID, edm::Event& iE
   Handle<std::vector<reco::CaloCluster>> layer_clusters;
   iEvent.getByToken(layerClustersToken_, layer_clusters);
 
+  if (!layer_clusters.isValid()) {
+    edm::LogWarning("AllHitToTracksterAssociatorsProducer") << "Missing LayerCluster collection.";
+    for (const auto& tracksterToken : tracksterCollectionTokens_) {
+      iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), "hitTo" + tracksterToken.first);
+      iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), tracksterToken.first + "ToHit");
+    }
+    return;
+  }
+
   Handle<std::unordered_map<DetId, const unsigned int>> hitMap;
   iEvent.getByToken(hitMapToken_, hitMap);
 
@@ -89,7 +98,7 @@ void AllHitToTracksterAssociatorsProducer::produce(edm::StreamID, edm::Event& iE
       edm::LogWarning("AllHitToTracksterAssociatorsProducer") << "Missing Tracksters for one of the hitsTokens.";
       iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), "hitTo" + tracksterToken.first);
       iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(), tracksterToken.first + "ToHit");
-      return;
+      continue;
     }
 
     auto hitToTracksterMap = std::make_unique<ticl::AssociationMap<ticl::mapWithFraction>>(rechitManager.size());

SimCalorimetry/HGCalAssociatorProducers/plugins/AllTracksterToSimTracksterAssociatorsByHitsProducer.cc

@@ -123,13 +123,7 @@ void AllTracksterToSimTracksterAssociatorsByHitsProducer::produce(edm::StreamID,
         << "No valid HGCRecHitCollections found. Association maps will be empty.";
 
     for (const auto& tracksterToken : tracksterCollectionTokens_) {
-      Handle<std::vector<ticl::Trackster>> recoTrackstersHandle;
-      iEvent.getByToken(tracksterToken.second, recoTrackstersHandle);
-
       for (const auto& simTracksterToken : simTracksterCollectionTokens_) {
-        Handle<std::vector<ticl::Trackster>> simTrackstersHandle;
-        iEvent.getByToken(simTracksterToken.second, simTrackstersHandle);
-
         iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithSharedEnergyAndScore,
                                                          std::vector<ticl::Trackster>,
                                                          std::vector<ticl::Trackster>>>(),
@@ -163,7 +157,6 @@ void AllTracksterToSimTracksterAssociatorsByHitsProducer::produce(edm::StreamID,
           << "No valid Trackster collection found. Association maps will be empty.";
       for (const auto& simTracksterToken : simTracksterCollectionTokens_) {
         Handle<std::vector<ticl::Trackster>> simTrackstersHandle;
-        iEvent.getByToken(simTracksterToken.second, simTrackstersHandle);
 
         iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithSharedEnergyAndScore,
                                                          std::vector<ticl::Trackster>,
@@ -174,7 +167,7 @@ void AllTracksterToSimTracksterAssociatorsByHitsProducer::produce(edm::StreamID,
                                                          std::vector<ticl::Trackster>>>(),
                    simTracksterToken.first + "To" + tracksterToken.first);
       }
-      return;
+      continue;
     }
 
     const auto& recoTracksters = *recoTrackstersHandle;
@@ -199,11 +192,30 @@ void AllTracksterToSimTracksterAssociatorsByHitsProducer::produce(edm::StreamID,
     if (tracksterToHitMapTokenIter != tracksterToHitMapTokens_.end()) {
       iEvent.getByToken(tracksterToHitMapTokenIter->second, tracksterToHitMapHandle);
     }
+
+    if (!tracksterToHitMapHandle.isValid()) {
+      edm::LogError("AllTracksterToSimTracksterAssociatorsByHitsProducer") << "tracksterToHitMapHandle is invalid";
+      continue;
+    }
+
     const auto& tracksterToHitMap = *tracksterToHitMapHandle;
 
     for (const auto& simTracksterToken : simTracksterCollectionTokens_) {
       Handle<std::vector<ticl::Trackster>> simTrackstersHandle;
       iEvent.getByToken(simTracksterToken.second, simTrackstersHandle);
+
+      if (!simTrackstersHandle.isValid()) {
+        iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithSharedEnergyAndScore,
+                                                         std::vector<ticl::Trackster>,
+                                                         std::vector<ticl::Trackster>>>(),
+                   tracksterToken.first + "To" + simTracksterToken.first);
+        iEvent.put(std::make_unique<ticl::AssociationMap<ticl::mapWithSharedEnergyAndScore,
+                                                         std::vector<ticl::Trackster>,
+                                                         std::vector<ticl::Trackster>>>(),
+                   simTracksterToken.first + "To" + tracksterToken.first);
+        continue;
+      }
+
       const auto& simTracksters = *simTrackstersHandle;
 
       // Retrieve the correct HitToSimTracksterMap for the current simTrackster collection
@@ -240,11 +252,17 @@ void AllTracksterToSimTracksterAssociatorsByHitsProducer::produce(edm::StreamID,
 
       for (unsigned int tracksterIndex = 0; tracksterIndex < recoTracksters.size(); ++tracksterIndex) {
         edm::Ref<std::vector<ticl::Trackster>> recoTracksterRef(recoTrackstersHandle, tracksterIndex);
+
         float recoToSimScoresDenominator = 0.f;
         const auto& recoTracksterHitsAndFractions = tracksterToHitMap[tracksterIndex];
+
+        if (tracksterToHitMap.size() == 0)
+          continue;
+
         ticl::AssociationMap<ticl::mapWithFraction> hitToAssociatedSimTracksterMap(
             recoTracksterHitsAndFractions.size());
         std::vector<unsigned int> associatedSimTracksterIndices;
+
         for (unsigned int i = 0; i < recoTracksterHitsAndFractions.size(); ++i) {
           const auto& hitElement = recoTracksterHitsAndFractions[i];
           unsigned int hitIndex = hitElement.index();
@@ -261,6 +279,7 @@ void AllTracksterToSimTracksterAssociatorsByHitsProducer::produce(edm::StreamID,
             const auto& simTrackster = simTracksters[simTracksterIndex];
             auto& seed = simTrackster.seedID();
             float simFraction = 0;
+
             if (seed == caloParticlesHandle.id()) {
               unsigned int caloParticleIndex = simTrackster.seedIndex();
               auto it =
@@ -279,6 +298,7 @@ void AllTracksterToSimTracksterAssociatorsByHitsProducer::produce(edm::StreamID,
                 simFraction = it->fraction();
               }
             }
+
             hitToAssociatedSimTracksterMap.insert(i, simTracksterIndex, simFraction);
             associatedSimTracksterIndices.push_back(simTracksterIndex);
           }

SimCalorimetry/HGCalAssociatorProducers/plugins/AllTracksterToSimTracksterAssociatorsByLCsProducer.cc

@@ -131,7 +131,7 @@ void AllTracksterToSimTracksterAssociatorsByLCsProducer::produce(edm::StreamID,
                                                          std::vector<ticl::Trackster>>>(),
                    simTracksterToken.first + "To" + tracksterToken.first);
       }
-      return;
+      continue;
     }
 
     const auto& recoTracksters = *recoTrackstersHandle;

Validation/HGCalValidation/python/HLT_TICLIterLabels_cff.py

@@ -1,19 +1,25 @@
 import FWCore.ParameterSet.Config as cms
 
-#hltTiclIterLabels = ["hltTiclTrackstersCLUE3DHigh", "hltTiclTrackstersCLUE3DHighL1Seeded", "hltTiclTrackstersMerge"]
-hltTiclIterLabels = ["hltTiclTrackstersCLUE3DHigh", "hltTiclTrackstersMerge"]
+hltTiclIterLabels = ["hltTiclTrackstersCLUE3DHigh", "hltTiclTrackstersCLUE3DHighL1Seeded", "hltTiclTrackstersMerge"]
 
 from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5
 ticl_v5.toModify(
     globals(),
     lambda g: g.update({
         "hltTiclIterLabels": [
             "hltTiclTrackstersCLUE3DHigh",
-            #"hltTiclTrackstersCLUE3DHighL1Seeded",
+            "hltTiclTrackstersCLUE3DHighL1Seeded",
             "hltTiclTracksterLinks",
             #"hltTiclTracksterLinksSuperclusteringDNNUnseeded",
             #"hltTiclTracksterLinksSuperclusteringDNNL1Seeded",
             "hltTiclCandidate"
         ]
     })
 )
+
+## remove the L1Seeded iteration form the HLT Ticl labels
+from Configuration.ProcessModifiers.ngtScouting_cff import ngtScouting
+_ngtLabels = [label for label in hltTiclIterLabels if label != "hltTiclTrackstersCLUE3DHighL1Seeded"]
+ngtScouting.toModify(
+    globals(), lambda g: g.update({"hltTiclIterLabels": _ngtLabels})
+)