Merge pull request #21 from cms-sw/CMSSW_6_2_X_SLHC

Merge cms-sw CMSSW_6_2_X_SLHC into my CMSSW_6_2_X_SLHC

Configuration/Geometry/python/GeometryExtended2019Reco_cff.py

@@ -17,7 +17,7 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *

Configuration/Geometry/python/GeometryExtended2023CFCal4EtaReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *

Configuration/Geometry/python/GeometryExtended2023CFCalReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *

Configuration/Geometry/python/GeometryExtended2023FastTimingReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *

Configuration/Geometry/python/GeometryExtended2023HGCalConcept_cff.py

@@ -2,3 +2,4 @@
 
 from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalConceptXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtended2023HGCalMuon4EtaReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
@@ -25,6 +25,9 @@
 trackerSLHCGeometry.applyAlignment = cms.bool(False)
 
 #  Calorimeters
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.FCalGeometry.HGCalGeometryESProducer_cfi import *
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
 

Configuration/Geometry/python/GeometryExtended2023HGCalMuon4Eta_cff.py

@@ -3,3 +3,4 @@
 from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalMuon4EtaXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
 from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtended2023HGCalMuonReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
@@ -25,6 +25,9 @@
 trackerSLHCGeometry.applyAlignment = cms.bool(False)
 
 #  Calorimeters
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.FCalGeometry.HGCalGeometryESProducer_cfi import *
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
 

Configuration/Geometry/python/GeometryExtended2023HGCalMuon_cff.py

@@ -3,3 +3,4 @@
 from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalMuonXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
 from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtended2023HGCalReco_cff.py

@@ -15,8 +15,7 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
@@ -25,6 +24,9 @@
 trackerSLHCGeometry.applyAlignment = cms.bool(False)
 
 #  Calorimeters
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.FCalGeometry.HGCalGeometryESProducer_cfi import *
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
 

Configuration/Geometry/python/GeometryExtended2023HGCalV4_cff.py

@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalV4XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
+from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtended2023HGCal_cff.py

@@ -3,3 +3,4 @@
 from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
 from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtended2023Muon4EtaReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *

Configuration/Geometry/python/GeometryExtended2023MuonReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *

Configuration/Geometry/python/GeometryExtended2023SHCal4EtaReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
@@ -27,7 +27,7 @@
 #  Calorimeters
 from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import *
 from Geometry.CaloEventSetup.ShashlikTopology_cfi import *
-from Geometry.CaloTopology.ShashlikGeometryESProducer_cfi import *
+from Geometry.FCalGeometry.ShashlikGeometryESProducer_cfi import *
 
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *

Configuration/Geometry/python/GeometryExtended2023SHCalNoTaper4EtaReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
@@ -27,7 +27,7 @@
 #  Calorimeters
 from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import *
 from Geometry.CaloEventSetup.ShashlikTopology_cfi import *
-from Geometry.CaloTopology.ShashlikGeometryESProducer_cfi import *
+from Geometry.FCalGeometry.ShashlikGeometryESProducer_cfi import *
 
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *

Configuration/Geometry/python/GeometryExtended2023SHCalNoTaperRebuild_cff.py

@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Geometry.CMSCommonData.cmsExtendedGeometry2023SHCalNoTaperRebuildXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
+from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
+from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import *

Configuration/Geometry/python/GeometryExtended2023SHCalNoTaperReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
@@ -27,7 +27,7 @@
 #  Calorimeters
 from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import *
 from Geometry.CaloEventSetup.ShashlikTopology_cfi import *
-from Geometry.CaloTopology.ShashlikGeometryESProducer_cfi import *
+from Geometry.FCalGeometry.ShashlikGeometryESProducer_cfi import *
 
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *

Configuration/Geometry/python/GeometryExtended2023SHCalReco_cff.py

@@ -15,8 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometry.gemGeometry_cfi import *
-from Geometry.GEMGeometry.me0Geometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
@@ -27,7 +27,7 @@
 #  Calorimeters
 from Geometry.HGCalCommonData.shashlikNumberingInitialization_cfi import *
 from Geometry.CaloEventSetup.ShashlikTopology_cfi import *
-from Geometry.CaloTopology.ShashlikGeometryESProducer_cfi import *
+from Geometry.FCalGeometry.ShashlikGeometryESProducer_cfi import *
 
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *

Configuration/PyReleaseValidation/python/MatrixRunner.py

@@ -60,7 +60,7 @@ def runTests(self, opt):
 
     	    print '\nPreparing to run %s %s' % (wf.numId, item)
 
-    	    current = WorkFlowRunner(wf,noRun,dryRun,cafVeto)
+            current = WorkFlowRunner(wf,noRun,dryRun,cafVeto, opt.dasOptions, opt.jobReports)
     	    self.threadList.append(current)
     	    current.start()
             if not dryRun:

Configuration/PyReleaseValidation/python/WorkFlowRunner.py

@@ -7,7 +7,7 @@
 from subprocess import Popen 
 
 class WorkFlowRunner(Thread):
-    def __init__(self, wf, noRun=False,dryRun=False,cafVeto=True):
+    def __init__(self, wf, noRun=False,dryRun=False,cafVeto=True,dasOptions="",jobReport=False):
         Thread.__init__(self)
         self.wf = wf
 
@@ -18,6 +18,8 @@ def __init__(self, wf, noRun=False,dryRun=False,cafVeto=True):
         self.noRun=noRun
         self.dryRun=dryRun
         self.cafVeto=cafVeto
+        self.dasOptions=dasOptions
+        self.jobReport=jobReport
 
         self.wfDir=str(self.wf.numId)+'_'+self.wf.nameId
         return
@@ -100,7 +102,7 @@ def closeCmd(i,ID):
                     cmd2 =cmd+cmd2+closeCmd(istep,'lumiRanges')
                     lumiRangeFile='step%d_lumiRanges.log'%(istep,)
                     retStep = self.doCmd(cmd2)
-                cmd+=com.das()
+                cmd+=com.das(self.dasOptions)
                 cmd+=closeCmd(istep,'dasquery')
                 retStep = self.doCmd(cmd)
                 #don't use the file list executed, but use the das command of cmsDriver for next step
@@ -124,11 +126,12 @@ def closeCmd(i,ID):
                         cmd+=' --filein file:step%s.root '%(istep-1,)
                     if not '--fileout' in com:
                         cmd+=' --fileout file:step%s.root '%(istep,)
-
-
-
+                if self.jobReport:
+                  cmd += ' --suffix "-j JobReport%s.xml " ' % istep
                 cmd+=closeCmd(istep,self.wf.nameId)            
                 retStep = self.doCmd(cmd)
+
+
 
             self.retStep.append(retStep)
             if (retStep!=0):