Lc to sim associator rebase

Configuration/PyReleaseValidation/python/relval_nano.py

@@ -405,6 +405,9 @@ def next(self, index: int = None) -> None:
 steps['BTVNANO_mc15.0'] = merge([{'-s': 'NANO:@BTV,DQM:@nanoAODDQM', '-n': '1000'},
                                  steps['NANO_mc15.0']])
 
+steps['EXONANO_mc15.0'] = merge([{'-s': 'PAT,NANO:@EXO', '-n': '1000'},
+                                 steps['NANO_mc15.0']])
+
 steps['lepTrackInfoNANO_mc15.0'] = merge([{'-s': 'NANO:@LepTrackInfo,DQM:@nanoAODDQM', '-n': '1000'},
                                           steps['NANO_mc15.0']])
 
@@ -422,10 +425,14 @@ def next(self, index: int = None) -> None:
 
 # ====== DATA ======
 lumis_Run2025C = {392175: [[95, 542]]}
+lumis_Run2025C_Muon0 = {392997: [[146, 202]]}
 
 steps['JetMET1_Run2025C_MINIAOD_150X'] = {'INPUT': InputInfo(
     location='STD', ls=lumis_Run2025C, dataSet='/JetMET1/Run2025C-PromptReco-v1/MINIAOD')}
 
+steps['Muon0_Run2025C_AOD_150X'] = {'INPUT': InputInfo(
+    location='STD',ls=lumis_Run2025C_Muon0, dataSet='/Muon0/Run2025C-PromptReco-v1/AOD')}
+
 steps['ScoutingPFRun3_Run2025C_HLTSCOUT_150X'] = {'INPUT': InputInfo(location='STD', ls=lumis_Run2025C,
                                                          dataSet='/ScoutingPFRun3/Run2025C-v1/HLTSCOUT')}
 
@@ -455,6 +462,9 @@ def next(self, index: int = None) -> None:
 steps['BTVNANO_data15.0'] = merge([{'-s': 'NANO:@BTV,DQM:@nanoAODDQM', '-n': '1000'},
                                    steps['NANO_data15.0']])
 
+steps['EXONANO_data15.0'] = merge([{'-s': 'PAT,NANO:@EXO', '-n': '1000'},
+                                   steps['NANO_data15.0']])
+
 steps['lepTrackInfoNANO_data15.0'] = merge([{'-s': 'NANO:@LepTrackInfo,DQM:@nanoAODDQM', '-n': '1000'},
                                            steps['NANO_data15.0']])
 
@@ -650,6 +660,7 @@ def next(self, index: int = None) -> None:
 workflows[_wfn()] = ['ScoutingNANOmc150X', ['TTbar_13p6_Summer24_MINIAOD_150X', 'scoutingNANO_mc15.0']]
 workflows[_wfn()] = ['ScoutingNANOwithPromptmc150X', ['TTbar_13p6_Summer24_MINIAOD_150X', 'scoutingNANO_withPrompt_mc15.0']]
 workflows[_wfn()] = ['BPHNANOmc150X', ['TTbar_13p6_Summer24_MINIAOD_150X', 'BPHNANO_mc15.0']]
+workflows[_wfn()] = ['EXONANOmc150X', ['TTbar_13p6_Summer24_AOD_140X', 'EXONANO_mc15.0']]
 
 # POG/PAG custom NANOs, data
 _wfn.subnext()
@@ -663,6 +674,7 @@ def next(self, index: int = None) -> None:
 workflows[_wfn()] = ['ScoutingNANOmonitordata150Xrun3', ['ScoutingPFMonitor_Run2025C_MINIAOD_150X', 'scoutingNANO_monitor_data15.0']]  # noqa
 workflows[_wfn()] = ['ScoutingNANOmonitorWithPromptdata150Xrun3', ['ScoutingPFMonitor_Run2025C_MINIAOD_150X', 'scoutingNANO_monitorWithPrompt_data15.0']]  # noqa
 workflows[_wfn()] = ['BPHNANOdata150Xrun3', ['JetMET1_Run2025C_MINIAOD_150X', 'BPHNANO_data15.0']]
+workflows[_wfn()] = ['EXONANOdata150Xrun3', ['Muon0_Run2025C_AOD_150X', 'EXONANO_data15.0']]
 workflows[_wfn()] = ['L1ScoutingNANOdata150Xrun3', ['L1Scouting2025RAW15.0', 'l1ScoutingNANO_data15.0']]
 workflows[_wfn()] = ['L1ScoutingSelectionNANOdata150Xrun3', ['L1ScoutingSelection2025RAW15.0', 'l1ScoutingSelectionNANO_data15.0']]
 

DQM/EcalMonitorClient/python/PresampleClient_cfi.py

@@ -6,8 +6,8 @@
 minChannelEntries = 6
 expectedMean = 200.0
 toleranceLow = 25.0
-toleranceHigh = 60.0
-toleranceHighFwd = 100.0
+toleranceHigh = 80.0
+toleranceHighFwd = 120.0
 toleranceRMS = 6.0
 toleranceRMSFwd = 6.0
 

DQM/SiTrackerPhase2/test/dqmstep_phase2tk_cfg.py

@@ -10,7 +10,7 @@
 # step3_pre4_inDQM.root - input for the next step in the DQM sequence, harvestingstep_phase2tk_cfg.py
 
 # Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v 
-# with command line options: step3 --conditions auto:phase2_realistic_T21 -s RAW2DIGI,L1Reco,RECO,RECOSIM,VALIDATION:@phase2Validation,DQM:@phase2 --datatier DQMIO -n 10 --geometry Extended2026D98 --era Phase2C11M9 --eventcontent DQM --no_exec
+# with command line options: step3 --conditions auto:phase2_realistic_T21 -s RAW2DIGI,L1Reco,RECO,RECOSIM,VALIDATION:@phase2Validation,DQM:@phase2 --datatier DQMIO -n 10 --geometry Extended2026D110 --era Phase2C11M9 --eventcontent DQM --no_exec
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
@@ -41,7 +41,7 @@
 
 # Input source
 process.source = cms.Source("PoolSource",
-    fileNames = cms.untracked.vstring('/store/relval/CMSSW_14_0_0_pre2/RelValTTbar_14TeV/GEN-SIM-DIGI-RAW/PU_133X_mcRun4_realistic_v1_STD_2026D98_PU200_RV229-v1/2580000/0b2b0b0b-f312-48a8-9d46-ccbadc69bbfd.root'),
+    fileNames = cms.untracked.vstring('/store/relval/CMSSW_15_0_0/RelValTTbar_14TeV/GEN-SIM-RECO/PU_141X_mcRun4_realistic_v3_STD_Run4D110_PU-v3/2580000/01972f5c-64f5-4fea-890d-ffa3bb070b77.root'),
     secondaryFileNames = cms.untracked.vstring()
 )
 

DQM/SiTrackerPhase2/test/harvestingstep_phase2tk_cfg.py

@@ -9,7 +9,7 @@
 # DQM_V0001_R000000001__Global__CMSSW_X_Y_Z__RECO.root - for local visualization of histograms
 
 # Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v 
-# with command line options: step4 --conditions auto:phase2_realistic_T21 -s HARVESTING:@phase2Validation+@phase2+@miniAODValidation+@miniAODDQM --scenario pp --filetype DQM --geometry ExtendedRun4D98 --era Phase2C11M9 --mc -n -1 --no_exec
+# with command line options: step4 --conditions auto:phase2_realistic_T21 -s HARVESTING:@phase2Validation+@phase2+@miniAODValidation+@miniAODDQM --scenario pp --filetype DQM --geometry ExtendedRun4D110 --era Phase2C11M9 --mc -n -1 --no_exec
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
@@ -27,6 +27,7 @@
 process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff')
 process.load('Configuration.StandardSequences.Harvesting_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+#process.load('Validation.SiTrackerPhase2V.Phase2OTEffClient_cff')
 
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(8000),
@@ -88,5 +89,5 @@
 process.dqmsave_step = cms.Path(process.DQMSaver)
 
 # Schedule definition
-#process.schedule = cms.Schedule(process.trackerphase2ValidationHarvesting_step,process.dqmsave_step)
-process.schedule = cms.Schedule(process.dqmsave_step)
+#process.schedule = cms.Schedule(process.trackerphase2ValidationHarvesting_step, process.dqmsave_step)
+process.schedule = cms.Schedule(process.dqmsave_step)

DQM/TrackingMonitorSource/python/TrackingSourceConfig_Tier0_cff.py

@@ -395,10 +395,13 @@ def _copyIfExists(mod, pset, name):
 from Configuration.ProcessModifiers.seedingDeepCore_cff import seedingDeepCore
 seedingDeepCore.toReplaceWith(TrackSeedMonSequence,_seedingDeepCore_TrackSeedMonSequence)
 
+from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
 from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
 trackingLST.toModify(locals()["TrackSeedMonhighPtTripletStep"],
     SeedProducer = "lstInputProducer"
 )
+_LST_TrackSeedMonSequence = TrackSeedMonSequence.copyAndExclude([locals()["TrackSeedMoninitialStep"]])
+(seedingLST | trackingLST).toReplaceWith(TrackSeedMonSequence, _LST_TrackSeedMonSequence)
 
 TrackingDQMSourceTier0 += TrackSeedMonSequence
 

DQMServices/StreamerIO/scripts/personalPlayback.py

@@ -218,7 +218,7 @@ def do_exec(self):
 logname="/var/log/hltd/pid/hlt_run$4_pid$$.log"
 lognamez="/var/log/hltd/pid/hlt_run$4_pid$$_gzip.log.gz"
 #override the noclobber option by using >| operator for redirection - then keep appending to log
-echo startDqmRun invoked $TODAY with arguments $1 $2 $3 $4 $5 $6 $7 $8 >| $logname
+echo startDqmRun invoked $TODAY with arguments $@ >| $logname
 export http_proxy="http://cmsproxy.cms:3128"
 export https_proxy="https://cmsproxy.cms:3128/"
 export NO_PROXY=".cms"
@@ -232,8 +232,8 @@ def do_exec(self):
 eval `scram runtime -sh`;
 cd $3;
 pwd >> $logname 2>&1
-#exec esMonitoring.py -z $lognamez cmsRun `readlink $6` runInputDir=$5 runNumber=$4 $7 $8 >> $logname 2>&1
-exec esMonitoring.py cmsRun `readlink $6` runInputDir=$5 runNumber=$4 $7 $8
+#exec esMonitoring.py -z $lognamez cmsRun `readlink $6` runInputDir=$5 runNumber=$4 ${{@:7}} >> $logname 2>&1
+exec esMonitoring.py cmsRun `readlink $6` runInputDir=$5 runNumber=$4 ${{@:7}}
 """
 
 start_dqm_job = start_dqm_job.replace("/var/log/hltd/pid/", '{log_path}/')
@@ -361,6 +361,9 @@ def make_args(self, run):
         args.append(self.cfg_link)          # cmsRun arg 1
         args.append(f"runkey={self.opts.run_key}")        # cmsRun arg 2
 
+        for extra_arg in self.opts.extra_args:
+            args.append(extra_arg)
+
         return args
 
     def discover_latest(self):
@@ -472,6 +475,8 @@ def do_exec(self):
     run_group.add_argument("--cmsRun", type=str, help="cmsRun command to run, for igprof and so on.", default="cmsRun")
     run_group.add_argument("--run_key", type=str, help="Run key to use (pp_run, cosmic_run or hi_run)", default="pp_run")
 
+    client_group = parser.add_argument_group("Client", "Client extra arguments.")
+    client_group.add_argument("--extra-args", nargs="+", metavar="KEY=VALUE", help="Client extra arguments split by whitespace")
 
     parser.add_argument('cmssw_configs', metavar='cmssw_cfg.py', type=str, nargs='*', help='List of cmssw jobs (clients).')
 

DataFormats/L1TMuonPhase2/interface/Constants.h

@@ -31,11 +31,11 @@ namespace Phase2L1GMT {
   const int BITSSTUBCOORD = 10;
   const int BITSSTUBETA = 8;
   const int BITSSTUBID = 12;
-  const int BITSSTUBPHIQUALITY = 4;
-  const int BITSSTUBETAQUALITY = 4;
-  const int BITSSTUBTIME = 8;
+  const int BITSSTUBPHIQUALITY = 2;
+  const int BITSSTUBETAQUALITY = 2;
+  const int BITSSTUBTIME = 5;
   const int BITSSTAMUONQUALITY = 6;
-  const int BITSMUONBX = 4;
+  const int BITSMUONBX = 3;
 
   //PreTrackMatherdMuon
   const int BITSMATCHQUALITY = 9;
@@ -44,7 +44,7 @@ namespace Phase2L1GMT {
   //Track Muon Match
   const int BITSSIGMAETA = 4;
   const int BITSSIGMACOORD = 4;
-  const int BITSPROPCOORD = 6;  //lowered this to make room for another prop coefficient
+  const int BITSPROPCOORD = 6;
   const int BITSPROPSIGMACOORD_A = 6;
   const int BITSPROPSIGMACOORD_B = 6;
   const int BITSPROPSIGMAETA_A = 5;

DataFormats/L1TMuonPhase2/interface/MuonStub.h

@@ -29,6 +29,7 @@
 //#include "DataFormats/L1TMuon/interface/BMTF/L1MuBMTrackSegLoc.h"
 #include "DataFormats/L1Trigger/interface/BXVector.h"
 #include "DataFormats/Common/interface/Ref.h"
+#include "DataFormats/L1TMuonPhase2/interface/Constants.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //              ---------------------
@@ -140,6 +141,12 @@ namespace l1t {
 
     void print() const;
 
+    const Phase2L1GMT::wordtype hybridStubWord() const;
+    void printHybridStub(const std::string module = "MuonStub", const uint spaces = 0, const bool label = true) const;
+    void printHybridStubWord(const std::string module = "MuonStub",
+                             const uint spaces = 0,
+                             const bool label = true) const;
+
   private:
     int etaRegion_;    //In the barrel this is wheel. In the endcap it is 6-ring
     int phiRegion_;    //In the barrel it is sector. In the endcap it is chamber

DataFormats/L1TMuonPhase2/src/MuonStub.cc

@@ -87,3 +87,57 @@ void MuonStub::print() const {
                        << " quality=" << quality_ << " eta1=" << eta1_ << " eta2=" << eta2_
                        << " etaQuality=" << etaQuality_ << " type=" << type_;
 }
+
+const Phase2L1GMT::wordtype MuonStub::hybridStubWord() const {
+  Phase2L1GMT::wordtype w = 0;
+  int bstart = 0;
+  //valid bit is always on in emulator because invalid stubs are never created
+  bstart = Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, 1, 1);
+  bstart = Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, quality_, Phase2L1GMT::BITSSTUBPHIQUALITY);
+  bstart = Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, etaQuality_, Phase2L1GMT::BITSSTUBETAQUALITY);
+  bstart = Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, bxNum_, Phase2L1GMT::BITSMUONBX);
+  bstart = Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, coord1_, Phase2L1GMT::BITSSTUBCOORD);
+  bstart = Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, coord2_, Phase2L1GMT::BITSSTUBCOORD);
+  bstart = Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, eta1_, Phase2L1GMT::BITSSTUBETA);
+  bstart = Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, eta2_, Phase2L1GMT::BITSSTUBETA);
+  bstart =
+      Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, 0, Phase2L1GMT::BITSSTUBTIME);  //placeholder for time
+  int addr = address();
+  bstart = Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, addr, Phase2L1GMT::BITSSTUBID);
+  bstart = Phase2L1GMT::wordconcat<Phase2L1GMT::wordtype>(w, bstart, tfLayer_, 3);
+  return w;
+}
+
+void MuonStub::printHybridStub(const std::string module, const uint spaces, const bool label) const {
+  std::string lab = "";
+  lab.append(spaces, ' ');
+  if (label)
+    lab.append("hybrid stub:    ");
+  int addr = address();
+  edm::LogInfo(module) << lab << "quality = " << quality_ << ",    "
+                       << "etaQuality = " << etaQuality_ << ",    "
+                       << "bxNum = " << bxNum_ << ",    "
+                       << "coord1 = " << offline_coord1_ << " (" << coord1_ << ")"
+                       << ",    "
+                       << "coord2 = " << offline_coord2_ << " (" << coord2_ << ")"
+                       << ",    "
+                       << "eta1 = " << offline_eta1_ << " (" << eta1_ << ")"
+                       << ",    "
+                       << "eta2 = " << offline_eta2_ << " (" << eta2_ << ")"
+                       << ","
+                       << "\n"
+                       << std::setfill(' ') << std::setw(lab.length()) << " "
+                       << "time = " << 0 << ",    "  //placeholder for time
+                       << "address = " << addr << " (id = " << id_ << ")"
+                       << ",    "
+                       << "tfLayer = " << tfLayer_ << std::flush;
+}
+
+void MuonStub::printHybridStubWord(const std::string module, const uint spaces, const bool label) const {
+  std::string lab = "";
+  lab.append(spaces, ' ');
+  if (label)
+    lab.append("hybrid stub word = ");
+  Phase2L1GMT::wordtype w = MuonStub::hybridStubWord();
+  edm::LogInfo(module) << lab << std::setfill('0') << std::setw(16) << std::hex << w.to_uint64() << std::flush;
+}

FastSimulation/Tracking/plugins/FastTrackerRecHitMaskFromSeedProducer.cc

@@ -0,0 +1,93 @@
+// system includes
+#include <memory>
+
+// framework stuff
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+
+// data formats
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/TrackerRecHit2D/interface/FastTrackerRecHit.h"
+#include "DataFormats/TrackerRecHit2D/interface/FastTrackerRecHitCollection.h"
+#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
+
+class FastTrackerRecHitMaskFromSeedProducer : public edm::global::EDProducer<> {
+public:
+  explicit FastTrackerRecHitMaskFromSeedProducer(const edm::ParameterSet&);
+
+  ~FastTrackerRecHitMaskFromSeedProducer() override {}
+
+  void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+private:
+  // an alias
+  using QualityMaskCollection = std::vector<unsigned char>;
+
+  // tokens
+  edm::EDGetTokenT<TrajectorySeedCollection> trajectories_;
+
+  edm::EDGetTokenT<FastTrackerRecHitCollection> recHits_;
+
+  edm::EDGetTokenT<std::vector<bool> > oldHitMaskToken_;
+
+  edm::EDPutTokenT<std::vector<bool> > collectedHits_;
+};
+
+FastTrackerRecHitMaskFromSeedProducer::FastTrackerRecHitMaskFromSeedProducer(const edm::ParameterSet& iConfig)
+    : trajectories_(consumes(iConfig.getParameter<edm::InputTag>("trajectories"))),
+      recHits_(consumes(iConfig.getParameter<edm::InputTag>("recHits"))),
+      collectedHits_(produces()) {
+  auto const& oldHitRemovalInfo = iConfig.getParameter<edm::InputTag>("oldHitRemovalInfo");
+  if (!oldHitRemovalInfo.label().empty()) {
+    oldHitMaskToken_ = consumes<std::vector<bool> >(oldHitRemovalInfo);
+  }
+}
+
+void FastTrackerRecHitMaskFromSeedProducer::produce(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const {
+  // the product
+
+  std::vector<bool> collectedHits;
+
+  // input
+
+  auto const& recHits = iEvent.get(recHits_);
+
+  if (!oldHitMaskToken_.isUninitialized()) {
+    auto const& oldHitMasks = iEvent.get(oldHitMaskToken_);
+    collectedHits.insert(collectedHits.begin(), oldHitMasks.begin(), oldHitMasks.end());
+  }
+  collectedHits.resize(recHits.size(), false);
+
+  auto const& seeds = iEvent.get(trajectories_);
+
+  // loop over seed tracks and mask hits
+  for (auto const& seed : seeds) {
+    for (auto const& hit : seed.recHits()) {
+      if (!hit.isValid())
+        continue;
+      const FastTrackerRecHit& fasthit = static_cast<const FastTrackerRecHit&>(hit);
+      // note: for matched hits nIds() returns 2, otherwise 1
+      for (unsigned id_index = 0; id_index < fasthit.nIds(); id_index++) {
+        collectedHits[unsigned(fasthit.id(id_index))] = true;
+      }
+    }
+  }
+
+  iEvent.emplace(collectedHits_, std::move(collectedHits));
+}
+
+void FastTrackerRecHitMaskFromSeedProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<edm::InputTag>("trajectories", edm::InputTag("initialStepSeeds"));
+  desc.add<edm::InputTag>("recHits", edm::InputTag("fastTrackerRecHits"));
+  desc.add<edm::InputTag>("oldHitRemovalInfo", edm::InputTag(""));
+  descriptions.addWithDefaultLabel(desc);
+}
+
+DEFINE_FWK_MODULE(FastTrackerRecHitMaskFromSeedProducer);

FastSimulation/Tracking/python/FastTrackerRecHitMaskFromSeedProducer_cff.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+from FastSimulation.Tracking.fastTrackerRecHitMaskFromSeedProducer_cfi import fastTrackerRecHitMaskFromSeedProducer
+
+def maskProducerFromSeedClusterRemover(seedClusterRemover):
+    maskProducer = fastTrackerRecHitMaskFromSeedProducer.clone(
+        trajectories = seedClusterRemover.trajectories,
+        )
+    if(hasattr(seedClusterRemover,"oldClusterRemovalInfo")):
+        maskProducer.oldHitRemovalInfo = cms.InputTag(seedClusterRemover.oldClusterRemovalInfo.getModuleLabel().replace("Clusters","Masks"))
+    return maskProducer

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

@@ -1557,9 +1557,11 @@ bool HGCalDDDConstants::tileExist(int zside, int layer, int ring, int phi) const
   const auto& index = getIndex(layer, true);
   bool fine = hgpar_->scintFine(index.first);
 #ifdef EDM_ML_DEBUG
-  edm::LogVerbatim("HGCalGeomT") << "TileExist: Layer : " << layer << ":" << index.first << " Fine " << fine;
+  edm::LogVerbatim("HGCalGeomT") << "TileExist: Layer : " << layer << ":" << index.first << " Fine " << fine
+                                 << " index " << index.first << " :" << index.second;
 #endif
-  bool ok = ((ring >= hgpar_->iradMinBH_[index.first]) && (ring <= hgpar_->iradMaxBH_[index.first]));
+  bool ok = (fine) ? ((ring >= hgpar_->iradMinBHFine_[index.first]) && (ring <= hgpar_->iradMaxBHFine_[index.first]))
+                   : ((ring >= hgpar_->iradMinBH_[index.first]) && (ring <= hgpar_->iradMaxBH_[index.first]));
   if (ok) {
     if (fine) {
       int indx = HGCalTileIndex::tileIndex(layer, ring, 1);
@@ -1601,9 +1603,13 @@ bool HGCalDDDConstants::tileExist(int zside, int layer, int ring, int phi) const
     }
 #ifdef EDM_ML_DEBUG
   } else {
+    std::ostringstream st1;
+    if (fine)
+      st1 << hgpar_->iradMinBHFine_[index.first] << ":" << hgpar_->iradMaxBHFine_[index.first];
+    else
+      st1 << hgpar_->iradMinBH_[index.first] << ":" << hgpar_->iradMaxBH_[index.first];
     edm::LogWarning("HGCalGeomT") << "TileExist:input " << zside << ":" << layer << ":" << ring << ":" << phi
-                                  << " Index " << index.first << " Ring limits " << hgpar_->iradMinBH_[index.first]
-                                  << ":" << hgpar_->iradMaxBH_[index.first] << " ok " << ok;
+                                  << " Index " << index.first << " Ring limits " << st1.str() << " ok " << ok;
 #endif
   }
   return ok;