Skip to content

Commit

Permalink
Merge development code to a usual Geometry structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@ianna
ianna committed Mar 21, 2019
1 parent 642e621 commit 37db9fb
Show file tree
Hide file tree
Showing 28 changed files with 284 additions and 245 deletions.
23 changes: 0 additions & 23 deletions DetectorDescription/DDCMS/interface/MuonNumbering.h
View file

This file was deleted.

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

This file was deleted.

30 changes: 15 additions & 15 deletions DetectorDescription/DDCMS/plugins/BuildFile.xml
View file
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>
9 changes: 0 additions & 9 deletions DetectorDescription/DDCMS/src/ES_DDDetector.cc
View file
Expand Up @@ -3,10 +3,6 @@
#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 "FWCore/Framework/interface/data_default_record_trait.h"

Expand All @@ -15,10 +11,5 @@ 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
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());
}
3 changes: 3 additions & 0 deletions DetectorDescription/RecoGeometry/interface/DTGeometryBuilder.h
View file
Expand Up @@ -4,6 +4,7 @@
#include "DataFormats/GeometrySurface/interface/ReferenceCounted.h"
#include "DataFormats/GeometrySurface/interface/Plane.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"
#include "Geometry/MuonNumbering/interface/DD4hep_DTNumberingScheme.h"

namespace dd4hep {
class Detector;
Expand Down Expand Up @@ -55,6 +56,8 @@ namespace cms {

RCPPlane plane(const DDFilteredView&,
Bounds* bounds) const;

std::unique_ptr<cms::DTNumberingScheme> dtnum_ = nullptr;
};
}

Expand Down
32 changes: 0 additions & 32 deletions DetectorDescription/RecoGeometry/interface/DTNumberingScheme.h
View file

This file was deleted.

14 changes: 5 additions & 9 deletions DetectorDescription/RecoGeometry/plugins/DTGeometryESProducer.cc
View file
Expand Up @@ -36,12 +36,12 @@
#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/ReusableObjectHolder.h"
#include "DetectorDescription/DDCMS/interface/MuonNumbering.h"
#include "DetectorDescription/DDCMS/interface/MuonNumberingRcd.h"
#include "DetectorDescription/DDCMS/interface/MuonGeometryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistryRcd.h"
#include "Geometry/MuonNumbering/interface/DD4hep_MuonNumbering.h"
#include "Geometry/Records/interface/MuonNumberingRcd.h"
#include "Geometry/Records/interface/MuonGeometryRcd.h"
#include "Geometry/Records/interface/DDSpecParRegistryRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"
#include "DetectorDescription/DDCMS/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DetectorDescription/DDCMS/interface/DDFilteredView.h"
#include "DetectorDescription/DDCMS/interface/BenchmarkGrd.h"
Expand Down Expand Up @@ -195,7 +195,3 @@ DTGeometryESProducer::setupDBGeometry( const DTRecoGeometryRcd& record,
}

DEFINE_FWK_EVENTSETUP_MODULE(DTGeometryESProducer);

#include "DetectorDescription/DDCMS/interface/MuonGeometryRcd.h"
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
EVENTSETUP_RECORD_REG(MuonGeometryRcd);
39 changes: 11 additions & 28 deletions DetectorDescription/RecoGeometry/src/DTGeometryBuilder.cc
View file
Expand Up @@ -29,27 +29,20 @@
#include "DataFormats/GeometrySurface/interface/Bounds.h"
#include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h"

#include "DetectorDescription/DDCMS/interface/MuonNumbering.h"
#include "DetectorDescription/DDCMS/interface/MuonNumberingRcd.h"
#include "DetectorDescription/DDCMS/interface/MuonGeometryRcd.h"
#include "DetectorDescription/DDCMS/interface/DetectorDescriptionRcd.h"
#include "Geometry/MuonNumbering/interface/DD4hep_MuonNumbering.h"
#include "Geometry/Records/interface/MuonNumberingRcd.h"
#include "Geometry/Records/interface/MuonGeometryRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DetectorDescription/DDCMS/interface/DDFilteredView.h"
#include "Geometry/DTGeometry/interface/DTGeometry.h"
#include "DetectorDescription/RecoGeometry/interface/DTNumberingScheme.h"
#include "Geometry/MuonNumbering/interface/DD4hep_DTNumberingScheme.h"
#include "DetectorDescription/RecoGeometry/interface/DTGeometryBuilder.h"
#include "DD4hep/Detector.h"
#include "DD4hep/DetectorTools.h"
#include "DD4hep/VolumeProcessor.h"
#include "TGeoManager.h"
#include "TClass.h"

#include <memory>
#include <iostream>
#include <iterator>
#include <string>
#include <string_view>
#include <regex>

using namespace edm;
using namespace std;
Expand Down Expand Up @@ -109,10 +102,7 @@ DTGeometryBuilder::plane(const DDFilteredView& fview,
DTChamber*
DTGeometryBuilder::buildChamber(const DDFilteredView& fview,
const MuonNumbering& muonConstants) const {
MuonConstants cons = muonConstants.values;
DTNumberingScheme dtnum(cons);

int rawid = dtnum.getDetId(muonConstants.geoHistoryToBaseNumber(fview.history()));
int rawid = dtnum_->getDetId(muonConstants.geoHistoryToBaseNumber(fview.history()));
DTChamberId detId(rawid);
auto const& par = fview.extractParameters();
// par[0] r-phi dimension - different in different chambers
Expand All @@ -130,10 +120,7 @@ DTSuperLayer*
DTGeometryBuilder::buildSuperLayer(const DDFilteredView& fview,
DTChamber* chamber,
const MuonNumbering& muonConstants) const {
MuonConstants cons = muonConstants.values;
DTNumberingScheme dtnum(cons);

int rawid = dtnum.getDetId(muonConstants.geoHistoryToBaseNumber(fview.history()));
int rawid = dtnum_->getDetId(muonConstants.geoHistoryToBaseNumber(fview.history()));
DTSuperLayerId slId(rawid);

auto const& par = fview.extractParameters();
Expand All @@ -156,10 +143,7 @@ DTLayer*
DTGeometryBuilder::buildLayer(DDFilteredView& fview,
DTSuperLayer* sl,
const MuonNumbering& muonConstants) const {
MuonConstants cons = muonConstants.values;
DTNumberingScheme dtnum(cons);

int rawid = dtnum.getDetId(muonConstants.geoHistoryToBaseNumber(fview.history()));
int rawid = dtnum_->getDetId(muonConstants.geoHistoryToBaseNumber(fview.history()));
DTLayerId layId(rawid);

auto const& par = fview.extractParameters();
Expand Down Expand Up @@ -195,12 +179,11 @@ DTGeometryBuilder::buildLayer(DDFilteredView& fview,

void
DTGeometryBuilder::build(DTGeometry& geom,
const cms::DDDetector* det,
const DDDetector* det,
const MuonNumbering& num,
const DDSpecParRefs& refs) {

dd4hep::DetElement world = det->description()->world();
DDFilteredView fview(det, world.volume());
DDFilteredView fview(det, det->description()->worldVolume());
fview.mergedSpecifics(refs);
dtnum_ = make_unique<DTNumberingScheme>(num.values());
buildGeometry(fview, geom, num);
}
81 changes: 0 additions & 81 deletions DetectorDescription/RecoGeometry/src/DTNumberingScheme.cc
View file

This file was deleted.

0 comments on commit 37db9fb

Please sign in to comment.