Skip to content

Commit

Permalink
Merge pull request #3635 from Dr15Jones/GeomConstInterface
Browse files Browse the repository at this point in the history 
Geometry -- Const only access to GeometricSearchTracker Geometry
  • Loading branch information
@ktf
ktf committed May 6, 2014
2 parents c588483 + 1c61c6d commit df87489
Show file tree
Hide file tree
Showing 57 changed files with 485 additions and 518 deletions.
6 changes: 3 additions & 3 deletions CalibTracker/SiStripHitEfficiency/src/HitEff.cc
View file
Expand Up @@ -364,7 +364,7 @@ void HitEff::analyze(const edm::Event& e, const edm::EventSetup& es){
if ( TKlayers==9 && isValid && isLastTOB5 ) {
// if ( TKlayers==9 && itm==TMeas.rbegin()) {
// if ( TKlayers==9 && (itm==TMeas.back()) ) { // to check for only the last entry in the trajectory for propagation
std::vector< BarrelDetLayer*> barrelTOBLayers = measurementTrackerHandle->geometricSearchTracker()->tobLayers() ;
std::vector< BarrelDetLayer const*> barrelTOBLayers = measurementTrackerHandle->geometricSearchTracker()->tobLayers() ;
const DetLayer* tob6 = barrelTOBLayers[barrelTOBLayers.size()-1];
const MeasurementEstimator* estimator = est.product();
const LayerMeasurements* theLayerMeasurements = new LayerMeasurements(*measurementTrackerHandle, *measurementTrackerEvent);
Expand Down Expand Up @@ -396,9 +396,9 @@ void HitEff::analyze(const edm::Event& e, const edm::EventSetup& es){

if ( TKlayers==21 && isValid && isLastTEC8 ) {

std::vector< ForwardDetLayer*> posTecLayers = measurementTrackerHandle->geometricSearchTracker()->posTecLayers() ;
std::vector< const ForwardDetLayer*> posTecLayers = measurementTrackerHandle->geometricSearchTracker()->posTecLayers() ;
const DetLayer* tec9pos = posTecLayers[posTecLayers.size()-1];
std::vector< ForwardDetLayer*> negTecLayers = measurementTrackerHandle->geometricSearchTracker()->negTecLayers() ;
std::vector< const ForwardDetLayer*> negTecLayers = measurementTrackerHandle->geometricSearchTracker()->negTecLayers() ;
const DetLayer* tec9neg = negTecLayers[negTecLayers.size()-1];

const MeasurementEstimator* estimator = est.product();
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc
View file
Expand Up @@ -350,7 +350,7 @@ void SiPixelHitEfficiencySource::analyze(const edm::Event& iEvent, const edm::Ev
}
}//end check last valid layer
if (lastValidL2) {
std::vector< BarrelDetLayer*> pxbLayers = measurementTrackerHandle->geometricSearchTracker()->pixelBarrelLayers();
std::vector< const BarrelDetLayer*> pxbLayers = measurementTrackerHandle->geometricSearchTracker()->pixelBarrelLayers();
const DetLayer* pxb1 = pxbLayers[extrapolateTo_-1];
const MeasurementEstimator* estimator = est.product();
const LayerMeasurements* theLayerMeasurements = new LayerMeasurements(*measurementTrackerHandle, *measurementTrackerEventHandle);
Expand Down
2 changes: 1 addition & 1 deletion DQM/TrackingMonitor/src/TrackEfficiencyMonitor.cc
View file
Expand Up @@ -647,7 +647,7 @@ int TrackEfficiencyMonitor::compatibleLayers(const NavigationSchool& navigationS
// check the number of compatible layers
//---------------------------------------------------

std::vector< BarrelDetLayer*> barrelTOBLayers = measurementTrackerHandle->geometricSearchTracker()->tobLayers() ;
std::vector< const BarrelDetLayer*> barrelTOBLayers = measurementTrackerHandle->geometricSearchTracker()->tobLayers() ;

unsigned int layers = 0;
for ( unsigned int k=0 ; k < barrelTOBLayers.size() ; k++ )
Expand Down
8 changes: 4 additions & 4 deletions FastSimulation/TrackerSetup/src/TrackerInteractionGeometry.cc
View file
Expand Up @@ -290,11 +290,11 @@ TrackerInteractionGeometry::TrackerInteractionGeometry(const edm::ParameterSet&
<< "The pointer to the GeometricSearchTracker was not set";

// The vector of Barrel Tracker Layers
std::vector< BarrelDetLayer*> barrelLayers =
auto const& barrelLayers =
theGeomSearchTracker->barrelLayers();

// The vector of Forward Tracker Layers (positive z)
std::vector< ForwardDetLayer*> posForwardLayers =
auto const& posForwardLayers =
theGeomSearchTracker->posForwardLayers();

// Local pointers
Expand All @@ -311,7 +311,7 @@ TrackerInteractionGeometry::TrackerInteractionGeometry(const edm::ParameterSet&

// Take the active layer position from the Tracker Reco Geometry
// Pixel barrel
std::vector< BarrelDetLayer*>::const_iterator bl = barrelLayers.begin();
auto bl = barrelLayers.begin();
double maxLength = (**bl).specificSurface().bounds().length()/2.+1.7;
double maxRadius = (**bl).specificSurface().radius()+0.01;
// First pixel barrel layer: r=4.41058, l=53.38
Expand Down Expand Up @@ -428,7 +428,7 @@ TrackerInteractionGeometry::TrackerInteractionGeometry(const edm::ParameterSet&
-tobOutCablesLength[version], tobOutCablesLength[version]);

// And now the disks...
std::vector< ForwardDetLayer*>::const_iterator fl = posForwardLayers.begin();
auto fl = posForwardLayers.begin();

// Pixel disks
// First Pixel disk: Z pos 35.5 radii 5.42078, 16.0756
Expand Down
16 changes: 8 additions & 8 deletions FastSimulation/TrajectoryManager/src/TrajectoryManager.cc
View file
Expand Up @@ -829,18 +829,18 @@ TrajectoryManager::initializeLayerMap()
/// ATTENTION: HARD CODED LOGIC! If Famos layer numbering changes this logic needs to
/// be adapted to the new numbering!

std::vector< BarrelDetLayer*> barrelLayers =
const std::vector< const BarrelDetLayer*>& barrelLayers =
theGeomSearchTracker->barrelLayers();
LogDebug("FastTracking") << "Barrel DetLayer dump: ";
for (std::vector< BarrelDetLayer*>::const_iterator bl=barrelLayers.begin();
for (auto bl=barrelLayers.begin();
bl != barrelLayers.end(); ++bl) {
LogDebug("FastTracking")<< "radius " << (**bl).specificSurface().radius();
}

std::vector< ForwardDetLayer*> posForwardLayers =
const std::vector< const ForwardDetLayer*>& posForwardLayers =
theGeomSearchTracker->posForwardLayers();
LogDebug("FastTracking") << "Positive Forward DetLayer dump: ";
for (std::vector< ForwardDetLayer*>::const_iterator fl=posForwardLayers.begin();
for (auto fl=posForwardLayers.begin();
fl != posForwardLayers.end(); ++fl) {
LogDebug("FastTracking") << "Z pos "
<< (**fl).surface().position().z()
Expand All @@ -867,7 +867,7 @@ TrajectoryManager::initializeLayerMap()
if (cyl != 0) {
LogDebug("FastTracking") << " cylinder radius " << cyl->radius();
bool found = false;
for (std::vector< BarrelDetLayer*>::const_iterator
for (auto
bl=barrelLayers.begin(); bl != barrelLayers.end(); ++bl) {

if (fabs( cyl->radius() - (**bl).specificSurface().radius()) < rTolerance) {
Expand All @@ -886,7 +886,7 @@ TrajectoryManager::initializeLayerMap()
LogDebug("FastTracking") << " disk radii " << disk->innerRadius()
<< ", " << disk->outerRadius();
bool found = false;
for (std::vector< ForwardDetLayer*>::const_iterator fl=posForwardLayers.begin();
for (auto fl=posForwardLayers.begin();
fl != posForwardLayers.end(); ++fl) {

if (fabs( disk->position().z() - (**fl).surface().position().z()) < zTolerance) {
Expand All @@ -908,8 +908,8 @@ TrajectoryManager::initializeLayerMap()
}

// Put the negative layers in the same map but with an offset
std::vector< ForwardDetLayer*> negForwardLayers = theGeomSearchTracker->negForwardLayers();
for (std::vector< ForwardDetLayer*>::const_iterator nl=negForwardLayers.begin();
const std::vector< const ForwardDetLayer*>& negForwardLayers = theGeomSearchTracker->negForwardLayers();
for (auto nl=negForwardLayers.begin();
nl != negForwardLayers.end(); ++nl) {
for (int i=0; i<=theNegLayerOffset; i++) {
if (theLayerMap[i] == 0) continue;
Expand Down
8 changes: 4 additions & 4 deletions RecoEgamma/EgammaElectronAlgos/interface/PixelMatchStartLayers.h
View file
Expand Up @@ -31,11 +31,11 @@ class GeometricSearchTracker;
class PixelMatchStartLayers {

public:
typedef std::vector<ForwardDetLayer*> ForwardLayerContainer;
typedef std::vector<ForwardDetLayer*>::const_iterator ForwardLayerIterator;
typedef std::vector<const ForwardDetLayer*> ForwardLayerContainer;
typedef std::vector<const ForwardDetLayer*>::const_iterator ForwardLayerIterator;

typedef std::vector<BarrelDetLayer*> BarrelLayerContainer;
typedef std::vector<BarrelDetLayer*>::const_iterator BarrelLayerIterator;
typedef std::vector<const BarrelDetLayer*> BarrelLayerContainer;
typedef std::vector<const BarrelDetLayer*>::const_iterator BarrelLayerIterator;

PixelMatchStartLayers();
void setup(const GeometricSearchTracker *);
Expand Down
4 changes: 2 additions & 2 deletions RecoEgamma/EgammaElectronAlgos/src/PixelHitMatcher.cc
View file
Expand Up @@ -240,7 +240,7 @@ PixelHitMatcher::compatibleHits
pred1Meas.clear();
pred2Meas.clear();

typedef vector<BarrelDetLayer*>::const_iterator BarrelLayerIterator;
typedef vector<const BarrelDetLayer*>::const_iterator BarrelLayerIterator;
BarrelLayerIterator firstLayer = startLayers.firstBLayer();

FreeTrajectoryState fts = FTSFromVertexToPointFactory::get(*theMagField,xmeas, vprim, energy, charge);
Expand Down Expand Up @@ -309,7 +309,7 @@ PixelHitMatcher::compatibleHits


// check if there are compatible 1st hits the forward disks
typedef vector<ForwardDetLayer*>::const_iterator ForwardLayerIterator;
typedef vector<const ForwardDetLayer*>::const_iterator ForwardLayerIterator;
ForwardLayerIterator flayer;

TrajectoryStateOnSurface tsosfwd(fts, *bpb(fts.position(), fts.momentum()));
Expand Down
22 changes: 11 additions & 11 deletions RecoEgamma/EgammaElectronAlgos/src/SiStripElectronSeedGenerator.cc
View file
Expand Up @@ -213,12 +213,12 @@ void SiStripElectronSeedGenerator::findSeedsFromCluster
//Use GST to retrieve hits from various DetLayers using layerMeasurements class
const GeometricSearchTracker* gst = theMeasurementTracker->geometricSearchTracker();

std::vector<BarrelDetLayer*> tibLayers = gst->tibLayers();
DetLayer* tib1 = tibLayers.at(0);
DetLayer* tib2 = tibLayers.at(1);
std::vector<const BarrelDetLayer*> tibLayers = gst->tibLayers();
const DetLayer* tib1 = tibLayers.at(0);
const DetLayer* tib2 = tibLayers.at(1);

std::vector<ForwardDetLayer*> tecLayers;
std::vector<ForwardDetLayer*> tidLayers;
std::vector<const ForwardDetLayer*> tecLayers;
std::vector<const ForwardDetLayer*> tidLayers;
if(scEta < 0){
tecLayers = gst->negTecLayers();
tidLayers = gst->negTidLayers();
Expand All @@ -228,12 +228,12 @@ void SiStripElectronSeedGenerator::findSeedsFromCluster
tidLayers = gst->posTidLayers();
}

DetLayer* tid1 = tidLayers.at(0);
DetLayer* tid2 = tidLayers.at(1);
DetLayer* tid3 = tidLayers.at(2);
DetLayer* tec1 = tecLayers.at(0);
DetLayer* tec2 = tecLayers.at(1);
DetLayer* tec3 = tecLayers.at(2);
const DetLayer* tid1 = tidLayers.at(0);
const DetLayer* tid2 = tidLayers.at(1);
const DetLayer* tid3 = tidLayers.at(2);
const DetLayer* tec1 = tecLayers.at(0);
const DetLayer* tec2 = tecLayers.at(1);
const DetLayer* tec3 = tecLayers.at(2);

//Figure out which DetLayers to use based on SC Eta
std::vector<bool> useDL = useDetLayer(scEta);
Expand Down
60 changes: 30 additions & 30 deletions RecoMuon/DetLayers/interface/MuonDetLayerGeometry.h
View file
Expand Up @@ -27,49 +27,49 @@ class MuonDetLayerGeometry : public DetLayerGeometry{
virtual ~MuonDetLayerGeometry();

/// return the DT DetLayers (barrel), inside-out
const std::vector<DetLayer*>& allDTLayers() const;
const std::vector<const DetLayer*>& allDTLayers() const;

/// return the CSC DetLayers (endcap), -Z to +Z
const std::vector<DetLayer*>& allCSCLayers() const;
const std::vector<const DetLayer*>& allCSCLayers() const;

/// return the forward (+Z) CSC DetLayers, inside-out
const std::vector<DetLayer*>& forwardCSCLayers() const;
const std::vector<const DetLayer*>& forwardCSCLayers() const;

/// return the backward (-Z) CSC DetLayers, inside-out
const std::vector<DetLayer*>& backwardCSCLayers() const;
const std::vector<const DetLayer*>& backwardCSCLayers() const;

/// return all RPC DetLayers, order: backward, barrel, forward
const std::vector<DetLayer*>& allRPCLayers() const;
const std::vector<const DetLayer*>& allRPCLayers() const;

/// return the barrel RPC DetLayers, inside-out
const std::vector<DetLayer*>& barrelRPCLayers() const;
const std::vector<const DetLayer*>& barrelRPCLayers() const;

/// return the endcap RPC DetLayers, -Z to +Z
const std::vector<DetLayer*>& endcapRPCLayers() const;
const std::vector<const DetLayer*>& endcapRPCLayers() const;

/// return the forward (+Z) RPC DetLayers, inside-out
const std::vector<DetLayer*>& forwardRPCLayers() const;
const std::vector<const DetLayer*>& forwardRPCLayers() const;

/// return the backward (-Z) RPC DetLayers, inside-out
const std::vector<DetLayer*>& backwardRPCLayers() const;
const std::vector<const DetLayer*>& backwardRPCLayers() const;

/// return all layers (DT+CSC+RPC), order: backward, barrel, forward
const std::vector<DetLayer*>& allLayers() const;
const std::vector<const DetLayer*>& allLayers() const;

/// return all barrel DetLayers (DT+RPC), inside-out
const std::vector<DetLayer*>& allBarrelLayers() const;
const std::vector<const DetLayer*>& allBarrelLayers() const;

/// return all endcap DetLayers (CSC+RPC), -Z to +Z
const std::vector<DetLayer*>& allEndcapLayers() const;
const std::vector<const DetLayer*>& allEndcapLayers() const;

/// return all forward (+Z) layers (CSC+RPC), inside-out
const std::vector<DetLayer*>& allForwardLayers() const;
const std::vector<const DetLayer*>& allForwardLayers() const;

/// return all backward (-Z) layers (CSC+RPC), inside-out
const std::vector<DetLayer*>& allBackwardLayers() const;
const std::vector<const DetLayer*>& allBackwardLayers() const;

/// return the DetLayer which correspond to a certain DetId
virtual const DetLayer* idToLayer(const DetId& detId) const;
virtual const DetLayer* idToLayer(const DetId& detId) const override;

private:
/// Add CSC layers
Expand All @@ -90,22 +90,22 @@ class MuonDetLayerGeometry : public DetLayerGeometry{

void sortLayers();

std::vector<DetLayer*> cscLayers_fw;
std::vector<DetLayer*> cscLayers_bk;
std::vector<DetLayer*> cscLayers_all;
std::vector<DetLayer*> rpcLayers_all;
std::vector<DetLayer*> rpcLayers_endcap;
std::vector<DetLayer*> rpcLayers_fw;
std::vector<DetLayer*> rpcLayers_bk;
std::vector<DetLayer*> rpcLayers_barrel;
std::vector<DetLayer*> dtLayers;
std::vector<DetLayer*> allForward;
std::vector<DetLayer*> allBackward;
std::vector<DetLayer*> allEndcap;
std::vector<DetLayer*> allBarrel;
std::vector<DetLayer*> allDetLayers;
std::vector<const DetLayer*> cscLayers_fw;
std::vector<const DetLayer*> cscLayers_bk;
std::vector<const DetLayer*> cscLayers_all;
std::vector<const DetLayer*> rpcLayers_all;
std::vector<const DetLayer*> rpcLayers_endcap;
std::vector<const DetLayer*> rpcLayers_fw;
std::vector<const DetLayer*> rpcLayers_bk;
std::vector<const DetLayer*> rpcLayers_barrel;
std::vector<const DetLayer*> dtLayers;
std::vector<const DetLayer*> allForward;
std::vector<const DetLayer*> allBackward;
std::vector<const DetLayer*> allEndcap;
std::vector<const DetLayer*> allBarrel;
std::vector<const DetLayer*> allDetLayers;

std::map<DetId,DetLayer*> detLayersMap;
std::map<DetId,const DetLayer*> detLayersMap;
};
#endif

0 comments on commit df87489

Please sign in to comment.