Skip to content

Commit

Permalink
Adapt PixelCPE to use phase2 pixel topology
Browse files Browse the repository at this point in the history
  • Loading branch information
@emiglior
emiglior committed Apr 24, 2024
1 parent f00a907 commit 4abd587
Show file tree
Hide file tree
Showing 22 changed files with 39 additions and 66 deletions.
1 change: 0 additions & 1 deletion Alignment/OfflineValidation/plugins/OverlapValidation.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
Expand Down
1 change: 0 additions & 1 deletion L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"

Expand Down
1 change: 0 additions & 1 deletion L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
//
Expand Down
1 change: 0 additions & 1 deletion L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"

Expand Down
1 change: 0 additions & 1 deletion L1Trigger/TrackTrigger/interface/StubPtConsistency.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"

Expand Down
1 change: 0 additions & 1 deletion L1Trigger/TrackTrigger/test/AnalyzerPrintGeomInfo.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "DataFormats/SiPixelDetId/interface/PXBDetId.h"
#include "DataFormats/SiPixelDetId/interface/PXFDetId.h"
#include "CommonTools/UtilAlgos/interface/TFileService.h"
Expand Down
6 changes: 3 additions & 3 deletions RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "CommonTools/UtilAlgos/interface/TFileService.h"
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"

Expand Down Expand Up @@ -105,8 +105,8 @@ void HIPixelClusterVtxAnalyzer::analyze(const edm::Event &ev, const edm::EventSe
continue;
const PixelGeomDetUnit *pgdu = static_cast<const PixelGeomDetUnit *>(tgeo->idToDet(id));
if (1) {
const RectangularPixelTopology *pixTopo =
static_cast<const RectangularPixelTopology *>(&(pgdu->specificTopology()));
const PixelTopology *pixTopo =
static_cast<const PixelTopology *>(&(pgdu->specificTopology()));
std::vector<SiPixelCluster::Pixel> pixels(hit.cluster()->pixels());
bool pixelOnEdge = false;
for (std::vector<SiPixelCluster::Pixel>::const_iterator pixel = pixels.begin(); pixel != pixels.end();
Expand Down
2 changes: 0 additions & 2 deletions RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h"

class RectangularPixelTopology;
class MagneticField;
class PixelCPEBase : public PixelClusterParameterEstimator {
public:
Expand All @@ -47,7 +46,6 @@ class PixelCPEBase : public PixelClusterParameterEstimator {
const PixelGeomDetUnit* theDet;
// gavril : replace RectangularPixelTopology with PixelTopology
const PixelTopology* theTopol;
const RectangularPixelTopology* theRecTopol;

//set default value of enum to avoid USBAN errors
GeomDetType::SubDetector thePart = GeomDetEnumerators::invalidDet;
Expand Down
1 change: 0 additions & 1 deletion RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// Already in the base class
//#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
//#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
//#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
//#include "Geometry/CommonDetAlgo/interface/MeasurementPoint.h"
//#include "Geometry/CommonDetAlgo/interface/MeasurementError.h"
//#include "Geometry/Surface/interface/GloballyPositioned.h"
Expand Down
27 changes: 11 additions & 16 deletions RecoLocalTracker/SiPixelRecHits/src/PixelCPEBase.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// Change to use Generic error & Template calibration from DB - D.Fehling 11/08

#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/CommonTopologies/interface/ProxyPixelTopology.h"

#include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h"

#define CORRECT_FOR_BIG_PIXELS
Expand Down Expand Up @@ -176,17 +173,15 @@ void PixelCPEBase::fillDetParams() {

auto topol = &(p.theDet->specificTopology());
p.theTopol = topol;
auto const proxyT = dynamic_cast<const ProxyPixelTopology*>(p.theTopol);
if (proxyT)
p.theRecTopol = dynamic_cast<const RectangularPixelTopology*>(&(proxyT->specificTopology()));
else
p.theRecTopol = dynamic_cast<const RectangularPixelTopology*>(p.theTopol);
assert(p.theRecTopol);
// auto const proxyT = dynamic_cast<const ProxyPixelTopology*>(p.theTopol);
// if (proxyT)
// p.theRecTopol = dynamic_cast<const RectangularPixelTopology*>(&(proxyT->specificTopology()));
// else
// p.theRecTopol = dynamic_cast<const RectangularPixelTopology*>(p.theTopol);
// assert(p.theRecTopol);

//--- The geometrical description of one module/plaquette
//p.theNumOfRow = p.theRecTopol->nrows(); // rows in x //Not used, AH. PM: leave commented out.
//p.theNumOfCol = p.theRecTopol->ncolumns(); // cols in y //Not used, AH. PM: leave commented out.
std::pair<float, float> pitchxy = p.theRecTopol->pitch();
std::pair<float, float> pitchxy = p.theTopol->pitch();
p.thePitchX = pitchxy.first; // pitch along x
p.thePitchY = pitchxy.second; // pitch along y

Expand Down Expand Up @@ -220,8 +215,8 @@ void PixelCPEBase::setTheClu(DetParam const& theDetParam, ClusterParam& theClust
maxInY = theClusterParam.theCluster->maxPixelCol();

int min_row(0), min_col(0);
int max_row = theDetParam.theRecTopol->nrows() - 1;
int max_col = theDetParam.theRecTopol->ncolumns() - 1;
int max_row = theDetParam.theTopol->nrows() - 1;
int max_col = theDetParam.theTopol->ncolumns() - 1;

if (minInX == min_row)
theClusterParam.edgeTypeX_ = 1;
Expand All @@ -246,8 +241,8 @@ void PixelCPEBase::setTheClu(DetParam const& theDetParam, ClusterParam& theClust
//if(theClusterParam.theCluster->pixelADC()[i] == 0) { hasBadPixels_ = true; break;}
//}

theClusterParam.spansTwoROCs_ = theDetParam.theRecTopol->containsBigPixelInX(minInX, maxInX) ||
theDetParam.theRecTopol->containsBigPixelInY(minInY, maxInY);
theClusterParam.spansTwoROCs_ = theDetParam.theTopol->containsBigPixelInX(minInX, maxInX) ||
theDetParam.theTopol->containsBigPixelInY(minInY, maxInY);
}

//-----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions RecoLocalTracker/SiPixelRecHits/src/PixelCPEClusterRepair.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,11 @@ LocalPoint PixelCPEClusterRepair::localPosition(DetParam const& theDetParam, Clu
bool xdouble[mrow], ydouble[mcol];
// x directions (shorter), rows
for (int irow = 0; irow < mrow; ++irow)
xdouble[irow] = theDetParam.theRecTopol->isItBigPixelInX(irow + row_offset);
xdouble[irow] = theDetParam.theTopol->isItBigPixelInX(irow + row_offset);
//
// y directions (longer), columns
for (int icol = 0; icol < mcol; ++icol)
ydouble[icol] = theDetParam.theRecTopol->isItBigPixelInY(icol + col_offset);
ydouble[icol] = theDetParam.theTopol->isItBigPixelInY(icol + col_offset);

//--- C-style matrix. We'll need it in either case.
float clustMatrix[mrow][mcol];
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalTracker/SiPixelRecHits/src/PixelCPEFast.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "DataFormats/DetId/interface/DetId.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
//#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h"
#include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h"
#include "MagneticField/Engine/interface/MagneticField.h"
Expand Down
17 changes: 8 additions & 9 deletions RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEGeneric.h"

#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "DataFormats/DetId/interface/DetId.h"

// Pixel templates contain the rec hit error parameterizaiton
Expand Down Expand Up @@ -263,8 +262,8 @@ LocalPoint PixelCPEGeneric::localPosition(DetParam const& theDetParam, ClusterPa
theDetParam.theThickness,
theClusterParam.cotalpha,
theDetParam.thePitchX,
theDetParam.theRecTopol->isItBigPixelInX(theClusterParam.theCluster->minPixelRow()),
theDetParam.theRecTopol->isItBigPixelInX(theClusterParam.theCluster->maxPixelRow()),
theDetParam.theTopol->isItBigPixelInX(theClusterParam.theCluster->minPixelRow()),
theDetParam.theTopol->isItBigPixelInX(theClusterParam.theCluster->maxPixelRow()),
the_eff_charge_cut_lowX,
the_eff_charge_cut_highX,
the_size_cutX); // cut for eff charge width &&&
Expand All @@ -287,8 +286,8 @@ LocalPoint PixelCPEGeneric::localPosition(DetParam const& theDetParam, ClusterPa
theDetParam.theThickness,
theClusterParam.cotbeta,
theDetParam.thePitchY,
theDetParam.theRecTopol->isItBigPixelInY(theClusterParam.theCluster->minPixelCol()),
theDetParam.theRecTopol->isItBigPixelInY(theClusterParam.theCluster->maxPixelCol()),
theDetParam.theTopol->isItBigPixelInY(theClusterParam.theCluster->minPixelCol()),
theDetParam.theTopol->isItBigPixelInY(theClusterParam.theCluster->maxPixelCol()),
the_eff_charge_cut_lowY,
the_eff_charge_cut_highY,
the_size_cutY); // cut for eff charge width &&&
Expand All @@ -304,7 +303,7 @@ LocalPoint PixelCPEGeneric::localPosition(DetParam const& theDetParam, ClusterPa
//cout << "Apply correction correction_dx1 = " << theClusterParam.dx1 << " to xPos = " << xPos;
xPos = xPos - (0.5f * theDetParam.lorentzShiftInCmX);
// Find if pixel is double (big).
bool bigInX = theDetParam.theRecTopol->isItBigPixelInX(theClusterParam.theCluster->maxPixelRow());
bool bigInX = theDetParam.theTopol->isItBigPixelInX(theClusterParam.theCluster->maxPixelRow());
if (!bigInX)
xPos -= theClusterParam.dx1;
else
Expand All @@ -321,7 +320,7 @@ LocalPoint PixelCPEGeneric::localPosition(DetParam const& theDetParam, ClusterPa
yPos = yPos - (0.5f * theDetParam.lorentzShiftInCmY);

// Find if pixel is double (big).
bool bigInY = theDetParam.theRecTopol->isItBigPixelInY(theClusterParam.theCluster->maxPixelCol());
bool bigInY = theDetParam.theTopol->isItBigPixelInY(theClusterParam.theCluster->maxPixelCol());
if (!bigInY)
yPos -= theClusterParam.dy1;
else
Expand Down Expand Up @@ -401,12 +400,12 @@ LocalError PixelCPEGeneric::localError(DetParam const& theDetParam, ClusterParam
int n_bigy = 0;

for (int irow = 0; irow < 7; ++irow) {
if (theDetParam.theRecTopol->isItBigPixelInX(irow + minPixelRow))
if (theDetParam.theTopol->isItBigPixelInX(irow + minPixelRow))
++n_bigx;
}

for (int icol = 0; icol < 21; ++icol) {
if (theDetParam.theRecTopol->isItBigPixelInY(icol + minPixelCol))
if (theDetParam.theTopol->isItBigPixelInY(icol + minPixelCol))
++n_bigy;
}

Expand Down
13 changes: 6 additions & 7 deletions RecoLocalTracker/SiPixelRecHits/src/PixelCPEGenericBase.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEGenericBase.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"

namespace {
constexpr float micronsToCm = 1.0e-4;
Expand Down Expand Up @@ -109,17 +108,17 @@ void PixelCPEGenericBase::initializeLocalErrorVariables(
minPixelCol = theClusterParam.theCluster->minPixelCol();
minPixelRow = theClusterParam.theCluster->minPixelRow();

edgex = (theDetParam.theRecTopol->isItEdgePixelInX(minPixelRow)) ||
(theDetParam.theRecTopol->isItEdgePixelInX(maxPixelRow));
edgey = (theDetParam.theRecTopol->isItEdgePixelInY(minPixelCol)) ||
(theDetParam.theRecTopol->isItEdgePixelInY(maxPixelCol));
edgex = (theDetParam.theTopol->isItEdgePixelInX(minPixelRow)) ||
(theDetParam.theTopol->isItEdgePixelInX(maxPixelRow));
edgey = (theDetParam.theTopol->isItEdgePixelInY(minPixelCol)) ||
(theDetParam.theTopol->isItEdgePixelInY(maxPixelCol));

sizex = theClusterParam.theCluster->sizeX();
sizey = theClusterParam.theCluster->sizeY();

// Find if cluster contains double (big) pixels.
bigInX = theDetParam.theRecTopol->containsBigPixelInX(minPixelRow, maxPixelRow);
bigInY = theDetParam.theRecTopol->containsBigPixelInY(minPixelCol, maxPixelCol);
bigInX = theDetParam.theTopol->containsBigPixelInX(minPixelRow, maxPixelRow);
bigInY = theDetParam.theTopol->containsBigPixelInY(minPixelCol, maxPixelCol);
};

void PixelCPEGenericBase::setXYErrors(float& xerr,
Expand Down
14 changes: 7 additions & 7 deletions RecoLocalTracker/SiPixelRecHits/src/PixelCPETemplateReco.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// Geometry services
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
//#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"

//#define DEBUG

Expand Down Expand Up @@ -206,11 +206,11 @@ LocalPoint PixelCPETemplateReco::localPosition(DetParam const& theDetParam, Clus
bool xdouble[mrow], ydouble[mcol];
// x directions (shorter), rows
for (int irow = 0; irow < mrow; ++irow)
xdouble[irow] = theDetParam.theRecTopol->isItBigPixelInX(irow + row_offset);
xdouble[irow] = theDetParam.theTopol->isItBigPixelInX(irow + row_offset);

// y directions (longer), columns
for (int icol = 0; icol < mcol; ++icol)
ydouble[icol] = theDetParam.theRecTopol->isItBigPixelInY(icol + col_offset);
ydouble[icol] = theDetParam.theTopol->isItBigPixelInY(icol + col_offset);

SiPixelTemplateReco::ClusMatrix clusterPayload{&clustMatrix[0][0], xdouble, ydouble, mrow, mcol};

Expand Down Expand Up @@ -441,10 +441,10 @@ LocalError PixelCPETemplateReco::localError(DetParam const& theDetParam, Cluster
int minPixelRow = theClusterParam.theCluster->minPixelRow();

//--- Are we near either of the edges?
bool edgex = (theDetParam.theRecTopol->isItEdgePixelInX(minPixelRow) ||
theDetParam.theRecTopol->isItEdgePixelInX(maxPixelRow));
bool edgey = (theDetParam.theRecTopol->isItEdgePixelInY(minPixelCol) ||
theDetParam.theRecTopol->isItEdgePixelInY(maxPixelCol));
bool edgex = (theDetParam.theTopol->isItEdgePixelInX(minPixelRow) ||
theDetParam.theTopol->isItEdgePixelInX(maxPixelRow));
bool edgey = (theDetParam.theTopol->isItEdgePixelInY(minPixelCol) ||
theDetParam.theTopol->isItEdgePixelInY(maxPixelCol));

if (theClusterParam.ierr != 0) {
// If reconstruction fails the hit position is calculated from cluster center of gravity
Expand Down
5 changes: 1 addition & 4 deletions RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,7 @@ void ReadPixelRecHit::analyze(const edm::Event &e, const edm::EventSetup &es) {

//const BoundPlane& plane = theGeomDet->surface(); //for transf. unused
//double detThick = theGeomDet->specificSurface().bounds().thickness(); unused

//const RectangularPixelTopology * topol =
//dynamic_cast<const RectangularPixelTopology*>(&(theGeomDet->specificTopology()));


const PixelTopology *topol = &(theGeomDet->specificTopology());

//int cols = theGeomDet->specificTopology().ncolumns(); UNUSED
Expand Down
1 change: 0 additions & 1 deletion RecoLocalTracker/SubCollectionProducers/interface/PixelClusterSelectorTopBottom.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "DataFormats/DetId/interface/DetId.h"
#include "FWCore/Utilities/interface/InputTag.h"

Expand Down
1 change: 0 additions & 1 deletion RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class TObject;
class TTree;
class TH1D;
class TFile;
class RectangularPixelTopology;
class DetId;

class PCCNTupler : public edm::one::EDAnalyzer<edm::one::SharedResources, edm::one::WatchLuminosityBlocks> {
Expand Down
3 changes: 0 additions & 3 deletions RecoTracker/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
#include "Geometry/CommonTopologies/interface/StripTopology.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"

#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/CommonTopologies/interface/RectangularStripTopology.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"

#include "MagneticField/Engine/interface/MagneticField.h"
Expand Down
1 change: 0 additions & 1 deletion SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include "Geometry/CommonTopologies/interface/StripTopology.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h"
//#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/CommonTopologies/interface/Topology.h"

Expand Down
1 change: 0 additions & 1 deletion SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h"

// For ROOT
Expand Down
1 change: 0 additions & 1 deletion SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "MagneticField/Engine/interface/MagneticField.h"
#include "SimDataFormats/Track/interface/SimTrack.h"
Expand Down

0 comments on commit 4abd587

Please sign in to comment.