Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gem rpc phase ii geometry integration #2276

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
a634bb9
RPC upscope
ianna Dec 20, 2013
1fb2ac8
Merged RPC-upscope from repository ianna
ianna Jan 9, 2014
63c47b6
Correct geometry and numbering.
ianna Jan 9, 2014
d2dc8eb
Extend RE3/1 to 2.4 Eta
ianna Jan 15, 2014
539c0e2
Add RPC 2.4 Eta upscope scenario
ianna Jan 15, 2014
502b793
Extend RE4/1 to 2.4 eta
ianna Jan 16, 2014
e4873ec
Use current shielding
ianna Jan 16, 2014
6d55469
Include extended RR4 chambers
ianna Jan 16, 2014
ba6fec7
Modified to incorporate RPC Chamber with more than 3 eta partition, b…
pietverwilligen Jan 19, 2014
b0f8d00
Added G3,G4,G5,H3,H4,H5 rolls for Eta 2p4 upgrade
pietverwilligen Jan 19, 2014
1e599ef
Simplified loading of RPC Endcap Sensitive Volumes such that upgrades…
pietverwilligen Jan 19, 2014
802bc1f
uncommented RE3/1 (REG) and RE4/1 (REH) volumes
pietverwilligen Jan 19, 2014
89ce2ec
more debug info
pietverwilligen Jan 19, 2014
42f2a08
loading right Extended2023RPCEtaUpscope geometry
pietverwilligen Jan 19, 2014
a3db836
updated config for RPCEtaUpgradeReco_cff file
pietverwilligen Jan 20, 2014
98fc051
adapted to new geometry
pietverwilligen Jan 20, 2014
5ccee74
first commit
pietverwilligen Jan 20, 2014
39305e3
add weights to products, start on update LHE event products
lgray Sep 25, 2013
2dd165d
correctly parsing weights information in events
lgray Oct 4, 2013
75f8522
first working version
lgray Oct 7, 2013
e8a3262
first actually working version :-)
lgray Oct 7, 2013
4c8b170
validated
lgray Oct 8, 2013
455f41c
remove double usage of boost
lgray Oct 15, 2013
405c8dd
add originalXWGTUP() to LHEEvent and LHEEventProduct so that reweight…
lgray Jan 21, 2014
024d445
modified for 5 rolls in RE3/1 and RE4/1
pietverwilligen Jan 22, 2014
7907e28
changed RE3/1 and RE4/1 from 64 to 256 strips
pietverwilligen Jan 24, 2014
ef17c7b
configuration file for RE3/1 and RE4/1 with 256 strips
pietverwilligen Jan 24, 2014
4a63ac6
configuration file for 256 strips in RE3/1 and RE4/1
pietverwilligen Jan 24, 2014
722e76b
configuration file for 256 strips in RE3/1 and RE4/1
pietverwilligen Jan 24, 2014
3bbde01
Merge pull request #2101 from lgray/store_lhe_original_xwgtup_62X_SLHC
cmsbuild Jan 28, 2014
eec5ca9
Adapted RPCSimSetup in RPCDigitizer to handle 256 strips (dirty fix n…
pietverwilligen Jan 28, 2014
bb672ce
Added min and max stripwidth for trapezoidal strips
pietverwilligen Jan 28, 2014
c5226be
Load RPCEta2Upgrade geometry
pietverwilligen Jan 28, 2014
86e4e97
Merge pull request #2213 from dildick/GE11-geometry-customs
cmsbuild Jan 29, 2014
ff8419d
first version
pietverwilligen Jan 29, 2014
39de098
first version
pietverwilligen Jan 29, 2014
d4e4670
first version
pietverwilligen Jan 29, 2014
e903d0a
first version
pietverwilligen Jan 29, 2014
6d18498
min and max stripwidth, output cleanup
pietverwilligen Jan 29, 2014
c0b378d
remove file1.txt
pietverwilligen Jan 29, 2014
26f9449
first introduction
pietverwilligen Jan 29, 2014
93f42db
remove tilde files
pietverwilligen Jan 29, 2014
fd0da5a
Backport of cfg-viewer.py from CMSSW_7_1_0_pre1.
aledegano Jan 30, 2014
c53d01a
Merge pull request #2237 from degano/cfg-viewer-to-62X-slhc
ktf Jan 30, 2014
ec1b350
feeding rpc geometry to RPCSimSetup
pietverwilligen Jan 30, 2014
f9ad1be
adapted for reading number of strips roll by roll
pietverwilligen Jan 30, 2014
f31c3d1
rewrote RPCSimSetup.cc
pietverwilligen Jan 31, 2014
20409eb
added RE3/1 and RE4/1 up to eta 2.4 and with 192 strips
pietverwilligen Feb 1, 2014
e14495c
changed maxRollId to 5 for RE3/1 and RE4/1 up to eta 2p4
pietverwilligen Feb 1, 2014
300d11a
added geometry to RPCSimSetup
pietverwilligen Feb 1, 2014
6a15bfe
rewrote RPCSimSetup to deal with an arbitrary number of conditions pe…
pietverwilligen Feb 1, 2014
495ceb9
simplified for RPC Endcap
pietverwilligen Feb 1, 2014
879b808
simplified for RPC Endcap
pietverwilligen Feb 1, 2014
649b926
simplified for RPC Endcap
pietverwilligen Feb 1, 2014
e076eca
added RE3/1 and RE4/1 up to eta 2.4 and with 192 strips
pietverwilligen Feb 1, 2014
b9667b0
deleted files
pietverwilligen Feb 1, 2014
8d011af
added RE3/1 and RE4/1 with 192 strips
pietverwilligen Feb 1, 2014
aa1dfc9
improved version
pietverwilligen Feb 1, 2014
5185513
to test Extended2023 geometry
pietverwilligen Feb 1, 2014
62fd7db
add debug stdcouts
pietverwilligen Feb 1, 2014
49f23ea
forgot some RE4 volumes to port from working 192 strips branch
pietverwilligen Feb 3, 2014
e6f83e6
forgot some RE4 volumes to port from working 192 strips branch
pietverwilligen Feb 3, 2014
0019370
forgot some RE4 volumes to port from working 192 strips branch
pietverwilligen Feb 3, 2014
821134e
forgot some RE4 volumes to port from working 192 strips branch
pietverwilligen Feb 3, 2014
03462fa
forgot some RE4 volumes to port from working 192 strips branch
pietverwilligen Feb 3, 2014
6bc7b7e
forgot some RE4 volumes to port from working 192 strips branch
pietverwilligen Feb 3, 2014
f53fe2f
add debug info
pietverwilligen Feb 3, 2014
d282535
improved
pietverwilligen Feb 3, 2014
f961887
Merged GE11-geometry-customs from repository dildick
Feb 3, 2014
b06bd72
Merged RPC-Upgrade-Eta-2p4-192-Strips from repository pietverwilligen
Feb 3, 2014
1b45b43
Merged GEM-RPC-geometry-customs from repository pietverwilligen
Feb 3, 2014
9826650
merge Geometry/MuonCommonData/data/upscope/2.4Eta/muonNumbering.xml
Feb 3, 2014
6b3f96d
xml syntacs fix
pietverwilligen Feb 3, 2014
0f1e67b
load extended2023 geom
pietverwilligen Feb 3, 2014
190a59c
load extended2023 geom
pietverwilligen Feb 3, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Configuration.Geometry.GeometryExtended2023RPCUpscope_2p1_64_cff import *



# Reconstruction geometry services
# Tracking Geometry
#bah - well, this is not a cfi!
from Geometry.CommonDetUnit.globalTrackingSLHCGeometry_cfi import *

#Tracker
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import *

#Muon
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *

# Alignment
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
trackerSLHCGeometry.applyAlignment = cms.bool(False)

# Calorimeters
from Geometry.CaloEventSetup.CaloTopology_cfi import *
from Geometry.CaloEventSetup.CaloGeometry_cff import *
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
from Geometry.EcalMapping.EcalMapping_cfi import *
from Geometry.EcalMapping.EcalMappingRecord_cfi import *

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Configuration.Geometry.GeometryExtended2023RPCUpscope_2p4_192_cff import *



# Reconstruction geometry services
# Tracking Geometry
#bah - well, this is not a cfi!
from Geometry.CommonDetUnit.globalTrackingSLHCGeometry_cfi import *

#Tracker
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import *

#Muon
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *

# Alignment
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
trackerSLHCGeometry.applyAlignment = cms.bool(False)

# Calorimeters
from Geometry.CaloEventSetup.CaloTopology_cfi import *
from Geometry.CaloEventSetup.CaloGeometry_cff import *
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
from Geometry.EcalMapping.EcalMapping_cfi import *
from Geometry.EcalMapping.EcalMappingRecord_cfi import *

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Configuration.Geometry.GeometryExtended2023RPCUpscope_2p4_256_cff import *



# Reconstruction geometry services
# Tracking Geometry
#bah - well, this is not a cfi!
from Geometry.CommonDetUnit.globalTrackingSLHCGeometry_cfi import *

#Tracker
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import *

#Muon
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *

# Alignment
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
trackerSLHCGeometry.applyAlignment = cms.bool(False)

# Calorimeters
from Geometry.CaloEventSetup.CaloTopology_cfi import *
from Geometry.CaloEventSetup.CaloGeometry_cff import *
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
from Geometry.EcalMapping.EcalMapping_cfi import *
from Geometry.EcalMapping.EcalMappingRecord_cfi import *

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Configuration.Geometry.GeometryExtended2023RPCUpscope_2p4_64_cff import *



# Reconstruction geometry services
# Tracking Geometry
#bah - well, this is not a cfi!
from Geometry.CommonDetUnit.globalTrackingSLHCGeometry_cfi import *

#Tracker
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import *

#Muon
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *

# Alignment
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
trackerSLHCGeometry.applyAlignment = cms.bool(False)

# Calorimeters
from Geometry.CaloEventSetup.CaloTopology_cfi import *
from Geometry.CaloEventSetup.CaloGeometry_cff import *
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
from Geometry.EcalMapping.EcalMapping_cfi import *
from Geometry.EcalMapping.EcalMappingRecord_cfi import *

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import FWCore.ParameterSet.Config as cms

#
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometry2023RPCUpscopeXML_2p1_64_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import FWCore.ParameterSet.Config as cms

#
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometry2023RPCUpscopeXML_2p4_192_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import FWCore.ParameterSet.Config as cms

#
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometry2023RPCUpscopeXML_2p4_256_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import FWCore.ParameterSet.Config as cms

#
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometry2023RPCUpscopeXML_2p4_64_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
37 changes: 21 additions & 16 deletions DQM/RPCMonitorDigi/test/rpcmonitordigi_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,23 @@
############# Source File #################

process.source = cms.Source("PoolSource",
fileNames = cms.untracked.vstring('/store/data/Run2010A/Mu/RECO/v4/000/143/727/2EB74417-51AF-DF11-8773-001617E30D00.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/4420AAFC-3BAF-DF11-8457-0019B9F72BAA.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/58BD28DA-4CAF-DF11-912A-001617E30D00.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/5E4D5A83-54AF-DF11-9580-001D09F24934.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/6C72A6E0-40AF-DF11-B657-001D09F252F3.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/7A94925E-4CAF-DF11-9C5E-001D09F2960F.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/8A10CC2F-47AF-DF11-BB2F-0030487A17B8.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/8CAFACF6-49AF-DF11-861A-003048F118AC.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/9A3E9521-53AF-DF11-84AC-001D09F24934.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/BEE0AAB1-37AF-DF11-9FB8-0030487C60AE.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/C4EF4794-48AF-DF11-AC6B-003048F117EA.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/D2381722-53AF-DF11-8D77-001D09F2906A.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/E4185ADF-4CAF-DF11-BA63-0030487CD906.root',
'/store/data/Run2010A/Mu/RECO/v4/000/143/727/FE2C2F5F-4CAF-DF11-AA49-0030487A3C9A.root')
fileNames = cms.untracked.vstring(
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/2EB74417-51AF-DF11-8773-001617E30D00.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/4420AAFC-3BAF-DF11-8457-0019B9F72BAA.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/58BD28DA-4CAF-DF11-912A-001617E30D00.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/5E4D5A83-54AF-DF11-9580-001D09F24934.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/6C72A6E0-40AF-DF11-B657-001D09F252F3.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/7A94925E-4CAF-DF11-9C5E-001D09F2960F.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/8A10CC2F-47AF-DF11-BB2F-0030487A17B8.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/8CAFACF6-49AF-DF11-861A-003048F118AC.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/9A3E9521-53AF-DF11-84AC-001D09F24934.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/BEE0AAB1-37AF-DF11-9FB8-0030487C60AE.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/C4EF4794-48AF-DF11-AC6B-003048F117EA.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/D2381722-53AF-DF11-8D77-001D09F2906A.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/E4185ADF-4CAF-DF11-BA63-0030487CD906.root',
# '/store/data/Run2010A/Mu/RECO/v4/000/143/727/FE2C2F5F-4CAF-DF11-AA49-0030487A3C9A.root',
'file:/build/piet/Upgrade/Eta_2p4_Releases/CMSSW_6_2_0_SLHC5/src/MyCmsDriverCommands/SingleMuPt100_1p6_2p4_cfi_RECO.root'
)
)

process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(10))
Expand All @@ -29,7 +32,8 @@

############ Geometry ######################
process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi")
process.load("Geometry.MuonCommonData.muonIdealGeometryXML_cfi")
# process.load("Geometry.MuonCommonData.muonIdealGeometryXML_cfi")
process.load("Geometry.CMSCommonData.cmsExtendedGeometry2023RPCEtaUpscopeXML_cfi")
process.load("Geometry.RPCGeometry.rpcGeometry_cfi")

process.load("Configuration.StandardSequences.MagneticField_cff")
Expand Down Expand Up @@ -68,7 +72,8 @@

############### Output Module ##############
process.out = cms.OutputModule("PoolOutputModule",
fileName = cms.untracked.string('/tmp/cimmino/RPCDQM.root'),
# fileName = cms.untracked.string('/tmp/cimmino/RPCDQM.root'),
fileName = cms.untracked.string('/tmp/piet/RPCDQM.root'),
outputCommands = cms.untracked.vstring("keep *")
)

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/MuonDetId/interface/RPCDetId.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class RPCDetId :public DetId {
static const int maxSubSectorForwardId= 6;

static const int minRollId= 0;
static const int maxRollId= 4;
static const int maxRollId= 5;


private:
Expand Down
Loading