From 452d6fb262c6c25a19085c9275a1e4cc8a29b629 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 13:43:02 +0200 Subject: [PATCH 01/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- .../python/cmsIdealGeometry2015MuonXML_cfi.py | 290 ++++++++++++++++++ 1 file changed, 290 insertions(+) create mode 100644 Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py new file mode 100644 index 0000000000000..9807e3c0ac932 --- /dev/null +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py @@ -0,0 +1,290 @@ +import FWCore.ParameterSet.Config as cms + +## Everything that is currently in the PostLS1 geometry (rpc,csc,beampipe) +## with full Muon Upgrade for Phase-2 :: ME0, GE1/1, GE2/1, RE3/1, RE4/1 + +XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", + geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/dev/materials.xml', + 'Geometry/CMSCommonData/data/rotations.xml', + 'Geometry/CMSCommonData/data/normal/cmsextent.xml', + # 'Geometry/CMSCommonData/data/cms.xml', # Phase-1 Muon + 'Geometry/CMSCommonData/data/PhaseII/cms.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/cmsMother.xml', + 'Geometry/CMSCommonData/data/cmsTracker.xml', + # 'Geometry/CMSCommonData/data/caloBase.xml', # Phase-1 Muon + # 'Geometry/CMSCommonData/data/PhaseII/caloBase.xml', # Phase-2 Muon + # 'Geometry/CMSCommonData/data/cmsCalo.xml', + # 'Geometry/CMSCommonData/data/muonBase.xml', # Phase-1 Muon + 'Geometry/CMSCommonData/data/PhaseII/muonBase.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/cmsMuon.xml', + 'Geometry/CMSCommonData/data/mgnt.xml', + 'Geometry/CMSCommonData/data/PhaseI/beampipe.xml', + 'Geometry/CMSCommonData/data/cmsBeam.xml', + 'Geometry/CMSCommonData/data/muonMB.xml', + 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/TrackerCommonData/data/dev/Pilot/pixfwdMaterials.xml', + 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq1x2.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq1x5.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x3.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x4.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x5.xml', + 'Geometry/TrackerCommonData/data/pixfwdPanelBase.xml', + 'Geometry/TrackerCommonData/data/pixfwdPanel.xml', + 'Geometry/TrackerCommonData/data/pixfwdBlade.xml', + 'Geometry/TrackerCommonData/data/pixfwdNipple.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdPilotBlade.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdDisk.xml', + 'Geometry/TrackerCommonData/data/dev/Pilot/pixfwdCylinder.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwd.xml', + 'Geometry/TrackerCommonData/data/pixbarmaterial.xml', + 'Geometry/TrackerCommonData/data/pixbarladder.xml', + 'Geometry/TrackerCommonData/data/pixbarladderfull.xml', + 'Geometry/TrackerCommonData/data/pixbarladderhalf.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer0.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer1.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer2.xml', + 'Geometry/TrackerCommonData/data/pixbar.xml', + 'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmodpar.xml', + 'Geometry/TrackerCommonData/data/tibmodule0.xml', + 'Geometry/TrackerCommonData/data/tibmodule0a.xml', + 'Geometry/TrackerCommonData/data/tibmodule0b.xml', + 'Geometry/TrackerCommonData/data/tibmodule2.xml', + 'Geometry/TrackerCommonData/data/tibstringpar.xml', + 'Geometry/TrackerCommonData/data/tibstring0ll.xml', + 'Geometry/TrackerCommonData/data/tibstring0lr.xml', + 'Geometry/TrackerCommonData/data/tibstring0ul.xml', + 'Geometry/TrackerCommonData/data/tibstring0ur.xml', + 'Geometry/TrackerCommonData/data/tibstring0.xml', + 'Geometry/TrackerCommonData/data/tibstring1ll.xml', + 'Geometry/TrackerCommonData/data/tibstring1lr.xml', + 'Geometry/TrackerCommonData/data/tibstring1ul.xml', + 'Geometry/TrackerCommonData/data/tibstring1ur.xml', + 'Geometry/TrackerCommonData/data/tibstring1.xml', + 'Geometry/TrackerCommonData/data/tibstring2ll.xml', + 'Geometry/TrackerCommonData/data/tibstring2lr.xml', + 'Geometry/TrackerCommonData/data/tibstring2ul.xml', + 'Geometry/TrackerCommonData/data/tibstring2ur.xml', + 'Geometry/TrackerCommonData/data/tibstring2.xml', + 'Geometry/TrackerCommonData/data/tibstring3ll.xml', + 'Geometry/TrackerCommonData/data/tibstring3lr.xml', + 'Geometry/TrackerCommonData/data/tibstring3ul.xml', + 'Geometry/TrackerCommonData/data/tibstring3ur.xml', + 'Geometry/TrackerCommonData/data/tibstring3.xml', + 'Geometry/TrackerCommonData/data/tiblayerpar.xml', + 'Geometry/TrackerCommonData/data/tiblayer0.xml', + 'Geometry/TrackerCommonData/data/tiblayer1.xml', + 'Geometry/TrackerCommonData/data/tiblayer2.xml', + 'Geometry/TrackerCommonData/data/tiblayer3.xml', + 'Geometry/TrackerCommonData/data/tib.xml', + 'Geometry/TrackerCommonData/data/tidmaterial.xml', + 'Geometry/TrackerCommonData/data/tidmodpar.xml', + 'Geometry/TrackerCommonData/data/tidmodule0.xml', + 'Geometry/TrackerCommonData/data/tidmodule0r.xml', + 'Geometry/TrackerCommonData/data/tidmodule0l.xml', + 'Geometry/TrackerCommonData/data/tidmodule1.xml', + 'Geometry/TrackerCommonData/data/tidmodule1r.xml', + 'Geometry/TrackerCommonData/data/tidmodule1l.xml', + 'Geometry/TrackerCommonData/data/tidmodule2.xml', + 'Geometry/TrackerCommonData/data/tidringpar.xml', + 'Geometry/TrackerCommonData/data/tidring0.xml', + 'Geometry/TrackerCommonData/data/tidring0f.xml', + 'Geometry/TrackerCommonData/data/tidring0b.xml', + 'Geometry/TrackerCommonData/data/tidring1.xml', + 'Geometry/TrackerCommonData/data/tidring1f.xml', + 'Geometry/TrackerCommonData/data/tidring1b.xml', + 'Geometry/TrackerCommonData/data/tidring2.xml', + 'Geometry/TrackerCommonData/data/tid.xml', + 'Geometry/TrackerCommonData/data/tidf.xml', + 'Geometry/TrackerCommonData/data/tidb.xml', + 'Geometry/TrackerCommonData/data/tibtidservices.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesf.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesb.xml', + 'Geometry/TrackerCommonData/data/tobmaterial.xml', + 'Geometry/TrackerCommonData/data/tobmodpar.xml', + 'Geometry/TrackerCommonData/data/tobmodule0.xml', + 'Geometry/TrackerCommonData/data/tobmodule2.xml', + 'Geometry/TrackerCommonData/data/tobmodule4.xml', + 'Geometry/TrackerCommonData/data/tobrodpar.xml', + 'Geometry/TrackerCommonData/data/tobrod0c.xml', + 'Geometry/TrackerCommonData/data/tobrod0l.xml', + 'Geometry/TrackerCommonData/data/tobrod0h.xml', + 'Geometry/TrackerCommonData/data/tobrod0.xml', + 'Geometry/TrackerCommonData/data/tobrod1l.xml', + 'Geometry/TrackerCommonData/data/tobrod1h.xml', + 'Geometry/TrackerCommonData/data/tobrod1.xml', + 'Geometry/TrackerCommonData/data/tobrod2c.xml', + 'Geometry/TrackerCommonData/data/tobrod2l.xml', + 'Geometry/TrackerCommonData/data/tobrod2h.xml', + 'Geometry/TrackerCommonData/data/tobrod2.xml', + 'Geometry/TrackerCommonData/data/tobrod3l.xml', + 'Geometry/TrackerCommonData/data/tobrod3h.xml', + 'Geometry/TrackerCommonData/data/tobrod3.xml', + 'Geometry/TrackerCommonData/data/tobrod4c.xml', + 'Geometry/TrackerCommonData/data/tobrod4l.xml', + 'Geometry/TrackerCommonData/data/tobrod4h.xml', + 'Geometry/TrackerCommonData/data/tobrod4.xml', + 'Geometry/TrackerCommonData/data/tobrod5l.xml', + 'Geometry/TrackerCommonData/data/tobrod5h.xml', + 'Geometry/TrackerCommonData/data/tobrod5.xml', + 'Geometry/TrackerCommonData/data/tob.xml', + 'Geometry/TrackerCommonData/data/tecmaterial.xml', + 'Geometry/TrackerCommonData/data/tecmodpar.xml', + 'Geometry/TrackerCommonData/data/tecmodule0.xml', + 'Geometry/TrackerCommonData/data/tecmodule0r.xml', + 'Geometry/TrackerCommonData/data/tecmodule0s.xml', + 'Geometry/TrackerCommonData/data/tecmodule1.xml', + 'Geometry/TrackerCommonData/data/tecmodule1r.xml', + 'Geometry/TrackerCommonData/data/tecmodule1s.xml', + 'Geometry/TrackerCommonData/data/tecmodule2.xml', + 'Geometry/TrackerCommonData/data/tecmodule3.xml', + 'Geometry/TrackerCommonData/data/tecmodule4.xml', + 'Geometry/TrackerCommonData/data/tecmodule4r.xml', + 'Geometry/TrackerCommonData/data/tecmodule4s.xml', + 'Geometry/TrackerCommonData/data/tecmodule5.xml', + 'Geometry/TrackerCommonData/data/tecmodule6.xml', + 'Geometry/TrackerCommonData/data/tecpetpar.xml', + 'Geometry/TrackerCommonData/data/tecring0.xml', + 'Geometry/TrackerCommonData/data/tecring1.xml', + 'Geometry/TrackerCommonData/data/tecring2.xml', + 'Geometry/TrackerCommonData/data/tecring3.xml', + 'Geometry/TrackerCommonData/data/tecring4.xml', + 'Geometry/TrackerCommonData/data/tecring5.xml', + 'Geometry/TrackerCommonData/data/tecring6.xml', + 'Geometry/TrackerCommonData/data/tecring0f.xml', + 'Geometry/TrackerCommonData/data/tecring1f.xml', + 'Geometry/TrackerCommonData/data/tecring2f.xml', + 'Geometry/TrackerCommonData/data/tecring3f.xml', + 'Geometry/TrackerCommonData/data/tecring4f.xml', + 'Geometry/TrackerCommonData/data/tecring5f.xml', + 'Geometry/TrackerCommonData/data/tecring6f.xml', + 'Geometry/TrackerCommonData/data/tecring0b.xml', + 'Geometry/TrackerCommonData/data/tecring1b.xml', + 'Geometry/TrackerCommonData/data/tecring2b.xml', + 'Geometry/TrackerCommonData/data/tecring3b.xml', + 'Geometry/TrackerCommonData/data/tecring4b.xml', + 'Geometry/TrackerCommonData/data/tecring5b.xml', + 'Geometry/TrackerCommonData/data/tecring6b.xml', + 'Geometry/TrackerCommonData/data/tecpetalf.xml', + 'Geometry/TrackerCommonData/data/tecpetalb.xml', + 'Geometry/TrackerCommonData/data/tecpetal0.xml', + 'Geometry/TrackerCommonData/data/tecpetal0f.xml', + 'Geometry/TrackerCommonData/data/tecpetal0b.xml', + 'Geometry/TrackerCommonData/data/tecpetal3.xml', + 'Geometry/TrackerCommonData/data/tecpetal3f.xml', + 'Geometry/TrackerCommonData/data/tecpetal3b.xml', + 'Geometry/TrackerCommonData/data/tecpetal6f.xml', + 'Geometry/TrackerCommonData/data/tecpetal6b.xml', + 'Geometry/TrackerCommonData/data/tecpetal8f.xml', + 'Geometry/TrackerCommonData/data/tecpetal8b.xml', + 'Geometry/TrackerCommonData/data/tecwheel.xml', + 'Geometry/TrackerCommonData/data/tecwheela.xml', + 'Geometry/TrackerCommonData/data/tecwheelb.xml', + 'Geometry/TrackerCommonData/data/tecwheelc.xml', + 'Geometry/TrackerCommonData/data/tecwheeld.xml', + 'Geometry/TrackerCommonData/data/tecwheel6.xml', + 'Geometry/TrackerCommonData/data/tecservices.xml', + 'Geometry/TrackerCommonData/data/tecbackplate.xml', + 'Geometry/TrackerCommonData/data/tec.xml', + 'Geometry/TrackerCommonData/data/trackermaterial.xml', + 'Geometry/TrackerCommonData/data/tracker.xml', + 'Geometry/TrackerCommonData/data/trackerpixbar.xml', + 'Geometry/TrackerCommonData/data/trackerpixfwd.xml', + 'Geometry/TrackerCommonData/data/trackertibtidservices.xml', + 'Geometry/TrackerCommonData/data/trackertib.xml', + 'Geometry/TrackerCommonData/data/trackertid.xml', + 'Geometry/TrackerCommonData/data/trackertob.xml', + 'Geometry/TrackerCommonData/data/trackertec.xml', + 'Geometry/TrackerCommonData/data/trackerbulkhead.xml', + 'Geometry/TrackerCommonData/data/trackerother.xml', + # 'Geometry/EcalCommonData/data/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/eefixed.xml', + # 'Geometry/EcalCommonData/data/eehier.xml', + # 'Geometry/EcalCommonData/data/eealgo.xml', + # 'Geometry/EcalCommonData/data/escon.xml', + # 'Geometry/EcalCommonData/data/esalgo.xml', + # 'Geometry/EcalCommonData/data/eeF.xml', + # 'Geometry/EcalCommonData/data/eeB.xml', + # 'Geometry/HcalCommonData/data/hcalrotations.xml', + # 'Geometry/HcalCommonData/data/hcalalgo.xml', + # 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + # 'Geometry/HcalCommonData/data/hcalendcapalgo.xml', + # 'Geometry/HcalCommonData/data/hcalouteralgo.xml', + # 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + # 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + + # --- Muon ------------------------------------------------------------ + '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/v2/mf.xml', # Phase-1 Muon + # 'Geometry/MuonCommonData/data/v2/rpcf.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/mf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v2/gemf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v4/gem11.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v6/gem21.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v2/csc.xml', + # 'Geometry/MuonCommonData/data/v2/mfshield.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/mfshield.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/PhaseII/me0.xml', # Phase-2 Muon + # --- Muon ------------------------------------------------------------ + + 'Geometry/ForwardCommonData/data/forward.xml', + 'Geometry/ForwardCommonData/data/v2/forwardshield.xml', + 'Geometry/ForwardCommonData/data/brmrotations.xml', + 'Geometry/ForwardCommonData/data/brm.xml', + 'Geometry/ForwardCommonData/data/totemMaterials.xml', + 'Geometry/ForwardCommonData/data/totemRotations.xml', + 'Geometry/ForwardCommonData/data/totemt1.xml', + 'Geometry/ForwardCommonData/data/totemt2.xml', + 'Geometry/ForwardCommonData/data/ionpump.xml')+cms.vstring( + 'Geometry/TrackerCommonData/data/trackerStructureTopology.xml', + 'Geometry/TrackerSimData/data/trackersens.xml', + 'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml', + + # 'Geometry/EcalSimData/data/ecalsens.xml', + # 'Geometry/HcalCommonData/data/hcalsenspmf.xml', + # 'Geometry/HcalSimData/data/hf.xml', + # 'Geometry/HcalSimData/data/hfpmt.xml', + # 'Geometry/HcalSimData/data/hffibrebundle.xml', + # 'Geometry/HcalSimData/data/CaloUtil.xml', + + # --- Muon ------------------------------------------------------------ + # 'Geometry/MuonCommonData/data/v2/muonNumbering.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml',# Phase-2 Muon + # 'Geometry/MuonSimData/data/muonSens.xml', # Phase-1 Muon + 'Geometry/MuonSimData/data/PhaseII/muonSens.xml', # Phase-2 Muon + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', + # 'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml', # Phase-1 Muon + 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', # Phase-2 Muon + 'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml', # Phase-2 Muon + # 'Geometry/MuonSimData/data/muonProdCuts.xml', # Phase-1 Muon + 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', # Phase-2 Muon + # --- Muon ------------------------------------------------------------ + + 'Geometry/ForwardCommonData/data/brmsens.xml', + # 'Geometry/HcalSimData/data/HcalProdCuts.xml', + # 'Geometry/EcalSimData/data/EcalProdCuts.xml', + # 'Geometry/EcalSimData/data/ESProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', + 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', + 'Geometry/CMSCommonData/data/FieldParameters.xml'), + rootNodeName = cms.string('cms:OCMS') +) + + From 67132e2fd299743588fb6dcf12a39c9f119cdfd3 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 13:43:11 +0200 Subject: [PATCH 02/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- Geometry/CMSCommonData/data/PhaseII/cms.xml | 117 ++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 Geometry/CMSCommonData/data/PhaseII/cms.xml diff --git a/Geometry/CMSCommonData/data/PhaseII/cms.xml b/Geometry/CMSCommonData/data/PhaseII/cms.xml new file mode 100644 index 0000000000000..523845b9a6a9a --- /dev/null +++ b/Geometry/CMSCommonData/data/PhaseII/cms.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5890fa0368957a729bae8d2ee756c3b3c6b48c03 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 13:43:18 +0200 Subject: [PATCH 03/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- .../CMSCommonData/data/PhaseII/muonBase.xml | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Geometry/CMSCommonData/data/PhaseII/muonBase.xml diff --git a/Geometry/CMSCommonData/data/PhaseII/muonBase.xml b/Geometry/CMSCommonData/data/PhaseII/muonBase.xml new file mode 100644 index 0000000000000..c04581e2c2c4c --- /dev/null +++ b/Geometry/CMSCommonData/data/PhaseII/muonBase.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6734a96b5b34172469db9d0808a6d8d962e9c645 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 13:43:27 +0200 Subject: [PATCH 04/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- .../Geometry/python/GeometryIdeal2015Muon_cff.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Configuration/Geometry/python/GeometryIdeal2015Muon_cff.py diff --git a/Configuration/Geometry/python/GeometryIdeal2015Muon_cff.py b/Configuration/Geometry/python/GeometryIdeal2015Muon_cff.py new file mode 100644 index 0000000000000..47118d903adfa --- /dev/null +++ b/Configuration/Geometry/python/GeometryIdeal2015Muon_cff.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +# +# Geometry master configuration +# +# Ideal geometry, needed for simulation +from Geometry.CMSCommonData.cmsIdealGeometry2015MuonXML_cfi import * +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * + From ccdbc74959a2a131e8cdab417f5eac9f0512b1fe Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 13:43:36 +0200 Subject: [PATCH 05/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- .../Geometry/python/GeometryIdeal2015MuonReco_cff.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py diff --git a/Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py b/Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py new file mode 100644 index 0000000000000..5d8b67cd44016 --- /dev/null +++ b/Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +# Ideal geometry, needed for transient ECAL alignement +from Configuration.Geometry.GeometryIdeal2015Muon_cff import * +from Configuration.Geometry.GeometryReco_cff import * From a585341c6cf9350c84564f0d982211b885adffcc Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 13:43:52 +0200 Subject: [PATCH 06/55] test 2015 Geometry + Full Phase-2 Muon Upgrade --- ...t100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py new file mode 100644 index 0000000000000..f736a1be19d92 --- /dev/null +++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py @@ -0,0 +1,120 @@ +# Auto generated configuration file +# using: +# Revision: 1.19 +# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v +# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:startup --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Ideal2015Muon --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py +import FWCore.ParameterSet.Config as cms + +from Configuration.StandardSequences.Eras import eras + +process = cms.Process('DIGI',eras.Run2_25ns) + +# import of standard configurations +process.load('Configuration.StandardSequences.Services_cff') +process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') +process.load('FWCore.MessageService.MessageLogger_cfi') +process.load('Configuration.EventContent.EventContent_cff') +process.load('SimGeneral.MixingModule.mixNoPU_cfi') +process.load('Configuration.StandardSequences.GeometryRecoDB_cff') +process.load('Configuration.Geometry.GeometryIdeal2015Muon_cff') +process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.Generator_cff') +process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi') +process.load('GeneratorInterface.Core.genFilterSummary_cff') +process.load('Configuration.StandardSequences.SimIdeal_cff') +process.load('Configuration.StandardSequences.Digi_cff') +process.load('Configuration.StandardSequences.EndOfProcess_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') + +# not fixed problem with TrackerGeometricDetESModule :: manual fix +process.es_prefer_noisesfromprep=cms.ESPrefer("TrackerGeometricDetESModule", "trackerNumberingGeometryDB") + + +process.maxEvents = cms.untracked.PSet( + input = cms.untracked.int32(100) +) + +# Input source +process.source = cms.Source("EmptySource") + +process.options = cms.untracked.PSet( + +) + +# Production Info +process.configurationMetadata = cms.untracked.PSet( + annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'), + name = cms.untracked.string('Applications'), + version = cms.untracked.string('$Revision: 1.19 $') +) + +# Output definition + +process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule", + SelectEvents = cms.untracked.PSet( + SelectEvents = cms.vstring('generation_step') + ), + dataset = cms.untracked.PSet( + dataTier = cms.untracked.string('GEN-SIM-DIGI'), + filterName = cms.untracked.string('') + ), + eventAutoFlushCompressedSize = cms.untracked.int32(1048576), + fileName = cms.untracked.string('out_digi.root'), + outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands, + splitLevel = cms.untracked.int32(0) +) + +# Additional output definition + +# Other statements +process.genstepfilter.triggerConditions=cms.vstring("generation_step") +from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:startup', '') + +process.generator = cms.EDProducer("FlatRandomPtGunProducer", + AddAntiParticle = cms.bool(True), + PGunParameters = cms.PSet( + MaxEta = cms.double(2.5), + MaxPhi = cms.double(3.14159265359), + MaxPt = cms.double(100.01), + MinEta = cms.double(-2.5), + MinPhi = cms.double(-3.14159265359), + MinPt = cms.double(99.99), + PartID = cms.vint32(-13) + ), + Verbosity = cms.untracked.int32(0), + firstRun = cms.untracked.uint32(1), + psethack = cms.string('single mu pt 100') +) + + +# Path and EndPath definitions +process.generation_step = cms.Path(process.pgen) +process.simulation_step = cms.Path(process.psim) +process.digitisation_step = cms.Path(process.pdigi) +process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) +process.endjob_step = cms.EndPath(process.endOfProcess) +process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) + +# Schedule definition +process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step) +# filter all path with the production filter sequence +for path in process.paths: + getattr(process,path)._seq = process.generator * getattr(process,path)._seq + +# customisation of the process. + +# Automatic addition of the customisation function from SimMuon.GEMDigitizer.customizeGEMDigi +from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only + +#call to customisation function customize_digi_addGEM_muon_only imported from SimMuon.GEMDigitizer.customizeGEMDigi +process = customize_digi_addGEM_muon_only(process) + +# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads +from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions + +#call to customisation function fixRPCConditions imported from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads +process = fixRPCConditions(process) + +# End of customisation functions + From 4f9f58d26a8e9305f4f44932424b3c1bf40e506b Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 13:50:47 +0200 Subject: [PATCH 07/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- Geometry/MuonCommonData/data/PhaseII/mf.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Geometry/MuonCommonData/data/PhaseII/mf.xml b/Geometry/MuonCommonData/data/PhaseII/mf.xml index 40c32283a4621..945c00b4f9fa9 100644 --- a/Geometry/MuonCommonData/data/PhaseII/mf.xml +++ b/Geometry/MuonCommonData/data/PhaseII/mf.xml @@ -1,7 +1,13 @@ - + + + + From 10ca3640757530a5cf165ad1c10c395b8c3ac128 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 14:39:50 +0200 Subject: [PATCH 08/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- ...0_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py new file mode 100644 index 0000000000000..aed79e09bc795 --- /dev/null +++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py @@ -0,0 +1,116 @@ +# Auto generated configuration file +# using: +# Revision: 1.19 +# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v +# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:startup --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Ideal2015Muon,Ideal2015MuonReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py +import FWCore.ParameterSet.Config as cms + +from Configuration.StandardSequences.Eras import eras + +process = cms.Process('DIGI',eras.Run2_25ns) + +# import of standard configurations +process.load('Configuration.StandardSequences.Services_cff') +process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') +process.load('FWCore.MessageService.MessageLogger_cfi') +process.load('Configuration.EventContent.EventContent_cff') +process.load('SimGeneral.MixingModule.mixNoPU_cfi') +process.load('Configuration.Geometry.GeometryIdeal2015MuonReco_cff') +process.load('Configuration.Geometry.GeometryIdeal2015Muon_cff') +process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.Generator_cff') +process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi') +process.load('GeneratorInterface.Core.genFilterSummary_cff') +process.load('Configuration.StandardSequences.SimIdeal_cff') +process.load('Configuration.StandardSequences.Digi_cff') +process.load('Configuration.StandardSequences.EndOfProcess_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') + +process.maxEvents = cms.untracked.PSet( + input = cms.untracked.int32(100) +) + +# Input source +process.source = cms.Source("EmptySource") + +process.options = cms.untracked.PSet( + +) + +# Production Info +process.configurationMetadata = cms.untracked.PSet( + annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'), + name = cms.untracked.string('Applications'), + version = cms.untracked.string('$Revision: 1.19 $') +) + +# Output definition + +process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule", + SelectEvents = cms.untracked.PSet( + SelectEvents = cms.vstring('generation_step') + ), + dataset = cms.untracked.PSet( + dataTier = cms.untracked.string('GEN-SIM-DIGI'), + filterName = cms.untracked.string('') + ), + eventAutoFlushCompressedSize = cms.untracked.int32(1048576), + fileName = cms.untracked.string('out_digi.root'), + outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands, + splitLevel = cms.untracked.int32(0) +) + +# Additional output definition + +# Other statements +process.genstepfilter.triggerConditions=cms.vstring("generation_step") +from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:startup', '') + +process.generator = cms.EDProducer("FlatRandomPtGunProducer", + AddAntiParticle = cms.bool(True), + PGunParameters = cms.PSet( + MaxEta = cms.double(2.5), + MaxPhi = cms.double(3.14159265359), + MaxPt = cms.double(100.01), + MinEta = cms.double(-2.5), + MinPhi = cms.double(-3.14159265359), + MinPt = cms.double(99.99), + PartID = cms.vint32(-13) + ), + Verbosity = cms.untracked.int32(0), + firstRun = cms.untracked.uint32(1), + psethack = cms.string('single mu pt 100') +) + + +# Path and EndPath definitions +process.generation_step = cms.Path(process.pgen) +process.simulation_step = cms.Path(process.psim) +process.digitisation_step = cms.Path(process.pdigi) +process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) +process.endjob_step = cms.EndPath(process.endOfProcess) +process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) + +# Schedule definition +process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step) +# filter all path with the production filter sequence +for path in process.paths: + getattr(process,path)._seq = process.generator * getattr(process,path)._seq + +# customisation of the process. + +# Automatic addition of the customisation function from SimMuon.GEMDigitizer.customizeGEMDigi +from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only + +#call to customisation function customize_digi_addGEM_muon_only imported from SimMuon.GEMDigitizer.customizeGEMDigi +process = customize_digi_addGEM_muon_only(process) + +# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads +from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions + +#call to customisation function fixRPCConditions imported from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads +process = fixRPCConditions(process) + +# End of customisation functions + From e76aa4d526de9a77eb94c74b11282cc10f187913 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 14:40:08 +0200 Subject: [PATCH 09/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- .../CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py index 9807e3c0ac932..0818d6f65ec9f 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py @@ -9,6 +9,7 @@ 'Geometry/CMSCommonData/data/normal/cmsextent.xml', # 'Geometry/CMSCommonData/data/cms.xml', # Phase-1 Muon 'Geometry/CMSCommonData/data/PhaseII/cms.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/eta3/etaMax.xml', # Phase-2 Muon 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', # 'Geometry/CMSCommonData/data/caloBase.xml', # Phase-1 Muon @@ -218,8 +219,8 @@ # 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', # 'Geometry/HcalCommonData/data/hcalendcapalgo.xml', # 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - # 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - # 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', # --- Muon ------------------------------------------------------------ 'Geometry/MuonCommonData/data/v1/mbCommon.xml', From 54c98537ddabdebf08cdacf57d3e248bba5e07a1 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 14:40:16 +0200 Subject: [PATCH 10/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- Geometry/MuonCommonData/data/PhaseII/mf.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Geometry/MuonCommonData/data/PhaseII/mf.xml b/Geometry/MuonCommonData/data/PhaseII/mf.xml index 945c00b4f9fa9..eacd00faea5ee 100644 --- a/Geometry/MuonCommonData/data/PhaseII/mf.xml +++ b/Geometry/MuonCommonData/data/PhaseII/mf.xml @@ -1,12 +1,7 @@ - - - + From b8cb05f96c514d04433b21f074f19d2c6f738c6f Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 14:56:14 +0200 Subject: [PATCH 11/55] test Ideal2015Muon geometry --- ...SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py index f736a1be19d92..1bfbae58d0f78 100644 --- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py +++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py @@ -2,7 +2,7 @@ # using: # Revision: 1.19 # Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v -# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:startup --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Ideal2015Muon --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py +# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Ideal2015Muon,Ideal2015MuonReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py import FWCore.ParameterSet.Config as cms from Configuration.StandardSequences.Eras import eras @@ -15,7 +15,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.StandardSequences.GeometryRecoDB_cff') +process.load('Configuration.Geometry.GeometryIdeal2015MuonReco_cff') process.load('Configuration.Geometry.GeometryIdeal2015Muon_cff') process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') process.load('Configuration.StandardSequences.Generator_cff') @@ -26,10 +26,6 @@ process.load('Configuration.StandardSequences.EndOfProcess_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -# not fixed problem with TrackerGeometricDetESModule :: manual fix -process.es_prefer_noisesfromprep=cms.ESPrefer("TrackerGeometricDetESModule", "trackerNumberingGeometryDB") - - process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100) ) @@ -69,7 +65,7 @@ # Other statements process.genstepfilter.triggerConditions=cms.vstring("generation_step") from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:startup', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.generator = cms.EDProducer("FlatRandomPtGunProducer", AddAntiParticle = cms.bool(True), From 7fdd7819ef3957b71257e214e86e5714534b00bb Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 15:33:43 +0200 Subject: [PATCH 12/55] moved to original v1 --- ...0_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py | 116 ------------------ 1 file changed, 116 deletions(-) delete mode 100644 RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py deleted file mode 100644 index aed79e09bc795..0000000000000 --- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py +++ /dev/null @@ -1,116 +0,0 @@ -# Auto generated configuration file -# using: -# Revision: 1.19 -# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v -# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:startup --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Ideal2015Muon,Ideal2015MuonReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py -import FWCore.ParameterSet.Config as cms - -from Configuration.StandardSequences.Eras import eras - -process = cms.Process('DIGI',eras.Run2_25ns) - -# import of standard configurations -process.load('Configuration.StandardSequences.Services_cff') -process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') -process.load('FWCore.MessageService.MessageLogger_cfi') -process.load('Configuration.EventContent.EventContent_cff') -process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryIdeal2015MuonReco_cff') -process.load('Configuration.Geometry.GeometryIdeal2015Muon_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') -process.load('Configuration.StandardSequences.Generator_cff') -process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi') -process.load('GeneratorInterface.Core.genFilterSummary_cff') -process.load('Configuration.StandardSequences.SimIdeal_cff') -process.load('Configuration.StandardSequences.Digi_cff') -process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(100) -) - -# Input source -process.source = cms.Source("EmptySource") - -process.options = cms.untracked.PSet( - -) - -# Production Info -process.configurationMetadata = cms.untracked.PSet( - annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'), - name = cms.untracked.string('Applications'), - version = cms.untracked.string('$Revision: 1.19 $') -) - -# Output definition - -process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule", - SelectEvents = cms.untracked.PSet( - SelectEvents = cms.vstring('generation_step') - ), - dataset = cms.untracked.PSet( - dataTier = cms.untracked.string('GEN-SIM-DIGI'), - filterName = cms.untracked.string('') - ), - eventAutoFlushCompressedSize = cms.untracked.int32(1048576), - fileName = cms.untracked.string('out_digi.root'), - outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands, - splitLevel = cms.untracked.int32(0) -) - -# Additional output definition - -# Other statements -process.genstepfilter.triggerConditions=cms.vstring("generation_step") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:startup', '') - -process.generator = cms.EDProducer("FlatRandomPtGunProducer", - AddAntiParticle = cms.bool(True), - PGunParameters = cms.PSet( - MaxEta = cms.double(2.5), - MaxPhi = cms.double(3.14159265359), - MaxPt = cms.double(100.01), - MinEta = cms.double(-2.5), - MinPhi = cms.double(-3.14159265359), - MinPt = cms.double(99.99), - PartID = cms.vint32(-13) - ), - Verbosity = cms.untracked.int32(0), - firstRun = cms.untracked.uint32(1), - psethack = cms.string('single mu pt 100') -) - - -# Path and EndPath definitions -process.generation_step = cms.Path(process.pgen) -process.simulation_step = cms.Path(process.psim) -process.digitisation_step = cms.Path(process.pdigi) -process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) -process.endjob_step = cms.EndPath(process.endOfProcess) -process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) - -# Schedule definition -process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step) -# filter all path with the production filter sequence -for path in process.paths: - getattr(process,path)._seq = process.generator * getattr(process,path)._seq - -# customisation of the process. - -# Automatic addition of the customisation function from SimMuon.GEMDigitizer.customizeGEMDigi -from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only - -#call to customisation function customize_digi_addGEM_muon_only imported from SimMuon.GEMDigitizer.customizeGEMDigi -process = customize_digi_addGEM_muon_only(process) - -# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads -from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions - -#call to customisation function fixRPCConditions imported from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads -process = fixRPCConditions(process) - -# End of customisation functions - From 25b0fdbf6e369a4f5956e25242f1b0e3fa8693c6 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 15:43:49 +0200 Subject: [PATCH 13/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- .../Geometry/python/GeometryExtended2015MuonReco_cff.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py b/Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py new file mode 100644 index 0000000000000..6d9c17ed3da5c --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +# Ideal geometry, needed for transient ECAL alignement +from Configuration.Geometry.GeometryExtended2015Muon_cff import * +from Configuration.Geometry.GeometryReco_cff import * From fc0a9ce9d51399f7ee440d9d5d6c1ad53fb9227e Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 15:44:11 +0200 Subject: [PATCH 14/55] test 2015 Geometry + Full Phase-2 Muon Upgrade --- ...eMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py new file mode 100644 index 0000000000000..e770dfc3c63a2 --- /dev/null +++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py @@ -0,0 +1,101 @@ +# Auto generated configuration file +# using: +# Revision: 1.19 +# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v +# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Ideal2015dev --eventcontent FEVTDEBUGHLT --era Run2_25ns -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py +import FWCore.ParameterSet.Config as cms + +from Configuration.StandardSequences.Eras import eras + +process = cms.Process('DIGI',eras.Run2_25ns) + +# import of standard configurations +process.load('Configuration.StandardSequences.Services_cff') +process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') +process.load('FWCore.MessageService.MessageLogger_cfi') +process.load('Configuration.EventContent.EventContent_cff') +process.load('SimGeneral.MixingModule.mixNoPU_cfi') +process.load('Configuration.Geometry.GeometryIdeal2015devReco_cff') +process.load('Configuration.Geometry.GeometryIdeal2015dev_cff') +process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.Generator_cff') +process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi') +process.load('GeneratorInterface.Core.genFilterSummary_cff') +process.load('Configuration.StandardSequences.SimIdeal_cff') +process.load('Configuration.StandardSequences.Digi_cff') +process.load('Configuration.StandardSequences.EndOfProcess_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') + +process.maxEvents = cms.untracked.PSet( + input = cms.untracked.int32(100) +) + +# Input source +process.source = cms.Source("EmptySource") + +process.options = cms.untracked.PSet( + +) + +# Production Info +process.configurationMetadata = cms.untracked.PSet( + annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'), + name = cms.untracked.string('Applications'), + version = cms.untracked.string('$Revision: 1.19 $') +) + +# Output definition + +process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule", + SelectEvents = cms.untracked.PSet( + SelectEvents = cms.vstring('generation_step') + ), + dataset = cms.untracked.PSet( + dataTier = cms.untracked.string('GEN-SIM-DIGI'), + filterName = cms.untracked.string('') + ), + eventAutoFlushCompressedSize = cms.untracked.int32(1048576), + fileName = cms.untracked.string('out_digi.root'), + outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands, + splitLevel = cms.untracked.int32(0) +) + +# Additional output definition + +# Other statements +process.genstepfilter.triggerConditions=cms.vstring("generation_step") +from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') + +process.generator = cms.EDProducer("FlatRandomPtGunProducer", + AddAntiParticle = cms.bool(True), + PGunParameters = cms.PSet( + MaxEta = cms.double(2.5), + MaxPhi = cms.double(3.14159265359), + MaxPt = cms.double(100.01), + MinEta = cms.double(-2.5), + MinPhi = cms.double(-3.14159265359), + MinPt = cms.double(99.99), + PartID = cms.vint32(-13) + ), + Verbosity = cms.untracked.int32(0), + firstRun = cms.untracked.uint32(1), + psethack = cms.string('single mu pt 100') +) + + +# Path and EndPath definitions +process.generation_step = cms.Path(process.pgen) +process.simulation_step = cms.Path(process.psim) +process.digitisation_step = cms.Path(process.pdigi) +process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) +process.endjob_step = cms.EndPath(process.endOfProcess) +process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) + +# Schedule definition +process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step) +# filter all path with the production filter sequence +for path in process.paths: + getattr(process,path)._seq = process.generator * getattr(process,path)._seq + + From 7e16dc40ef6d2e3fad284a5341b04323ec5cd8b5 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 15:44:25 +0200 Subject: [PATCH 15/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- .../Geometry/python/GeometryExtended2015Muon_cff.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Configuration/Geometry/python/GeometryExtended2015Muon_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2015Muon_cff.py b/Configuration/Geometry/python/GeometryExtended2015Muon_cff.py new file mode 100644 index 0000000000000..0cbce59371540 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtended2015Muon_cff.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +# +# Geometry master configuration +# +# Ideal geometry, needed for simulation +from Geometry.CMSCommonData.cmsExtendedGeometry2015MuonXML_cfi import * +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * + From 0fdaff9c41e56c9764b2d519cb36d3a9e597e364 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 15:44:33 +0200 Subject: [PATCH 16/55] trial to create 2015 Geometry + Full Phase-2 Muon Upgrade --- .../cmsExtendedGeometry2015MuonXML_cfi.py | 311 ++++++++++++++++++ 1 file changed, 311 insertions(+) create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py new file mode 100644 index 0000000000000..e616a34193bdf --- /dev/null +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py @@ -0,0 +1,311 @@ +import FWCore.ParameterSet.Config as cms + +## Everything that is currently in the PostLS1 geometry (rpc,csc,beampipe) +## with full Muon Upgrade for Phase-2 :: ME0, GE1/1, GE2/1, RE3/1, RE4/1 + +XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", + geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', + 'Geometry/CMSCommonData/data/rotations.xml', + 'Geometry/CMSCommonData/data/extend/cmsextent.xml', + # 'Geometry/CMSCommonData/data/cms.xml', # Phase-1 Muon + 'Geometry/CMSCommonData/data/PhaseII/cms.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/eta3/etaMax.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/cmsMother.xml', + 'Geometry/CMSCommonData/data/cmsTracker.xml', + # 'Geometry/CMSCommonData/data/caloBase.xml', + # 'Geometry/CMSCommonData/data/cmsCalo.xml', + # 'Geometry/CMSCommonData/data/muonBase.xml', # Phase-1 Muon + 'Geometry/CMSCommonData/data/PhaseII/muonBase.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/cmsMuon.xml', + 'Geometry/CMSCommonData/data/mgnt.xml', + 'Geometry/CMSCommonData/data/PhaseI/beampipe.xml', + 'Geometry/CMSCommonData/data/cmsBeam.xml', + 'Geometry/CMSCommonData/data/muonMB.xml', + 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/CMSCommonData/data/cavern.xml', + 'Geometry/TrackerCommonData/data/trackerParameters.xml', + 'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', + 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq1x2.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq1x5.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x3.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x4.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x5.xml', + 'Geometry/TrackerCommonData/data/pixfwdPanelBase.xml', + 'Geometry/TrackerCommonData/data/pixfwdPanel.xml', + 'Geometry/TrackerCommonData/data/pixfwdBlade.xml', + 'Geometry/TrackerCommonData/data/pixfwdNipple.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdPilotBlade.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdDisk.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdCylinder.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwd.xml', + 'Geometry/TrackerCommonData/data/pixbarmaterial.xml', + 'Geometry/TrackerCommonData/data/pixbarladder.xml', + 'Geometry/TrackerCommonData/data/pixbarladderfull.xml', + 'Geometry/TrackerCommonData/data/pixbarladderhalf.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer0.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer1.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer2.xml', + 'Geometry/TrackerCommonData/data/pixbar.xml', + 'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmodpar.xml', + 'Geometry/TrackerCommonData/data/tibmodule0.xml', + 'Geometry/TrackerCommonData/data/tibmodule0a.xml', + 'Geometry/TrackerCommonData/data/tibmodule0b.xml', + 'Geometry/TrackerCommonData/data/tibmodule2.xml', + 'Geometry/TrackerCommonData/data/tibstringpar.xml', + 'Geometry/TrackerCommonData/data/tibstring0ll.xml', + 'Geometry/TrackerCommonData/data/tibstring0lr.xml', + 'Geometry/TrackerCommonData/data/tibstring0ul.xml', + 'Geometry/TrackerCommonData/data/tibstring0ur.xml', + 'Geometry/TrackerCommonData/data/tibstring0.xml', + 'Geometry/TrackerCommonData/data/tibstring1ll.xml', + 'Geometry/TrackerCommonData/data/tibstring1lr.xml', + 'Geometry/TrackerCommonData/data/tibstring1ul.xml', + 'Geometry/TrackerCommonData/data/tibstring1ur.xml', + 'Geometry/TrackerCommonData/data/tibstring1.xml', + 'Geometry/TrackerCommonData/data/tibstring2ll.xml', + 'Geometry/TrackerCommonData/data/tibstring2lr.xml', + 'Geometry/TrackerCommonData/data/tibstring2ul.xml', + 'Geometry/TrackerCommonData/data/tibstring2ur.xml', + 'Geometry/TrackerCommonData/data/tibstring2.xml', + 'Geometry/TrackerCommonData/data/tibstring3ll.xml', + 'Geometry/TrackerCommonData/data/tibstring3lr.xml', + 'Geometry/TrackerCommonData/data/tibstring3ul.xml', + 'Geometry/TrackerCommonData/data/tibstring3ur.xml', + 'Geometry/TrackerCommonData/data/tibstring3.xml', + 'Geometry/TrackerCommonData/data/tiblayerpar.xml', + 'Geometry/TrackerCommonData/data/tiblayer0.xml', + 'Geometry/TrackerCommonData/data/tiblayer1.xml', + 'Geometry/TrackerCommonData/data/tiblayer2.xml', + 'Geometry/TrackerCommonData/data/tiblayer3.xml', + 'Geometry/TrackerCommonData/data/tib.xml', + 'Geometry/TrackerCommonData/data/tidmaterial.xml', + 'Geometry/TrackerCommonData/data/tidmodpar.xml', + 'Geometry/TrackerCommonData/data/tidmodule0.xml', + 'Geometry/TrackerCommonData/data/tidmodule0r.xml', + 'Geometry/TrackerCommonData/data/tidmodule0l.xml', + 'Geometry/TrackerCommonData/data/tidmodule1.xml', + 'Geometry/TrackerCommonData/data/tidmodule1r.xml', + 'Geometry/TrackerCommonData/data/tidmodule1l.xml', + 'Geometry/TrackerCommonData/data/tidmodule2.xml', + 'Geometry/TrackerCommonData/data/tidringpar.xml', + 'Geometry/TrackerCommonData/data/tidring0.xml', + 'Geometry/TrackerCommonData/data/tidring0f.xml', + 'Geometry/TrackerCommonData/data/tidring0b.xml', + 'Geometry/TrackerCommonData/data/tidring1.xml', + 'Geometry/TrackerCommonData/data/tidring1f.xml', + 'Geometry/TrackerCommonData/data/tidring1b.xml', + 'Geometry/TrackerCommonData/data/tidring2.xml', + 'Geometry/TrackerCommonData/data/tid.xml', + 'Geometry/TrackerCommonData/data/tidf.xml', + 'Geometry/TrackerCommonData/data/tidb.xml', + 'Geometry/TrackerCommonData/data/tibtidservices.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesf.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesb.xml', + 'Geometry/TrackerCommonData/data/tobmaterial.xml', + 'Geometry/TrackerCommonData/data/tobmodpar.xml', + 'Geometry/TrackerCommonData/data/tobmodule0.xml', + 'Geometry/TrackerCommonData/data/tobmodule2.xml', + 'Geometry/TrackerCommonData/data/tobmodule4.xml', + 'Geometry/TrackerCommonData/data/tobrodpar.xml', + 'Geometry/TrackerCommonData/data/tobrod0c.xml', + 'Geometry/TrackerCommonData/data/tobrod0l.xml', + 'Geometry/TrackerCommonData/data/tobrod0h.xml', + 'Geometry/TrackerCommonData/data/tobrod0.xml', + 'Geometry/TrackerCommonData/data/tobrod1l.xml', + 'Geometry/TrackerCommonData/data/tobrod1h.xml', + 'Geometry/TrackerCommonData/data/tobrod1.xml', + 'Geometry/TrackerCommonData/data/tobrod2c.xml', + 'Geometry/TrackerCommonData/data/tobrod2l.xml', + 'Geometry/TrackerCommonData/data/tobrod2h.xml', + 'Geometry/TrackerCommonData/data/tobrod2.xml', + 'Geometry/TrackerCommonData/data/tobrod3l.xml', + 'Geometry/TrackerCommonData/data/tobrod3h.xml', + 'Geometry/TrackerCommonData/data/tobrod3.xml', + 'Geometry/TrackerCommonData/data/tobrod4c.xml', + 'Geometry/TrackerCommonData/data/tobrod4l.xml', + 'Geometry/TrackerCommonData/data/tobrod4h.xml', + 'Geometry/TrackerCommonData/data/tobrod4.xml', + 'Geometry/TrackerCommonData/data/tobrod5l.xml', + 'Geometry/TrackerCommonData/data/tobrod5h.xml', + 'Geometry/TrackerCommonData/data/tobrod5.xml', + 'Geometry/TrackerCommonData/data/tob.xml', + 'Geometry/TrackerCommonData/data/tecmaterial.xml', + 'Geometry/TrackerCommonData/data/tecmodpar.xml', + 'Geometry/TrackerCommonData/data/tecmodule0.xml', + 'Geometry/TrackerCommonData/data/tecmodule0r.xml', + 'Geometry/TrackerCommonData/data/tecmodule0s.xml', + 'Geometry/TrackerCommonData/data/tecmodule1.xml', + 'Geometry/TrackerCommonData/data/tecmodule1r.xml', + 'Geometry/TrackerCommonData/data/tecmodule1s.xml', + 'Geometry/TrackerCommonData/data/tecmodule2.xml', + 'Geometry/TrackerCommonData/data/tecmodule3.xml', + 'Geometry/TrackerCommonData/data/tecmodule4.xml', + 'Geometry/TrackerCommonData/data/tecmodule4r.xml', + 'Geometry/TrackerCommonData/data/tecmodule4s.xml', + 'Geometry/TrackerCommonData/data/tecmodule5.xml', + 'Geometry/TrackerCommonData/data/tecmodule6.xml', + 'Geometry/TrackerCommonData/data/tecpetpar.xml', + 'Geometry/TrackerCommonData/data/tecring0.xml', + 'Geometry/TrackerCommonData/data/tecring1.xml', + 'Geometry/TrackerCommonData/data/tecring2.xml', + 'Geometry/TrackerCommonData/data/tecring3.xml', + 'Geometry/TrackerCommonData/data/tecring4.xml', + 'Geometry/TrackerCommonData/data/tecring5.xml', + 'Geometry/TrackerCommonData/data/tecring6.xml', + 'Geometry/TrackerCommonData/data/tecring0f.xml', + 'Geometry/TrackerCommonData/data/tecring1f.xml', + 'Geometry/TrackerCommonData/data/tecring2f.xml', + 'Geometry/TrackerCommonData/data/tecring3f.xml', + 'Geometry/TrackerCommonData/data/tecring4f.xml', + 'Geometry/TrackerCommonData/data/tecring5f.xml', + 'Geometry/TrackerCommonData/data/tecring6f.xml', + 'Geometry/TrackerCommonData/data/tecring0b.xml', + 'Geometry/TrackerCommonData/data/tecring1b.xml', + 'Geometry/TrackerCommonData/data/tecring2b.xml', + 'Geometry/TrackerCommonData/data/tecring3b.xml', + 'Geometry/TrackerCommonData/data/tecring4b.xml', + 'Geometry/TrackerCommonData/data/tecring5b.xml', + 'Geometry/TrackerCommonData/data/tecring6b.xml', + 'Geometry/TrackerCommonData/data/tecpetalf.xml', + 'Geometry/TrackerCommonData/data/tecpetalb.xml', + 'Geometry/TrackerCommonData/data/tecpetal0.xml', + 'Geometry/TrackerCommonData/data/tecpetal0f.xml', + 'Geometry/TrackerCommonData/data/tecpetal0b.xml', + 'Geometry/TrackerCommonData/data/tecpetal3.xml', + 'Geometry/TrackerCommonData/data/tecpetal3f.xml', + 'Geometry/TrackerCommonData/data/tecpetal3b.xml', + 'Geometry/TrackerCommonData/data/tecpetal6f.xml', + 'Geometry/TrackerCommonData/data/tecpetal6b.xml', + 'Geometry/TrackerCommonData/data/tecpetal8f.xml', + 'Geometry/TrackerCommonData/data/tecpetal8b.xml', + 'Geometry/TrackerCommonData/data/tecwheel.xml', + 'Geometry/TrackerCommonData/data/tecwheela.xml', + 'Geometry/TrackerCommonData/data/tecwheelb.xml', + 'Geometry/TrackerCommonData/data/tecwheelc.xml', + 'Geometry/TrackerCommonData/data/tecwheeld.xml', + 'Geometry/TrackerCommonData/data/tecwheel6.xml', + 'Geometry/TrackerCommonData/data/tecservices.xml', + 'Geometry/TrackerCommonData/data/tecbackplate.xml', + 'Geometry/TrackerCommonData/data/tec.xml', + 'Geometry/TrackerCommonData/data/trackermaterial.xml', + 'Geometry/TrackerCommonData/data/tracker.xml', + 'Geometry/TrackerCommonData/data/trackerpixbar.xml', + 'Geometry/TrackerCommonData/data/trackerpixfwd.xml', + 'Geometry/TrackerCommonData/data/trackertibtidservices.xml', + 'Geometry/TrackerCommonData/data/trackertib.xml', + 'Geometry/TrackerCommonData/data/trackertid.xml', + 'Geometry/TrackerCommonData/data/trackertob.xml', + 'Geometry/TrackerCommonData/data/trackertec.xml', + 'Geometry/TrackerCommonData/data/trackerbulkhead.xml', + 'Geometry/TrackerCommonData/data/trackerother.xml', + # 'Geometry/EcalCommonData/data/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/eefixed.xml', + # 'Geometry/EcalCommonData/data/eehier.xml', + # 'Geometry/EcalCommonData/data/eealgo.xml', + # 'Geometry/EcalCommonData/data/escon.xml', + # 'Geometry/EcalCommonData/data/esalgo.xml', + # 'Geometry/EcalCommonData/data/eeF.xml', + # 'Geometry/EcalCommonData/data/eeB.xml', + # 'Geometry/HcalCommonData/data/hcalrotations.xml', + # 'Geometry/HcalCommonData/data/hcalalgo.xml', + # 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + # 'Geometry/HcalCommonData/data/hcalendcapalgo.xml', + # 'Geometry/HcalCommonData/data/hcalouteralgo.xml', + 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + # 'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', + # 'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', + + # --- Muon ------------------------------------------------------------ + '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/v2/mf.xml', # Phase-1 Muon + # 'Geometry/MuonCommonData/data/v2/rpcf.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/mf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v2/gemf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v4/gem11.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v6/gem21.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v2/csc.xml', + # 'Geometry/MuonCommonData/data/v2/mfshield.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/mfshield.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/PhaseII/me0.xml', # Phase-2 Muon + # --- Muon ------------------------------------------------------------ + + 'Geometry/ForwardCommonData/data/forward.xml', + 'Geometry/ForwardCommonData/data/v2/forwardshield.xml', + 'Geometry/ForwardCommonData/data/brmrotations.xml', + 'Geometry/ForwardCommonData/data/brm.xml', + 'Geometry/ForwardCommonData/data/totemMaterials.xml', + 'Geometry/ForwardCommonData/data/totemRotations.xml', + 'Geometry/ForwardCommonData/data/totemt1.xml', + 'Geometry/ForwardCommonData/data/totemt2.xml', + 'Geometry/ForwardCommonData/data/ionpump.xml', + 'Geometry/ForwardCommonData/data/castor.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/ForwardCommonData/data/bhm.xml', + ##'Geometry/ForwardCommonData/data/bhmsens.xml', #not needed for geomtery purposes only + 'Geometry/ForwardCommonData/data/pltbcm.xml', + 'Geometry/ForwardCommonData/data/bcm1f.xml', + 'Geometry/ForwardSimData/data/bcm1fsens.xml', + 'Geometry/ForwardCommonData/data/plt.xml', + 'Geometry/TrackerCommonData/data/trackerStructureTopology.xml', + 'Geometry/TrackerSimData/data/trackersens.xml', + 'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml', + # 'Geometry/EcalSimData/data/ecalsens.xml', + # 'Geometry/HcalCommonData/data/hcalsenspmf.xml', + 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hfpmt.xml', + 'Geometry/HcalSimData/data/hffibrebundle.xml', + # 'Geometry/HcalSimData/data/CaloUtil.xml', + + # --- Muon ------------------------------------------------------------ + # 'Geometry/MuonCommonData/data/v2/muonNumbering.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml', # Phase-2 Muon + # 'Geometry/MuonSimData/data/muonSens.xml', # Phase-1 Muon + 'Geometry/MuonSimData/data/PhaseII/muonSens.xml', # Phase-2 Muon + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', + # 'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml', # Phase-1 Muon + 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', # Phase-2 Muon + 'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml', # Phase-2 Muon + # 'Geometry/MuonSimData/data/muonProdCuts.xml', # Phase-1 Muon + 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', # Phase-2 Muon + # --- Muon ------------------------------------------------------------ + + 'Geometry/ForwardCommonData/data/brmsens.xml', + 'Geometry/ForwardSimData/data/castorsens.xml', + 'Geometry/ForwardSimData/data/zdcsens.xml', + # 'Geometry/HcalSimData/data/HcalProdCuts.xml', + # 'Geometry/EcalSimData/data/EcalProdCuts.xml', + # 'Geometry/EcalSimData/data/ESProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', + 'Geometry/ForwardSimData/data/CastorProdCuts.xml', + 'Geometry/ForwardSimData/data/zdcProdCuts.xml', + 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', + 'Geometry/CMSCommonData/data/FieldParameters.xml'), + rootNodeName = cms.string('cms:OCMS') +) + + From da7546b9905333c59fdcc9975888e4b6a59526b1 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 16:22:36 +0200 Subject: [PATCH 17/55] test 2015 Geometry + Full Phase-2 Muon Upgrade --- ...0_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py new file mode 100644 index 0000000000000..85c4153ebdd9e --- /dev/null +++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py @@ -0,0 +1,138 @@ +# Auto generated configuration file +# using: +# Revision: 1.19 +# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v +# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Extended2015Muon,Extended2015MuonReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py +import FWCore.ParameterSet.Config as cms + +from Configuration.StandardSequences.Eras import eras + +process = cms.Process('DIGI',eras.Run2_25ns) + +# import of standard configurations +process.load('Configuration.StandardSequences.Services_cff') +process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') +process.load('FWCore.MessageService.MessageLogger_cfi') +process.load('Configuration.EventContent.EventContent_cff') +process.load('SimGeneral.MixingModule.mixNoPU_cfi') +process.load('Configuration.Geometry.GeometryExtended2015MuonReco_cff') +process.load('Configuration.Geometry.GeometryExtended2015Muon_cff') +process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.Generator_cff') +process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi') +process.load('GeneratorInterface.Core.genFilterSummary_cff') +process.load('Configuration.StandardSequences.SimIdeal_cff') +process.load('Configuration.StandardSequences.Digi_cff') +process.load('Configuration.StandardSequences.EndOfProcess_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') + +process.maxEvents = cms.untracked.PSet( + input = cms.untracked.int32(100) +) + +# Input source +process.source = cms.Source("EmptySource") +process.options = cms.untracked.PSet() + +# Production Info +process.configurationMetadata = cms.untracked.PSet( + annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'), + name = cms.untracked.string('Applications'), + version = cms.untracked.string('$Revision: 1.19 $') +) + +# Output definition +process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule", + SelectEvents = cms.untracked.PSet( + SelectEvents = cms.vstring('generation_step') + ), + dataset = cms.untracked.PSet( + dataTier = cms.untracked.string('GEN-SIM-DIGI'), + filterName = cms.untracked.string('') + ), + eventAutoFlushCompressedSize = cms.untracked.int32(1048576), + fileName = cms.untracked.string('out_digi.root'), + outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands, + splitLevel = cms.untracked.int32(0) +) + +# Additional output definition + +### TO ACTIVATE LogDebug NEED TO COMPILE IT WITH: +### -------------------------------------------------------------- +### --> scram b -j8 USER_CXXFLAGS="-DEDM_ML_DEBUG" +### Make sure that you first cleaned your CMSSW version: +### --> scram b clean +### before issuing the scram command above +### -------------------------------------------------------------- +### LogDebug output goes to cout; all other output to "junk.log" +### Code/Configuration with thanks to Tim Cox +################################################################## +process.load("FWCore.MessageLogger.MessageLogger_cfi") +process.MessageLogger.categories.append("GEMGeometryBuilderFromDDD") +process.MessageLogger.categories.append("ME0GeometryBuilderFromDDD") +process.MessageLogger.categories.append("RPCGeometryBuilderFromDDD") +process.MessageLogger.debugModules = cms.untracked.vstring("*") +process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cout = cms.untracked.PSet( + threshold = cms.untracked.string("DEBUG"), + default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), + FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), + GEMGeometryBuilderFromDDD = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), + ME0GeometryBuilderFromDDD = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), + RPCGeometryBuilderFromDDD = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), +) +################################################################## + +# Other statements +process.genstepfilter.triggerConditions=cms.vstring("generation_step") +from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') + +process.generator = cms.EDProducer("FlatRandomPtGunProducer", + AddAntiParticle = cms.bool(True), + PGunParameters = cms.PSet( + MaxEta = cms.double(2.5), + MaxPhi = cms.double(3.14159265359), + MaxPt = cms.double(100.01), + MinEta = cms.double(-2.5), + MinPhi = cms.double(-3.14159265359), + MinPt = cms.double(99.99), + PartID = cms.vint32(-13) + ), + Verbosity = cms.untracked.int32(0), + firstRun = cms.untracked.uint32(1), + psethack = cms.string('single mu pt 100') +) + + +# Path and EndPath definitions +process.generation_step = cms.Path(process.pgen) +process.simulation_step = cms.Path(process.psim) +process.digitisation_step = cms.Path(process.pdigi) +process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) +process.endjob_step = cms.EndPath(process.endOfProcess) +process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) + +# Schedule definition +process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step) +# filter all path with the production filter sequence +for path in process.paths: + getattr(process,path)._seq = process.generator * getattr(process,path)._seq + +# customisation of the process. + +# Automatic addition of the customisation function from SimMuon.GEMDigitizer.customizeGEMDigi +from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only + +#call to customisation function customize_digi_addGEM_muon_only imported from SimMuon.GEMDigitizer.customizeGEMDigi +process = customize_digi_addGEM_muon_only(process) + +# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads +from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions + +#call to customisation function fixRPCConditions imported from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads +process = fixRPCConditions(process) + +# End of customisation functions + From 919d8d8120dce6e53bf1024c74dfdc06ecb25a6f Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 16:22:49 +0200 Subject: [PATCH 18/55] test 2015 Geometry --- ...Pt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py new file mode 100644 index 0000000000000..b8c0a2afcc20c --- /dev/null +++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py @@ -0,0 +1,101 @@ +# Auto generated configuration file +# using: +# Revision: 1.19 +# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v +# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Extended2015,Extended2015Reco --eventcontent FEVTDEBUGHLT --era Run2_25ns -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py +import FWCore.ParameterSet.Config as cms + +from Configuration.StandardSequences.Eras import eras + +process = cms.Process('DIGI',eras.Run2_25ns) + +# import of standard configurations +process.load('Configuration.StandardSequences.Services_cff') +process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') +process.load('FWCore.MessageService.MessageLogger_cfi') +process.load('Configuration.EventContent.EventContent_cff') +process.load('SimGeneral.MixingModule.mixNoPU_cfi') +process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2015_cff') +process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.Generator_cff') +process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi') +process.load('GeneratorInterface.Core.genFilterSummary_cff') +process.load('Configuration.StandardSequences.SimIdeal_cff') +process.load('Configuration.StandardSequences.Digi_cff') +process.load('Configuration.StandardSequences.EndOfProcess_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') + +process.maxEvents = cms.untracked.PSet( + input = cms.untracked.int32(100) +) + +# Input source +process.source = cms.Source("EmptySource") + +process.options = cms.untracked.PSet( + +) + +# Production Info +process.configurationMetadata = cms.untracked.PSet( + annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'), + name = cms.untracked.string('Applications'), + version = cms.untracked.string('$Revision: 1.19 $') +) + +# Output definition + +process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule", + SelectEvents = cms.untracked.PSet( + SelectEvents = cms.vstring('generation_step') + ), + dataset = cms.untracked.PSet( + dataTier = cms.untracked.string('GEN-SIM-DIGI'), + filterName = cms.untracked.string('') + ), + eventAutoFlushCompressedSize = cms.untracked.int32(1048576), + fileName = cms.untracked.string('out_digi.root'), + outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands, + splitLevel = cms.untracked.int32(0) +) + +# Additional output definition + +# Other statements +process.genstepfilter.triggerConditions=cms.vstring("generation_step") +from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') + +process.generator = cms.EDProducer("FlatRandomPtGunProducer", + AddAntiParticle = cms.bool(True), + PGunParameters = cms.PSet( + MaxEta = cms.double(2.5), + MaxPhi = cms.double(3.14159265359), + MaxPt = cms.double(100.01), + MinEta = cms.double(-2.5), + MinPhi = cms.double(-3.14159265359), + MinPt = cms.double(99.99), + PartID = cms.vint32(-13) + ), + Verbosity = cms.untracked.int32(0), + firstRun = cms.untracked.uint32(1), + psethack = cms.string('single mu pt 100') +) + + +# Path and EndPath definitions +process.generation_step = cms.Path(process.pgen) +process.simulation_step = cms.Path(process.psim) +process.digitisation_step = cms.Path(process.pdigi) +process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) +process.endjob_step = cms.EndPath(process.endOfProcess) +process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) + +# Schedule definition +process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step) +# filter all path with the production filter sequence +for path in process.paths: + getattr(process,path)._seq = process.generator * getattr(process,path)._seq + + From 5938265daaa86ea869127d7510b819fb7fee0790 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 17:46:43 +0200 Subject: [PATCH 19/55] added missing trackerParameters.xml --- Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py index f8ade3f34c9f8..30f07efbb4a36 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py @@ -18,6 +18,8 @@ 'Geometry/CMSCommonData/data/cmsBeam.xml', 'Geometry/CMSCommonData/data/muonMB.xml', 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/TrackerCommonData/data/trackerParameters.xml' + 'Geometry/TrackerCommonData/data/trackerParameters.xml', 'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', From 4ba507d31619f958b2063a14a0f80cdfecfa00f3 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 17:46:50 +0200 Subject: [PATCH 20/55] added missing trackerParameters.xml --- Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py index 0818d6f65ec9f..3863b50e24b34 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py @@ -23,6 +23,7 @@ 'Geometry/CMSCommonData/data/cmsBeam.xml', 'Geometry/CMSCommonData/data/muonMB.xml', 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/TrackerCommonData/data/trackerParameters.xml' 'Geometry/TrackerCommonData/data/dev/Pilot/pixfwdMaterials.xml', 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', From f7297371c1ffc418ff85279b4614205dfb1f0cbf Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 17:47:15 +0200 Subject: [PATCH 21/55] added missing GEM and ME0 Geometry Builders --- .../Geometry/python/GeometryIdeal2015MuonReco_cff.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py b/Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py index 5d8b67cd44016..292e4547160bc 100644 --- a/Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py +++ b/Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py @@ -3,3 +3,7 @@ # Ideal geometry, needed for transient ECAL alignement from Configuration.Geometry.GeometryIdeal2015Muon_cff import * from Configuration.Geometry.GeometryReco_cff import * + +from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * +from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * +from Geometry.RPCGeometryBuilder.rpcGeometry_cfi import * From 4d6f1f9c11aadeec1cd75e0b5ee11a265e42fe5d Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 17:47:28 +0200 Subject: [PATCH 22/55] added missing GEM and ME0 Geometry Builders --- .../Geometry/python/GeometryExtended2015MuonReco_cff.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py b/Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py index 6d9c17ed3da5c..dd830fba9874e 100644 --- a/Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py @@ -3,3 +3,7 @@ # Ideal geometry, needed for transient ECAL alignement from Configuration.Geometry.GeometryExtended2015Muon_cff import * from Configuration.Geometry.GeometryReco_cff import * + +from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * +from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * +from Geometry.RPCGeometryBuilder.rpcGeometry_cfi import * From dfd106ef1d8ae31c0b5aee7361f3f7e681c6727c Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 19:27:10 +0200 Subject: [PATCH 23/55] produce also MuonME0Hits --- SimG4Core/Application/plugins/OscarProducer.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SimG4Core/Application/plugins/OscarProducer.cc b/SimG4Core/Application/plugins/OscarProducer.cc index 989b40891ca52..67a1172246465 100644 --- a/SimG4Core/Application/plugins/OscarProducer.cc +++ b/SimG4Core/Application/plugins/OscarProducer.cc @@ -102,6 +102,8 @@ OscarProducer::OscarProducer(edm::ParameterSet const & p) produces("MuonCSCHits"); produces("MuonRPCHits"); produces("MuonGEMHits"); + produces("MuonME0Hits"); + produces("CastorPL"); produces("CastorFI"); produces("CastorBU"); From 52df756238530510d9996992aa4f88ddcf5241d5 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 19:28:36 +0200 Subject: [PATCH 24/55] test 2015 Geometry + Full Phase-2 Muon Upgrade only GEN-SIM step --- ...uPt100_cfi_GEM-SIM_Extended2015Muon_cfg.py | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015Muon_cfg.py diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015Muon_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015Muon_cfg.py new file mode 100644 index 0000000000000..bfc99fe1cc2f7 --- /dev/null +++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015Muon_cfg.py @@ -0,0 +1,99 @@ +# Auto generated configuration file +# using: +# Revision: 1.19 +# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v +# with command line options: SingleMuPt100_cfi -s GEN,SIM --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM --geometry Extended2015Muon,Extended2015MuonReco --eventcontent FEVTDEBUGHLT --era Run2_25ns -n 100 --no_exec --fileout out_sim.root --python_filename SingleMuPt100_cfi_GEM-SIM_Extended2015Muon_cfg.py +import FWCore.ParameterSet.Config as cms + +from Configuration.StandardSequences.Eras import eras + +process = cms.Process('SIM',eras.Run2_25ns) + +# import of standard configurations +process.load('Configuration.StandardSequences.Services_cff') +process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') +process.load('FWCore.MessageService.MessageLogger_cfi') +process.load('Configuration.EventContent.EventContent_cff') +process.load('SimGeneral.MixingModule.mixNoPU_cfi') +process.load('Configuration.Geometry.GeometryExtended2015MuonReco_cff') +process.load('Configuration.Geometry.GeometryExtended2015Muon_cff') +process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.Generator_cff') +process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi') +process.load('GeneratorInterface.Core.genFilterSummary_cff') +process.load('Configuration.StandardSequences.SimIdeal_cff') +process.load('Configuration.StandardSequences.EndOfProcess_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') + +process.maxEvents = cms.untracked.PSet( + input = cms.untracked.int32(100) +) + +# Input source +process.source = cms.Source("EmptySource") + +process.options = cms.untracked.PSet( + +) + +# Production Info +process.configurationMetadata = cms.untracked.PSet( + annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'), + name = cms.untracked.string('Applications'), + version = cms.untracked.string('$Revision: 1.19 $') +) + +# Output definition + +process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule", + SelectEvents = cms.untracked.PSet( + SelectEvents = cms.vstring('generation_step') + ), + dataset = cms.untracked.PSet( + dataTier = cms.untracked.string('GEN-SIM'), + filterName = cms.untracked.string('') + ), + eventAutoFlushCompressedSize = cms.untracked.int32(1048576), + fileName = cms.untracked.string('out_sim.root'), + outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands, + splitLevel = cms.untracked.int32(0) +) + +# Additional output definition + +# Other statements +process.genstepfilter.triggerConditions=cms.vstring("generation_step") +from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') + +process.generator = cms.EDProducer("FlatRandomPtGunProducer", + AddAntiParticle = cms.bool(True), + PGunParameters = cms.PSet( + MaxEta = cms.double(2.5), + MaxPhi = cms.double(3.14159265359), + MaxPt = cms.double(100.01), + MinEta = cms.double(-2.5), + MinPhi = cms.double(-3.14159265359), + MinPt = cms.double(99.99), + PartID = cms.vint32(-13) + ), + Verbosity = cms.untracked.int32(0), + firstRun = cms.untracked.uint32(1), + psethack = cms.string('single mu pt 100') +) + + +# Path and EndPath definitions +process.generation_step = cms.Path(process.pgen) +process.simulation_step = cms.Path(process.psim) +process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) +process.endjob_step = cms.EndPath(process.endOfProcess) +process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) + +# Schedule definition +process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step) +# filter all path with the production filter sequence +for path in process.paths: + getattr(process,path)._seq = process.generator * getattr(process,path)._seq + + From bd2b05b449b770dbde47ad17d6c92d6fdd218500 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 19:29:02 +0200 Subject: [PATCH 25/55] forgot a comma --- Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py index 30f07efbb4a36..fcf54a1d0197b 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py @@ -18,7 +18,6 @@ 'Geometry/CMSCommonData/data/cmsBeam.xml', 'Geometry/CMSCommonData/data/muonMB.xml', 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/TrackerCommonData/data/trackerParameters.xml' 'Geometry/TrackerCommonData/data/trackerParameters.xml', 'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', From 5786cc01fd18f1a409b77e007edaaeff1c151ded Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 7 May 2015 19:29:17 +0200 Subject: [PATCH 26/55] forgot a comma --- .../CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py index 3863b50e24b34..d54252b0bc8b1 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py @@ -23,7 +23,7 @@ 'Geometry/CMSCommonData/data/cmsBeam.xml', 'Geometry/CMSCommonData/data/muonMB.xml', 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/TrackerCommonData/data/trackerParameters.xml' + 'Geometry/TrackerCommonData/data/trackerParameters.xml', 'Geometry/TrackerCommonData/data/dev/Pilot/pixfwdMaterials.xml', 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', From 9d4a6b237a8ea4ddb9791a84c077769a1e61002b Mon Sep 17 00:00:00 2001 From: Piet Date: Mon, 11 May 2015 15:15:40 +0200 Subject: [PATCH 27/55] applied same change also to OscarMTProducer: added ME0 SimHits --- SimG4Core/Application/plugins/OscarMTProducer.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/SimG4Core/Application/plugins/OscarMTProducer.cc b/SimG4Core/Application/plugins/OscarMTProducer.cc index ec7b7fef110cb..01ccbb0725f57 100644 --- a/SimG4Core/Application/plugins/OscarMTProducer.cc +++ b/SimG4Core/Application/plugins/OscarMTProducer.cc @@ -101,6 +101,7 @@ OscarMTProducer::OscarMTProducer(edm::ParameterSet const & p, const OscarMTMaste produces("MuonCSCHits"); produces("MuonRPCHits"); produces("MuonGEMHits"); + produces("MuonME0Hits"); produces("CastorPL"); produces("CastorFI"); produces("CastorBU"); From aab674ec69183c47979842871385740ee44fd03b Mon Sep 17 00:00:00 2001 From: Piet Date: Mon, 11 May 2015 15:16:06 +0200 Subject: [PATCH 28/55] brought me0customs back from SLHC releases --- .../python/muonME0DigisPreReco_cfi.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/SimMuon/GEMDigitizer/python/muonME0DigisPreReco_cfi.py b/SimMuon/GEMDigitizer/python/muonME0DigisPreReco_cfi.py index e8db6bd8b1fc6..dbfd9e02e5a5a 100644 --- a/SimMuon/GEMDigitizer/python/muonME0DigisPreReco_cfi.py +++ b/SimMuon/GEMDigitizer/python/muonME0DigisPreReco_cfi.py @@ -2,20 +2,21 @@ # Module to create simulated ME0 Pre Reco digis. simMuonME0Digis = cms.EDProducer("ME0DigiPreRecoProducer", + mixLabel = cms.string('mix'), inputCollection = cms.string('g4SimHitsMuonME0Hits'), digiPreRecoModelString = cms.string('PreRecoGaussian'), - timeResolution = cms.double(0.001), # in ns - phiResolution = cms.double(0.05), # in cm average resoltion along local x in case of no correlation - etaResolution = cms.double(1.),# in cm average resoltion along local y in case of no correlation + timeResolution = cms.double(0.010), # [in ns] => for now at 10ps + phiResolution = cms.double(0.05), # [in cm] average resolution along local x in case of no correlation + etaResolution = cms.double(1.), # [in cm] average resolution along local y in case of no correlation useCorrelation = cms.bool(False), useEtaProjectiveGEO = cms.bool(False), averageEfficiency = cms.double(0.98), - doBkgNoise = cms.bool(False), #False == No background simulation + doBkgNoise = cms.bool(False), # False => No background noise simulation digitizeOnlyMuons = cms.bool(False), simulateIntrinsicNoise = cms.bool(False), - simulateElectronBkg = cms.bool(False), #True - will simulate electron background - averageNoiseRate = cms.double(0.001), #intrinsic noise + simulateElectronBkg = cms.bool(False), # True => will simulate electron background + averageNoiseRate = cms.double(0.001), # simulation of intrinsic noise bxwidth = cms.int32(25), - minBunch = cms.int32(-5), ## in terms of 25 ns + minBunch = cms.int32(-5), # in bx-units (x 25 ns) maxBunch = cms.int32(3) ) From 9b14caec1a8179885bf581886e10817fa616c65e Mon Sep 17 00:00:00 2001 From: Piet Date: Mon, 11 May 2015 15:16:45 +0200 Subject: [PATCH 29/55] RPCSimAverageNoiseEff model for RPC Digitization + mixLabel for ME0 --- SLHCUpgradeSimulations/Configuration/python/gemCustom.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SLHCUpgradeSimulations/Configuration/python/gemCustom.py b/SLHCUpgradeSimulations/Configuration/python/gemCustom.py index 2d36b9b064c06..183ef39730786 100644 --- a/SLHCUpgradeSimulations/Configuration/python/gemCustom.py +++ b/SLHCUpgradeSimulations/Configuration/python/gemCustom.py @@ -11,9 +11,10 @@ def customise_digitization(process): from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only process = customize_digi_addGEM_muon_only(process) process.simMuonGEMDigis.mixLabel = cms.string("mix") - #process.simMuonRPCDigis.digiModel = cms.string('RPCSimParam') - #process.simMuonME0Digis.mixLabel = cms.string("mix") - process.digitisation_step.remove(process.simMuonRPCDigis) + process.simMuonME0Digis.mixLabel = cms.string("mix") + # process.digitisation_step.remove(process.simMuonRPCDigis) + # process.simMuonRPCDigis.digiModel = cms.string('RPCSimParam') + process.simMuonRPCDigis.digiModel = cms.string('RPCSimAverageNoiseEff') return process def customise_Validation(process): From 65ad2bafb349c526fe3c4edb4a01bd3bc142767f Mon Sep 17 00:00:00 2001 From: Piet Date: Mon, 11 May 2015 15:17:05 +0200 Subject: [PATCH 30/55] configured / customized for ME0 digi production --- ...SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py index 85c4153ebdd9e..c60384411b963 100644 --- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py +++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py @@ -2,7 +2,7 @@ # using: # Revision: 1.19 # Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v -# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Extended2015Muon,Extended2015MuonReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py +# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Extended2015Muon,Extended2015MuonReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions,SLHCUpgradeSimulations/Configuration/me0Customs.customize_Digi -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py import FWCore.ParameterSet.Config as cms from Configuration.StandardSequences.Eras import eras @@ -134,5 +134,11 @@ #call to customisation function fixRPCConditions imported from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads process = fixRPCConditions(process) +# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.me0Customs +from SLHCUpgradeSimulations.Configuration.me0Customs import customise_Digi + +#call to customisation function customise_Digi imported from SLHCUpgradeSimulations.Configuration.me0Customs +process = customise_Digi(process) + # End of customisation functions From c9ee5d7f35e1fde330511b45012bd523f101260f Mon Sep 17 00:00:00 2001 From: Piet Date: Mon, 11 May 2015 15:17:49 +0200 Subject: [PATCH 31/55] brought me0customs back from SLHC releases --- .../Configuration/python/me0Customs.py | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 SLHCUpgradeSimulations/Configuration/python/me0Customs.py diff --git a/SLHCUpgradeSimulations/Configuration/python/me0Customs.py b/SLHCUpgradeSimulations/Configuration/python/me0Customs.py new file mode 100644 index 0000000000000..242d28e1fabe6 --- /dev/null +++ b/SLHCUpgradeSimulations/Configuration/python/me0Customs.py @@ -0,0 +1,106 @@ +import FWCore.ParameterSet.Config as cms + +def customise(process): + if hasattr(process,'digitisation_step'): + process=customise_Digi(process) + if hasattr(process,'L1simulation_step'): + process=customise_L1Emulator(process) + if hasattr(process,'DigiToRaw'): + process=customise_DigiToRaw(process) + if hasattr(process,'RawToDigi'): + process=customise_RawToDigi(process) + if hasattr(process,'reconstruction'): + process=customise_RecoFull(process) + if hasattr(process,'famosWithEverything'): + process=customise_RecoFast(process) + if hasattr(process,'dqmoffline_step'): + process=customise_DQM(process) + if hasattr(process,'dqmHarvesting'): + process=customise_harvesting(process) + if hasattr(process,'validation_step'): + process=customise_Validation(process) + return process + +def customise_Digi(process): + process.RandomNumberGeneratorService.simMuonME0Digis = cms.PSet( + initialSeed = cms.untracked.uint32(1234567), + engineName = cms.untracked.string('HepJamesRandom') + ) + process.mix.mixObjects.mixSH.crossingFrames.append('MuonME0Hits') + process.mix.mixObjects.mixSH.input.append(cms.InputTag("g4SimHits","MuonME0Hits")) + process.mix.mixObjects.mixSH.subdets.append('MuonME0Hits') + process.load('SimMuon.GEMDigitizer.muonME0DigisPreReco_cfi') + process.muonDigi += process.simMuonME0Digis + process=outputCustoms(process) + return process + +def customise_L1Emulator(process): + return process + +def customise_DigiToRaw(process): + return process + +def customise_RawToDigi(process): + return process + +def customise_LocalReco(process): + process.load('RecoLocalMuon.GEMRecHit.me0LocalReco_cff') + process.muonlocalreco += process.me0LocalReco + process=outputCustoms(process) + return process + +def customise_GlobalRecoInclude(process): + process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi") + process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorOpposite_cfi") + process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAny_cfi") + return process + +def customise_GlobalRecoFast(process): + customise_GlobalRecoInclude(process) + process.load('RecoMuon.MuonIdentification.me0MuonReco_cff') + process.reconstructionWithFamos += process.me0MuonReco + return process + +def customise_GlobalRecoFull(process): + customise_GlobalRecoInclude(process) + process.load('RecoMuon.MuonIdentification.me0MuonReco_cff') + process.muonGlobalReco += process.me0MuonReco + return process + +def customise_RecoFast(process): + process=customise_LocalReco(process) + process=customise_GlobalRecoFast(process) + process=outputCustoms(process) + return process + +def customise_RecoFull(process): + process=customise_LocalReco(process) + process=customise_GlobalRecoFull(process) + process=outputCustoms(process) + return process + +def customise_Validation(process): + process.load('Validation.Configuration.gemSimValid_cff') + process.genvalid_all += process.me0SimValid + return process + +def customise_DQM(process): + return process + +def customise_harvesting(process): + return process + +def outputCustoms(process): + alist=['AODSIM','RECOSIM','FEVTSIM','FEVTDEBUG','FEVTDEBUGHLT','RECODEBUG','RAWRECOSIMHLT','RAWRECODEBUGHLT'] + for a in alist: + b=a+'output' + if hasattr(process,b): + getattr(process,b).outputCommands.append('keep *_simMuonME0Digis_*_*') + getattr(process,b).outputCommands.append('keep *_me0RecHits_*_*') + getattr(process,b).outputCommands.append('keep *_me0Segments_*_*') + getattr(process,b).outputCommands.append('keep *_me0SegmentProducer_*_*') + getattr(process,b).outputCommands.append('drop *_me0SegmentMatcher_*_*') + getattr(process,b).outputCommands.append('drop *_me0MuonConverter_*_*') + getattr(process,b).outputCommands.append('keep *_me0SegmentMatching_*_*') + getattr(process,b).outputCommands.append('keep *_me0MuonConverting_*_*') + return process From e06fe6245f223849b67e3fa4695aec123331069d Mon Sep 17 00:00:00 2001 From: Piet Date: Mon, 11 May 2015 15:23:39 +0200 Subject: [PATCH 32/55] removed changes to cmsIdealGeometry2015XML_cfi.py from pull request --- Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py index fcf54a1d0197b..f8ade3f34c9f8 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py @@ -18,7 +18,6 @@ 'Geometry/CMSCommonData/data/cmsBeam.xml', 'Geometry/CMSCommonData/data/muonMB.xml', 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/TrackerCommonData/data/trackerParameters.xml', 'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', From 514a1c1d6be3fe6be310c8e1575650c8acc9f00f Mon Sep 17 00:00:00 2001 From: Piet Date: Mon, 11 May 2015 15:28:01 +0200 Subject: [PATCH 33/55] removed empty line --- SimG4Core/Application/plugins/OscarProducer.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/SimG4Core/Application/plugins/OscarProducer.cc b/SimG4Core/Application/plugins/OscarProducer.cc index 67a1172246465..02cdfcedd1a5c 100644 --- a/SimG4Core/Application/plugins/OscarProducer.cc +++ b/SimG4Core/Application/plugins/OscarProducer.cc @@ -103,7 +103,6 @@ OscarProducer::OscarProducer(edm::ParameterSet const & p) produces("MuonRPCHits"); produces("MuonGEMHits"); produces("MuonME0Hits"); - produces("CastorPL"); produces("CastorFI"); produces("CastorBU"); From 9944f7040ed9bb9609de9a59833913fabd24cb57 Mon Sep 17 00:00:00 2001 From: Piet Date: Fri, 22 May 2015 15:53:14 +0200 Subject: [PATCH 34/55] update gem11.xml to v7 --- .../CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py index e616a34193bdf..6cf62eb1b9af3 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py @@ -237,7 +237,7 @@ 'Geometry/MuonCommonData/data/PhaseII/mf.xml', # Phase-2 Muon 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', # Phase-2 Muon 'Geometry/MuonCommonData/data/v2/gemf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v4/gem11.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v7/gem11.xml', # Phase-2 Muon 'Geometry/MuonCommonData/data/v6/gem21.xml', # Phase-2 Muon 'Geometry/MuonCommonData/data/v2/csc.xml', # 'Geometry/MuonCommonData/data/v2/mfshield.xml', # Phase-1 Muon From 9e301cb4488981c4e82d778f5f2e8d951f12f6ca Mon Sep 17 00:00:00 2001 From: Piet Date: Fri, 22 May 2015 15:53:21 +0200 Subject: [PATCH 35/55] update gem11.xml to v7 --- .../CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py index d54252b0bc8b1..93579158bfdab 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py @@ -235,7 +235,7 @@ 'Geometry/MuonCommonData/data/PhaseII/mf.xml', # Phase-2 Muon 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', # Phase-2 Muon 'Geometry/MuonCommonData/data/v2/gemf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v4/gem11.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v7/gem11.xml', # Phase-2 Muon 'Geometry/MuonCommonData/data/v6/gem21.xml', # Phase-2 Muon 'Geometry/MuonCommonData/data/v2/csc.xml', # 'Geometry/MuonCommonData/data/v2/mfshield.xml', # Phase-1 Muon From 78d5882185a9a6fdff740a3dba0097b93b6496ac Mon Sep 17 00:00:00 2001 From: Piet Date: Fri, 22 May 2015 15:59:50 +0200 Subject: [PATCH 36/55] add GEMDev as tag to load GeometryExtended2015MuonReco_GEMDev_cff.py --- Fireworks/Geometry/python/dumpRecoGeometry_cfg.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py index 1350295037743..5b6707703695f 100644 --- a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py +++ b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py @@ -71,7 +71,12 @@ def recoGeoLoad(score): # Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms #from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023Muon #call to customisation function cust_2023Muon imported from SLHCUpgradeSimulations.Configuration.combinedCustoms - # process = cust_2023Muon(process) + #process = cust_2023Muon(process) + + elif score == "GEMDev": + from Configuration.AlCa.autoCond import autoCond + process.GlobalTag.globaltag = autoCond['mc'] + process.load('Configuration.Geometry.GeometryExtended2015MuonReco_GEMDev_cff') elif score == "SLHCDB": # orig dumpFWRecoSLHCGeometry_cfg.py process.GlobalTag.globaltag = 'DESIGN42_V17::All' From 2767bd20641357e9b692e7a0868497213e3130f4 Mon Sep 17 00:00:00 2001 From: Piet Date: Fri, 22 May 2015 16:00:28 +0200 Subject: [PATCH 37/55] renamed 2015Muon --> 2015Muon_GEMDev --- .../python/GeometryExtended2015MuonReco_GEMDev_cff.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Configuration/Geometry/python/GeometryExtended2015MuonReco_GEMDev_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2015MuonReco_GEMDev_cff.py b/Configuration/Geometry/python/GeometryExtended2015MuonReco_GEMDev_cff.py new file mode 100644 index 0000000000000..dd830fba9874e --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtended2015MuonReco_GEMDev_cff.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +# Ideal geometry, needed for transient ECAL alignement +from Configuration.Geometry.GeometryExtended2015Muon_cff import * +from Configuration.Geometry.GeometryReco_cff import * + +from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * +from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * +from Geometry.RPCGeometryBuilder.rpcGeometry_cfi import * From e2d1b4e157b34ab03b482571197a219308c1b260 Mon Sep 17 00:00:00 2001 From: Piet Date: Fri, 22 May 2015 16:00:36 +0200 Subject: [PATCH 38/55] renamed 2015Muon --> 2015Muon_GEMDev --- .../python/GeometryExtended2015Muon_GEMDev_cff.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Configuration/Geometry/python/GeometryExtended2015Muon_GEMDev_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2015Muon_GEMDev_cff.py b/Configuration/Geometry/python/GeometryExtended2015Muon_GEMDev_cff.py new file mode 100644 index 0000000000000..1d609ce447a8f --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtended2015Muon_GEMDev_cff.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +# +# Geometry master configuration +# +# Ideal geometry, needed for simulation +from Geometry.CMSCommonData.cmsExtendedGeometry2015MuonXML_GEMDev_cfi import * +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * + From 32e7dc86d7ce8530bb7bfe9fa6f9a0cb39f8f34e Mon Sep 17 00:00:00 2001 From: Piet Date: Fri, 22 May 2015 16:00:44 +0200 Subject: [PATCH 39/55] renamed 2015Muon --> 2015Muon_GEMDev --- ...sExtendedGeometry2015MuonXML_GEMDev_cfi.py | 311 ++++++++++++++++++ 1 file changed, 311 insertions(+) create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_GEMDev_cfi.py diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_GEMDev_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_GEMDev_cfi.py new file mode 100644 index 0000000000000..6cf62eb1b9af3 --- /dev/null +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_GEMDev_cfi.py @@ -0,0 +1,311 @@ +import FWCore.ParameterSet.Config as cms + +## Everything that is currently in the PostLS1 geometry (rpc,csc,beampipe) +## with full Muon Upgrade for Phase-2 :: ME0, GE1/1, GE2/1, RE3/1, RE4/1 + +XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", + geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', + 'Geometry/CMSCommonData/data/rotations.xml', + 'Geometry/CMSCommonData/data/extend/cmsextent.xml', + # 'Geometry/CMSCommonData/data/cms.xml', # Phase-1 Muon + 'Geometry/CMSCommonData/data/PhaseII/cms.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/eta3/etaMax.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/cmsMother.xml', + 'Geometry/CMSCommonData/data/cmsTracker.xml', + # 'Geometry/CMSCommonData/data/caloBase.xml', + # 'Geometry/CMSCommonData/data/cmsCalo.xml', + # 'Geometry/CMSCommonData/data/muonBase.xml', # Phase-1 Muon + 'Geometry/CMSCommonData/data/PhaseII/muonBase.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/cmsMuon.xml', + 'Geometry/CMSCommonData/data/mgnt.xml', + 'Geometry/CMSCommonData/data/PhaseI/beampipe.xml', + 'Geometry/CMSCommonData/data/cmsBeam.xml', + 'Geometry/CMSCommonData/data/muonMB.xml', + 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/CMSCommonData/data/cavern.xml', + 'Geometry/TrackerCommonData/data/trackerParameters.xml', + 'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', + 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq1x2.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq1x5.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x3.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x4.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x5.xml', + 'Geometry/TrackerCommonData/data/pixfwdPanelBase.xml', + 'Geometry/TrackerCommonData/data/pixfwdPanel.xml', + 'Geometry/TrackerCommonData/data/pixfwdBlade.xml', + 'Geometry/TrackerCommonData/data/pixfwdNipple.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdPilotBlade.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdDisk.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdCylinder.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwd.xml', + 'Geometry/TrackerCommonData/data/pixbarmaterial.xml', + 'Geometry/TrackerCommonData/data/pixbarladder.xml', + 'Geometry/TrackerCommonData/data/pixbarladderfull.xml', + 'Geometry/TrackerCommonData/data/pixbarladderhalf.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer0.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer1.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer2.xml', + 'Geometry/TrackerCommonData/data/pixbar.xml', + 'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmodpar.xml', + 'Geometry/TrackerCommonData/data/tibmodule0.xml', + 'Geometry/TrackerCommonData/data/tibmodule0a.xml', + 'Geometry/TrackerCommonData/data/tibmodule0b.xml', + 'Geometry/TrackerCommonData/data/tibmodule2.xml', + 'Geometry/TrackerCommonData/data/tibstringpar.xml', + 'Geometry/TrackerCommonData/data/tibstring0ll.xml', + 'Geometry/TrackerCommonData/data/tibstring0lr.xml', + 'Geometry/TrackerCommonData/data/tibstring0ul.xml', + 'Geometry/TrackerCommonData/data/tibstring0ur.xml', + 'Geometry/TrackerCommonData/data/tibstring0.xml', + 'Geometry/TrackerCommonData/data/tibstring1ll.xml', + 'Geometry/TrackerCommonData/data/tibstring1lr.xml', + 'Geometry/TrackerCommonData/data/tibstring1ul.xml', + 'Geometry/TrackerCommonData/data/tibstring1ur.xml', + 'Geometry/TrackerCommonData/data/tibstring1.xml', + 'Geometry/TrackerCommonData/data/tibstring2ll.xml', + 'Geometry/TrackerCommonData/data/tibstring2lr.xml', + 'Geometry/TrackerCommonData/data/tibstring2ul.xml', + 'Geometry/TrackerCommonData/data/tibstring2ur.xml', + 'Geometry/TrackerCommonData/data/tibstring2.xml', + 'Geometry/TrackerCommonData/data/tibstring3ll.xml', + 'Geometry/TrackerCommonData/data/tibstring3lr.xml', + 'Geometry/TrackerCommonData/data/tibstring3ul.xml', + 'Geometry/TrackerCommonData/data/tibstring3ur.xml', + 'Geometry/TrackerCommonData/data/tibstring3.xml', + 'Geometry/TrackerCommonData/data/tiblayerpar.xml', + 'Geometry/TrackerCommonData/data/tiblayer0.xml', + 'Geometry/TrackerCommonData/data/tiblayer1.xml', + 'Geometry/TrackerCommonData/data/tiblayer2.xml', + 'Geometry/TrackerCommonData/data/tiblayer3.xml', + 'Geometry/TrackerCommonData/data/tib.xml', + 'Geometry/TrackerCommonData/data/tidmaterial.xml', + 'Geometry/TrackerCommonData/data/tidmodpar.xml', + 'Geometry/TrackerCommonData/data/tidmodule0.xml', + 'Geometry/TrackerCommonData/data/tidmodule0r.xml', + 'Geometry/TrackerCommonData/data/tidmodule0l.xml', + 'Geometry/TrackerCommonData/data/tidmodule1.xml', + 'Geometry/TrackerCommonData/data/tidmodule1r.xml', + 'Geometry/TrackerCommonData/data/tidmodule1l.xml', + 'Geometry/TrackerCommonData/data/tidmodule2.xml', + 'Geometry/TrackerCommonData/data/tidringpar.xml', + 'Geometry/TrackerCommonData/data/tidring0.xml', + 'Geometry/TrackerCommonData/data/tidring0f.xml', + 'Geometry/TrackerCommonData/data/tidring0b.xml', + 'Geometry/TrackerCommonData/data/tidring1.xml', + 'Geometry/TrackerCommonData/data/tidring1f.xml', + 'Geometry/TrackerCommonData/data/tidring1b.xml', + 'Geometry/TrackerCommonData/data/tidring2.xml', + 'Geometry/TrackerCommonData/data/tid.xml', + 'Geometry/TrackerCommonData/data/tidf.xml', + 'Geometry/TrackerCommonData/data/tidb.xml', + 'Geometry/TrackerCommonData/data/tibtidservices.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesf.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesb.xml', + 'Geometry/TrackerCommonData/data/tobmaterial.xml', + 'Geometry/TrackerCommonData/data/tobmodpar.xml', + 'Geometry/TrackerCommonData/data/tobmodule0.xml', + 'Geometry/TrackerCommonData/data/tobmodule2.xml', + 'Geometry/TrackerCommonData/data/tobmodule4.xml', + 'Geometry/TrackerCommonData/data/tobrodpar.xml', + 'Geometry/TrackerCommonData/data/tobrod0c.xml', + 'Geometry/TrackerCommonData/data/tobrod0l.xml', + 'Geometry/TrackerCommonData/data/tobrod0h.xml', + 'Geometry/TrackerCommonData/data/tobrod0.xml', + 'Geometry/TrackerCommonData/data/tobrod1l.xml', + 'Geometry/TrackerCommonData/data/tobrod1h.xml', + 'Geometry/TrackerCommonData/data/tobrod1.xml', + 'Geometry/TrackerCommonData/data/tobrod2c.xml', + 'Geometry/TrackerCommonData/data/tobrod2l.xml', + 'Geometry/TrackerCommonData/data/tobrod2h.xml', + 'Geometry/TrackerCommonData/data/tobrod2.xml', + 'Geometry/TrackerCommonData/data/tobrod3l.xml', + 'Geometry/TrackerCommonData/data/tobrod3h.xml', + 'Geometry/TrackerCommonData/data/tobrod3.xml', + 'Geometry/TrackerCommonData/data/tobrod4c.xml', + 'Geometry/TrackerCommonData/data/tobrod4l.xml', + 'Geometry/TrackerCommonData/data/tobrod4h.xml', + 'Geometry/TrackerCommonData/data/tobrod4.xml', + 'Geometry/TrackerCommonData/data/tobrod5l.xml', + 'Geometry/TrackerCommonData/data/tobrod5h.xml', + 'Geometry/TrackerCommonData/data/tobrod5.xml', + 'Geometry/TrackerCommonData/data/tob.xml', + 'Geometry/TrackerCommonData/data/tecmaterial.xml', + 'Geometry/TrackerCommonData/data/tecmodpar.xml', + 'Geometry/TrackerCommonData/data/tecmodule0.xml', + 'Geometry/TrackerCommonData/data/tecmodule0r.xml', + 'Geometry/TrackerCommonData/data/tecmodule0s.xml', + 'Geometry/TrackerCommonData/data/tecmodule1.xml', + 'Geometry/TrackerCommonData/data/tecmodule1r.xml', + 'Geometry/TrackerCommonData/data/tecmodule1s.xml', + 'Geometry/TrackerCommonData/data/tecmodule2.xml', + 'Geometry/TrackerCommonData/data/tecmodule3.xml', + 'Geometry/TrackerCommonData/data/tecmodule4.xml', + 'Geometry/TrackerCommonData/data/tecmodule4r.xml', + 'Geometry/TrackerCommonData/data/tecmodule4s.xml', + 'Geometry/TrackerCommonData/data/tecmodule5.xml', + 'Geometry/TrackerCommonData/data/tecmodule6.xml', + 'Geometry/TrackerCommonData/data/tecpetpar.xml', + 'Geometry/TrackerCommonData/data/tecring0.xml', + 'Geometry/TrackerCommonData/data/tecring1.xml', + 'Geometry/TrackerCommonData/data/tecring2.xml', + 'Geometry/TrackerCommonData/data/tecring3.xml', + 'Geometry/TrackerCommonData/data/tecring4.xml', + 'Geometry/TrackerCommonData/data/tecring5.xml', + 'Geometry/TrackerCommonData/data/tecring6.xml', + 'Geometry/TrackerCommonData/data/tecring0f.xml', + 'Geometry/TrackerCommonData/data/tecring1f.xml', + 'Geometry/TrackerCommonData/data/tecring2f.xml', + 'Geometry/TrackerCommonData/data/tecring3f.xml', + 'Geometry/TrackerCommonData/data/tecring4f.xml', + 'Geometry/TrackerCommonData/data/tecring5f.xml', + 'Geometry/TrackerCommonData/data/tecring6f.xml', + 'Geometry/TrackerCommonData/data/tecring0b.xml', + 'Geometry/TrackerCommonData/data/tecring1b.xml', + 'Geometry/TrackerCommonData/data/tecring2b.xml', + 'Geometry/TrackerCommonData/data/tecring3b.xml', + 'Geometry/TrackerCommonData/data/tecring4b.xml', + 'Geometry/TrackerCommonData/data/tecring5b.xml', + 'Geometry/TrackerCommonData/data/tecring6b.xml', + 'Geometry/TrackerCommonData/data/tecpetalf.xml', + 'Geometry/TrackerCommonData/data/tecpetalb.xml', + 'Geometry/TrackerCommonData/data/tecpetal0.xml', + 'Geometry/TrackerCommonData/data/tecpetal0f.xml', + 'Geometry/TrackerCommonData/data/tecpetal0b.xml', + 'Geometry/TrackerCommonData/data/tecpetal3.xml', + 'Geometry/TrackerCommonData/data/tecpetal3f.xml', + 'Geometry/TrackerCommonData/data/tecpetal3b.xml', + 'Geometry/TrackerCommonData/data/tecpetal6f.xml', + 'Geometry/TrackerCommonData/data/tecpetal6b.xml', + 'Geometry/TrackerCommonData/data/tecpetal8f.xml', + 'Geometry/TrackerCommonData/data/tecpetal8b.xml', + 'Geometry/TrackerCommonData/data/tecwheel.xml', + 'Geometry/TrackerCommonData/data/tecwheela.xml', + 'Geometry/TrackerCommonData/data/tecwheelb.xml', + 'Geometry/TrackerCommonData/data/tecwheelc.xml', + 'Geometry/TrackerCommonData/data/tecwheeld.xml', + 'Geometry/TrackerCommonData/data/tecwheel6.xml', + 'Geometry/TrackerCommonData/data/tecservices.xml', + 'Geometry/TrackerCommonData/data/tecbackplate.xml', + 'Geometry/TrackerCommonData/data/tec.xml', + 'Geometry/TrackerCommonData/data/trackermaterial.xml', + 'Geometry/TrackerCommonData/data/tracker.xml', + 'Geometry/TrackerCommonData/data/trackerpixbar.xml', + 'Geometry/TrackerCommonData/data/trackerpixfwd.xml', + 'Geometry/TrackerCommonData/data/trackertibtidservices.xml', + 'Geometry/TrackerCommonData/data/trackertib.xml', + 'Geometry/TrackerCommonData/data/trackertid.xml', + 'Geometry/TrackerCommonData/data/trackertob.xml', + 'Geometry/TrackerCommonData/data/trackertec.xml', + 'Geometry/TrackerCommonData/data/trackerbulkhead.xml', + 'Geometry/TrackerCommonData/data/trackerother.xml', + # 'Geometry/EcalCommonData/data/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/eefixed.xml', + # 'Geometry/EcalCommonData/data/eehier.xml', + # 'Geometry/EcalCommonData/data/eealgo.xml', + # 'Geometry/EcalCommonData/data/escon.xml', + # 'Geometry/EcalCommonData/data/esalgo.xml', + # 'Geometry/EcalCommonData/data/eeF.xml', + # 'Geometry/EcalCommonData/data/eeB.xml', + # 'Geometry/HcalCommonData/data/hcalrotations.xml', + # 'Geometry/HcalCommonData/data/hcalalgo.xml', + # 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + # 'Geometry/HcalCommonData/data/hcalendcapalgo.xml', + # 'Geometry/HcalCommonData/data/hcalouteralgo.xml', + 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + # 'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', + # 'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', + + # --- Muon ------------------------------------------------------------ + '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/v2/mf.xml', # Phase-1 Muon + # 'Geometry/MuonCommonData/data/v2/rpcf.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/mf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v2/gemf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v7/gem11.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v6/gem21.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v2/csc.xml', + # 'Geometry/MuonCommonData/data/v2/mfshield.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/mfshield.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/PhaseII/me0.xml', # Phase-2 Muon + # --- Muon ------------------------------------------------------------ + + 'Geometry/ForwardCommonData/data/forward.xml', + 'Geometry/ForwardCommonData/data/v2/forwardshield.xml', + 'Geometry/ForwardCommonData/data/brmrotations.xml', + 'Geometry/ForwardCommonData/data/brm.xml', + 'Geometry/ForwardCommonData/data/totemMaterials.xml', + 'Geometry/ForwardCommonData/data/totemRotations.xml', + 'Geometry/ForwardCommonData/data/totemt1.xml', + 'Geometry/ForwardCommonData/data/totemt2.xml', + 'Geometry/ForwardCommonData/data/ionpump.xml', + 'Geometry/ForwardCommonData/data/castor.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/ForwardCommonData/data/bhm.xml', + ##'Geometry/ForwardCommonData/data/bhmsens.xml', #not needed for geomtery purposes only + 'Geometry/ForwardCommonData/data/pltbcm.xml', + 'Geometry/ForwardCommonData/data/bcm1f.xml', + 'Geometry/ForwardSimData/data/bcm1fsens.xml', + 'Geometry/ForwardCommonData/data/plt.xml', + 'Geometry/TrackerCommonData/data/trackerStructureTopology.xml', + 'Geometry/TrackerSimData/data/trackersens.xml', + 'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml', + # 'Geometry/EcalSimData/data/ecalsens.xml', + # 'Geometry/HcalCommonData/data/hcalsenspmf.xml', + 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hfpmt.xml', + 'Geometry/HcalSimData/data/hffibrebundle.xml', + # 'Geometry/HcalSimData/data/CaloUtil.xml', + + # --- Muon ------------------------------------------------------------ + # 'Geometry/MuonCommonData/data/v2/muonNumbering.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml', # Phase-2 Muon + # 'Geometry/MuonSimData/data/muonSens.xml', # Phase-1 Muon + 'Geometry/MuonSimData/data/PhaseII/muonSens.xml', # Phase-2 Muon + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', + # 'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml', # Phase-1 Muon + 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', # Phase-2 Muon + 'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml', # Phase-2 Muon + # 'Geometry/MuonSimData/data/muonProdCuts.xml', # Phase-1 Muon + 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', # Phase-2 Muon + # --- Muon ------------------------------------------------------------ + + 'Geometry/ForwardCommonData/data/brmsens.xml', + 'Geometry/ForwardSimData/data/castorsens.xml', + 'Geometry/ForwardSimData/data/zdcsens.xml', + # 'Geometry/HcalSimData/data/HcalProdCuts.xml', + # 'Geometry/EcalSimData/data/EcalProdCuts.xml', + # 'Geometry/EcalSimData/data/ESProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', + 'Geometry/ForwardSimData/data/CastorProdCuts.xml', + 'Geometry/ForwardSimData/data/zdcProdCuts.xml', + 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', + 'Geometry/CMSCommonData/data/FieldParameters.xml'), + rootNodeName = cms.string('cms:OCMS') +) + + From 49124ed6a3292c6af417dfc3775ae270c15aaf15 Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Fri, 22 May 2015 16:18:33 +0200 Subject: [PATCH 40/55] Delete cmsExtendedGeometry2015MuonXML_cfi.py remove because of confusing name --- .../cmsExtendedGeometry2015MuonXML_cfi.py | 311 ------------------ 1 file changed, 311 deletions(-) delete mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py deleted file mode 100644 index 6cf62eb1b9af3..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_cfi.py +++ /dev/null @@ -1,311 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -## Everything that is currently in the PostLS1 geometry (rpc,csc,beampipe) -## with full Muon Upgrade for Phase-2 :: ME0, GE1/1, GE2/1, RE3/1, RE4/1 - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - # 'Geometry/CMSCommonData/data/cms.xml', # Phase-1 Muon - 'Geometry/CMSCommonData/data/PhaseII/cms.xml', # Phase-2 Muon - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', # Phase-2 Muon - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - # 'Geometry/CMSCommonData/data/caloBase.xml', - # 'Geometry/CMSCommonData/data/cmsCalo.xml', - # 'Geometry/CMSCommonData/data/muonBase.xml', # Phase-1 Muon - 'Geometry/CMSCommonData/data/PhaseII/muonBase.xml', # Phase-2 Muon - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/PhaseI/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern.xml', - 'Geometry/TrackerCommonData/data/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq1x2.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq1x5.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x3.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x4.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x5.xml', - 'Geometry/TrackerCommonData/data/pixfwdPanelBase.xml', - 'Geometry/TrackerCommonData/data/pixfwdPanel.xml', - 'Geometry/TrackerCommonData/data/pixfwdBlade.xml', - 'Geometry/TrackerCommonData/data/pixfwdNipple.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwdPilotBlade.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwdDisk.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwdCylinder.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwd.xml', - 'Geometry/TrackerCommonData/data/pixbarmaterial.xml', - 'Geometry/TrackerCommonData/data/pixbarladder.xml', - 'Geometry/TrackerCommonData/data/pixbarladderfull.xml', - 'Geometry/TrackerCommonData/data/pixbarladderhalf.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer0.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer1.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer2.xml', - 'Geometry/TrackerCommonData/data/pixbar.xml', - 'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml', - 'Geometry/TrackerCommonData/data/tibmaterial.xml', - 'Geometry/TrackerCommonData/data/tibmodpar.xml', - 'Geometry/TrackerCommonData/data/tibmodule0.xml', - 'Geometry/TrackerCommonData/data/tibmodule0a.xml', - 'Geometry/TrackerCommonData/data/tibmodule0b.xml', - 'Geometry/TrackerCommonData/data/tibmodule2.xml', - 'Geometry/TrackerCommonData/data/tibstringpar.xml', - 'Geometry/TrackerCommonData/data/tibstring0ll.xml', - 'Geometry/TrackerCommonData/data/tibstring0lr.xml', - 'Geometry/TrackerCommonData/data/tibstring0ul.xml', - 'Geometry/TrackerCommonData/data/tibstring0ur.xml', - 'Geometry/TrackerCommonData/data/tibstring0.xml', - 'Geometry/TrackerCommonData/data/tibstring1ll.xml', - 'Geometry/TrackerCommonData/data/tibstring1lr.xml', - 'Geometry/TrackerCommonData/data/tibstring1ul.xml', - 'Geometry/TrackerCommonData/data/tibstring1ur.xml', - 'Geometry/TrackerCommonData/data/tibstring1.xml', - 'Geometry/TrackerCommonData/data/tibstring2ll.xml', - 'Geometry/TrackerCommonData/data/tibstring2lr.xml', - 'Geometry/TrackerCommonData/data/tibstring2ul.xml', - 'Geometry/TrackerCommonData/data/tibstring2ur.xml', - 'Geometry/TrackerCommonData/data/tibstring2.xml', - 'Geometry/TrackerCommonData/data/tibstring3ll.xml', - 'Geometry/TrackerCommonData/data/tibstring3lr.xml', - 'Geometry/TrackerCommonData/data/tibstring3ul.xml', - 'Geometry/TrackerCommonData/data/tibstring3ur.xml', - 'Geometry/TrackerCommonData/data/tibstring3.xml', - 'Geometry/TrackerCommonData/data/tiblayerpar.xml', - 'Geometry/TrackerCommonData/data/tiblayer0.xml', - 'Geometry/TrackerCommonData/data/tiblayer1.xml', - 'Geometry/TrackerCommonData/data/tiblayer2.xml', - 'Geometry/TrackerCommonData/data/tiblayer3.xml', - 'Geometry/TrackerCommonData/data/tib.xml', - 'Geometry/TrackerCommonData/data/tidmaterial.xml', - 'Geometry/TrackerCommonData/data/tidmodpar.xml', - 'Geometry/TrackerCommonData/data/tidmodule0.xml', - 'Geometry/TrackerCommonData/data/tidmodule0r.xml', - 'Geometry/TrackerCommonData/data/tidmodule0l.xml', - 'Geometry/TrackerCommonData/data/tidmodule1.xml', - 'Geometry/TrackerCommonData/data/tidmodule1r.xml', - 'Geometry/TrackerCommonData/data/tidmodule1l.xml', - 'Geometry/TrackerCommonData/data/tidmodule2.xml', - 'Geometry/TrackerCommonData/data/tidringpar.xml', - 'Geometry/TrackerCommonData/data/tidring0.xml', - 'Geometry/TrackerCommonData/data/tidring0f.xml', - 'Geometry/TrackerCommonData/data/tidring0b.xml', - 'Geometry/TrackerCommonData/data/tidring1.xml', - 'Geometry/TrackerCommonData/data/tidring1f.xml', - 'Geometry/TrackerCommonData/data/tidring1b.xml', - 'Geometry/TrackerCommonData/data/tidring2.xml', - 'Geometry/TrackerCommonData/data/tid.xml', - 'Geometry/TrackerCommonData/data/tidf.xml', - 'Geometry/TrackerCommonData/data/tidb.xml', - 'Geometry/TrackerCommonData/data/tibtidservices.xml', - 'Geometry/TrackerCommonData/data/tibtidservicesf.xml', - 'Geometry/TrackerCommonData/data/tibtidservicesb.xml', - 'Geometry/TrackerCommonData/data/tobmaterial.xml', - 'Geometry/TrackerCommonData/data/tobmodpar.xml', - 'Geometry/TrackerCommonData/data/tobmodule0.xml', - 'Geometry/TrackerCommonData/data/tobmodule2.xml', - 'Geometry/TrackerCommonData/data/tobmodule4.xml', - 'Geometry/TrackerCommonData/data/tobrodpar.xml', - 'Geometry/TrackerCommonData/data/tobrod0c.xml', - 'Geometry/TrackerCommonData/data/tobrod0l.xml', - 'Geometry/TrackerCommonData/data/tobrod0h.xml', - 'Geometry/TrackerCommonData/data/tobrod0.xml', - 'Geometry/TrackerCommonData/data/tobrod1l.xml', - 'Geometry/TrackerCommonData/data/tobrod1h.xml', - 'Geometry/TrackerCommonData/data/tobrod1.xml', - 'Geometry/TrackerCommonData/data/tobrod2c.xml', - 'Geometry/TrackerCommonData/data/tobrod2l.xml', - 'Geometry/TrackerCommonData/data/tobrod2h.xml', - 'Geometry/TrackerCommonData/data/tobrod2.xml', - 'Geometry/TrackerCommonData/data/tobrod3l.xml', - 'Geometry/TrackerCommonData/data/tobrod3h.xml', - 'Geometry/TrackerCommonData/data/tobrod3.xml', - 'Geometry/TrackerCommonData/data/tobrod4c.xml', - 'Geometry/TrackerCommonData/data/tobrod4l.xml', - 'Geometry/TrackerCommonData/data/tobrod4h.xml', - 'Geometry/TrackerCommonData/data/tobrod4.xml', - 'Geometry/TrackerCommonData/data/tobrod5l.xml', - 'Geometry/TrackerCommonData/data/tobrod5h.xml', - 'Geometry/TrackerCommonData/data/tobrod5.xml', - 'Geometry/TrackerCommonData/data/tob.xml', - 'Geometry/TrackerCommonData/data/tecmaterial.xml', - 'Geometry/TrackerCommonData/data/tecmodpar.xml', - 'Geometry/TrackerCommonData/data/tecmodule0.xml', - 'Geometry/TrackerCommonData/data/tecmodule0r.xml', - 'Geometry/TrackerCommonData/data/tecmodule0s.xml', - 'Geometry/TrackerCommonData/data/tecmodule1.xml', - 'Geometry/TrackerCommonData/data/tecmodule1r.xml', - 'Geometry/TrackerCommonData/data/tecmodule1s.xml', - 'Geometry/TrackerCommonData/data/tecmodule2.xml', - 'Geometry/TrackerCommonData/data/tecmodule3.xml', - 'Geometry/TrackerCommonData/data/tecmodule4.xml', - 'Geometry/TrackerCommonData/data/tecmodule4r.xml', - 'Geometry/TrackerCommonData/data/tecmodule4s.xml', - 'Geometry/TrackerCommonData/data/tecmodule5.xml', - 'Geometry/TrackerCommonData/data/tecmodule6.xml', - 'Geometry/TrackerCommonData/data/tecpetpar.xml', - 'Geometry/TrackerCommonData/data/tecring0.xml', - 'Geometry/TrackerCommonData/data/tecring1.xml', - 'Geometry/TrackerCommonData/data/tecring2.xml', - 'Geometry/TrackerCommonData/data/tecring3.xml', - 'Geometry/TrackerCommonData/data/tecring4.xml', - 'Geometry/TrackerCommonData/data/tecring5.xml', - 'Geometry/TrackerCommonData/data/tecring6.xml', - 'Geometry/TrackerCommonData/data/tecring0f.xml', - 'Geometry/TrackerCommonData/data/tecring1f.xml', - 'Geometry/TrackerCommonData/data/tecring2f.xml', - 'Geometry/TrackerCommonData/data/tecring3f.xml', - 'Geometry/TrackerCommonData/data/tecring4f.xml', - 'Geometry/TrackerCommonData/data/tecring5f.xml', - 'Geometry/TrackerCommonData/data/tecring6f.xml', - 'Geometry/TrackerCommonData/data/tecring0b.xml', - 'Geometry/TrackerCommonData/data/tecring1b.xml', - 'Geometry/TrackerCommonData/data/tecring2b.xml', - 'Geometry/TrackerCommonData/data/tecring3b.xml', - 'Geometry/TrackerCommonData/data/tecring4b.xml', - 'Geometry/TrackerCommonData/data/tecring5b.xml', - 'Geometry/TrackerCommonData/data/tecring6b.xml', - 'Geometry/TrackerCommonData/data/tecpetalf.xml', - 'Geometry/TrackerCommonData/data/tecpetalb.xml', - 'Geometry/TrackerCommonData/data/tecpetal0.xml', - 'Geometry/TrackerCommonData/data/tecpetal0f.xml', - 'Geometry/TrackerCommonData/data/tecpetal0b.xml', - 'Geometry/TrackerCommonData/data/tecpetal3.xml', - 'Geometry/TrackerCommonData/data/tecpetal3f.xml', - 'Geometry/TrackerCommonData/data/tecpetal3b.xml', - 'Geometry/TrackerCommonData/data/tecpetal6f.xml', - 'Geometry/TrackerCommonData/data/tecpetal6b.xml', - 'Geometry/TrackerCommonData/data/tecpetal8f.xml', - 'Geometry/TrackerCommonData/data/tecpetal8b.xml', - 'Geometry/TrackerCommonData/data/tecwheel.xml', - 'Geometry/TrackerCommonData/data/tecwheela.xml', - 'Geometry/TrackerCommonData/data/tecwheelb.xml', - 'Geometry/TrackerCommonData/data/tecwheelc.xml', - 'Geometry/TrackerCommonData/data/tecwheeld.xml', - 'Geometry/TrackerCommonData/data/tecwheel6.xml', - 'Geometry/TrackerCommonData/data/tecservices.xml', - 'Geometry/TrackerCommonData/data/tecbackplate.xml', - 'Geometry/TrackerCommonData/data/tec.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/tracker.xml', - 'Geometry/TrackerCommonData/data/trackerpixbar.xml', - 'Geometry/TrackerCommonData/data/trackerpixfwd.xml', - 'Geometry/TrackerCommonData/data/trackertibtidservices.xml', - 'Geometry/TrackerCommonData/data/trackertib.xml', - 'Geometry/TrackerCommonData/data/trackertid.xml', - 'Geometry/TrackerCommonData/data/trackertob.xml', - 'Geometry/TrackerCommonData/data/trackertec.xml', - 'Geometry/TrackerCommonData/data/trackerbulkhead.xml', - 'Geometry/TrackerCommonData/data/trackerother.xml', - # 'Geometry/EcalCommonData/data/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/eefixed.xml', - # 'Geometry/EcalCommonData/data/eehier.xml', - # 'Geometry/EcalCommonData/data/eealgo.xml', - # 'Geometry/EcalCommonData/data/escon.xml', - # 'Geometry/EcalCommonData/data/esalgo.xml', - # 'Geometry/EcalCommonData/data/eeF.xml', - # 'Geometry/EcalCommonData/data/eeB.xml', - # 'Geometry/HcalCommonData/data/hcalrotations.xml', - # 'Geometry/HcalCommonData/data/hcalalgo.xml', - # 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - # 'Geometry/HcalCommonData/data/hcalendcapalgo.xml', - # 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - # 'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', - # 'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', - - # --- Muon ------------------------------------------------------------ - '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/v2/mf.xml', # Phase-1 Muon - # 'Geometry/MuonCommonData/data/v2/rpcf.xml', # Phase-1 Muon - 'Geometry/MuonCommonData/data/PhaseII/mf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v2/gemf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v7/gem11.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v6/gem21.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v2/csc.xml', - # 'Geometry/MuonCommonData/data/v2/mfshield.xml', # Phase-1 Muon - 'Geometry/MuonCommonData/data/PhaseII/mfshield.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/PhaseII/me0.xml', # Phase-2 Muon - # --- Muon ------------------------------------------------------------ - - 'Geometry/ForwardCommonData/data/forward.xml', - 'Geometry/ForwardCommonData/data/v2/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/brm.xml', - 'Geometry/ForwardCommonData/data/totemMaterials.xml', - 'Geometry/ForwardCommonData/data/totemRotations.xml', - 'Geometry/ForwardCommonData/data/totemt1.xml', - 'Geometry/ForwardCommonData/data/totemt2.xml', - 'Geometry/ForwardCommonData/data/ionpump.xml', - 'Geometry/ForwardCommonData/data/castor.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/ForwardCommonData/data/bhm.xml', - ##'Geometry/ForwardCommonData/data/bhmsens.xml', #not needed for geomtery purposes only - 'Geometry/ForwardCommonData/data/pltbcm.xml', - 'Geometry/ForwardCommonData/data/bcm1f.xml', - 'Geometry/ForwardSimData/data/bcm1fsens.xml', - 'Geometry/ForwardCommonData/data/plt.xml', - 'Geometry/TrackerCommonData/data/trackerStructureTopology.xml', - 'Geometry/TrackerSimData/data/trackersens.xml', - 'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml', - # 'Geometry/EcalSimData/data/ecalsens.xml', - # 'Geometry/HcalCommonData/data/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - # 'Geometry/HcalSimData/data/CaloUtil.xml', - - # --- Muon ------------------------------------------------------------ - # 'Geometry/MuonCommonData/data/v2/muonNumbering.xml', # Phase-1 Muon - 'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml', # Phase-2 Muon - # 'Geometry/MuonSimData/data/muonSens.xml', # Phase-1 Muon - 'Geometry/MuonSimData/data/PhaseII/muonSens.xml', # Phase-2 Muon - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - # 'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml', # Phase-1 Muon - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', # Phase-2 Muon - 'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml', # Phase-2 Muon - # 'Geometry/MuonSimData/data/muonProdCuts.xml', # Phase-1 Muon - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', # Phase-2 Muon - # --- Muon ------------------------------------------------------------ - - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/castorsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - # 'Geometry/HcalSimData/data/HcalProdCuts.xml', - # 'Geometry/EcalSimData/data/EcalProdCuts.xml', - # 'Geometry/EcalSimData/data/ESProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/ForwardSimData/data/CastorProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml'), - rootNodeName = cms.string('cms:OCMS') -) - - From ce8ed23d993a8e1f3e5e23710891e512357a66fe Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Fri, 22 May 2015 16:20:24 +0200 Subject: [PATCH 41/55] Delete GeometryExtended2015MuonReco_cff.py remove because of confusing name --- .../Geometry/python/GeometryExtended2015MuonReco_cff.py | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py b/Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py deleted file mode 100644 index dd830fba9874e..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2015MuonReco_cff.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# Ideal geometry, needed for transient ECAL alignement -from Configuration.Geometry.GeometryExtended2015Muon_cff import * -from Configuration.Geometry.GeometryReco_cff import * - -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.RPCGeometryBuilder.rpcGeometry_cfi import * From 5a27e1e82cb1f2fbe2a245714bc933bc76a9fd6f Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Fri, 22 May 2015 16:21:26 +0200 Subject: [PATCH 42/55] Delete GeometryIdeal2015Muon_cff.py no need for both Ideal2015Muon and Extended2015Muon geometries, since both are test geometries --- .../Geometry/python/GeometryIdeal2015Muon_cff.py | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Configuration/Geometry/python/GeometryIdeal2015Muon_cff.py diff --git a/Configuration/Geometry/python/GeometryIdeal2015Muon_cff.py b/Configuration/Geometry/python/GeometryIdeal2015Muon_cff.py deleted file mode 100644 index 47118d903adfa..0000000000000 --- a/Configuration/Geometry/python/GeometryIdeal2015Muon_cff.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# -# Geometry master configuration -# -# Ideal geometry, needed for simulation -from Geometry.CMSCommonData.cmsIdealGeometry2015MuonXML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * - From 57d36348bb248a06504654424cb05e364ff1f900 Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Fri, 22 May 2015 16:21:45 +0200 Subject: [PATCH 43/55] Delete GeometryIdeal2015MuonReco_cff.py no need for both Ideal2015Muon and Extended2015Muon geometries, since both are test geometries --- .../Geometry/python/GeometryIdeal2015MuonReco_cff.py | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py diff --git a/Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py b/Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py deleted file mode 100644 index 292e4547160bc..0000000000000 --- a/Configuration/Geometry/python/GeometryIdeal2015MuonReco_cff.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# Ideal geometry, needed for transient ECAL alignement -from Configuration.Geometry.GeometryIdeal2015Muon_cff import * -from Configuration.Geometry.GeometryReco_cff import * - -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.RPCGeometryBuilder.rpcGeometry_cfi import * From ff0fb5439c0f8557d107e89f097c08e1e8d13c45 Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Fri, 22 May 2015 16:22:23 +0200 Subject: [PATCH 44/55] Delete GeometryExtended2015Muon_cff.py removed because of confusing name --- .../Geometry/python/GeometryExtended2015Muon_cff.py | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Configuration/Geometry/python/GeometryExtended2015Muon_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2015Muon_cff.py b/Configuration/Geometry/python/GeometryExtended2015Muon_cff.py deleted file mode 100644 index 0cbce59371540..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2015Muon_cff.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# -# Geometry master configuration -# -# Ideal geometry, needed for simulation -from Geometry.CMSCommonData.cmsExtendedGeometry2015MuonXML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * - From 6431479f18fafcbc4da2d12f0e2d2704a7d62bd0 Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Fri, 22 May 2015 16:23:35 +0200 Subject: [PATCH 45/55] Delete cmsIdealGeometry2015MuonXML_cfi.py no need for both Ideal2015Muon and Extended2015Muon geometries, since both are test geometries --- .../python/cmsIdealGeometry2015MuonXML_cfi.py | 292 ------------------ 1 file changed, 292 deletions(-) delete mode 100644 Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py deleted file mode 100644 index 93579158bfdab..0000000000000 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015MuonXML_cfi.py +++ /dev/null @@ -1,292 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -## Everything that is currently in the PostLS1 geometry (rpc,csc,beampipe) -## with full Muon Upgrade for Phase-2 :: ME0, GE1/1, GE2/1, RE3/1, RE4/1 - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/dev/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/normal/cmsextent.xml', - # 'Geometry/CMSCommonData/data/cms.xml', # Phase-1 Muon - 'Geometry/CMSCommonData/data/PhaseII/cms.xml', # Phase-2 Muon - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', # Phase-2 Muon - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - # 'Geometry/CMSCommonData/data/caloBase.xml', # Phase-1 Muon - # 'Geometry/CMSCommonData/data/PhaseII/caloBase.xml', # Phase-2 Muon - # 'Geometry/CMSCommonData/data/cmsCalo.xml', - # 'Geometry/CMSCommonData/data/muonBase.xml', # Phase-1 Muon - 'Geometry/CMSCommonData/data/PhaseII/muonBase.xml', # Phase-2 Muon - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/PhaseI/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/TrackerCommonData/data/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/dev/Pilot/pixfwdMaterials.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq1x2.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq1x5.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x3.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x4.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x5.xml', - 'Geometry/TrackerCommonData/data/pixfwdPanelBase.xml', - 'Geometry/TrackerCommonData/data/pixfwdPanel.xml', - 'Geometry/TrackerCommonData/data/pixfwdBlade.xml', - 'Geometry/TrackerCommonData/data/pixfwdNipple.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwdPilotBlade.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwdDisk.xml', - 'Geometry/TrackerCommonData/data/dev/Pilot/pixfwdCylinder.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwd.xml', - 'Geometry/TrackerCommonData/data/pixbarmaterial.xml', - 'Geometry/TrackerCommonData/data/pixbarladder.xml', - 'Geometry/TrackerCommonData/data/pixbarladderfull.xml', - 'Geometry/TrackerCommonData/data/pixbarladderhalf.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer0.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer1.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer2.xml', - 'Geometry/TrackerCommonData/data/pixbar.xml', - 'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml', - 'Geometry/TrackerCommonData/data/tibmaterial.xml', - 'Geometry/TrackerCommonData/data/tibmodpar.xml', - 'Geometry/TrackerCommonData/data/tibmodule0.xml', - 'Geometry/TrackerCommonData/data/tibmodule0a.xml', - 'Geometry/TrackerCommonData/data/tibmodule0b.xml', - 'Geometry/TrackerCommonData/data/tibmodule2.xml', - 'Geometry/TrackerCommonData/data/tibstringpar.xml', - 'Geometry/TrackerCommonData/data/tibstring0ll.xml', - 'Geometry/TrackerCommonData/data/tibstring0lr.xml', - 'Geometry/TrackerCommonData/data/tibstring0ul.xml', - 'Geometry/TrackerCommonData/data/tibstring0ur.xml', - 'Geometry/TrackerCommonData/data/tibstring0.xml', - 'Geometry/TrackerCommonData/data/tibstring1ll.xml', - 'Geometry/TrackerCommonData/data/tibstring1lr.xml', - 'Geometry/TrackerCommonData/data/tibstring1ul.xml', - 'Geometry/TrackerCommonData/data/tibstring1ur.xml', - 'Geometry/TrackerCommonData/data/tibstring1.xml', - 'Geometry/TrackerCommonData/data/tibstring2ll.xml', - 'Geometry/TrackerCommonData/data/tibstring2lr.xml', - 'Geometry/TrackerCommonData/data/tibstring2ul.xml', - 'Geometry/TrackerCommonData/data/tibstring2ur.xml', - 'Geometry/TrackerCommonData/data/tibstring2.xml', - 'Geometry/TrackerCommonData/data/tibstring3ll.xml', - 'Geometry/TrackerCommonData/data/tibstring3lr.xml', - 'Geometry/TrackerCommonData/data/tibstring3ul.xml', - 'Geometry/TrackerCommonData/data/tibstring3ur.xml', - 'Geometry/TrackerCommonData/data/tibstring3.xml', - 'Geometry/TrackerCommonData/data/tiblayerpar.xml', - 'Geometry/TrackerCommonData/data/tiblayer0.xml', - 'Geometry/TrackerCommonData/data/tiblayer1.xml', - 'Geometry/TrackerCommonData/data/tiblayer2.xml', - 'Geometry/TrackerCommonData/data/tiblayer3.xml', - 'Geometry/TrackerCommonData/data/tib.xml', - 'Geometry/TrackerCommonData/data/tidmaterial.xml', - 'Geometry/TrackerCommonData/data/tidmodpar.xml', - 'Geometry/TrackerCommonData/data/tidmodule0.xml', - 'Geometry/TrackerCommonData/data/tidmodule0r.xml', - 'Geometry/TrackerCommonData/data/tidmodule0l.xml', - 'Geometry/TrackerCommonData/data/tidmodule1.xml', - 'Geometry/TrackerCommonData/data/tidmodule1r.xml', - 'Geometry/TrackerCommonData/data/tidmodule1l.xml', - 'Geometry/TrackerCommonData/data/tidmodule2.xml', - 'Geometry/TrackerCommonData/data/tidringpar.xml', - 'Geometry/TrackerCommonData/data/tidring0.xml', - 'Geometry/TrackerCommonData/data/tidring0f.xml', - 'Geometry/TrackerCommonData/data/tidring0b.xml', - 'Geometry/TrackerCommonData/data/tidring1.xml', - 'Geometry/TrackerCommonData/data/tidring1f.xml', - 'Geometry/TrackerCommonData/data/tidring1b.xml', - 'Geometry/TrackerCommonData/data/tidring2.xml', - 'Geometry/TrackerCommonData/data/tid.xml', - 'Geometry/TrackerCommonData/data/tidf.xml', - 'Geometry/TrackerCommonData/data/tidb.xml', - 'Geometry/TrackerCommonData/data/tibtidservices.xml', - 'Geometry/TrackerCommonData/data/tibtidservicesf.xml', - 'Geometry/TrackerCommonData/data/tibtidservicesb.xml', - 'Geometry/TrackerCommonData/data/tobmaterial.xml', - 'Geometry/TrackerCommonData/data/tobmodpar.xml', - 'Geometry/TrackerCommonData/data/tobmodule0.xml', - 'Geometry/TrackerCommonData/data/tobmodule2.xml', - 'Geometry/TrackerCommonData/data/tobmodule4.xml', - 'Geometry/TrackerCommonData/data/tobrodpar.xml', - 'Geometry/TrackerCommonData/data/tobrod0c.xml', - 'Geometry/TrackerCommonData/data/tobrod0l.xml', - 'Geometry/TrackerCommonData/data/tobrod0h.xml', - 'Geometry/TrackerCommonData/data/tobrod0.xml', - 'Geometry/TrackerCommonData/data/tobrod1l.xml', - 'Geometry/TrackerCommonData/data/tobrod1h.xml', - 'Geometry/TrackerCommonData/data/tobrod1.xml', - 'Geometry/TrackerCommonData/data/tobrod2c.xml', - 'Geometry/TrackerCommonData/data/tobrod2l.xml', - 'Geometry/TrackerCommonData/data/tobrod2h.xml', - 'Geometry/TrackerCommonData/data/tobrod2.xml', - 'Geometry/TrackerCommonData/data/tobrod3l.xml', - 'Geometry/TrackerCommonData/data/tobrod3h.xml', - 'Geometry/TrackerCommonData/data/tobrod3.xml', - 'Geometry/TrackerCommonData/data/tobrod4c.xml', - 'Geometry/TrackerCommonData/data/tobrod4l.xml', - 'Geometry/TrackerCommonData/data/tobrod4h.xml', - 'Geometry/TrackerCommonData/data/tobrod4.xml', - 'Geometry/TrackerCommonData/data/tobrod5l.xml', - 'Geometry/TrackerCommonData/data/tobrod5h.xml', - 'Geometry/TrackerCommonData/data/tobrod5.xml', - 'Geometry/TrackerCommonData/data/tob.xml', - 'Geometry/TrackerCommonData/data/tecmaterial.xml', - 'Geometry/TrackerCommonData/data/tecmodpar.xml', - 'Geometry/TrackerCommonData/data/tecmodule0.xml', - 'Geometry/TrackerCommonData/data/tecmodule0r.xml', - 'Geometry/TrackerCommonData/data/tecmodule0s.xml', - 'Geometry/TrackerCommonData/data/tecmodule1.xml', - 'Geometry/TrackerCommonData/data/tecmodule1r.xml', - 'Geometry/TrackerCommonData/data/tecmodule1s.xml', - 'Geometry/TrackerCommonData/data/tecmodule2.xml', - 'Geometry/TrackerCommonData/data/tecmodule3.xml', - 'Geometry/TrackerCommonData/data/tecmodule4.xml', - 'Geometry/TrackerCommonData/data/tecmodule4r.xml', - 'Geometry/TrackerCommonData/data/tecmodule4s.xml', - 'Geometry/TrackerCommonData/data/tecmodule5.xml', - 'Geometry/TrackerCommonData/data/tecmodule6.xml', - 'Geometry/TrackerCommonData/data/tecpetpar.xml', - 'Geometry/TrackerCommonData/data/tecring0.xml', - 'Geometry/TrackerCommonData/data/tecring1.xml', - 'Geometry/TrackerCommonData/data/tecring2.xml', - 'Geometry/TrackerCommonData/data/tecring3.xml', - 'Geometry/TrackerCommonData/data/tecring4.xml', - 'Geometry/TrackerCommonData/data/tecring5.xml', - 'Geometry/TrackerCommonData/data/tecring6.xml', - 'Geometry/TrackerCommonData/data/tecring0f.xml', - 'Geometry/TrackerCommonData/data/tecring1f.xml', - 'Geometry/TrackerCommonData/data/tecring2f.xml', - 'Geometry/TrackerCommonData/data/tecring3f.xml', - 'Geometry/TrackerCommonData/data/tecring4f.xml', - 'Geometry/TrackerCommonData/data/tecring5f.xml', - 'Geometry/TrackerCommonData/data/tecring6f.xml', - 'Geometry/TrackerCommonData/data/tecring0b.xml', - 'Geometry/TrackerCommonData/data/tecring1b.xml', - 'Geometry/TrackerCommonData/data/tecring2b.xml', - 'Geometry/TrackerCommonData/data/tecring3b.xml', - 'Geometry/TrackerCommonData/data/tecring4b.xml', - 'Geometry/TrackerCommonData/data/tecring5b.xml', - 'Geometry/TrackerCommonData/data/tecring6b.xml', - 'Geometry/TrackerCommonData/data/tecpetalf.xml', - 'Geometry/TrackerCommonData/data/tecpetalb.xml', - 'Geometry/TrackerCommonData/data/tecpetal0.xml', - 'Geometry/TrackerCommonData/data/tecpetal0f.xml', - 'Geometry/TrackerCommonData/data/tecpetal0b.xml', - 'Geometry/TrackerCommonData/data/tecpetal3.xml', - 'Geometry/TrackerCommonData/data/tecpetal3f.xml', - 'Geometry/TrackerCommonData/data/tecpetal3b.xml', - 'Geometry/TrackerCommonData/data/tecpetal6f.xml', - 'Geometry/TrackerCommonData/data/tecpetal6b.xml', - 'Geometry/TrackerCommonData/data/tecpetal8f.xml', - 'Geometry/TrackerCommonData/data/tecpetal8b.xml', - 'Geometry/TrackerCommonData/data/tecwheel.xml', - 'Geometry/TrackerCommonData/data/tecwheela.xml', - 'Geometry/TrackerCommonData/data/tecwheelb.xml', - 'Geometry/TrackerCommonData/data/tecwheelc.xml', - 'Geometry/TrackerCommonData/data/tecwheeld.xml', - 'Geometry/TrackerCommonData/data/tecwheel6.xml', - 'Geometry/TrackerCommonData/data/tecservices.xml', - 'Geometry/TrackerCommonData/data/tecbackplate.xml', - 'Geometry/TrackerCommonData/data/tec.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/tracker.xml', - 'Geometry/TrackerCommonData/data/trackerpixbar.xml', - 'Geometry/TrackerCommonData/data/trackerpixfwd.xml', - 'Geometry/TrackerCommonData/data/trackertibtidservices.xml', - 'Geometry/TrackerCommonData/data/trackertib.xml', - 'Geometry/TrackerCommonData/data/trackertid.xml', - 'Geometry/TrackerCommonData/data/trackertob.xml', - 'Geometry/TrackerCommonData/data/trackertec.xml', - 'Geometry/TrackerCommonData/data/trackerbulkhead.xml', - 'Geometry/TrackerCommonData/data/trackerother.xml', - # 'Geometry/EcalCommonData/data/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/eefixed.xml', - # 'Geometry/EcalCommonData/data/eehier.xml', - # 'Geometry/EcalCommonData/data/eealgo.xml', - # 'Geometry/EcalCommonData/data/escon.xml', - # 'Geometry/EcalCommonData/data/esalgo.xml', - # 'Geometry/EcalCommonData/data/eeF.xml', - # 'Geometry/EcalCommonData/data/eeB.xml', - # 'Geometry/HcalCommonData/data/hcalrotations.xml', - # 'Geometry/HcalCommonData/data/hcalalgo.xml', - # 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - # 'Geometry/HcalCommonData/data/hcalendcapalgo.xml', - # 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - - # --- Muon ------------------------------------------------------------ - '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/v2/mf.xml', # Phase-1 Muon - # 'Geometry/MuonCommonData/data/v2/rpcf.xml', # Phase-1 Muon - 'Geometry/MuonCommonData/data/PhaseII/mf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v2/gemf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v7/gem11.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v6/gem21.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v2/csc.xml', - # 'Geometry/MuonCommonData/data/v2/mfshield.xml', # Phase-1 Muon - 'Geometry/MuonCommonData/data/PhaseII/mfshield.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/PhaseII/me0.xml', # Phase-2 Muon - # --- Muon ------------------------------------------------------------ - - 'Geometry/ForwardCommonData/data/forward.xml', - 'Geometry/ForwardCommonData/data/v2/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/brm.xml', - 'Geometry/ForwardCommonData/data/totemMaterials.xml', - 'Geometry/ForwardCommonData/data/totemRotations.xml', - 'Geometry/ForwardCommonData/data/totemt1.xml', - 'Geometry/ForwardCommonData/data/totemt2.xml', - 'Geometry/ForwardCommonData/data/ionpump.xml')+cms.vstring( - 'Geometry/TrackerCommonData/data/trackerStructureTopology.xml', - 'Geometry/TrackerSimData/data/trackersens.xml', - 'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml', - - # 'Geometry/EcalSimData/data/ecalsens.xml', - # 'Geometry/HcalCommonData/data/hcalsenspmf.xml', - # 'Geometry/HcalSimData/data/hf.xml', - # 'Geometry/HcalSimData/data/hfpmt.xml', - # 'Geometry/HcalSimData/data/hffibrebundle.xml', - # 'Geometry/HcalSimData/data/CaloUtil.xml', - - # --- Muon ------------------------------------------------------------ - # 'Geometry/MuonCommonData/data/v2/muonNumbering.xml', # Phase-1 Muon - 'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml',# Phase-2 Muon - # 'Geometry/MuonSimData/data/muonSens.xml', # Phase-1 Muon - 'Geometry/MuonSimData/data/PhaseII/muonSens.xml', # Phase-2 Muon - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - # 'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml', # Phase-1 Muon - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', # Phase-2 Muon - 'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml', # Phase-2 Muon - # 'Geometry/MuonSimData/data/muonProdCuts.xml', # Phase-1 Muon - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', # Phase-2 Muon - # --- Muon ------------------------------------------------------------ - - 'Geometry/ForwardCommonData/data/brmsens.xml', - # 'Geometry/HcalSimData/data/HcalProdCuts.xml', - # 'Geometry/EcalSimData/data/EcalProdCuts.xml', - # 'Geometry/EcalSimData/data/ESProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml'), - rootNodeName = cms.string('cms:OCMS') -) - - From d83066e47ddfefbe388c3c1ed2ea0310ac261897 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 28 May 2015 18:28:24 +0200 Subject: [PATCH 46/55] renamed --- .../python/GeometryExtended2015MuonGEMDevReco_cff.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Configuration/Geometry/python/GeometryExtended2015MuonGEMDevReco_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2015MuonGEMDevReco_cff.py b/Configuration/Geometry/python/GeometryExtended2015MuonGEMDevReco_cff.py new file mode 100644 index 0000000000000..fce3784df228e --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtended2015MuonGEMDevReco_cff.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +# Ideal geometry, needed for transient ECAL alignement +from Configuration.Geometry.GeometryExtended2015MuonGEMDev_cff import * +from Configuration.Geometry.GeometryReco_cff import * + +from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * +from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * +from Geometry.RPCGeometryBuilder.rpcGeometry_cfi import * From 46c61871913db4900d6d42a7a646188449468d06 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 28 May 2015 18:28:35 +0200 Subject: [PATCH 47/55] renamed --- .../python/GeometryExtended2015MuonGEMDev_cff.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Configuration/Geometry/python/GeometryExtended2015MuonGEMDev_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2015MuonGEMDev_cff.py b/Configuration/Geometry/python/GeometryExtended2015MuonGEMDev_cff.py new file mode 100644 index 0000000000000..9f9f6fe9b0225 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtended2015MuonGEMDev_cff.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +# +# Geometry master configuration +# +# Ideal geometry, needed for simulation +from Geometry.CMSCommonData.cmsExtendedGeometry2015MuonGEMDevXML_cfi import * +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * + From c926c8cf7555c3a44654347f1defe63a15a9ae82 Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 28 May 2015 18:28:44 +0200 Subject: [PATCH 48/55] renamed --- ...msExtendedGeometry2015MuonGEMDevXML_cfi.py | 311 ++++++++++++++++++ 1 file changed, 311 insertions(+) create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py new file mode 100644 index 0000000000000..6cf62eb1b9af3 --- /dev/null +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py @@ -0,0 +1,311 @@ +import FWCore.ParameterSet.Config as cms + +## Everything that is currently in the PostLS1 geometry (rpc,csc,beampipe) +## with full Muon Upgrade for Phase-2 :: ME0, GE1/1, GE2/1, RE3/1, RE4/1 + +XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", + geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', + 'Geometry/CMSCommonData/data/rotations.xml', + 'Geometry/CMSCommonData/data/extend/cmsextent.xml', + # 'Geometry/CMSCommonData/data/cms.xml', # Phase-1 Muon + 'Geometry/CMSCommonData/data/PhaseII/cms.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/eta3/etaMax.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/cmsMother.xml', + 'Geometry/CMSCommonData/data/cmsTracker.xml', + # 'Geometry/CMSCommonData/data/caloBase.xml', + # 'Geometry/CMSCommonData/data/cmsCalo.xml', + # 'Geometry/CMSCommonData/data/muonBase.xml', # Phase-1 Muon + 'Geometry/CMSCommonData/data/PhaseII/muonBase.xml', # Phase-2 Muon + 'Geometry/CMSCommonData/data/cmsMuon.xml', + 'Geometry/CMSCommonData/data/mgnt.xml', + 'Geometry/CMSCommonData/data/PhaseI/beampipe.xml', + 'Geometry/CMSCommonData/data/cmsBeam.xml', + 'Geometry/CMSCommonData/data/muonMB.xml', + 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/CMSCommonData/data/cavern.xml', + 'Geometry/TrackerCommonData/data/trackerParameters.xml', + 'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', + 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq1x2.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq1x5.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x3.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x4.xml', + 'Geometry/TrackerCommonData/data/pixfwdPlaq2x5.xml', + 'Geometry/TrackerCommonData/data/pixfwdPanelBase.xml', + 'Geometry/TrackerCommonData/data/pixfwdPanel.xml', + 'Geometry/TrackerCommonData/data/pixfwdBlade.xml', + 'Geometry/TrackerCommonData/data/pixfwdNipple.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdPilotBlade.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdDisk.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwdCylinder.xml', + 'Geometry/TrackerCommonData/data/Pilot/pixfwd.xml', + 'Geometry/TrackerCommonData/data/pixbarmaterial.xml', + 'Geometry/TrackerCommonData/data/pixbarladder.xml', + 'Geometry/TrackerCommonData/data/pixbarladderfull.xml', + 'Geometry/TrackerCommonData/data/pixbarladderhalf.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer0.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer1.xml', + 'Geometry/TrackerCommonData/data/pixbarlayer2.xml', + 'Geometry/TrackerCommonData/data/pixbar.xml', + 'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmodpar.xml', + 'Geometry/TrackerCommonData/data/tibmodule0.xml', + 'Geometry/TrackerCommonData/data/tibmodule0a.xml', + 'Geometry/TrackerCommonData/data/tibmodule0b.xml', + 'Geometry/TrackerCommonData/data/tibmodule2.xml', + 'Geometry/TrackerCommonData/data/tibstringpar.xml', + 'Geometry/TrackerCommonData/data/tibstring0ll.xml', + 'Geometry/TrackerCommonData/data/tibstring0lr.xml', + 'Geometry/TrackerCommonData/data/tibstring0ul.xml', + 'Geometry/TrackerCommonData/data/tibstring0ur.xml', + 'Geometry/TrackerCommonData/data/tibstring0.xml', + 'Geometry/TrackerCommonData/data/tibstring1ll.xml', + 'Geometry/TrackerCommonData/data/tibstring1lr.xml', + 'Geometry/TrackerCommonData/data/tibstring1ul.xml', + 'Geometry/TrackerCommonData/data/tibstring1ur.xml', + 'Geometry/TrackerCommonData/data/tibstring1.xml', + 'Geometry/TrackerCommonData/data/tibstring2ll.xml', + 'Geometry/TrackerCommonData/data/tibstring2lr.xml', + 'Geometry/TrackerCommonData/data/tibstring2ul.xml', + 'Geometry/TrackerCommonData/data/tibstring2ur.xml', + 'Geometry/TrackerCommonData/data/tibstring2.xml', + 'Geometry/TrackerCommonData/data/tibstring3ll.xml', + 'Geometry/TrackerCommonData/data/tibstring3lr.xml', + 'Geometry/TrackerCommonData/data/tibstring3ul.xml', + 'Geometry/TrackerCommonData/data/tibstring3ur.xml', + 'Geometry/TrackerCommonData/data/tibstring3.xml', + 'Geometry/TrackerCommonData/data/tiblayerpar.xml', + 'Geometry/TrackerCommonData/data/tiblayer0.xml', + 'Geometry/TrackerCommonData/data/tiblayer1.xml', + 'Geometry/TrackerCommonData/data/tiblayer2.xml', + 'Geometry/TrackerCommonData/data/tiblayer3.xml', + 'Geometry/TrackerCommonData/data/tib.xml', + 'Geometry/TrackerCommonData/data/tidmaterial.xml', + 'Geometry/TrackerCommonData/data/tidmodpar.xml', + 'Geometry/TrackerCommonData/data/tidmodule0.xml', + 'Geometry/TrackerCommonData/data/tidmodule0r.xml', + 'Geometry/TrackerCommonData/data/tidmodule0l.xml', + 'Geometry/TrackerCommonData/data/tidmodule1.xml', + 'Geometry/TrackerCommonData/data/tidmodule1r.xml', + 'Geometry/TrackerCommonData/data/tidmodule1l.xml', + 'Geometry/TrackerCommonData/data/tidmodule2.xml', + 'Geometry/TrackerCommonData/data/tidringpar.xml', + 'Geometry/TrackerCommonData/data/tidring0.xml', + 'Geometry/TrackerCommonData/data/tidring0f.xml', + 'Geometry/TrackerCommonData/data/tidring0b.xml', + 'Geometry/TrackerCommonData/data/tidring1.xml', + 'Geometry/TrackerCommonData/data/tidring1f.xml', + 'Geometry/TrackerCommonData/data/tidring1b.xml', + 'Geometry/TrackerCommonData/data/tidring2.xml', + 'Geometry/TrackerCommonData/data/tid.xml', + 'Geometry/TrackerCommonData/data/tidf.xml', + 'Geometry/TrackerCommonData/data/tidb.xml', + 'Geometry/TrackerCommonData/data/tibtidservices.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesf.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesb.xml', + 'Geometry/TrackerCommonData/data/tobmaterial.xml', + 'Geometry/TrackerCommonData/data/tobmodpar.xml', + 'Geometry/TrackerCommonData/data/tobmodule0.xml', + 'Geometry/TrackerCommonData/data/tobmodule2.xml', + 'Geometry/TrackerCommonData/data/tobmodule4.xml', + 'Geometry/TrackerCommonData/data/tobrodpar.xml', + 'Geometry/TrackerCommonData/data/tobrod0c.xml', + 'Geometry/TrackerCommonData/data/tobrod0l.xml', + 'Geometry/TrackerCommonData/data/tobrod0h.xml', + 'Geometry/TrackerCommonData/data/tobrod0.xml', + 'Geometry/TrackerCommonData/data/tobrod1l.xml', + 'Geometry/TrackerCommonData/data/tobrod1h.xml', + 'Geometry/TrackerCommonData/data/tobrod1.xml', + 'Geometry/TrackerCommonData/data/tobrod2c.xml', + 'Geometry/TrackerCommonData/data/tobrod2l.xml', + 'Geometry/TrackerCommonData/data/tobrod2h.xml', + 'Geometry/TrackerCommonData/data/tobrod2.xml', + 'Geometry/TrackerCommonData/data/tobrod3l.xml', + 'Geometry/TrackerCommonData/data/tobrod3h.xml', + 'Geometry/TrackerCommonData/data/tobrod3.xml', + 'Geometry/TrackerCommonData/data/tobrod4c.xml', + 'Geometry/TrackerCommonData/data/tobrod4l.xml', + 'Geometry/TrackerCommonData/data/tobrod4h.xml', + 'Geometry/TrackerCommonData/data/tobrod4.xml', + 'Geometry/TrackerCommonData/data/tobrod5l.xml', + 'Geometry/TrackerCommonData/data/tobrod5h.xml', + 'Geometry/TrackerCommonData/data/tobrod5.xml', + 'Geometry/TrackerCommonData/data/tob.xml', + 'Geometry/TrackerCommonData/data/tecmaterial.xml', + 'Geometry/TrackerCommonData/data/tecmodpar.xml', + 'Geometry/TrackerCommonData/data/tecmodule0.xml', + 'Geometry/TrackerCommonData/data/tecmodule0r.xml', + 'Geometry/TrackerCommonData/data/tecmodule0s.xml', + 'Geometry/TrackerCommonData/data/tecmodule1.xml', + 'Geometry/TrackerCommonData/data/tecmodule1r.xml', + 'Geometry/TrackerCommonData/data/tecmodule1s.xml', + 'Geometry/TrackerCommonData/data/tecmodule2.xml', + 'Geometry/TrackerCommonData/data/tecmodule3.xml', + 'Geometry/TrackerCommonData/data/tecmodule4.xml', + 'Geometry/TrackerCommonData/data/tecmodule4r.xml', + 'Geometry/TrackerCommonData/data/tecmodule4s.xml', + 'Geometry/TrackerCommonData/data/tecmodule5.xml', + 'Geometry/TrackerCommonData/data/tecmodule6.xml', + 'Geometry/TrackerCommonData/data/tecpetpar.xml', + 'Geometry/TrackerCommonData/data/tecring0.xml', + 'Geometry/TrackerCommonData/data/tecring1.xml', + 'Geometry/TrackerCommonData/data/tecring2.xml', + 'Geometry/TrackerCommonData/data/tecring3.xml', + 'Geometry/TrackerCommonData/data/tecring4.xml', + 'Geometry/TrackerCommonData/data/tecring5.xml', + 'Geometry/TrackerCommonData/data/tecring6.xml', + 'Geometry/TrackerCommonData/data/tecring0f.xml', + 'Geometry/TrackerCommonData/data/tecring1f.xml', + 'Geometry/TrackerCommonData/data/tecring2f.xml', + 'Geometry/TrackerCommonData/data/tecring3f.xml', + 'Geometry/TrackerCommonData/data/tecring4f.xml', + 'Geometry/TrackerCommonData/data/tecring5f.xml', + 'Geometry/TrackerCommonData/data/tecring6f.xml', + 'Geometry/TrackerCommonData/data/tecring0b.xml', + 'Geometry/TrackerCommonData/data/tecring1b.xml', + 'Geometry/TrackerCommonData/data/tecring2b.xml', + 'Geometry/TrackerCommonData/data/tecring3b.xml', + 'Geometry/TrackerCommonData/data/tecring4b.xml', + 'Geometry/TrackerCommonData/data/tecring5b.xml', + 'Geometry/TrackerCommonData/data/tecring6b.xml', + 'Geometry/TrackerCommonData/data/tecpetalf.xml', + 'Geometry/TrackerCommonData/data/tecpetalb.xml', + 'Geometry/TrackerCommonData/data/tecpetal0.xml', + 'Geometry/TrackerCommonData/data/tecpetal0f.xml', + 'Geometry/TrackerCommonData/data/tecpetal0b.xml', + 'Geometry/TrackerCommonData/data/tecpetal3.xml', + 'Geometry/TrackerCommonData/data/tecpetal3f.xml', + 'Geometry/TrackerCommonData/data/tecpetal3b.xml', + 'Geometry/TrackerCommonData/data/tecpetal6f.xml', + 'Geometry/TrackerCommonData/data/tecpetal6b.xml', + 'Geometry/TrackerCommonData/data/tecpetal8f.xml', + 'Geometry/TrackerCommonData/data/tecpetal8b.xml', + 'Geometry/TrackerCommonData/data/tecwheel.xml', + 'Geometry/TrackerCommonData/data/tecwheela.xml', + 'Geometry/TrackerCommonData/data/tecwheelb.xml', + 'Geometry/TrackerCommonData/data/tecwheelc.xml', + 'Geometry/TrackerCommonData/data/tecwheeld.xml', + 'Geometry/TrackerCommonData/data/tecwheel6.xml', + 'Geometry/TrackerCommonData/data/tecservices.xml', + 'Geometry/TrackerCommonData/data/tecbackplate.xml', + 'Geometry/TrackerCommonData/data/tec.xml', + 'Geometry/TrackerCommonData/data/trackermaterial.xml', + 'Geometry/TrackerCommonData/data/tracker.xml', + 'Geometry/TrackerCommonData/data/trackerpixbar.xml', + 'Geometry/TrackerCommonData/data/trackerpixfwd.xml', + 'Geometry/TrackerCommonData/data/trackertibtidservices.xml', + 'Geometry/TrackerCommonData/data/trackertib.xml', + 'Geometry/TrackerCommonData/data/trackertid.xml', + 'Geometry/TrackerCommonData/data/trackertob.xml', + 'Geometry/TrackerCommonData/data/trackertec.xml', + 'Geometry/TrackerCommonData/data/trackerbulkhead.xml', + 'Geometry/TrackerCommonData/data/trackerother.xml', + # 'Geometry/EcalCommonData/data/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/eefixed.xml', + # 'Geometry/EcalCommonData/data/eehier.xml', + # 'Geometry/EcalCommonData/data/eealgo.xml', + # 'Geometry/EcalCommonData/data/escon.xml', + # 'Geometry/EcalCommonData/data/esalgo.xml', + # 'Geometry/EcalCommonData/data/eeF.xml', + # 'Geometry/EcalCommonData/data/eeB.xml', + # 'Geometry/HcalCommonData/data/hcalrotations.xml', + # 'Geometry/HcalCommonData/data/hcalalgo.xml', + # 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + # 'Geometry/HcalCommonData/data/hcalendcapalgo.xml', + # 'Geometry/HcalCommonData/data/hcalouteralgo.xml', + 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + # 'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', + # 'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', + + # --- Muon ------------------------------------------------------------ + '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/v2/mf.xml', # Phase-1 Muon + # 'Geometry/MuonCommonData/data/v2/rpcf.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/mf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v2/gemf.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v7/gem11.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v6/gem21.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/v2/csc.xml', + # 'Geometry/MuonCommonData/data/v2/mfshield.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/mfshield.xml', # Phase-2 Muon + 'Geometry/MuonCommonData/data/PhaseII/me0.xml', # Phase-2 Muon + # --- Muon ------------------------------------------------------------ + + 'Geometry/ForwardCommonData/data/forward.xml', + 'Geometry/ForwardCommonData/data/v2/forwardshield.xml', + 'Geometry/ForwardCommonData/data/brmrotations.xml', + 'Geometry/ForwardCommonData/data/brm.xml', + 'Geometry/ForwardCommonData/data/totemMaterials.xml', + 'Geometry/ForwardCommonData/data/totemRotations.xml', + 'Geometry/ForwardCommonData/data/totemt1.xml', + 'Geometry/ForwardCommonData/data/totemt2.xml', + 'Geometry/ForwardCommonData/data/ionpump.xml', + 'Geometry/ForwardCommonData/data/castor.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/ForwardCommonData/data/bhm.xml', + ##'Geometry/ForwardCommonData/data/bhmsens.xml', #not needed for geomtery purposes only + 'Geometry/ForwardCommonData/data/pltbcm.xml', + 'Geometry/ForwardCommonData/data/bcm1f.xml', + 'Geometry/ForwardSimData/data/bcm1fsens.xml', + 'Geometry/ForwardCommonData/data/plt.xml', + 'Geometry/TrackerCommonData/data/trackerStructureTopology.xml', + 'Geometry/TrackerSimData/data/trackersens.xml', + 'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml', + # 'Geometry/EcalSimData/data/ecalsens.xml', + # 'Geometry/HcalCommonData/data/hcalsenspmf.xml', + 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hfpmt.xml', + 'Geometry/HcalSimData/data/hffibrebundle.xml', + # 'Geometry/HcalSimData/data/CaloUtil.xml', + + # --- Muon ------------------------------------------------------------ + # 'Geometry/MuonCommonData/data/v2/muonNumbering.xml', # Phase-1 Muon + 'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml', # Phase-2 Muon + # 'Geometry/MuonSimData/data/muonSens.xml', # Phase-1 Muon + 'Geometry/MuonSimData/data/PhaseII/muonSens.xml', # Phase-2 Muon + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', + # 'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml', # Phase-1 Muon + 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', # Phase-2 Muon + 'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml', # Phase-2 Muon + # 'Geometry/MuonSimData/data/muonProdCuts.xml', # Phase-1 Muon + 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', # Phase-2 Muon + # --- Muon ------------------------------------------------------------ + + 'Geometry/ForwardCommonData/data/brmsens.xml', + 'Geometry/ForwardSimData/data/castorsens.xml', + 'Geometry/ForwardSimData/data/zdcsens.xml', + # 'Geometry/HcalSimData/data/HcalProdCuts.xml', + # 'Geometry/EcalSimData/data/EcalProdCuts.xml', + # 'Geometry/EcalSimData/data/ESProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', + 'Geometry/ForwardSimData/data/CastorProdCuts.xml', + 'Geometry/ForwardSimData/data/zdcProdCuts.xml', + 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', + 'Geometry/CMSCommonData/data/FieldParameters.xml'), + rootNodeName = cms.string('cms:OCMS') +) + + From 3594317af3b4c73d7329f76b3a5aef698aafeaaa Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Thu, 28 May 2015 18:34:35 +0200 Subject: [PATCH 49/55] Delete GeometryExtended2015MuonReco_GEMDev_cff.py --- .../python/GeometryExtended2015MuonReco_GEMDev_cff.py | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Configuration/Geometry/python/GeometryExtended2015MuonReco_GEMDev_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2015MuonReco_GEMDev_cff.py b/Configuration/Geometry/python/GeometryExtended2015MuonReco_GEMDev_cff.py deleted file mode 100644 index dd830fba9874e..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2015MuonReco_GEMDev_cff.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# Ideal geometry, needed for transient ECAL alignement -from Configuration.Geometry.GeometryExtended2015Muon_cff import * -from Configuration.Geometry.GeometryReco_cff import * - -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.RPCGeometryBuilder.rpcGeometry_cfi import * From 6140448a4e28f8ff5de34f0a0ab936cc85874589 Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Thu, 28 May 2015 18:35:07 +0200 Subject: [PATCH 50/55] Delete GeometryExtended2015Muon_GEMDev_cff.py --- .../python/GeometryExtended2015Muon_GEMDev_cff.py | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Configuration/Geometry/python/GeometryExtended2015Muon_GEMDev_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2015Muon_GEMDev_cff.py b/Configuration/Geometry/python/GeometryExtended2015Muon_GEMDev_cff.py deleted file mode 100644 index 1d609ce447a8f..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2015Muon_GEMDev_cff.py +++ /dev/null @@ -1,9 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# -# Geometry master configuration -# -# Ideal geometry, needed for simulation -from Geometry.CMSCommonData.cmsExtendedGeometry2015MuonXML_GEMDev_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * - From c1825c6bc6ef8cd26c668229c58b2ba567e67c1e Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Thu, 28 May 2015 18:35:48 +0200 Subject: [PATCH 51/55] Delete cmsExtendedGeometry2015MuonXML_GEMDev_cfi.py --- ...sExtendedGeometry2015MuonXML_GEMDev_cfi.py | 311 ------------------ 1 file changed, 311 deletions(-) delete mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_GEMDev_cfi.py diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_GEMDev_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_GEMDev_cfi.py deleted file mode 100644 index 6cf62eb1b9af3..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonXML_GEMDev_cfi.py +++ /dev/null @@ -1,311 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -## Everything that is currently in the PostLS1 geometry (rpc,csc,beampipe) -## with full Muon Upgrade for Phase-2 :: ME0, GE1/1, GE2/1, RE3/1, RE4/1 - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - # 'Geometry/CMSCommonData/data/cms.xml', # Phase-1 Muon - 'Geometry/CMSCommonData/data/PhaseII/cms.xml', # Phase-2 Muon - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', # Phase-2 Muon - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - # 'Geometry/CMSCommonData/data/caloBase.xml', - # 'Geometry/CMSCommonData/data/cmsCalo.xml', - # 'Geometry/CMSCommonData/data/muonBase.xml', # Phase-1 Muon - 'Geometry/CMSCommonData/data/PhaseII/muonBase.xml', # Phase-2 Muon - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/PhaseI/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern.xml', - 'Geometry/TrackerCommonData/data/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq1x2.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq1x5.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x3.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x4.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x5.xml', - 'Geometry/TrackerCommonData/data/pixfwdPanelBase.xml', - 'Geometry/TrackerCommonData/data/pixfwdPanel.xml', - 'Geometry/TrackerCommonData/data/pixfwdBlade.xml', - 'Geometry/TrackerCommonData/data/pixfwdNipple.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwdPilotBlade.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwdDisk.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwdCylinder.xml', - 'Geometry/TrackerCommonData/data/Pilot/pixfwd.xml', - 'Geometry/TrackerCommonData/data/pixbarmaterial.xml', - 'Geometry/TrackerCommonData/data/pixbarladder.xml', - 'Geometry/TrackerCommonData/data/pixbarladderfull.xml', - 'Geometry/TrackerCommonData/data/pixbarladderhalf.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer0.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer1.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer2.xml', - 'Geometry/TrackerCommonData/data/pixbar.xml', - 'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml', - 'Geometry/TrackerCommonData/data/tibmaterial.xml', - 'Geometry/TrackerCommonData/data/tibmodpar.xml', - 'Geometry/TrackerCommonData/data/tibmodule0.xml', - 'Geometry/TrackerCommonData/data/tibmodule0a.xml', - 'Geometry/TrackerCommonData/data/tibmodule0b.xml', - 'Geometry/TrackerCommonData/data/tibmodule2.xml', - 'Geometry/TrackerCommonData/data/tibstringpar.xml', - 'Geometry/TrackerCommonData/data/tibstring0ll.xml', - 'Geometry/TrackerCommonData/data/tibstring0lr.xml', - 'Geometry/TrackerCommonData/data/tibstring0ul.xml', - 'Geometry/TrackerCommonData/data/tibstring0ur.xml', - 'Geometry/TrackerCommonData/data/tibstring0.xml', - 'Geometry/TrackerCommonData/data/tibstring1ll.xml', - 'Geometry/TrackerCommonData/data/tibstring1lr.xml', - 'Geometry/TrackerCommonData/data/tibstring1ul.xml', - 'Geometry/TrackerCommonData/data/tibstring1ur.xml', - 'Geometry/TrackerCommonData/data/tibstring1.xml', - 'Geometry/TrackerCommonData/data/tibstring2ll.xml', - 'Geometry/TrackerCommonData/data/tibstring2lr.xml', - 'Geometry/TrackerCommonData/data/tibstring2ul.xml', - 'Geometry/TrackerCommonData/data/tibstring2ur.xml', - 'Geometry/TrackerCommonData/data/tibstring2.xml', - 'Geometry/TrackerCommonData/data/tibstring3ll.xml', - 'Geometry/TrackerCommonData/data/tibstring3lr.xml', - 'Geometry/TrackerCommonData/data/tibstring3ul.xml', - 'Geometry/TrackerCommonData/data/tibstring3ur.xml', - 'Geometry/TrackerCommonData/data/tibstring3.xml', - 'Geometry/TrackerCommonData/data/tiblayerpar.xml', - 'Geometry/TrackerCommonData/data/tiblayer0.xml', - 'Geometry/TrackerCommonData/data/tiblayer1.xml', - 'Geometry/TrackerCommonData/data/tiblayer2.xml', - 'Geometry/TrackerCommonData/data/tiblayer3.xml', - 'Geometry/TrackerCommonData/data/tib.xml', - 'Geometry/TrackerCommonData/data/tidmaterial.xml', - 'Geometry/TrackerCommonData/data/tidmodpar.xml', - 'Geometry/TrackerCommonData/data/tidmodule0.xml', - 'Geometry/TrackerCommonData/data/tidmodule0r.xml', - 'Geometry/TrackerCommonData/data/tidmodule0l.xml', - 'Geometry/TrackerCommonData/data/tidmodule1.xml', - 'Geometry/TrackerCommonData/data/tidmodule1r.xml', - 'Geometry/TrackerCommonData/data/tidmodule1l.xml', - 'Geometry/TrackerCommonData/data/tidmodule2.xml', - 'Geometry/TrackerCommonData/data/tidringpar.xml', - 'Geometry/TrackerCommonData/data/tidring0.xml', - 'Geometry/TrackerCommonData/data/tidring0f.xml', - 'Geometry/TrackerCommonData/data/tidring0b.xml', - 'Geometry/TrackerCommonData/data/tidring1.xml', - 'Geometry/TrackerCommonData/data/tidring1f.xml', - 'Geometry/TrackerCommonData/data/tidring1b.xml', - 'Geometry/TrackerCommonData/data/tidring2.xml', - 'Geometry/TrackerCommonData/data/tid.xml', - 'Geometry/TrackerCommonData/data/tidf.xml', - 'Geometry/TrackerCommonData/data/tidb.xml', - 'Geometry/TrackerCommonData/data/tibtidservices.xml', - 'Geometry/TrackerCommonData/data/tibtidservicesf.xml', - 'Geometry/TrackerCommonData/data/tibtidservicesb.xml', - 'Geometry/TrackerCommonData/data/tobmaterial.xml', - 'Geometry/TrackerCommonData/data/tobmodpar.xml', - 'Geometry/TrackerCommonData/data/tobmodule0.xml', - 'Geometry/TrackerCommonData/data/tobmodule2.xml', - 'Geometry/TrackerCommonData/data/tobmodule4.xml', - 'Geometry/TrackerCommonData/data/tobrodpar.xml', - 'Geometry/TrackerCommonData/data/tobrod0c.xml', - 'Geometry/TrackerCommonData/data/tobrod0l.xml', - 'Geometry/TrackerCommonData/data/tobrod0h.xml', - 'Geometry/TrackerCommonData/data/tobrod0.xml', - 'Geometry/TrackerCommonData/data/tobrod1l.xml', - 'Geometry/TrackerCommonData/data/tobrod1h.xml', - 'Geometry/TrackerCommonData/data/tobrod1.xml', - 'Geometry/TrackerCommonData/data/tobrod2c.xml', - 'Geometry/TrackerCommonData/data/tobrod2l.xml', - 'Geometry/TrackerCommonData/data/tobrod2h.xml', - 'Geometry/TrackerCommonData/data/tobrod2.xml', - 'Geometry/TrackerCommonData/data/tobrod3l.xml', - 'Geometry/TrackerCommonData/data/tobrod3h.xml', - 'Geometry/TrackerCommonData/data/tobrod3.xml', - 'Geometry/TrackerCommonData/data/tobrod4c.xml', - 'Geometry/TrackerCommonData/data/tobrod4l.xml', - 'Geometry/TrackerCommonData/data/tobrod4h.xml', - 'Geometry/TrackerCommonData/data/tobrod4.xml', - 'Geometry/TrackerCommonData/data/tobrod5l.xml', - 'Geometry/TrackerCommonData/data/tobrod5h.xml', - 'Geometry/TrackerCommonData/data/tobrod5.xml', - 'Geometry/TrackerCommonData/data/tob.xml', - 'Geometry/TrackerCommonData/data/tecmaterial.xml', - 'Geometry/TrackerCommonData/data/tecmodpar.xml', - 'Geometry/TrackerCommonData/data/tecmodule0.xml', - 'Geometry/TrackerCommonData/data/tecmodule0r.xml', - 'Geometry/TrackerCommonData/data/tecmodule0s.xml', - 'Geometry/TrackerCommonData/data/tecmodule1.xml', - 'Geometry/TrackerCommonData/data/tecmodule1r.xml', - 'Geometry/TrackerCommonData/data/tecmodule1s.xml', - 'Geometry/TrackerCommonData/data/tecmodule2.xml', - 'Geometry/TrackerCommonData/data/tecmodule3.xml', - 'Geometry/TrackerCommonData/data/tecmodule4.xml', - 'Geometry/TrackerCommonData/data/tecmodule4r.xml', - 'Geometry/TrackerCommonData/data/tecmodule4s.xml', - 'Geometry/TrackerCommonData/data/tecmodule5.xml', - 'Geometry/TrackerCommonData/data/tecmodule6.xml', - 'Geometry/TrackerCommonData/data/tecpetpar.xml', - 'Geometry/TrackerCommonData/data/tecring0.xml', - 'Geometry/TrackerCommonData/data/tecring1.xml', - 'Geometry/TrackerCommonData/data/tecring2.xml', - 'Geometry/TrackerCommonData/data/tecring3.xml', - 'Geometry/TrackerCommonData/data/tecring4.xml', - 'Geometry/TrackerCommonData/data/tecring5.xml', - 'Geometry/TrackerCommonData/data/tecring6.xml', - 'Geometry/TrackerCommonData/data/tecring0f.xml', - 'Geometry/TrackerCommonData/data/tecring1f.xml', - 'Geometry/TrackerCommonData/data/tecring2f.xml', - 'Geometry/TrackerCommonData/data/tecring3f.xml', - 'Geometry/TrackerCommonData/data/tecring4f.xml', - 'Geometry/TrackerCommonData/data/tecring5f.xml', - 'Geometry/TrackerCommonData/data/tecring6f.xml', - 'Geometry/TrackerCommonData/data/tecring0b.xml', - 'Geometry/TrackerCommonData/data/tecring1b.xml', - 'Geometry/TrackerCommonData/data/tecring2b.xml', - 'Geometry/TrackerCommonData/data/tecring3b.xml', - 'Geometry/TrackerCommonData/data/tecring4b.xml', - 'Geometry/TrackerCommonData/data/tecring5b.xml', - 'Geometry/TrackerCommonData/data/tecring6b.xml', - 'Geometry/TrackerCommonData/data/tecpetalf.xml', - 'Geometry/TrackerCommonData/data/tecpetalb.xml', - 'Geometry/TrackerCommonData/data/tecpetal0.xml', - 'Geometry/TrackerCommonData/data/tecpetal0f.xml', - 'Geometry/TrackerCommonData/data/tecpetal0b.xml', - 'Geometry/TrackerCommonData/data/tecpetal3.xml', - 'Geometry/TrackerCommonData/data/tecpetal3f.xml', - 'Geometry/TrackerCommonData/data/tecpetal3b.xml', - 'Geometry/TrackerCommonData/data/tecpetal6f.xml', - 'Geometry/TrackerCommonData/data/tecpetal6b.xml', - 'Geometry/TrackerCommonData/data/tecpetal8f.xml', - 'Geometry/TrackerCommonData/data/tecpetal8b.xml', - 'Geometry/TrackerCommonData/data/tecwheel.xml', - 'Geometry/TrackerCommonData/data/tecwheela.xml', - 'Geometry/TrackerCommonData/data/tecwheelb.xml', - 'Geometry/TrackerCommonData/data/tecwheelc.xml', - 'Geometry/TrackerCommonData/data/tecwheeld.xml', - 'Geometry/TrackerCommonData/data/tecwheel6.xml', - 'Geometry/TrackerCommonData/data/tecservices.xml', - 'Geometry/TrackerCommonData/data/tecbackplate.xml', - 'Geometry/TrackerCommonData/data/tec.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/tracker.xml', - 'Geometry/TrackerCommonData/data/trackerpixbar.xml', - 'Geometry/TrackerCommonData/data/trackerpixfwd.xml', - 'Geometry/TrackerCommonData/data/trackertibtidservices.xml', - 'Geometry/TrackerCommonData/data/trackertib.xml', - 'Geometry/TrackerCommonData/data/trackertid.xml', - 'Geometry/TrackerCommonData/data/trackertob.xml', - 'Geometry/TrackerCommonData/data/trackertec.xml', - 'Geometry/TrackerCommonData/data/trackerbulkhead.xml', - 'Geometry/TrackerCommonData/data/trackerother.xml', - # 'Geometry/EcalCommonData/data/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/eefixed.xml', - # 'Geometry/EcalCommonData/data/eehier.xml', - # 'Geometry/EcalCommonData/data/eealgo.xml', - # 'Geometry/EcalCommonData/data/escon.xml', - # 'Geometry/EcalCommonData/data/esalgo.xml', - # 'Geometry/EcalCommonData/data/eeF.xml', - # 'Geometry/EcalCommonData/data/eeB.xml', - # 'Geometry/HcalCommonData/data/hcalrotations.xml', - # 'Geometry/HcalCommonData/data/hcalalgo.xml', - # 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - # 'Geometry/HcalCommonData/data/hcalendcapalgo.xml', - # 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - # 'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', - # 'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', - - # --- Muon ------------------------------------------------------------ - '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/v2/mf.xml', # Phase-1 Muon - # 'Geometry/MuonCommonData/data/v2/rpcf.xml', # Phase-1 Muon - 'Geometry/MuonCommonData/data/PhaseII/mf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v2/gemf.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v7/gem11.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v6/gem21.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/v2/csc.xml', - # 'Geometry/MuonCommonData/data/v2/mfshield.xml', # Phase-1 Muon - 'Geometry/MuonCommonData/data/PhaseII/mfshield.xml', # Phase-2 Muon - 'Geometry/MuonCommonData/data/PhaseII/me0.xml', # Phase-2 Muon - # --- Muon ------------------------------------------------------------ - - 'Geometry/ForwardCommonData/data/forward.xml', - 'Geometry/ForwardCommonData/data/v2/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/brm.xml', - 'Geometry/ForwardCommonData/data/totemMaterials.xml', - 'Geometry/ForwardCommonData/data/totemRotations.xml', - 'Geometry/ForwardCommonData/data/totemt1.xml', - 'Geometry/ForwardCommonData/data/totemt2.xml', - 'Geometry/ForwardCommonData/data/ionpump.xml', - 'Geometry/ForwardCommonData/data/castor.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/ForwardCommonData/data/bhm.xml', - ##'Geometry/ForwardCommonData/data/bhmsens.xml', #not needed for geomtery purposes only - 'Geometry/ForwardCommonData/data/pltbcm.xml', - 'Geometry/ForwardCommonData/data/bcm1f.xml', - 'Geometry/ForwardSimData/data/bcm1fsens.xml', - 'Geometry/ForwardCommonData/data/plt.xml', - 'Geometry/TrackerCommonData/data/trackerStructureTopology.xml', - 'Geometry/TrackerSimData/data/trackersens.xml', - 'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml', - # 'Geometry/EcalSimData/data/ecalsens.xml', - # 'Geometry/HcalCommonData/data/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - # 'Geometry/HcalSimData/data/CaloUtil.xml', - - # --- Muon ------------------------------------------------------------ - # 'Geometry/MuonCommonData/data/v2/muonNumbering.xml', # Phase-1 Muon - 'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml', # Phase-2 Muon - # 'Geometry/MuonSimData/data/muonSens.xml', # Phase-1 Muon - 'Geometry/MuonSimData/data/PhaseII/muonSens.xml', # Phase-2 Muon - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - # 'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml', # Phase-1 Muon - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', # Phase-2 Muon - 'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml', # Phase-2 Muon - # 'Geometry/MuonSimData/data/muonProdCuts.xml', # Phase-1 Muon - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', # Phase-2 Muon - # --- Muon ------------------------------------------------------------ - - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/castorsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - # 'Geometry/HcalSimData/data/HcalProdCuts.xml', - # 'Geometry/EcalSimData/data/EcalProdCuts.xml', - # 'Geometry/EcalSimData/data/ESProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/ForwardSimData/data/CastorProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml'), - rootNodeName = cms.string('cms:OCMS') -) - - From 4fa9f58b35127bac5b5aadfa063a237d34fc0f5d Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Thu, 28 May 2015 18:37:27 +0200 Subject: [PATCH 52/55] Delete SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py --- ...Pt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py | 101 ------------------ 1 file changed, 101 deletions(-) delete mode 100644 RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py deleted file mode 100644 index b8c0a2afcc20c..0000000000000 --- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py +++ /dev/null @@ -1,101 +0,0 @@ -# Auto generated configuration file -# using: -# Revision: 1.19 -# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v -# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Extended2015,Extended2015Reco --eventcontent FEVTDEBUGHLT --era Run2_25ns -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015_cfg.py -import FWCore.ParameterSet.Config as cms - -from Configuration.StandardSequences.Eras import eras - -process = cms.Process('DIGI',eras.Run2_25ns) - -# import of standard configurations -process.load('Configuration.StandardSequences.Services_cff') -process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') -process.load('FWCore.MessageService.MessageLogger_cfi') -process.load('Configuration.EventContent.EventContent_cff') -process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2015_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') -process.load('Configuration.StandardSequences.Generator_cff') -process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi') -process.load('GeneratorInterface.Core.genFilterSummary_cff') -process.load('Configuration.StandardSequences.SimIdeal_cff') -process.load('Configuration.StandardSequences.Digi_cff') -process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(100) -) - -# Input source -process.source = cms.Source("EmptySource") - -process.options = cms.untracked.PSet( - -) - -# Production Info -process.configurationMetadata = cms.untracked.PSet( - annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'), - name = cms.untracked.string('Applications'), - version = cms.untracked.string('$Revision: 1.19 $') -) - -# Output definition - -process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule", - SelectEvents = cms.untracked.PSet( - SelectEvents = cms.vstring('generation_step') - ), - dataset = cms.untracked.PSet( - dataTier = cms.untracked.string('GEN-SIM-DIGI'), - filterName = cms.untracked.string('') - ), - eventAutoFlushCompressedSize = cms.untracked.int32(1048576), - fileName = cms.untracked.string('out_digi.root'), - outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands, - splitLevel = cms.untracked.int32(0) -) - -# Additional output definition - -# Other statements -process.genstepfilter.triggerConditions=cms.vstring("generation_step") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') - -process.generator = cms.EDProducer("FlatRandomPtGunProducer", - AddAntiParticle = cms.bool(True), - PGunParameters = cms.PSet( - MaxEta = cms.double(2.5), - MaxPhi = cms.double(3.14159265359), - MaxPt = cms.double(100.01), - MinEta = cms.double(-2.5), - MinPhi = cms.double(-3.14159265359), - MinPt = cms.double(99.99), - PartID = cms.vint32(-13) - ), - Verbosity = cms.untracked.int32(0), - firstRun = cms.untracked.uint32(1), - psethack = cms.string('single mu pt 100') -) - - -# Path and EndPath definitions -process.generation_step = cms.Path(process.pgen) -process.simulation_step = cms.Path(process.psim) -process.digitisation_step = cms.Path(process.pdigi) -process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) -process.endjob_step = cms.EndPath(process.endOfProcess) -process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) - -# Schedule definition -process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step) -# filter all path with the production filter sequence -for path in process.paths: - getattr(process,path)._seq = process.generator * getattr(process,path)._seq - - From 33b2a9596242158b9a09dcef3e08d8723af08e79 Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Thu, 28 May 2015 18:37:41 +0200 Subject: [PATCH 53/55] Delete SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py --- ...t100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py | 116 ------------------ 1 file changed, 116 deletions(-) delete mode 100644 RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py deleted file mode 100644 index 1bfbae58d0f78..0000000000000 --- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_cfg.py +++ /dev/null @@ -1,116 +0,0 @@ -# Auto generated configuration file -# using: -# Revision: 1.19 -# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v -# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Ideal2015Muon,Ideal2015MuonReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015Muon_v2_cfg.py -import FWCore.ParameterSet.Config as cms - -from Configuration.StandardSequences.Eras import eras - -process = cms.Process('DIGI',eras.Run2_25ns) - -# import of standard configurations -process.load('Configuration.StandardSequences.Services_cff') -process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') -process.load('FWCore.MessageService.MessageLogger_cfi') -process.load('Configuration.EventContent.EventContent_cff') -process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryIdeal2015MuonReco_cff') -process.load('Configuration.Geometry.GeometryIdeal2015Muon_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') -process.load('Configuration.StandardSequences.Generator_cff') -process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi') -process.load('GeneratorInterface.Core.genFilterSummary_cff') -process.load('Configuration.StandardSequences.SimIdeal_cff') -process.load('Configuration.StandardSequences.Digi_cff') -process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(100) -) - -# Input source -process.source = cms.Source("EmptySource") - -process.options = cms.untracked.PSet( - -) - -# Production Info -process.configurationMetadata = cms.untracked.PSet( - annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'), - name = cms.untracked.string('Applications'), - version = cms.untracked.string('$Revision: 1.19 $') -) - -# Output definition - -process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule", - SelectEvents = cms.untracked.PSet( - SelectEvents = cms.vstring('generation_step') - ), - dataset = cms.untracked.PSet( - dataTier = cms.untracked.string('GEN-SIM-DIGI'), - filterName = cms.untracked.string('') - ), - eventAutoFlushCompressedSize = cms.untracked.int32(1048576), - fileName = cms.untracked.string('out_digi.root'), - outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands, - splitLevel = cms.untracked.int32(0) -) - -# Additional output definition - -# Other statements -process.genstepfilter.triggerConditions=cms.vstring("generation_step") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') - -process.generator = cms.EDProducer("FlatRandomPtGunProducer", - AddAntiParticle = cms.bool(True), - PGunParameters = cms.PSet( - MaxEta = cms.double(2.5), - MaxPhi = cms.double(3.14159265359), - MaxPt = cms.double(100.01), - MinEta = cms.double(-2.5), - MinPhi = cms.double(-3.14159265359), - MinPt = cms.double(99.99), - PartID = cms.vint32(-13) - ), - Verbosity = cms.untracked.int32(0), - firstRun = cms.untracked.uint32(1), - psethack = cms.string('single mu pt 100') -) - - -# Path and EndPath definitions -process.generation_step = cms.Path(process.pgen) -process.simulation_step = cms.Path(process.psim) -process.digitisation_step = cms.Path(process.pdigi) -process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) -process.endjob_step = cms.EndPath(process.endOfProcess) -process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) - -# Schedule definition -process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step) -# filter all path with the production filter sequence -for path in process.paths: - getattr(process,path)._seq = process.generator * getattr(process,path)._seq - -# customisation of the process. - -# Automatic addition of the customisation function from SimMuon.GEMDigitizer.customizeGEMDigi -from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only - -#call to customisation function customize_digi_addGEM_muon_only imported from SimMuon.GEMDigitizer.customizeGEMDigi -process = customize_digi_addGEM_muon_only(process) - -# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads -from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions - -#call to customisation function fixRPCConditions imported from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads -process = fixRPCConditions(process) - -# End of customisation functions - From 03f0eb3f71b63c1f2309464d76c52ab338b73a21 Mon Sep 17 00:00:00 2001 From: Piet Verwilligen Date: Thu, 28 May 2015 18:38:04 +0200 Subject: [PATCH 54/55] Delete SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py --- ...eMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py | 101 ------------------ 1 file changed, 101 deletions(-) delete mode 100644 RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py deleted file mode 100644 index e770dfc3c63a2..0000000000000 --- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py +++ /dev/null @@ -1,101 +0,0 @@ -# Auto generated configuration file -# using: -# Revision: 1.19 -# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v -# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Ideal2015dev --eventcontent FEVTDEBUGHLT --era Run2_25ns -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Ideal2015_cfg.py -import FWCore.ParameterSet.Config as cms - -from Configuration.StandardSequences.Eras import eras - -process = cms.Process('DIGI',eras.Run2_25ns) - -# import of standard configurations -process.load('Configuration.StandardSequences.Services_cff') -process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') -process.load('FWCore.MessageService.MessageLogger_cfi') -process.load('Configuration.EventContent.EventContent_cff') -process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryIdeal2015devReco_cff') -process.load('Configuration.Geometry.GeometryIdeal2015dev_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') -process.load('Configuration.StandardSequences.Generator_cff') -process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi') -process.load('GeneratorInterface.Core.genFilterSummary_cff') -process.load('Configuration.StandardSequences.SimIdeal_cff') -process.load('Configuration.StandardSequences.Digi_cff') -process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(100) -) - -# Input source -process.source = cms.Source("EmptySource") - -process.options = cms.untracked.PSet( - -) - -# Production Info -process.configurationMetadata = cms.untracked.PSet( - annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'), - name = cms.untracked.string('Applications'), - version = cms.untracked.string('$Revision: 1.19 $') -) - -# Output definition - -process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule", - SelectEvents = cms.untracked.PSet( - SelectEvents = cms.vstring('generation_step') - ), - dataset = cms.untracked.PSet( - dataTier = cms.untracked.string('GEN-SIM-DIGI'), - filterName = cms.untracked.string('') - ), - eventAutoFlushCompressedSize = cms.untracked.int32(1048576), - fileName = cms.untracked.string('out_digi.root'), - outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands, - splitLevel = cms.untracked.int32(0) -) - -# Additional output definition - -# Other statements -process.genstepfilter.triggerConditions=cms.vstring("generation_step") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') - -process.generator = cms.EDProducer("FlatRandomPtGunProducer", - AddAntiParticle = cms.bool(True), - PGunParameters = cms.PSet( - MaxEta = cms.double(2.5), - MaxPhi = cms.double(3.14159265359), - MaxPt = cms.double(100.01), - MinEta = cms.double(-2.5), - MinPhi = cms.double(-3.14159265359), - MinPt = cms.double(99.99), - PartID = cms.vint32(-13) - ), - Verbosity = cms.untracked.int32(0), - firstRun = cms.untracked.uint32(1), - psethack = cms.string('single mu pt 100') -) - - -# Path and EndPath definitions -process.generation_step = cms.Path(process.pgen) -process.simulation_step = cms.Path(process.psim) -process.digitisation_step = cms.Path(process.pdigi) -process.genfiltersummary_step = cms.EndPath(process.genFilterSummary) -process.endjob_step = cms.EndPath(process.endOfProcess) -process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput) - -# Schedule definition -process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step) -# filter all path with the production filter sequence -for path in process.paths: - getattr(process,path)._seq = process.generator * getattr(process,path)._seq - - From a461e5166dcd7044b0aabd6fd1ce3e0d4282c19c Mon Sep 17 00:00:00 2001 From: Piet Date: Thu, 28 May 2015 18:41:12 +0200 Subject: [PATCH 55/55] rename --- Fireworks/Geometry/python/dumpRecoGeometry_cfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py index 5b6707703695f..a6841aa6c9ff1 100644 --- a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py +++ b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py @@ -76,7 +76,7 @@ def recoGeoLoad(score): elif score == "GEMDev": from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['mc'] - process.load('Configuration.Geometry.GeometryExtended2015MuonReco_GEMDev_cff') + process.load('Configuration.Geometry.GeometryExtended2015MuonGEMDevReco_cff') elif score == "SLHCDB": # orig dumpFWRecoSLHCGeometry_cfg.py process.GlobalTag.globaltag = 'DESIGN42_V17::All'