Skip to content

Commit

Permalink
Merge pull request #106 from cms-sw/CMSSW_6_2_X_SLHC
Browse files Browse the repository at this point in the history
Cmssw 6 2 x slhc
  • Loading branch information
jshlee committed Mar 14, 2014
2 parents 5913deb + 34d6ba6 commit be802e8
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 180 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'Geometry/CMSCommonData/data/PhaseI/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/eta4/etaMax.xml',
'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
'Geometry/CMSCommonData/data/muonBase.xml',
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/PhaseI/beampipe.xml',
Expand Down Expand Up @@ -57,7 +57,7 @@
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
Expand All @@ -76,14 +76,13 @@
'Geometry/MuonCommonData/data/v1/mb3.xml',
'Geometry/MuonCommonData/data/v1/mb4.xml',
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/v7/mf.xml',
'Geometry/MuonCommonData/data/v2/rpcf.xml',
'Geometry/MuonCommonData/data/PhaseII/v2/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/rpcf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v5/gem11.xml',
'Geometry/MuonCommonData/data/v6/gem21.xml',
'Geometry/MuonCommonData/data/v7/me0.xml',
'Geometry/MuonCommonData/data/v2/csc.xml',
'Geometry/MuonCommonData/data/v7/mfshield.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/mfshield.xml',
'Geometry/ForwardCommonData/data/forward.xml',
'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
'Geometry/ForwardCommonData/data/brmrotations.xml',
Expand All @@ -101,7 +100,7 @@
'Geometry/ForwardCommonData/data/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
'Geometry/MuonCommonData/data/v7/muonNumbering.xml',
'Geometry/MuonCommonData/data/PhaseII/v2/muonNumbering.xml',
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
Expand All @@ -113,11 +112,11 @@
'Geometry/HcalSimData/data/CaloUtil.xml',
'Geometry/HGCalSimData/data/hgcsens.xml',
'Geometry/HGCalSimData/data/hgccons.xml',
'Geometry/MuonSimData/data/v4/muonSens.xml',
'Geometry/MuonSimData/data/PhaseII/v3/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml',
'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml',
'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml',
'Geometry/ForwardCommonData/data/brmsens.xml',
'Geometry/ForwardSimData/data/castorsens.xml',
Expand All @@ -127,7 +126,7 @@
'Geometry/HGCalSimData/data/hgcProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/v2/muonProdCuts.xml',
'Geometry/MuonSimData/data/PhaseII/v3/muonProdCuts.xml',
'Geometry/ForwardSimData/data/CastorProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
'Geometry/CMSCommonData/data/PhaseI/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/eta4/etaMax.xml',
'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
Expand Down Expand Up @@ -88,8 +88,8 @@
'Geometry/HcalCommonData/data/PhaseII/hcalendcapalgo.xml',
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumberingRebuildHE.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuildHE.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/MuonCommonData/data/v1/mbCommon.xml',
'Geometry/MuonCommonData/data/v1/mb1.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumberingRebuildHE.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuildHE.xml',
'Geometry/HGCalCommonData/data/shashlikmodule.xml',
'Geometry/HGCalCommonData/data/shashliksupermodule.xml',
'Geometry/HGCalCommonData/data/shashlik.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumberingRebuildHE.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuildHE.xml',
'Geometry/HGCalCommonData/data/NoTaper/shashlikmodule.xml',
'Geometry/HGCalCommonData/data/NoTaper/shashliksupermodule.xml',
'Geometry/HGCalCommonData/data/NoTaper/shashlik.xml',
Expand Down Expand Up @@ -104,6 +104,7 @@
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HGCalSimData/data/shashliksens.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
'Geometry/HcalSimData/data/hfpmt.xml',
Expand All @@ -120,6 +121,7 @@
'Geometry/ForwardSimData/data/zdcsens.xml',
'Geometry/HcalSimData/data/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
'Geometry/HGCalSimData/data/shashlikProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/PhaseII/v3/muonProdCuts.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumberingRebuildHE.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuildHE.xml',
'Geometry/HGCalCommonData/data/shashlikmodule.xml',
'Geometry/HGCalCommonData/data/shashliksupermodule.xml',
'Geometry/HGCalCommonData/data/shashlik.xml',
Expand Down Expand Up @@ -103,7 +103,6 @@
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
'Geometry/HGCalSimData/data/shashliksens.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HGCalSimData/data/shashliksens.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalsenspmf.xml',
Expand Down
157 changes: 0 additions & 157 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023TTIXML_cfg.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* \author David Nash
*/

#include <RecoMuon/MuonIdentification/interface/ME0MuonConverter.h>
#include <RecoMuon/MuonIdentification/plugins/ME0MuonConverter.h>

#include <FWCore/PluginManager/interface/ModuleDef.h>
#include <FWCore/Framework/interface/MakerMacros.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* \author David Nash
*/

#include <RecoMuon/MuonIdentification/interface/ME0SegmentMatcher.h>
#include <RecoMuon/MuonIdentification/plugins/ME0SegmentMatcher.h>

#include <FWCore/PluginManager/interface/ModuleDef.h>
#include <FWCore/Framework/interface/MakerMacros.h>
Expand Down

0 comments on commit be802e8

Please sign in to comment.