Skip to content

GeometricDetExtra, PGeometricDetExtra schema removal #31729

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.

Sign up for GitHub

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

Merged
cmsbuild merged 4 commits into from
Oct 19, 2020
Merged

GeometricDetExtra, PGeometricDetExtra schema removal #31729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fc263c
GeometricDetExtra Removal
vargasa Oct 9, 2020
f6188ba
Fix merging conflicts
vargasa Oct 14, 2020
34ffcf9
code format
vargasa Oct 14, 2020
8f6e93a
autoCond key, ESPrefer. Patches from @mmusich:
vargasa Oct 15, 2020
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
2 changes: 1 addition & 1 deletion CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ function die { echo $1: status $2 ; exit $2; }
(cmsRun ${LOCAL_TEST_DIR}/testSSTGain_PCL_FromRECO_cfg.py era=A) || die 'Failure running cmsRun testSSTGain_PCL_FromRECO_cfg.py era=A' $?
(cmsRun ${LOCAL_TEST_DIR}/testSSTGain_PCL_FromRECO_cfg.py era=B) || die 'Failure running cmsRun testSSTGain_PCL_FromRECO_cfg.py era=B' $?
(cmsRun ${LOCAL_TEST_DIR}/testSSTGain_HARVEST_FromRECO.py 0) || die 'Failure running cmsRun testSSTGain_HARVEST_FromRECO.py 0' $?
(cmsRun ${LOCAL_TEST_DIR}/testSSTGain_MultiRun_ALCAHARVEST.py globalTag=102X_dataRun2_Express_v3) || die 'Failure running cmsRun testSSTGain_MultiRun_ALCAHARVEST.py 0' $?
(cmsRun ${LOCAL_TEST_DIR}/testSSTGain_MultiRun_ALCAHARVEST.py globalTag=auto:run3_data_express) || die 'Failure running cmsRun testSSTGain_MultiRun_ALCAHARVEST.py 0' $?
4 changes: 0 additions & 4 deletions CondCore/GeometryPlugins/plugins/plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
#include "Geometry/Records/interface/GEMRecoGeometryRcd.h"
#include "Geometry/Records/interface/ME0RecoGeometryRcd.h"

#include "CondFormats/GeometryObjects/interface/PGeometricDetExtra.h"
#include "Geometry/Records/interface/PGeometricDetExtraRcd.h"

#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
#include "Geometry/Records/interface/PTrackerParametersRcd.h"

Expand All @@ -43,7 +40,6 @@

REGISTER_PLUGIN(GeometryFileRcd, FileBlob);
REGISTER_PLUGIN(IdealGeometryRecord, PGeometricDet);
REGISTER_PLUGIN(PGeometricDetExtraRcd, PGeometricDetExtra);
REGISTER_PLUGIN(PTrackerParametersRcd, PTrackerParameters);
REGISTER_PLUGIN(PEcalBarrelRcd, PCaloGeometry);
REGISTER_PLUGIN(PEcalEndcapRcd, PCaloGeometry);
Expand Down
1 change: 0 additions & 1 deletion CondCore/Utilities/plugins/Module_2XML.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ PAYLOAD_2XML_MODULE(pluginUtilities_payload2xml) {
PAYLOAD_2XML_CLASS(OOTPileupCorrectionBuffer);
PAYLOAD_2XML_CLASS(PCaloGeometry);
PAYLOAD_2XML_CLASS(PGeometricDet);
PAYLOAD_2XML_CLASS(PGeometricDetExtra);
PAYLOAD_2XML_CLASS(PHGCalParameters);
PAYLOAD_2XML_CLASS(PTrackerParameters);
PAYLOAD_2XML_CLASS(PerformancePayloadFromBinnedTFormula);
Expand Down
1 change: 0 additions & 1 deletion CondCore/Utilities/src/CondDBFetch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ namespace cond {
FETCH_PAYLOAD_CASE(PCaloGeometry)
FETCH_PAYLOAD_CASE(HcalParameters)
FETCH_PAYLOAD_CASE(PGeometricDet)
FETCH_PAYLOAD_CASE(PGeometricDetExtra)
FETCH_PAYLOAD_CASE(PTrackerParameters)
FETCH_PAYLOAD_CASE(PHGCalParameters)
//FETCH_PAYLOAD_CASE( PerformancePayload )
Expand Down
1 change: 0 additions & 1 deletion CondCore/Utilities/src/CondDBImport.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,6 @@ namespace cond {
IMPORT_PAYLOAD_CASE(PCaloGeometry)
IMPORT_PAYLOAD_CASE(HcalParameters)
IMPORT_PAYLOAD_CASE(PGeometricDet)
IMPORT_PAYLOAD_CASE(PGeometricDetExtra)
IMPORT_PAYLOAD_CASE(PTrackerParameters)
IMPORT_PAYLOAD_CASE(PHGCalParameters)
//IMPORT_PAYLOAD_CASE( PerformancePayload )
Expand Down
1 change: 0 additions & 1 deletion CondCore/Utilities/src/CondFormats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
#include "CondFormats/PhysicsToolsObjects/interface/PhysicsTGraphPayload.h"
#include "CondFormats/PhysicsToolsObjects/interface/PhysicsTFormulaPayload.h"
#include "CondFormats/GeometryObjects/interface/PGeometricDet.h"
#include "CondFormats/GeometryObjects/interface/PGeometricDetExtra.h"
#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
#include "CondFormats/GeometryObjects/interface/PHGCalParameters.h"
#include "CondFormats/RPCObjects/interface/RPCEMap.h"
Expand Down
53 changes: 0 additions & 53 deletions CondFormats/GeometryObjects/doc/GeometryObjects.doc
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions CondFormats/GeometryObjects/interface/PGeometricDetExtra.h
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CondFormats/GeometryObjects/src/T_EventSetup_PGeometricDetExtra.cc
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion CondFormats/GeometryObjects/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "CondFormats/GeometryObjects/interface/PGeometricDet.h"
#include "CondFormats/GeometryObjects/interface/PGeometricDetExtra.h"
#include "CondFormats/GeometryObjects/interface/PGeometricTimingDet.h"
#include "CondFormats/GeometryObjects/interface/PGeometricTimingDetExtra.h"
#include "CondFormats/GeometryObjects/interface/PCaloGeometry.h"
Expand Down
6 changes: 0 additions & 6 deletions CondFormats/GeometryObjects/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
<class name="PGeometricDet::Item"/>
<class name="std::vector<PGeometricDet::Item>"/>

<class name="PGeometricDetExtra" class_version="0">
<field name="pgdes_" mapping="blob"/>
</class>
<class name="PGeometricDetExtra::Item"/>
<class name="std::vector<PGeometricDetExtra::Item>"/>

<class name="PGeometricTimingDet" class_version="0">
<field name="pgeomdets_" mapping="blob"/>
</class>
Expand Down
3 changes: 0 additions & 3 deletions CondFormats/GeometryObjects/test/testSerializationGeometryObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ int main() {
testSerialization<PCaloGeometry>();
testSerialization<PGeometricDet>();
//testSerialization<PGeometricDet::Item>(); has uninitialized booleans
testSerialization<PGeometricDetExtra>();
testSerialization<PGeometricDetExtra::Item>();
testSerialization<RecoIdealGeometry>();
testSerialization<std::vector<PGeometricDet::Item>>();
testSerialization<std::vector<PGeometricDetExtra::Item>>();
testSerialization<PTrackerParameters>();
testSerialization<PTrackerParameters::Item>();
testSerialization<HcalParameters>();
Expand Down
9 changes: 0 additions & 9 deletions CondFormats/GeometryObjects/xml/PGeometricDetExtra_automatic_default_0.xml
View file
Open in desktop

This file was deleted.

80 changes: 0 additions & 80 deletions CondTools/Geometry/plugins/PGeometricDetExtraBuilder.cc
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions CondTools/Geometry/test/GeometryTester.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@

#include "CondFormats/Common/interface/FileBlob.h"
#include "CondFormats/GeometryObjects/interface/PGeometricDet.h"
#include "CondFormats/GeometryObjects/interface/PGeometricDetExtra.h"
#include "CondFormats/GeometryObjects/interface/PCaloGeometry.h"
#include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
#include "CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h"
#include "DataFormats/Math/interface/Rounding.h"

#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "Geometry/Records/interface/PGeometricDetExtraRcd.h"
#include "Geometry/Records/interface/DTRecoGeometryRcd.h"
#include "Geometry/Records/interface/RPCRecoGeometryRcd.h"
#include "Geometry/Records/interface/CSCRecoGeometryRcd.h"
Expand Down Expand Up @@ -123,27 +121,15 @@ void GeometryTester::analyze(const edm::Event &, const edm::EventSetup &iSetup)
FmtOstream outStream;
if (m_tktest) {
edm::ESHandle<PGeometricDet> tkGeo;
edm::ESHandle<PGeometricDetExtra> tkExtra;
iSetup.get<IdealGeometryRecord>().get(tkGeo);
iSetup.get<PGeometricDetExtraRcd>().get(tkExtra);
std::cout << "TRACKER\n";

//helper map
std::map<uint32_t, uint32_t> diTogde;
for (uint32_t g = 0; g < tkExtra->pgdes_.size(); ++g) {
diTogde[tkExtra->pgdes_[g]._geographicalId] = g;
}
uint32_t tkeInd;
for (auto it : tkGeo->pgeomdets_) {
std::cout << "trk ";
outStream << it._params0 << it._params1 << it._params2 << it._params3 << it._params4 << it._params5 << it._params6
<< it._params7 << it._params8 << it._params9 << it._params10 << it._x << it._y << it._z << it._phi
<< it._rho << it._a11 << it._a12 << it._a13 << it._a21 << it._a22 << it._a23 << it._a31 << it._a32
<< it._a33 << it._shape << it._name << it._ns;
tkeInd = diTogde[it._geographicalID];
outStream << tkExtra->pgdes_[tkeInd]._volume << tkExtra->pgdes_[tkeInd]._density
<< tkExtra->pgdes_[tkeInd]._weight << tkExtra->pgdes_[tkeInd]._copy
<< tkExtra->pgdes_[tkeInd]._material;
outStream << it._radLength << it._xi << it._pixROCRows << it._pixROCCols << it._pixROCx << it._pixROCy
<< it._stereo << it._siliconAPVNum << it._geographicalID << it._nt0 << it._nt1 << it._nt2 << it._nt3
<< it._nt4 << it._nt5 << it._nt6 << it._nt7 << it._nt8 << it._nt9 << it._nt10 << "\n";
Expand Down
5 changes: 0 additions & 5 deletions CondTools/Geometry/test/geometrytest_local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@
connect = cms.string("sqlite_file:myfile.db"),
# label = cms.string("Extended")
),
cms.PSet(record = cms.string("PGeometricDetExtraRcd"),
tag = cms.string("TKExtra_Geometry_TagXX"),
connect = cms.string("sqlite_file:myfile.db"),
# label = cms.string("Extra")
),
cms.PSet(record = cms.string("IdealGeometryRecord"),
tag = cms.string("TKRECO_Geometry_TagXX"),
connect = cms.string("sqlite_file:myfile.db")
Expand Down
12 changes: 6 additions & 6 deletions CondTools/Geometry/test/geometrywriter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
XMLFileName = cms.untracked.string("./geTagXX.xml"),
ZIP = cms.untracked.bool(True)
)
process.TrackerGeometricDetExtraESModule = cms.ESProducer( "TrackerGeometricDetExtraESModule",
fromDDD = cms.bool( True )
)

process.TrackerGeometricDetESModule = cms.ESProducer( "TrackerGeometricDetESModule",
fromDDD = cms.bool( True )
)


process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder",fromDD4hep=cms.bool( False ))
process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder", fromDD4hep=cms.bool( False ))
process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder", fromDD4hep=cms.bool( False ))

process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder")
Expand All @@ -39,7 +40,6 @@
process.CondDB,
toPut = cms.VPSet(cms.PSet(record = cms.string('GeometryFileRcd'),tag = cms.string('XMLFILE_Geometry_Extended_TagXX')),
cms.PSet(record = cms.string('IdealGeometryRecord'),tag = cms.string('TKRECO_Geometry_TagXX')),
cms.PSet(record = cms.string('PGeometricDetExtraRcd'),tag = cms.string('TKExtra_Geometry_TagXX')),
cms.PSet(record = cms.string('PTrackerParametersRcd'),tag = cms.string('TKParameters_Geometry_TagXX')),
cms.PSet(record = cms.string('PEcalBarrelRcd'), tag = cms.string('EBRECO_Geometry_TagXX')),
cms.PSet(record = cms.string('PEcalEndcapRcd'), tag = cms.string('EERECO_Geometry_TagXX')),
Expand All @@ -59,5 +59,5 @@
input = cms.untracked.int32(1)
)

process.p1 = cms.Path(process.XMLGeometryWriter+process.TrackerGeometryWriter+process.TrackerGeometryExtraWriter+process.TrackerParametersWriter+process.CaloGeometryWriter+process.CSCGeometryWriter+process.DTGeometryWriter+process.RPCGeometryWriter)
process.p1 = cms.Path(process.XMLGeometryWriter+process.TrackerGeometryWriter+process.TrackerParametersWriter+process.CaloGeometryWriter+process.CSCGeometryWriter+process.DTGeometryWriter+process.RPCGeometryWriter)

10 changes: 4 additions & 6 deletions CondTools/Geometry/test/trackergeometrywriter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,18 @@
interval = cms.uint64(1)
)

process.TrackerGeometricDetExtraESModule = cms.ESProducer( "TrackerGeometricDetExtraESModule",
fromDDD = cms.bool( True )
)
process.TrackerGeometricDetESModule = cms.ESProducer( "TrackerGeometricDetESModule",
fromDDD = cms.bool( True )
)

process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder", fromDD4hep=cms.bool(False))
process.TrackerGeometryExtraWriter = cms.EDAnalyzer("PGeometricDetExtraBuilder", fromDD4hep=cms.bool(False))
process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder", fromDD4hep=cms.bool(False))

process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:myfile.db')
process.PoolDBOutputService = cms.Service("PoolDBOutputService",
process.CondDB,
toPut = cms.VPSet(cms.PSet(record = cms.string('IdealGeometryRecord'),tag = cms.string('TKRECO_Geometry_Test01')),
cms.PSet(record = cms.string('PGeometricDetExtraRcd'),tag = cms.string('TKExtra_Geometry_Test01')),
cms.PSet(record = cms.string('PTrackerParametersRcd'),tag = cms.string('TKParameters_Geometry_Test01'))
)
)
Expand All @@ -33,4 +31,4 @@
input = cms.untracked.int32(1)
)

process.p1 = cms.Path(process.TrackerGeometryWriter*process.TrackerGeometryExtraWriter*process.TrackerParametersWriter)
process.p1 = cms.Path(process.TrackerGeometryWriter*process.TrackerParametersWriter)
Loading