Merge pull request #45211 from fabiocos/fc-fixD110

MTD geometry: fix BTL numbering scheme for scenario v3, input by Geant4, move unit tests to D110 scenario

Author: cmsbuild

Geometry/MTDCommonData/src/BTLNumberingScheme.cc

@@ -26,6 +26,10 @@ uint32_t BTLNumberingScheme::getUnitID(const MTDBaseNumber& baseNumber) const {
     }
   }
 
+#ifdef EDM_ML_DEBUG
+  LogDebug("MTDGeom") << "BTLNumberingScheme::getUnitID(): isDD4hep " << isDD4hepOK;
+#endif
+
   auto bareBaseName = [&](std::string_view name) {
     size_t ipos = name.rfind('_');
     return (isDD4hepOK) ? name.substr(0, ipos) : name;
@@ -117,7 +121,11 @@ uint32_t BTLNumberingScheme::getUnitID(const MTDBaseNumber& baseNumber) const {
         modCopy = negModCopy[modCopy - 1];
       }
 
-      bool isV2(baseNumber.getLevelName(0).back() != 'l');
+      bool isV2(bareBaseName(baseNumber.getLevelName(0)).back() != 'l');
+
+#ifdef EDM_ML_DEBUG
+      LogDebug("MTDGeom") << "BTLNumberingScheme::getUnitID(): isV2 " << isV2;
+#endif
 
       if (isV2) {
         // V2: the type is embedded in crystal name
@@ -204,7 +212,11 @@ uint32_t BTLNumberingScheme::getUnitID(const MTDBaseNumber& baseNumber) const {
       modCopy = negModCopy[modCopy - 1];
     }
 
-    bool isV2(baseNumber.getLevelName(0).back() != 'e');
+    bool isV2(bareBaseName(baseNumber.getLevelName(0)).back() != 'e');
+
+#ifdef EDM_ML_DEBUG
+    LogDebug("MTDGeom") << "BTLNumberingScheme::getUnitID(): isV2 " << isV2;
+#endif
 
     if (isV2) {
       // V2: the type is embedded in crystal name

Geometry/MTDCommonData/test/testMTDinDD4hep.py

@@ -54,7 +54,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load('Configuration.Geometry.GeometryDD4hepExtended2026D98_cff')
+process.load('Configuration.Geometry.GeometryDD4hepExtended2026D110_cff')
 
 process.testBTL = cms.EDAnalyzer("DD4hep_TestMTDIdealGeometry",
                                  DDDetector = cms.ESInputTag('',''),

Geometry/MTDCommonData/test/testMTDinDDD.py

@@ -53,7 +53,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load('Configuration.Geometry.GeometryExtended2026D98_cff')
+process.load('Configuration.Geometry.GeometryExtended2026D110_cff')
 
 process.testBTL = cms.EDAnalyzer("TestMTDIdealGeometry",
                                ddTopNodeName = cms.untracked.string('BarrelTimingLayer')

Geometry/MTDGeometryBuilder/test/dd4hep_mtd_cfg.py

@@ -50,7 +50,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryDD4hepExtended2026D98Reco_cff")
+process.load("Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff")
 
 process.Timing = cms.Service("Timing")
 

Geometry/MTDGeometryBuilder/test/mtd_cfg.py

@@ -46,7 +46,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryExtended2026D98_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110_cff")
 
 process.load("Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff")
 

Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py

@@ -47,7 +47,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryDD4hepExtended2026D98Reco_cff")
+process.load("Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff")
 
 process.prod = cms.EDAnalyzer("GeometricTimingDetAnalyzer")
 

Geometry/MTDNumberingBuilder/test/mtd_cfg.py

@@ -46,7 +46,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryExtended2026D98Reco_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
 
 process.Timing = cms.Service("Timing")
 

RecoMTD/DetLayers/test/mtd_cfg.py

@@ -48,7 +48,7 @@
     threshold = cms.untracked.string('INFO'))
 
 # Choose Tracker Geometry
-process.load("Configuration.Geometry.GeometryExtended2026D98Reco_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
 process.load("MagneticField.Engine.volumeBasedMagneticField_160812_cfi")
 
 process.Timing = cms.Service("Timing")

SimG4CMS/Forward/test/python/runMTDSens_DD4hep_cfg.py

@@ -4,7 +4,7 @@
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
 process = cms.Process('G4PrintGeometry',Phase2C17I13M9,dd4hep)
 
-process.load('Configuration.Geometry.GeometryDD4hepExtended2026D98Reco_cff')
+process.load('Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
@@ -85,6 +85,6 @@
 process.g4SimHits.UseMagneticField        = False
 process.g4SimHits.Physics.DefaultCutValue = 10. 
 process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
-	Name           = cms.untracked.vstring('BTLCrystal1','BTLCrystal2','BTLCrystal3','EModule_Timingactive'),
+	Name           = cms.untracked.vstring('BTLCrystal','LGAD_active'),
 	type           = cms.string('PrintMTDSens')
 ))

SimG4CMS/Forward/test/python/runMTDSens_cfg.py

@@ -3,7 +3,7 @@
 from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
 process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
 
-process.load('Configuration.Geometry.GeometryExtended2026D98Reco_cff')
+process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
@@ -84,6 +84,6 @@
 process.g4SimHits.UseMagneticField        = False
 process.g4SimHits.Physics.DefaultCutValue = 10. 
 process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
-	Name           = cms.untracked.vstring('BTLCrystal1','BTLCrystal2','BTLCrystal3','EModule_Timingactive'),
+	Name           = cms.untracked.vstring('BTLCrystal','LGAD_active'),
 	type           = cms.string('PrintMTDSens')
 ))