From 499d8c0a83b5022937d8dd1d855175b48fdbf797 Mon Sep 17 00:00:00 2001
From: Matti Kortelainen <matti.kortelainen@cern.ch>
Date: Fri, 5 Dec 2014 15:39:33 +0100
Subject: [PATCH] RecoTracker: Add Phase2OTBarrelLayerBuilder and
 Phase2OTECRingedLayerBuilder to GeometricSearchTrackerBuilder from
 6_2_0_SLHC21

---
 .../src/GeometricSearchTrackerBuilder.cc      | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc b/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc
index e353016b68ee0..1aaf2b472a2fc 100644
--- a/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc
+++ b/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc
@@ -1,7 +1,10 @@
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "RecoTracker/TkDetLayers/interface/GeometricSearchTrackerBuilder.h"
 
 #include "PixelBarrelLayerBuilder.h"
+#include "Phase2OTBarrelLayerBuilder.h"
 #include "PixelForwardLayerBuilder.h"
+#include "Phase2OTECRingedLayerBuilder.h"
 #include "TIBLayerBuilder.h"
 #include "TOBLayerBuilder.h"
 #include "TIDLayerBuilder.h"
@@ -24,7 +27,9 @@ GeometricSearchTrackerBuilder::build(const GeometricDet* theGeometricTracker,
 				     const TrackerTopology* tTopo)
 {
   PixelBarrelLayerBuilder aPixelBarrelLayerBuilder;
+  Phase2OTBarrelLayerBuilder aPhase2OTBarrelLayerBuilder;
   PixelForwardLayerBuilder aPixelForwardLayerBuilder;
+  Phase2OTECRingedLayerBuilder aPhase2OTECRingedLayerBuilder;
   TIBLayerBuilder aTIBLayerBuilder;
   TOBLayerBuilder aTOBLayerBuilder;
   TIDLayerBuilder aTIDLayerBuilder;
@@ -102,10 +107,20 @@ GeometricSearchTrackerBuilder::build(const GeometricDet* theGeometricTracker,
       it!=theGeometricDetLayers.end(); it++){
 
     if( (*it)->type() == GeometricDet::PixelBarrel) {
+      std::string barrel_name = (*it)->name();
+      LogDebug("BuildingPixelBarrel") << "I got  " << barrel_name << " type " << (*it)->type();
       vector<const GeometricDet*> thePxlBarGeometricDetLayers = (*it)->components();
       for(vector<const GeometricDet*>::const_iterator it2=thePxlBarGeometricDetLayers.begin();
 	  it2!=thePxlBarGeometricDetLayers.end(); it2++){
-	thePxlBarLayers.push_back( aPixelBarrelLayerBuilder.build(*it2,theGeomDetGeometry) );
+	std::string layer_name = (*it2)->name();
+	if(layer_name.find("PixelBarrelLayer") < layer_name.size()) {
+	  LogDebug("BuildingPixelBarrelLayer") << "I got  " << layer_name << " type " << (*it2)->type();
+	  thePxlBarLayers.push_back( aPixelBarrelLayerBuilder.build(*it2,theGeomDetGeometry) );
+	}
+	else {
+	  LogDebug("BuildingPhase2OTBarrelLayer") << "I got  " << layer_name << " type " << (*it2)->type();
+	  thePxlBarLayers.push_back( aPhase2OTBarrelLayerBuilder.build(*it2,theGeomDetGeometry) );
+	}
       }
     }
 
@@ -119,7 +134,7 @@ GeometricSearchTrackerBuilder::build(const GeometricDet* theGeometricTracker,
 
     if( (*it)->type() == GeometricDet::TOB) {
       vector<const GeometricDet*> theTOBGeometricDetLayers = (*it)->components();
-      for(vector<const GeometricDet*>::const_iterator it2=theTOBGeometricDetLayers.begin();	  
+      for(vector<const GeometricDet*>::const_iterator it2=theTOBGeometricDetLayers.begin();
       it2!=theTOBGeometricDetLayers.end(); it2++){
 	theTOBLayers.push_back( aTOBLayerBuilder.build(*it2,theGeomDetGeometry) );
       }
@@ -130,10 +145,23 @@ GeometricSearchTrackerBuilder::build(const GeometricDet* theGeometricTracker,
       vector<const GeometricDet*> thePxlFwdGeometricDetLayers = (*it)->components();
       for(vector<const GeometricDet*>::const_iterator it2=thePxlFwdGeometricDetLayers.begin();
 	  it2!=thePxlFwdGeometricDetLayers.end(); it2++){
-	if((*it2)->positionBounds().z() < 0)
-	  theNegPxlFwdLayers.push_back( aPixelForwardLayerBuilder.build(*it2,theGeomDetGeometry) );
-	if((*it2)->positionBounds().z() > 0)
-	  thePosPxlFwdLayers.push_back( aPixelForwardLayerBuilder.build(*it2,theGeomDetGeometry) );
+	std::string layer_name = (*it2)->name();
+	
+	if(layer_name.find("PixelForwardDisk") < layer_name.size()){
+	  LogDebug("BuildingPixelForwardLayer") << "I got  " << layer_name << " type " << (*it2)->type();
+	  if((*it2)->positionBounds().z() < 0)
+	    theNegPxlFwdLayers.push_back( aPixelForwardLayerBuilder.build(*it2,theGeomDetGeometry) );
+	  if((*it2)->positionBounds().z() > 0)
+	    thePosPxlFwdLayers.push_back( aPixelForwardLayerBuilder.build(*it2,theGeomDetGeometry) );
+	}
+	else if(layer_name.find("Disc") < layer_name.size()){
+	  LogDebug("BuildingPhase2OTECRingedLayer") << "I got  " << layer_name << " type " << (*it2)->type();
+	  if((*it2)->positionBounds().z() < 0)
+	    theNegPxlFwdLayers.push_back( aPhase2OTECRingedLayerBuilder.build(*it2,theGeomDetGeometry) );
+	  if((*it2)->positionBounds().z() > 0)
+	    thePosPxlFwdLayers.push_back( aPhase2OTECRingedLayerBuilder.build(*it2,theGeomDetGeometry) );
+	}
+	else edm::LogError("WrongDiskType")<<" ERROR - I was expecting a PixelForwardDisk or a Disc... I got a "<< layer_name;
       }
     }