Merge pull request #103 from cms-sw/CMSSW_6_2_X_SLHC

Cmssw 6 2 x slhc

Configuration/Geometry/python/GeometryExtended2023SHCalRebuild_cff.py

@@ -0,0 +1,34 @@
+import FWCore.ParameterSet.Config as cms
+
+from Geometry.CMSCommonData.cmsExtendedGeometry2023SHCalRebuildXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
+from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi 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 *
+from Geometry.GEMGeometry.gemGeometry_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 *
+from Geometry.HcalCommonData.hcalRecNumberingInitialization_cfi import *
+

DataFormats/MuonReco/interface/EmulatedME0SegmentCollection.h

@@ -19,8 +19,6 @@ typedef std::vector<EmulatedME0Segment> EmulatedME0SegmentCollection;
 /// persistent reference to a EmulatedME0Segment
 typedef edm::Ref<EmulatedME0SegmentCollection> EmulatedME0SegmentRef;
 
-//typedef std::vector<EmulatedME0Segment> EmulatedME0SegmentCollection; 
-
 #endif
 
 

DataFormats/MuonReco/interface/ME0MuonCollection.h

@@ -17,7 +17,5 @@ typedef std::vector<reco::ME0Muon> ME0MuonCollection;
 
 /// persistent reference to a ME0Muon
 typedef edm::Ref<ME0MuonCollection> ME0MuonRef;
-
-//typedef std::vector<ME0Muon> ME0MuonCollection; 
 
 #endif