Merged run2-scripts-update from repository ianna

cms-sw · May 12, 2015 · a980feb · a980feb
2 parents 2d4e808 + 2299822
commit a980feb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/CondTools/Geometry/test/writehelpers/geometryrun2devwriter.py b/CondTools/Geometry/test/writehelpers/geometryrun2devwriter.py
@@ -32,8 +32,10 @@
 
 process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder")
 process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder")
+process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder")
 
 process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder")
+process.HcalParametersWriter = cms.EDAnalyzer("PHcalParametersDBBuilder")
 
 process.CSCGeometryWriter = cms.EDAnalyzer("CSCRecoIdealDBLoader")
 
@@ -49,10 +51,12 @@
                                           toPut = cms.VPSet(cms.PSet(record = cms.string('GeometryFileRcd'),tag = cms.string('XMLFILE_Geometry_TagXX_Extended2015dev_mc')),
                                                             cms.PSet(record = cms.string('IdealGeometryRecord'),tag = cms.string('TKRECO_Geometry2015dev_TagXX')),
                                                             cms.PSet(record = cms.string('PGeometricDetExtraRcd'),tag = cms.string('TKExtra_Geometry2015dev_TagXX')),
+                                                            cms.PSet(record = cms.string('PTrackerParametersRcd'),tag = cms.string('TKParameters_Geometry2015dev_TagXX')),
                                                             cms.PSet(record = cms.string('PEcalBarrelRcd'),   tag = cms.string('EBRECO_Geometry2015dev_TagXX')),
                                                             cms.PSet(record = cms.string('PEcalEndcapRcd'),   tag = cms.string('EERECO_Geometry2015dev_TagXX')),
                                                             cms.PSet(record = cms.string('PEcalPreshowerRcd'),tag = cms.string('EPRECO_Geometry2015dev_TagXX')),
                                                             cms.PSet(record = cms.string('PHcalRcd'),         tag = cms.string('HCALRECO_Geometry2015dev_TagXX')),
+                                                            cms.PSet(record = cms.string('PHcalParametersRcd'), tag = cms.string('HCALParameters_Geometry2015dev_TagXX')),
                                                             cms.PSet(record = cms.string('PCaloTowerRcd'),    tag = cms.string('CTRECO_Geometry2015dev_TagXX')),
                                                             cms.PSet(record = cms.string('PZdcRcd'),          tag = cms.string('ZDCRECO_Geometry2015dev_TagXX')),
                                                             cms.PSet(record = cms.string('PCastorRcd'),       tag = cms.string('CASTORRECO_Geometry2015dev_TagXX')),
@@ -67,4 +71,4 @@
     input = cms.untracked.int32(1)
     )
 
-process.p1 = cms.Path(process.XMLGeometryWriter+process.TrackerGeometryWriter+process.TrackerGeometryExtraWriter+process.CaloGeometryWriter+process.CSCGeometryWriter+process.DTGeometryWriter+process.RPCGeometryWriter)
+process.p1 = cms.Path(process.XMLGeometryWriter+process.TrackerGeometryWriter+process.TrackerGeometryExtraWriter+process.TrackerParametersWriter+process.CaloGeometryWriter+process.HcalParametersWriter+process.CSCGeometryWriter+process.DTGeometryWriter+process.RPCGeometryWriter)
diff --git a/CondTools/Geometry/test/writehelpers/splitRun2devDatabase.sh b/CondTools/Geometry/test/writehelpers/splitRun2devDatabase.sh
@@ -1,16 +1,18 @@
 #!/bin/sh
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:GeometryFileExtended2015dev.db -D CondFormatsGeometryObjects  -t XMLFILE_Geometry_TagXX_Extended2015dev_mc -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:GeometryFileIdeal2015dev.db -D CondFormatsGeometryObjects  -t XMLFILE_Geometry_TagXX_Ideal2015dev_mc -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:TKRECO_Geometry.db -D CondFormatsGeometryObjects  -t TKRECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:TKExtra_Geometry.db -D CondFormatsGeometryObjects  -t TKExtra_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:EBRECO_Geometry.db -D CondFormatsGeometryObjects  -t EBRECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:EERECO_Geometry.db -D CondFormatsGeometryObjects  -t EERECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:EPRECO_Geometry.db -D CondFormatsGeometryObjects  -t EPRECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:HCALRECO_Geometry.db -D CondFormatsGeometryObjects  -t HCALRECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:CTRECO_Geometry.db -D CondFormatsGeometryObjects  -t CTRECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:ZDCRECO_Geometry.db -D CondFormatsGeometryObjects  -t ZDCRECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:CASTORRECO_Geometry.db -D CondFormatsGeometryObjects  -t CASTORRECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:CSCRECO_Geometry.db -D CondFormatsGeometryObjects  -t CSCRECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:CSCRECODIGI_Geometry.db -D CondFormatsGeometryObjects  -t CSCRECODIGI_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:DTRECO_Geometry.db -D CondFormatsGeometryObjects  -t DTRECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
-cmscond_export_iov -s sqlite_file:myfile.db -d sqlite_file:RPCRECO_Geometry.db -D CondFormatsGeometryObjects  -t RPCRECO_Geometry2015dev_TagXX -l sqlite_file:localpopconlog.db
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015dev.db -t XMLFILE_Geometry_TagXX_Extended2015dev_mc -i XMLFILE_Geometry_TagXX_Extended2015dev_mc
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileIdeal2015dev.db -t XMLFILE_Geometry_TagXX_Ideal2015dev_mc -i XMLFILE_Geometry_TagXX_Ideal2015dev_mc
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:TKRECO_Geometry.db -t TKRECO_Geometry2015dev_TagXX -i TKRECO_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:TKExtra_Geometry.db -t TKExtra_Geometry2015dev_TagXX -i TKExtra_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:TKParameters_Geometry.db -t TKParameters_Geometry2015dev_TagXX -i TKParameters_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:EBRECO_Geometry.db -t EBRECO_Geometry2015dev_TagXX -i EBRECO_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:EERECO_Geometry.db -t EERECO_Geometry2015dev_TagXX -i EERECO_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:EPRECO_Geometry.db -t EPRECO_Geometry2015dev_TagXX -i EPRECO_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:HCALRECO_Geometry.db -t HCALRECO_Geometry2015dev_TagXX -i HCALRECO_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:HCALParameters_Geometry.db -t HCALParameters_Geometry2015dev_TagXX -i HCALParameters_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:CTRECO_Geometry.db -t CTRECO_Geometry2015dev_TagXX -i CTRECO_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:ZDCRECO_Geometry.db -t ZDCRECO_Geometry2015dev_TagXX -i ZDCRECO_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:CASTORRECO_Geometry.db -t CASTORRECO_Geometry2015dev_TagXX -i CASTORRECO_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:CSCRECO_Geometry.db -t CSCRECO_Geometry2015dev_TagXX -i CSCRECO_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:CSCRECODIGI_Geometry.db -t CSCRECODIGI_Geometry2015dev_TagXX -i CSCRECODIGI_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:DTRECO_Geometry.db -t DTRECO_Geometry2015dev_TagXX -i DTRECO_Geometry2015dev_TagXX
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:RPCRECO_Geometry.db -t RPCRECO_Geometry2015dev_TagXX -i RPCRECO_Geometry2015dev_TagXX
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py
@@ -218,6 +218,8 @@
         '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', 
         'Geometry/MuonCommonData/data/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/v1/mb1.xml',
         'Geometry/MuonCommonData/data/v1/mb2.xml',