Merge pull request #48730 from kpedro88/InputTagUninitialized

cmsbuild · web-flow · commit 35bba00b26c1 · 2025-08-18T18:39:41.000+02:00
add and use isUninitialized() accessor for InputTag
diff --git a/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc b/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc
@@ -115,7 +115,7 @@ SelectedElectronFEDListProducer<TEle, TCand>::SelectedElectronFEDListProducer(co
   else
     beamSpotTag_ = edm::InputTag("hltOnlineBeamSpot");
 
-  if (!(beamSpotTag_ == edm::InputTag("")))
+  if (!beamSpotTag_.isUninitialized())
     beamSpotToken_ = consumes<reco::BeamSpot>(beamSpotTag_);
 
   LogDebug("SelectedElectronFEDListProducer") << " Beam Spot Tag " << beamSpotTag_ << std::endl;
@@ -126,7 +126,7 @@ SelectedElectronFEDListProducer<TEle, TCand>::SelectedElectronFEDListProducer(co
   else
     HBHERecHitTag_ = edm::InputTag("hltHbhereco");
 
-  if (!(HBHERecHitTag_ == edm::InputTag("")))
+  if (!HBHERecHitTag_.isUninitialized())
     hbheRecHitToken_ = consumes<HBHERecHitCollection>(HBHERecHitTag_);
 
   // raw data collector label
@@ -135,7 +135,7 @@ SelectedElectronFEDListProducer<TEle, TCand>::SelectedElectronFEDListProducer(co
   else
     rawDataTag_ = edm::InputTag("rawDataCollector");
 
-  if (!(rawDataTag_ == edm::InputTag("")))
+  if (!rawDataTag_.isUninitialized())
     rawDataToken_ = consumes<FEDRawDataCollection>(rawDataTag_);
 
   LogDebug("SelectedElectronFEDListProducer") << " RawDataInput " << rawDataTag_ << std::endl;
@@ -347,12 +347,12 @@ void SelectedElectronFEDListProducer<TEle, TCand>::produce(edm::Event& iEvent, c
   // event by event analysis
   // Get event raw data
   edm::Handle<FEDRawDataCollection> rawdata;
-  if (!(rawDataTag_ == edm::InputTag("")))
+  if (!rawDataTag_.isUninitialized())
     iEvent.getByToken(rawDataToken_, rawdata);
 
   // take the beam spot position
   edm::Handle<reco::BeamSpot> beamSpot;
-  if (!(beamSpotTag_ == edm::InputTag("")))
+  if (!beamSpotTag_.isUninitialized())
     iEvent.getByToken(beamSpotToken_, beamSpot);
   if (!beamSpot.failedToGet())
     beamSpotPosition_ = beamSpot->position();
@@ -361,7 +361,7 @@ void SelectedElectronFEDListProducer<TEle, TCand>::produce(edm::Event& iEvent, c
 
   // take the calo tower collection
   edm::Handle<HBHERecHitCollection> hbheRecHitHandle;
-  if (!(HBHERecHitTag_ == edm::InputTag("")))
+  if (!HBHERecHitTag_.isUninitialized())
     iEvent.getByToken(hbheRecHitToken_, hbheRecHitHandle);
   const HBHERecHitCollection* hcalRecHitCollection = nullptr;
   if (!hbheRecHitHandle.failedToGet())
diff --git a/FWCore/Utilities/interface/InputTag.h b/FWCore/Utilities/interface/InputTag.h
@@ -44,6 +44,8 @@ namespace edm {
 
     void cacheToken(EDGetToken) const;
 
+    bool isUninitialized() const;
+
     static const std::string kSkipCurrentProcess;
     static const std::string kCurrentProcess;
 
diff --git a/FWCore/Utilities/src/InputTag.cc b/FWCore/Utilities/src/InputTag.cc
@@ -108,6 +108,8 @@ namespace edm {
 
   void InputTag::cacheToken(EDGetToken token) const { token_.store(token); }
 
+  bool InputTag::isUninitialized() const { return label_.empty(); }
+
   std::ostream& operator<<(std::ostream& ost, InputTag const& tag) {
     static std::string const process(", process = ");
     ost << "InputTag:  label = " << tag.label() << ", instance = " << tag.instance()
diff --git a/HLTrigger/Muon/plugins/HLTMuonTrkFilter.cc b/HLTrigger/Muon/plugins/HLTMuonTrkFilter.cc
@@ -96,7 +96,7 @@ bool HLTMuonTrkFilter::hltFilter(edm::Event& iEvent,
   std::vector<l1extra::L1MuonParticleRef>::iterator vl1cands_end;
 
   bool check_l1match = true;
-  if (m_previousCandTag == edm::InputTag(""))
+  if (m_previousCandTag.isUninitialized())
     check_l1match = false;
   if (check_l1match) {
     iEvent.getByToken(m_previousCandToken, previousLevelCands);
diff --git a/HLTrigger/Muon/plugins/HLTMuonTrkL1TFilter.cc b/HLTrigger/Muon/plugins/HLTMuonTrkL1TFilter.cc
@@ -94,7 +94,7 @@ bool HLTMuonTrkL1TFilter::hltFilter(edm::Event& iEvent,
   std::vector<l1t::MuonRef>::iterator vl1cands_end;
 
   bool check_l1match = true;
-  if (m_previousCandTag == edm::InputTag(""))
+  if (m_previousCandTag.isUninitialized())
     check_l1match = false;
   if (check_l1match) {
     iEvent.getByToken(m_previousCandToken, previousLevelCands);
diff --git a/HLTrigger/Muon/plugins/HLTMuonTrkL1TkMuFilter.cc b/HLTrigger/Muon/plugins/HLTMuonTrkL1TkMuFilter.cc
@@ -73,7 +73,7 @@ bool HLTMuonTrkL1TkMuFilter::hltFilter(edm::Event& iEvent,
 
   std::vector<l1t::P2GTCandidateRef> vl1cands;
   bool check_l1match = true;
-  if (m_l1GTAlgoBlockTag == edm::InputTag("") || m_l1GTAlgoNames.empty())
+  if (m_l1GTAlgoBlockTag.isUninitialized() || m_l1GTAlgoNames.empty())
     check_l1match = false;
   if (check_l1match) {
     const l1t::P2GTAlgoBlockMap& algos = iEvent.get(m_algoBlockToken);
diff --git a/L1Trigger/L1TGlobal/plugins/L1TExtCondProducer.cc b/L1Trigger/L1TGlobal/plugins/L1TExtCondProducer.cc
@@ -96,7 +96,7 @@ L1TExtCondProducer::L1TExtCondProducer(const ParameterSet& iConfig)
 
   tcdsRecordToken_ = consumes<TCDSRecord>(tcdsInputTag_);
   // Note that the tcdsRecord input tag should be used as InputTag("unpackTcds","tcdsRecord") only for data
-  if (!(tcdsInputTag_ == edm::InputTag(""))) {
+  if (!tcdsInputTag_.isUninitialized()) {
     makeTriggerRulePrefireVetoBit_ = true;
   }
 
diff --git a/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc b/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc
@@ -821,7 +821,7 @@ void TrackListMerger::produce(edm::Event& e, const edm::EventSetup& es) {
           }  //valid hit
         }  //nhit!=0
 
-        if (doRekeyOnThisSeed && !(clusterRemovalInfos == edm::InputTag(""))) {
+        if (doRekeyOnThisSeed && !clusterRemovalInfos.isUninitialized()) {
           ClusterRemovalRefSetter refSetter(e, clusterRemovalInfos);
           TrajectorySeed::RecHitContainer newRecHitContainer;
           newRecHitContainer.reserve(origSeedRef->nHits());
diff --git a/RecoTracker/MeasurementDet/plugins/MeasurementTrackerEventProducer.cc b/RecoTracker/MeasurementDet/plugins/MeasurementTrackerEventProducer.cc
@@ -35,7 +35,7 @@ MeasurementTrackerEventProducer::MeasurementTrackerEventProducer(const edm::Para
 
   //the measurement tracking is set to skip clusters, the other option is set from outside
   edm::InputTag skip = iConfig.getParameter<edm::InputTag>("skipClusters");
-  selfUpdateSkipClusters_ = !(skip == edm::InputTag(""));
+  selfUpdateSkipClusters_ = !skip.isUninitialized();
   LogDebug("MeasurementTracker") << "skipping clusters: " << selfUpdateSkipClusters_;
   isPhase2_ = false;
   useVectorHits_ = false;
@@ -59,8 +59,8 @@ MeasurementTrackerEventProducer::MeasurementTrackerEventProducer(const edm::Para
         edm::InputTag(iConfig.getParameter<std::string>("Phase2TrackerCluster1DProducer")));
     isPhase2_ = true;
   }
-  if (!(iConfig.getParameter<edm::InputTag>("vectorHits") == edm::InputTag("") ||
-        iConfig.getParameter<edm::InputTag>("vectorHitsRej") == edm::InputTag(""))) {
+  if (!(iConfig.getParameter<edm::InputTag>("vectorHits").isUninitialized() ||
+        iConfig.getParameter<edm::InputTag>("vectorHitsRej").isUninitialized())) {
     thePh2OTVectorHitsLabel = consumes<VectorHitCollection>(iConfig.getParameter<edm::InputTag>("vectorHits"));
     thePh2OTVectorHitsRejLabel = consumes<VectorHitCollection>(iConfig.getParameter<edm::InputTag>("vectorHitsRej"));
     isPhase2_ = true;
diff --git a/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.cc b/RecoTracker/TkSeedGenerator/plugins/SeedCombiner.cc
@@ -36,7 +36,7 @@ SeedCombiner::SeedCombiner(const edm::ParameterSet& cfg) {
     clusterRemovalInfos_ = cfg.getParameter<std::vector<edm::InputTag> >("clusterRemovalInfos");
     clusterRemovalTokens_.resize(clusterRemovalInfos_.size());
     for (unsigned int i = 0; i < clusterRemovalInfos_.size(); ++i)
-      if (!(clusterRemovalInfos_[i] == edm::InputTag("")))
+      if (!clusterRemovalInfos_[i].isUninitialized())
         clusterRemovalTokens_[i] = consumes<reco::ClusterRemovalInfo>(clusterRemovalInfos_[i]);
     if (!clusterRemovalInfos_.empty() && clusterRemovalInfos_.size() == inputCollections_.size())
       reKeing_ = true;
@@ -61,7 +61,7 @@ void SeedCombiner::produce(edm::Event& ev, const edm::EventSetup& es) {
   unsigned int iSC = 0, iSC_max = seedCollections.size();
   for (; iSC != iSC_max; ++iSC) {
     Handle<TrajectorySeedCollection>& collection = seedCollections[iSC];
-    if (reKeing_ && !(clusterRemovalInfos_[iSC] == edm::InputTag(""))) {
+    if (reKeing_ && !clusterRemovalInfos_[iSC].isUninitialized()) {
       ClusterRemovalRefSetter refSetter(ev, clusterRemovalTokens_[iSC]);
 
       for (TrajectorySeedCollection::const_iterator iS = collection->begin(); iS != collection->end(); ++iS) {
diff --git a/SimTracker/TrackerHitAssociation/plugins/ClusterTPAssociationProducer.cc b/SimTracker/TrackerHitAssociation/plugins/ClusterTPAssociationProducer.cc
@@ -124,7 +124,7 @@ void ClusterTPAssociationProducer::produce(edm::StreamID, edm::Event& iEvent, co
   // Strip Cluster (other product, if there)
   bool foundOtherStripClusters = false;
   edm::Handle<edmNew::DetSetVector<SiStripCluster> > stripClustersOther;
-  if (otherStripClusterTag_ != edm::InputTag(""))
+  if (!otherStripClusterTag_.isUninitialized())
     foundOtherStripClusters = iEvent.getByToken(stripClustersOtherToken_, stripClustersOther);
 
   // Phase2 Cluster
diff --git a/Validation/HcalDigis/src/HcalDigisValidation.cc b/Validation/HcalDigis/src/HcalDigisValidation.cc
@@ -46,7 +46,7 @@ HcalDigisValidation::HcalDigisValidation(const edm::ParameterSet& iConfig) {
   tok_ho_ = consumes<HODigiCollection>(inputTag_);
   tok_hf_ = consumes<HFDigiCollection>(inputTag_);
   tok_emulTPs_ = consumes<HcalTrigPrimDigiCollection>(emulTPsTag_);
-  if (dataTPsTag_ == edm::InputTag(""))
+  if (dataTPsTag_.isUninitialized())
     skipDataTPs = true;
   else {
     skipDataTPs = false;
diff --git a/Validation/HcalDigis/test/HcalDigiStudy.cc b/Validation/HcalDigis/test/HcalDigiStudy.cc
@@ -183,7 +183,7 @@ HcalDigiStudy::HcalDigiStudy(const edm::ParameterSet& iConfig) {
   tok_ho_ = consumes<HODigiCollection>(inputTag_);
   tok_hf_ = consumes<HFDigiCollection>(inputTag_);
   tok_emulTPs_ = consumes<HcalTrigPrimDigiCollection>(emulTPsTag_);
-  if (dataTPsTag_ == edm::InputTag("")) {
+  if (dataTPsTag_.isUninitialized()) {
     skipDataTPs = true;
     skipTPs = true;
   } else {

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ L1TExtCondProducer::L1TExtCondProducer(const ParameterSet& iConfig)`
`96`	`96`
`97`	`97`	`tcdsRecordToken_ = consumes<TCDSRecord>(tcdsInputTag_);`
`98`	`98`	`// Note that the tcdsRecord input tag should be used as InputTag("unpackTcds","tcdsRecord") only for data`
`99`		`- if (!(tcdsInputTag_ == edm::InputTag(""))) {`
	`99`	`+ if (!tcdsInputTag_.isUninitialized()) {`
`100`	`100`	`makeTriggerRulePrefireVetoBit_ = true;`
`101`	`101`	`}`
`102`	`102`