Skip to content

Commit c93034d

Browse files
fabiocosfabiocos
committed
Move MTDTopology to MTDGeometryBuilder, add methods for BTL topology
1 parent 93af1c7 commit c93034d

File tree

30 files changed

+72
-29
lines changed

30 files changed

+72
-29
lines changed

‎Geometry/MTDGeometryBuilder/interface/MTDGeomUtil.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "Geometry/MTDGeometryBuilder/interface/MTDGeometry.h"
1313
#include "Geometry/MTDGeometryBuilder/interface/ProxyMTDTopology.h"
1414
#include "Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h"
15-
#include "Geometry/MTDNumberingBuilder/interface/MTDTopology.h"
15+
#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
1616

1717
namespace edm {
1818
class Event;

Geometry/MTDNumberingBuilder/interface/MTDTopology.h renamed to Geometry/MTDGeometryBuilder/interface/MTDTopology.h

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "DataFormats/DetId/interface/DetId.h"
55
#include "DataFormats/ForwardDetId/interface/ForwardSubdetector.h"
6-
#include "DataFormats/ForwardDetId/interface/MTDDetId.h"
6+
#include "DataFormats/ForwardDetId/interface/BTLDetId.h"
77
#include "DataFormats/ForwardDetId/interface/ETLDetId.h"
88
#include <Geometry/CommonDetUnit/interface/GeomDet.h>
99

@@ -12,6 +12,11 @@
1212

1313
class MTDTopology {
1414
public:
15+
// number of logical rods, i.e. rows of sensor modules along eta/z in phi, and of modules per rod
16+
static constexpr size_t nBTLphi = BTLDetId::HALF_ROD * BTLDetId::kModulesPerTrkV2;
17+
static constexpr size_t nBTLeta =
18+
2 * BTLDetId::kRUPerTypeV2 * BTLDetId::kCrystalTypes * BTLDetId::kModulesPerRUV2 / BTLDetId::kModulesPerTrkV2;
19+
1520
struct ETLfaceLayout {
1621
uint32_t idDiscSide_; // disc face identifier
1722
uint32_t idDetType1_; // module type id identifier for first row
@@ -26,6 +31,16 @@ class MTDTopology {
2631

2732
int getMTDTopologyMode() const { return mtdTopologyMode_; }
2833

34+
// BTL topology navigation is based on a predefined order of dets in MTDGeometry, mapped onto phi/eta grid
35+
36+
std::pair<uint32_t, uint32_t> btlIndex(const uint32_t detId);
37+
uint32_t btlidFromIndex(const uint32_t iphi, const uint32_t ieta);
38+
39+
// BTL topology navigation methods, find index of closest module along eta or phi
40+
41+
size_t phishiftBTL(const uint32_t detid, const int phiShift);
42+
size_t etashiftBTL(const uint32_t detid, const int etaShift);
43+
2944
// ETL topology navigation is based on a predefined order of dets in sector
3045

3146
static bool orderETLSector(const GeomDet*& gd1, const GeomDet*& gd2);

‎Geometry/MTDGeometryBuilder/plugins/MTDDigiGeometryESModule.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "Geometry/Records/interface/IdealGeometryRecord.h"
99
#include "Geometry/Records/interface/PMTDParametersRcd.h"
1010
#include "CondFormats/GeometryObjects/interface/PMTDParameters.h"
11-
#include "Geometry/MTDNumberingBuilder/interface/MTDTopology.h"
11+
#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
1212
#include "Geometry/Records/interface/MTDTopologyRcd.h"
1313

1414
// Alignments

Geometry/MTDNumberingBuilder/plugins/MTDTopologyEP.cc renamed to Geometry/MTDGeometryBuilder/plugins/MTDTopologyEP.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "FWCore/Framework/interface/ModuleFactory.h"
77
#include "FWCore/Framework/interface/ESHandle.h"
88
#include "FWCore/Framework/interface/ESProducer.h"
9-
#include "Geometry/MTDNumberingBuilder/interface/MTDTopology.h"
9+
#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
1010
#include "Geometry/MTDCommonData/interface/MTDTopologyMode.h"
1111
#include "Geometry/Records/interface/MTDTopologyRcd.h"
1212
#include "CondFormats/GeometryObjects/interface/PMTDParameters.h"

Geometry/MTDNumberingBuilder/src/ES_MTDTopology.cc renamed to Geometry/MTDGeometryBuilder/src/ES_MTDTopology.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "Geometry/MTDNumberingBuilder/interface/MTDTopology.h"
1+
#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
22

33
#include "FWCore/Utilities/interface/typelookup.h"
44

‎Geometry/MTDGeometryBuilder/src/MTDGeomBuilderFromGeometricTimingDet.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "Geometry/MTDGeometryBuilder/interface/MTDPixelTopologyBuilder.h"
77
#include "DataFormats/DetId/interface/DetId.h"
88
#include "CondFormats/GeometryObjects/interface/PMTDParameters.h"
9-
#include "Geometry/MTDNumberingBuilder/interface/MTDTopology.h"
9+
#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
1010
#include "DataFormats/GeometrySurface/interface/MediumProperties.h"
1111
#include "FWCore/MessageLogger/interface/MessageLogger.h"
1212
#include "FWCore/Utilities/interface/Exception.h"

Geometry/MTDNumberingBuilder/src/MTDTopology.cc renamed to Geometry/MTDGeometryBuilder/src/MTDTopology.cc

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,37 @@
1-
#include "Geometry/MTDNumberingBuilder/interface/MTDTopology.h"
1+
#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
22
#include "FWCore/MessageLogger/interface/MessageLogger.h"
33
#include "Geometry/MTDCommonData/interface/MTDTopologyMode.h"
44

5+
#include <utility>
6+
57
MTDTopology::MTDTopology(const int& topologyMode, const ETLValues& etl)
68
: mtdTopologyMode_(topologyMode), etlVals_(etl) {}
79

10+
std::pair<uint32_t, uint32_t> MTDTopology::btlIndex(const uint32_t detId) {
11+
uint32_t iphi(0), ieta(0);
12+
return std::make_pair(iphi, ieta);
13+
}
14+
15+
uint32_t MTDTopology::btlidFromIndex(const uint32_t iphi, const uint32_t ieta) { return 0; }
16+
17+
size_t MTDTopology::phishiftBTL(const uint32_t detid, const int phiShift) {
18+
if (phiShift == 0) {
19+
edm::LogWarning("MTDTopology") << "asking of a null phiShift in BTL";
20+
return failIndex_;
21+
}
22+
23+
return failIndex_;
24+
}
25+
26+
size_t MTDTopology::etashiftBTL(const uint32_t detid, const int etaShift) {
27+
if (etaShift == 0) {
28+
edm::LogWarning("MTDTopology") << "asking of a null etaShift in BTL";
29+
return failIndex_;
30+
}
31+
32+
return failIndex_;
33+
}
34+
835
bool MTDTopology::orderETLSector(const GeomDet*& gd1, const GeomDet*& gd2) {
936
ETLDetId det1(gd1->geographicalId().rawId());
1037
ETLDetId det2(gd2->geographicalId().rawId());

‎Geometry/MTDGeometryBuilder/test/DD4hep_TestPixelTopology.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h"
3434

3535
#include "Geometry/Records/interface/MTDTopologyRcd.h"
36-
#include "Geometry/MTDNumberingBuilder/interface/MTDTopology.h"
36+
#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
3737
#include "Geometry/MTDGeometryBuilder/interface/MTDGeometry.h"
3838
#include "Geometry/MTDGeometryBuilder/interface/MTDGeomDetUnit.h"
3939
#include "Geometry/Records/interface/MTDDigiGeometryRecord.h"

‎Geometry/MTDNumberingBuilder/python/mtdTopology_cfi.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from Geometry.MTDGeometryBuilder.mtdTopology_cfi import *

‎RecoLocalFastTime/FTLClusterizer/interface/MTDClusterizerBase.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "DataFormats/FTLRecHit/interface/FTLClusterCollections.h"
99

1010
#include "Geometry/MTDGeometryBuilder/interface/MTDGeometry.h"
11-
#include "Geometry/MTDNumberingBuilder/interface/MTDTopology.h"
11+
#include "Geometry/MTDGeometryBuilder/interface/MTDTopology.h"
1212

1313
#include <vector>
1414
#include <array>

0 commit comments

Comments
 (0)