Skip to content

Commit

Permalink
Update some of the cfi files to test v7/v8 scenarios
Browse files Browse the repository at this point in the history
  • Loading branch information
Sunanda committed Apr 15, 2017
1 parent 0940b04 commit 594986d
Show file tree
Hide file tree
Showing 3 changed files with 130 additions and 80 deletions.
2 changes: 2 additions & 0 deletions Geometry/HGCalCommonData/plugins/DDHGCalModule.cc
View file
Expand Up @@ -189,6 +189,8 @@ void DDHGCalModule::constructLayers(DDLogicalPart module,
<< " Tubs made of " << matName << " of dimensions " << rinB
<< ", " << routF << ", " << 0.5*thick[ii] << ", 0.0, "
<< CLHEP::twopi/CLHEP::deg << std::endl;
std::cout << "DDHGCalModule test position in: " << glog.name()
<< " number " << copy << std::endl;
#endif
positionSensitive(glog,rinB,routF,cpv);
}
Expand Down
106 changes: 98 additions & 8 deletions Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py
View file
@@ -1,27 +1,117 @@
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/materials.xml',
geomXMLFiles = cms.vstring(
'Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/cmsextent.xml',
'Geometry/CMSCommonData/data/cms/2017/v1/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/muonBase/2023/v1/muonBase.xml',
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml',
'Geometry/CMSCommonData/data/cmsBeam/2023/v1/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/TiltedTracker4026/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerStructureTopology.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixelStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackersens.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelsens.xml',
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4026/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelProdCuts.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/hcalRecNumberingRebuild.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalsenspmf.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/HGCalCommonData/data/v7/hgcalCons.xml',
'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2023/v1/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2023/v1/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/csc/2015/v1/csc.xml',
'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml',
'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/me0.xml',
'Geometry/ForwardCommonData/data/forwardshield/2015/v1/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',
)+
cms.vstring(
'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/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/ME0EtaPart/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/v7/GEMSpecsFilter.xml',
'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
'Geometry/ForwardCommonData/data/brmsens.xml',
'Geometry/ForwardSimData/data/zdcsens.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/CMSCommonData/data/FieldParameters.xml',
),
rootNodeName = cms.string('cms:OCMS')
)


102 changes: 30 additions & 72 deletions Geometry/HGCalCommonData/python/testHGCV8XML_cfi.py
View file
Expand Up @@ -8,7 +8,7 @@
'Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/cmsextent.xml',
'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml',
'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
Expand All @@ -24,57 +24,20 @@
'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/PhaseII/TiltedTracker4026/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/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/TrackerCommonData/data/PhaseII/TiltedTracker4026/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerStructureTopology.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixelStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackersens.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelsens.xml',
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4026/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/eregalgo.xml',
Expand All @@ -98,24 +61,21 @@
'Geometry/HGCalCommonData/data/v8/hgcalHEsil.xml',
'Geometry/HGCalCommonData/data/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/v8/hgcalCons.xml',
'Geometry/HGCalCommonData/data/fastTimingBarrel.xml',
'Geometry/HGCalCommonData/data/fastTimingEndcap.xml',
'Geometry/HGCalCommonData/data/fastTimingElement.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/mbCommon/2017/v2/mbCommon.xml',
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/PhaseII/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/rpcf.xml',
'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2023/v1/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/MuonCommonData/data/PhaseII/TDR_Dev/gem21.xml',
'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml',
'Geometry/MuonCommonData/data/PhaseII/TDR_Dev/me0.xml',
'Geometry/ForwardCommonData/data/forwardshield/2015/v1/forwardshield.xml',
'Geometry/ForwardCommonData/data/brmrotations.xml',
'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
'Geometry/ForwardCommonData/data/zdcmaterials.xml',
Expand All @@ -127,7 +87,7 @@
'Geometry/ForwardCommonData/data/cmszdc.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml',
'Geometry/MuonCommonData/data/PhaseII/TDR_Dev/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand All @@ -137,15 +97,13 @@
'Geometry/HGCalSimData/data/hgcsensv8.xml',
'Geometry/HGCalSimData/data/hgccons.xml',
'Geometry/HGCalSimData/data/hgcProdCuts.xml',
'Geometry/HGCalSimData/data/fasttimesens.xml',
'Geometry/HGCalSimData/data/fasttimeProdCuts.xml',
'Geometry/MuonSimData/data/PhaseII/muonSens.xml',
'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/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/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
'Geometry/ForwardCommonData/data/brmsens.xml',
'Geometry/ForwardSimData/data/zdcsens.xml',
'Geometry/HcalSimData/data/HcalProdCuts.xml',
Expand Down

0 comments on commit 594986d

Please sign in to comment.