Skip to content
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

Jump to bottom

DD4hep: Merge Development to a Usual Geometry Structure #26231

Merged
merged 9 commits into from Apr 8, 2019
Merged

DD4hep: Merge Development to a Usual Geometry Structure #26231

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
37db9fb
Merge development code to a usual Geometry structure
ianna Mar 21, 2019
1847306
Add DT geometry validation
ianna Mar 22, 2019
94b6c1b
Use emplace_back
ianna Mar 22, 2019
417adf3
Correct include
ianna Mar 22, 2019
ecf0318
Correct includes
ianna Mar 22, 2019
e99fc64
Correct includes
ianna Mar 22, 2019
8a3f6f5
Fix script
ianna Mar 25, 2019
c8f01c3
Move the validation plugin
ianna Mar 29, 2019
265b2c5
Merge branch 'master' into dd4hep-merge-geometry-v0
ianna Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion DetectorDescription/DDCMS/interface/DDDetector.h
View file
Open in desktop
Expand Up @@ -6,13 +6,15 @@

namespace dd4hep {
class Detector;
class Volume;
}

namespace cms {
class DDDetector {
public:
using Detector = dd4hep::Detector;

using Volume = dd4hep::Volume;

explicit DDDetector(const std::string&, const std::string&);
DDDetector() = delete;

Expand All @@ -34,6 +36,8 @@ namespace cms {
DDSpecParRegistry const& specpars() const {
return m_specpars;
}

Volume worldVolume() const;
ianna marked this conversation as resolved.
Show resolved Hide resolved

private:

Expand Down
23 changes: 0 additions & 23 deletions DetectorDescription/DDCMS/interface/MuonNumbering.h
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions DetectorDescription/DDCMS/interface/MuonSubDetector.h
View file
Open in desktop

This file was deleted.

30 changes: 15 additions & 15 deletions DetectorDescription/DDCMS/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -4,28 +4,28 @@
<use name="dd4hep"/>
<use name="DetectorDescription/DDCMS"/>

<library name="DetectorDescriptionTestPlugins" file="DDTestVectors.cc,DDTestSpecPars.cc,DDTestSpecParsFilter.cc,DDTestDumpFile.cc,DDTestDumpGeometry.cc,DDTestNavigateGeometry.cc,DDTestMuonNumbering.cc" >
<library name="DetectorDescriptionTestPlugins" file="DDTestVectors.cc,DDTestSpecPars.cc,DDTestSpecParsFilter.cc,DDTestDumpFile.cc,DDTestDumpGeometry.cc,DDTestNavigateGeometry.cc" >
<use name="Geometry/Records"/>
<lib name="Geom"/>
<flags EDM_PLUGIN="1"/>
</library>
<library name="DetectorDescriptionPlugins" file="DDCMSDetector.cc,DDDetectorESProducer.cc,DDVectorRegistryESProducer.cc,DDSpecParRegistryESProducer.cc,MuonNumberingESProducer.cc" >
<library name="DetectorDescriptionPlugins" file="DDCMSDetector.cc,DDDetectorESProducer.cc,DDVectorRegistryESProducer.cc,DDSpecParRegistryESProducer.cc" >
<use name="Geometry/Records"/>
<lib name="Geom"/>
<flags EDM_PLUGIN="1"/>
</library>
<library name="DetectorDescriptionDD4HepPlugins" file="*.cc" >
<flags SKIP_FILE="DTGeometryESProducer.cc"/>
<flags SKIP_FILE="DDCMSDetector.cc"/>
<flags SKIP_FILE="DDTestVector.cc"/>
<flags SKIP_FILE="DDTestSpecPars.cc"/>
<flags SKIP_FILE="DDTestSpecParsFilter.cc"/>
<flags SKIP_FILE="DDTestDumpFile.cc"/>
<flags SKIP_FILE="DDTestDumpGeometry.cc"/>
<flags SKIP_FILE="DDTestNavigateGeometry.cc"/>
<flags SKIP_FILE="DDTestMuonNumbering.cc"/>
<flags SKIP_FILE="DDDetectorESProducer.cc"/>
<flags SKIP_FILE="DDVectorRegistryESProducer.cc"/>
<flags SKIP_FILE="DDSpecParRegistryESProducer.cc"/>
<flags SKIP_FILE="MuonNumberingESProducer.cc"/>
<flags SKIP_FILES="DTGeometryESProducer.cc"/>
<flags SKIP_FILES="DDCMSDetector.cc"/>
<flags SKIP_FILES="DDTestVectors.cc"/>
<flags SKIP_FILES="DDTestSpecPars.cc"/>
<flags SKIP_FILES="DDTestSpecParsFilter.cc"/>
<flags SKIP_FILES="DDTestDumpFile.cc"/>
<flags SKIP_FILES="DDTestDumpGeometry.cc"/>
<flags SKIP_FILES="DDTestNavigateGeometry.cc"/>
<flags SKIP_FILES="DDDetectorESProducer.cc"/>
<flags SKIP_FILES="DDVectorRegistryESProducer.cc"/>
<flags SKIP_FILES="DDSpecParRegistryESProducer.cc"/>
<use name="rootgeom"/>
<flags DD4HEP_PLUGIN="1"/>
</library>
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDCMSDetector.cc
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "DetectorDescription/DDCMS/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistryRcd.h"
#include "Geometry/Records/interface/DDVectorRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistry.h"
#include "DD4hep/Detector.h"

Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "DetectorDescription/DDCMS/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"

Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc
View file
Open in desktop
Expand Up @@ -24,9 +24,9 @@

#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistryRcd.h"
#include "Geometry/Records/interface/DDSpecParRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"
#include "DetectorDescription/DDCMS/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"

Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/plugins/DDTestDumpFile.cc
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "DetectorDescription/DDCMS/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"
#include "DD4hep/DD4hepRootPersistency.h"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/plugins/DDTestDumpGeometry.cc
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "DetectorDescription/DDCMS/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"
#include "DD4hep/DD4hepRootPersistency.h"
Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDTestNavigateGeometry.cc
View file
Open in desktop
Expand Up @@ -3,9 +3,9 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "DetectorDescription/DDCMS/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistryRcd.h"
#include "Geometry/Records/interface/DDVectorRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistry.h"
#include "DetectorDescription/DDCMS/interface/DDVolumeProcessor.h"
#include "DD4hep/Detector.h"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/plugins/DDTestSpecPars.cc
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistryRcd.h"
#include "Geometry/Records/interface/DDSpecParRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"

#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/plugins/DDTestSpecParsFilter.cc
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistryRcd.h"
#include "Geometry/Records/interface/DDSpecParRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"

#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/plugins/DDTestVectors.cc
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistryRcd.h"
#include "Geometry/Records/interface/DDVectorRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistry.h"

#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc
View file
Open in desktop
Expand Up @@ -25,9 +25,9 @@

#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistryRcd.h"
#include "Geometry/Records/interface/DDVectorRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistry.h"
#include "DetectorDescription/DDCMS/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"

Expand Down
9 changes: 8 additions & 1 deletion DetectorDescription/DDCMS/src/DDDetector.cc
View file
Open in desktop
@@ -1,5 +1,6 @@
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"
#include <DD4hep/Detector.h>
#include <DD4hep/Volumes.h>

#include <iostream>

Expand Down Expand Up @@ -28,3 +29,9 @@ DDDetector::process(const string& fileName)
const char* files[] = { fileName.c_str(), nullptr };
m_description->apply( name.c_str(), 2, (char**)files );
}

dd4hep::Volume
DDDetector::worldVolume() const {
assert(m_description);
return m_description->worldVolume();
}
12 changes: 1 addition & 11 deletions DetectorDescription/DDCMS/src/ES_DDDetector.cc
View file
Open in desktop
@@ -1,24 +1,14 @@
#include "FWCore/Utilities/interface/typelookup.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistry.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/MuonNumbering.h"
#include "DetectorDescription/DDCMS/interface/MuonNumberingRcd.h"
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "FWCore/Framework/interface/data_default_record_trait.h"

using namespace cms;

TYPELOOKUP_DATA_REG(DDDetector);
TYPELOOKUP_DATA_REG(DDSpecParRegistry);
TYPELOOKUP_DATA_REG(DDVectorRegistry);
TYPELOOKUP_DATA_REG(MuonNumbering);

EVENTSETUP_RECORD_REG(DetectorDescriptionRcd);
EVENTSETUP_DATA_DEFAULT_RECORD(DDDetector, DetectorDescriptionRcd);
EVENTSETUP_RECORD_REG(DDSpecParRegistryRcd);
EVENTSETUP_RECORD_REG(DDVectorRegistryRcd);
EVENTSETUP_RECORD_REG(MuonNumberingRcd);
2 changes: 1 addition & 1 deletion DetectorDescription/DDCMS/test/DDFilteredView.cppunit.cc
View file
Open in desktop
Expand Up @@ -39,6 +39,6 @@ void testDDFilteredView::setUp() {

void testDDFilteredView::checkFilteredView()
{
unique_ptr<DDDetector> det = make_unique<DDDetector>("DUMMY", fileName_);
unique_ptr<DDDetector> det = make_unique<DDDetector>("DUMMY", fileName_);
DDFilteredView fview(det.get(), det->description()->worldVolume());
}
13 changes: 0 additions & 13 deletions DetectorDescription/RecoGeometry/BuildFile.xml
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions DetectorDescription/RecoGeometry/interface/DTNumberingScheme.h
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions DetectorDescription/RecoGeometry/plugins/BuildFile.xml
View file
Open in desktop

This file was deleted.