Merge pull request #16081 from lgray/phase2_timing_geometry

Phase2 Timing Layer Geometry

Configuration/Geometry/python/GeometryExtended2023D5Reco_cff.py

@@ -0,0 +1,50 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2023Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryExtended2023D5_cff import *
+
+# tracker
+from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+trackerGeometry.applyAlignment = cms.bool(False)
+
+# calo
+from Geometry.CaloEventSetup.HGCalV6Topology_cfi import *
+from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL"                   ,
+                                "ZDC"                    ,
+                                "EcalBarrel"             ,
+                                "TOWER"                  ,
+                                "HGCalEESensitive"       ,
+                                "HGCalHESiliconSensitive" 
+    )
+)
+from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+

Configuration/Geometry/python/GeometryExtended2023D5_cff.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2023Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Geometry.CMSCommonData.cmsExtendedGeometry2023D5XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import *

Configuration/Geometry/scripts/dict2023Geometry.py

@@ -430,12 +430,34 @@
     }
 }
 
-allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict ]
+timingDict = {
+    "abbrev" : "I",
+    "name" : "timing",
+    "I1" : {},
+    "I2" : {
+        1 : [
+            'Geometry/HGCalCommonData/data/fastTimingBarrel.xml',
+            'Geometry/HGCalCommonData/data/fastTiming.xml',
+            'Geometry/HGCalCommonData/data/v2/fastTimingElement.xml',
+            'Geometry/HGCalCommonData/data/fastTimingConst.xml'
+            ],
+        3 : [
+            'Geometry/HGCalSimData/data/fasttimesens.xml'
+            ],
+        4 : [
+            'Geometry/HGCalSimData/data/fasttimeProdCuts.xml'
+            ],
+        "era" : "self.phase2_timing",
+    }
+}
+
+allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, timingDict ]
 
 detectorVersionDict = {
-    ("O1","T1","C1","M1","F1") : "D1",
-    ("O1","T2","C1","M1","F1") : "D2",
-    ("O1","T1","C2","M1","F1") : "D3",
-    ("O1","T3","C2","M1","F1") : "D4"
+    ("O1","T1","C1","M1","F1","I1") : "D1",
+    ("O1","T2","C1","M1","F1","I1") : "D2",
+    ("O1","T1","C2","M1","F1","I1") : "D3",
+    ("O1","T3","C2","M1","F1","I1") : "D4",
+    ("O1","T1","C2","M1","F1","I2") : "D5",
 }
 

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1615,6 +1615,7 @@ def lhegensim(fragment,howMuch):
 defaultDataSets['2023D3Timing']=''
 defaultDataSets['2023D4Timing']=''
 defaultDataSets['2023D4']=''
+defaultDataSets['2023D5']=''
 
 keys=defaultDataSets.keys()
 for key in keys:

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -28,7 +28,9 @@
     '2023D3Timing',
     '2023D3TimingPU',
     '2023D4Timing',
-    '2023D4TimingPU'
+    '2023D4TimingPU',
+    '2023D5',
+    '2023D5PU'
 ]
 
 upgradeSteps=[
@@ -114,6 +116,13 @@
         'Custom' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023tilted4021',
         'Era' : 'Phase2C2',
         'ScenToRun' : ['GenSimFull','DigiFull','RecoFullLocal'],
+    },
+    '2023D5' : {
+        'Geom' : 'Extended2023D5',
+        'GT' : 'auto:run2_mc',
+        'Custom' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023tilted',
+        'Era' : 'Phase2C2_timing',
+        'ScenToRun' : ['GenSimFull','DigiFull','RecoFullGlobal', 'HARVESTFullGlobal'],
     }
 }
 
@@ -138,6 +147,8 @@
 upgradeProperties[2023]['2023D3PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 upgradeProperties[2023]['2023D4PU'] = deepcopy(upgradeProperties[2023]['2023D4'])
 upgradeProperties[2023]['2023D4PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullLocalPU']
+upgradeProperties[2023]['2023D5PU'] = deepcopy(upgradeProperties[2023]['2023D5'])
+upgradeProperties[2023]['2023D5PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 
 #Timing PU (for now copy ScenToRun of standard PU)
 upgradeProperties[2023]['2023D1TimingPU'] = deepcopy(upgradeProperties[2023]['2023D1Timing'])

Configuration/StandardSequences/python/GeometryConf.py

@@ -34,5 +34,6 @@
     'Extended2023D2' : 'Extended2023D2,Extended2023D2Reco',
     'Extended2023D3' : 'Extended2023D3,Extended2023D3Reco',
     'Extended2023D4' : 'Extended2023D4,Extended2023D4Reco',
+    'Extended2023D5' : 'Extended2023D5,Extended2023D5Reco',
     'Extended2017NewFPix' : 'Extended2017NewFPix,Extended2017NewFPixReco',
     }

Fireworks/Geometry/python/dumpRecoGeometry_cfg.py

@@ -3,7 +3,7 @@
 import FWCore.ParameterSet.VarParsing as VarParsing
 from FWCore.Utilities.Enumerate import Enumerate
 
-varType = Enumerate ("Run1 2015 2017 2019 2023D1 2023D2 2023D3 MaPSA")
+varType = Enumerate ("Run1 2015 2017 2019 2023D1 2023D2 2023D3 2023D4 2023D5 MaPSA")
 
 def help():
    print "Usage: cmsRun dumpFWRecoGeometry_cfg.py  tag=TAG "
@@ -76,6 +76,18 @@ def recoGeoLoad(score):
        from Configuration.AlCa.autoCond import autoCond
        process.GlobalTag.globaltag = autoCond['run2_mc']
        process.load('Configuration.Geometry.GeometryExtended2023D3Reco_cff')
+
+    elif  score == "2023D4":
+       process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
+       from Configuration.AlCa.autoCond import autoCond
+       process.GlobalTag.globaltag = autoCond['run2_mc']
+       process.load('Configuration.Geometry.GeometryExtended2023D4Reco_cff')
+
+    elif  score == "2023D5":
+       process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
+       from Configuration.AlCa.autoCond import autoCond
+       process.GlobalTag.globaltag = autoCond['run2_mc']
+       process.load('Configuration.Geometry.GeometryExtended2023D5Reco_cff')
 
     elif score == "MaPSA":
        process.load('Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff')

Fireworks/Geometry/python/dumpSimGeometry_cfg.py

@@ -62,6 +62,12 @@ def simGeoLoad(score):
 
     elif score == "2023D3":
        process.load('Geometry.CMSCommonData.cmsExtendedGeometry2023D3XML_cfi')
+
+    elif score == "2023D4":
+       process.load('Geometry.CMSCommonData.cmsExtendedGeometry2023D4XML_cfi')
+
+    elif score == "2023D5":
+       process.load('Geometry.CMSCommonData.cmsExtendedGeometry2023D5XML_cfi')
 
     elif score == "MaPSA":
        process.load('Geometry.TrackerCommonData.mapsaGeometryXML_cfi')

Geometry/CMSCommonData/python/cmsExtendedGeometry2023D5XML_cfi.py

@@ -0,0 +1,160 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2023Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/PhaseII/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/cmsextent.xml',
+        'Geometry/CMSCommonData/data/PostLS2/cms.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/PostLS2/beampipe.xml',
+        'Geometry/CMSCommonData/data/PostLS2/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/muonMB.xml',
+        'Geometry/CMSCommonData/data/muonMagnet.xml',
+        'Geometry/CMSCommonData/data/cavern.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdMaterials.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdCylinder.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdDisks.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk8.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk9.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk10.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade8.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade9.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade10.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixbar.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/trackerStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker/trackersens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/ectkcable.xml',
+        'Geometry/EcalCommonData/data/PhaseII/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/EcalCommonData/data/eecon.xml',
+        'Geometry/EcalCommonData/data/PhaseII/escon.xml',
+        'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalRecNumberingRebuild.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcal.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalCons.xml',
+        'Geometry/MuonCommonData/data/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/v1/mb1.xml',
+        'Geometry/MuonCommonData/data/v1/mb2.xml',
+        'Geometry/MuonCommonData/data/v1/mb3.xml',
+        'Geometry/MuonCommonData/data/v1/mb4.xml',
+        'Geometry/MuonCommonData/data/design/muonYoke.xml',
+        'Geometry/MuonCommonData/data/PhaseII/mf.xml',
+        'Geometry/MuonCommonData/data/PhaseII/rpcf.xml',
+        'Geometry/MuonCommonData/data/PhaseII/gemf.xml',
+        'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem21.xml',
+        'Geometry/MuonCommonData/data/v2/csc.xml',
+        'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
+        'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/me0.xml',
+        'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/brmrotations.xml',
+        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
+        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
+        'Geometry/ForwardCommonData/data/lumimaterials.xml',
+        'Geometry/ForwardCommonData/data/zdcrotations.xml',
+        'Geometry/ForwardCommonData/data/lumirotations.xml',
+        'Geometry/ForwardCommonData/data/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/cmszdc.xml',
+        'Geometry/HGCalCommonData/data/fastTimingBarrel.xml',
+        'Geometry/HGCalCommonData/data/fastTiming.xml',
+        'Geometry/HGCalCommonData/data/v2/fastTimingElement.xml',
+        'Geometry/HGCalCommonData/data/fastTimingConst.xml',
+    )+
+    cms.vstring(
+        'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil.xml',
+        'Geometry/HGCalSimData/data/hgcsensv6.xml',
+        'Geometry/HGCalSimData/data/hgccons.xml',
+        'Geometry/HGCalSimData/data/hgcProdCuts.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml',
+        'Geometry/ForwardCommonData/data/brmsens.xml',
+        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/HGCalSimData/data/fasttimesens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/HGCalSimData/data/fasttimeProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml',
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)

Geometry/HGCalCommonData/data/fastTimingBarrel.xml

@@ -3,8 +3,8 @@
 
 <ConstantsSection label="fastTimingBarrel.xml" eval="true">
   <Constant name="zero" value="0.0*fm"/>
-  <Constant name="OuterCylinderRin"   value="1.223*m"/>
-  <Constant name="OuterCylinderRout"  value="[cms:TrackCalorR]"/>
+  <Constant name="OuterCylinderRin"   value="119*cm - 4*mm"/>
+  <Constant name="OuterCylinderRout"  value="119*cm"/>
   <Constant name="OuterCylinderL"     value="2.650*m"/>
   <Constant name="FastTimeBarrelRin"  value="[OuterCylinderRin]"/>
   <Constant name="FastTimeBarrelRout" value="[FastTimeBarrelRin]+4*mm"/>
@@ -29,7 +29,7 @@
 
 <PosPartSection label="fastTimingBarrel.xml">
   <PosPart copyNumber="1">
-    <rParent name="tracker:Tracker"/>
+    <rParent name="pixbar:Phase2OTBarrel"/>
     <rChild name="fastTimingBarrel:FastTimeBarrelCylinder"/>
   </PosPart>
   <PosPart copyNumber="1">