From 16121e2f643f61d8cdcb62e3a760ad58eff3d74a Mon Sep 17 00:00:00 2001 From: Nick McColl Date: Sun, 18 Jan 2015 18:59:04 +0100 Subject: [PATCH 1/2] Removed SiStripDetId dependence from Validation/RecoTracker and Validation/TrackerRecHits --- .../src/SiStripTrackingRecHitsValid.cc | 17 +++++++---------- Validation/TrackerRecHits/BuildFile.xml | 1 - .../TrackerRecHits/src/SiStripRecHitsValid.cc | 17 +++++++---------- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc b/Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc index 1da02c7604526..3f750726df06a 100644 --- a/Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc +++ b/Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc @@ -14,10 +14,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "DataFormats/SiStripDetId/interface/TECDetId.h" -#include "DataFormats/SiStripDetId/interface/TIBDetId.h" -#include "DataFormats/SiStripDetId/interface/TIDDetId.h" -#include "DataFormats/SiStripDetId/interface/TOBDetId.h" +#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" @@ -1354,22 +1351,22 @@ void SiStripTrackingRecHitsValid::createMEs(DQMStore::IBooker & ibooker,const ed // Keep in mind that when we are on the TID or TEC we deal with rings not wheel int32_t stereolnumber = det_layer_pair.second; std::vector stereoandmatchedDetIds; - if ( (det_layer_pair.first == "TIB") && (TIBDetId(detid).stereo()== 1) ) { + if ( (det_layer_pair.first == "TIB") && (tTopo->tibIsStereo(detid)== 1) ) { substructure.getTIBDetectors(activeDets,stereoandmatchedDetIds,stereolnumber,0,0,0); isStereo = true; - } else if ( (det_layer_pair.first == "TOB") && (TOBDetId(detid).stereo()== 1) ) { + } else if ( (det_layer_pair.first == "TOB") && (tTopo->tobIsStereo(detid)== 1) ) { substructure.getTOBDetectors(activeDets,stereoandmatchedDetIds,stereolnumber,0,0); isStereo = true; - } else if ( (det_layer_pair.first == "TID") && (stereolnumber > 0) && (TIDDetId(detid).stereo()== 1) ) { + } else if ( (det_layer_pair.first == "TID") && (stereolnumber > 0) && (tTopo->tidIsStereo(detid)== 1) ) { substructure.getTIDDetectors(activeDets,stereoandmatchedDetIds,2,0,abs(stereolnumber),1); isStereo = true; - } else if ( (det_layer_pair.first == "TID") && (stereolnumber < 0) && (TIDDetId(detid).stereo()== 1) ) { + } else if ( (det_layer_pair.first == "TID") && (stereolnumber < 0) && (tTopo->tidIsStereo(detid)== 1) ) { substructure.getTIDDetectors(activeDets,stereoandmatchedDetIds,1,0,abs(stereolnumber),1); isStereo = true; - } else if ( (det_layer_pair.first == "TEC") && (stereolnumber > 0) && (TECDetId(detid).stereo()== 1) ) { + } else if ( (det_layer_pair.first == "TEC") && (stereolnumber > 0) && (tTopo->tecIsStereo(detid)== 1) ) { substructure.getTECDetectors(activeDets,stereoandmatchedDetIds,2,0,0,0,abs(stereolnumber),1); isStereo = true; - } else if ( (det_layer_pair.first == "TEC") && (stereolnumber < 0) && (TECDetId(detid).stereo()== 1) ) { + } else if ( (det_layer_pair.first == "TEC") && (stereolnumber < 0) && (tTopo->tecIsStereo(detid)== 1) ) { substructure.getTECDetectors(activeDets,stereoandmatchedDetIds,1,0,0,0,abs(stereolnumber),1); isStereo = true; } diff --git a/Validation/TrackerRecHits/BuildFile.xml b/Validation/TrackerRecHits/BuildFile.xml index a8fa2e0a0c5bd..fc29c721e5c87 100644 --- a/Validation/TrackerRecHits/BuildFile.xml +++ b/Validation/TrackerRecHits/BuildFile.xml @@ -3,7 +3,6 @@ - diff --git a/Validation/TrackerRecHits/src/SiStripRecHitsValid.cc b/Validation/TrackerRecHits/src/SiStripRecHitsValid.cc index 95867a6197fa2..88f3bc8fb43ee 100644 --- a/Validation/TrackerRecHits/src/SiStripRecHitsValid.cc +++ b/Validation/TrackerRecHits/src/SiStripRecHitsValid.cc @@ -8,10 +8,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h" #include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h" -#include "DataFormats/SiStripDetId/interface/TECDetId.h" -#include "DataFormats/SiStripDetId/interface/TIBDetId.h" -#include "DataFormats/SiStripDetId/interface/TIDDetId.h" -#include "DataFormats/SiStripDetId/interface/TOBDetId.h" +#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DQM/SiStripCommon/interface/SiStripHistoId.h" @@ -702,22 +699,22 @@ void SiStripRecHitsValid::createMEs(DQMStore::IBooker & ibooker,const edm::Event // Keep in mind that when we are on the TID or TEC we deal with rings not wheel int32_t stereolnumber = det_layer_pair.second; std::vector stereoandmatchedDetIds; - if ( (det_layer_pair.first == "TIB") && (TIBDetId(detid).stereo()== 1) ) { + if ( (det_layer_pair.first == "TIB") && (tTopo->tibIsStereo(detid) == 1) ) { substructure.getTIBDetectors(activeDets,stereoandmatchedDetIds,stereolnumber,0,0,0); isStereo = true; - } else if ( (det_layer_pair.first == "TOB") && (TOBDetId(detid).stereo()== 1) ) { + } else if ( (det_layer_pair.first == "TOB") && (tTopo->tobIsStereo(detid) == 1) ) { substructure.getTOBDetectors(activeDets,stereoandmatchedDetIds,stereolnumber,0,0); isStereo = true; - } else if ( (det_layer_pair.first == "TID") && (stereolnumber > 0) && (TIDDetId(detid).stereo()== 1) ) { + } else if ( (det_layer_pair.first == "TID") && (stereolnumber > 0) && (tTopo->tidIsStereo(detid) == 1) ) { substructure.getTIDDetectors(activeDets,stereoandmatchedDetIds,2,0,abs(stereolnumber),1); isStereo = true; - } else if ( (det_layer_pair.first == "TID") && (stereolnumber < 0) && (TIDDetId(detid).stereo()== 1) ) { + } else if ( (det_layer_pair.first == "TID") && (stereolnumber < 0) && (tTopo->tidIsStereo(detid) == 1) ) { substructure.getTIDDetectors(activeDets,stereoandmatchedDetIds,1,0,abs(stereolnumber),1); isStereo = true; - } else if ( (det_layer_pair.first == "TEC") && (stereolnumber > 0) && (TECDetId(detid).stereo()== 1) ) { + } else if ( (det_layer_pair.first == "TEC") && (stereolnumber > 0) && (tTopo->tecIsStereo(detid) == 1) ) { substructure.getTECDetectors(activeDets,stereoandmatchedDetIds,2,0,0,0,abs(stereolnumber),1); isStereo = true; - } else if ( (det_layer_pair.first == "TEC") && (stereolnumber < 0) && (TECDetId(detid).stereo()== 1) ) { + } else if ( (det_layer_pair.first == "TEC") && (stereolnumber < 0) && (tTopo->tecIsStereo(detid) == 1) ) { substructure.getTECDetectors(activeDets,stereoandmatchedDetIds,1,0,0,0,abs(stereolnumber),1); isStereo = true; } From b46e9a01990c67874efb6b0ca6fa35a764cb086d Mon Sep 17 00:00:00 2001 From: Nick McColl Date: Sun, 18 Jan 2015 21:49:27 +0100 Subject: [PATCH 2/2] Removed SiStripDetId from CalibFormats/SiStripObjects --- .../SiStripQuality/plugins/BuildFile.xml | 1 - .../plugins/SiStripQualityStatistics.cc | 23 ++++++++++--------- ...tripBadAPVAlgorithmFromClusterOccupancy.cc | 6 +++-- ...ndHotStripAlgorithmFromClusterOccupancy.cc | 6 +++-- ...ipHotStripAlgorithmFromClusterOccupancy.cc | 8 +++---- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/CalibTracker/SiStripQuality/plugins/BuildFile.xml b/CalibTracker/SiStripQuality/plugins/BuildFile.xml index 2828d5bc574a8..3cf7d14728309 100644 --- a/CalibTracker/SiStripQuality/plugins/BuildFile.xml +++ b/CalibTracker/SiStripQuality/plugins/BuildFile.xml @@ -9,7 +9,6 @@ - diff --git a/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc b/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc index b0cae9a5054d2..faf1e82c9c0b7 100644 --- a/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc +++ b/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc @@ -122,10 +122,10 @@ void SiStripQualityStatistics::analyze( const edm::Event& e, const edm::EventSet //&&&&&&&&&&&&&&&&& //Single SubSyste //&&&&&&&&&&&&&&&&& - int component; - SiStripDetId a(BC[i].detid); - if ( a.subdetId() == SiStripDetId::TIB ){ + DetId detectorId=DetId(BC[i].detid); + int subDet = detectorId.subdetId(); + if ( subDet == StripSubdetector::TIB ){ //&&&&&&&&&&&&&&&&& //TIB //&&&&&&&&&&&&&&&&& @@ -133,7 +133,7 @@ void SiStripQualityStatistics::analyze( const edm::Event& e, const edm::EventSet component=tTopo->tibLayer(BC[i].detid); SetBadComponents(0, component, BC[i]); - } else if ( a.subdetId() == SiStripDetId::TID ) { + } else if ( subDet == StripSubdetector::TID ) { //&&&&&&&&&&&&&&&&& //TID //&&&&&&&&&&&&&&&&& @@ -141,7 +141,7 @@ void SiStripQualityStatistics::analyze( const edm::Event& e, const edm::EventSet component=tTopo->tidSide(BC[i].detid)==2?tTopo->tidWheel(BC[i].detid):tTopo->tidWheel(BC[i].detid)+3; SetBadComponents(1, component, BC[i]); - } else if ( a.subdetId() == SiStripDetId::TOB ) { + } else if ( subDet == StripSubdetector::TOB ) { //&&&&&&&&&&&&&&&&& //TOB //&&&&&&&&&&&&&&&&& @@ -149,7 +149,7 @@ void SiStripQualityStatistics::analyze( const edm::Event& e, const edm::EventSet component=tTopo->tobLayer(BC[i].detid); SetBadComponents(2, component, BC[i]); - } else if ( a.subdetId() == SiStripDetId::TEC ) { + } else if ( subDet == StripSubdetector::TEC ) { //&&&&&&&&&&&&&&&&& //TEC //&&&&&&&&&&&&&&&&& @@ -172,17 +172,18 @@ void SiStripQualityStatistics::analyze( const edm::Event& e, const edm::EventSet uint32_t detid=rp->detid; int subdet=-999; int component=-999; - SiStripDetId a(detid); - if ( a.subdetId() == 3 ){ + DetId detectorId=DetId(detid); + int subDet = detectorId.subdetId(); + if ( subDet == StripSubdetector::TIB ){ subdet=0; component=tTopo->tibLayer(detid); - } else if ( a.subdetId() == 4 ) { + } else if ( subDet == StripSubdetector::TID ) { subdet=1; component=tTopo->tidSide(detid)==2?tTopo->tidWheel(detid):tTopo->tidWheel(detid)+3; - } else if ( a.subdetId() == 5 ) { + } else if ( subDet == StripSubdetector::TOB ) { subdet=2; component=tTopo->tobLayer(detid); - } else if ( a.subdetId() == 6 ) { + } else if ( subDet == StripSubdetector::TEC ) { subdet=3; component=tTopo->tecSide(detid)==2?tTopo->tecWheel(detid):tTopo->tecWheel(detid)+9; } diff --git a/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc index 1361a5869fb99..ad693321e8e9e 100644 --- a/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc +++ b/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc @@ -110,13 +110,12 @@ void SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs(SiStripQuality* detrawid = detid; APV.detrawId = detrawid; subdetid = detectorId.subdetId(); - if (SiStripDetId(detrawid).stereo() !=0 ) isstereo = 1; // It's a stereo module - else isstereo = 0; // It's an rphi module switch (detectorId.subdetId()) { case StripSubdetector::TIB : layer_ring = tTopo->tibLayer(detrawid); disc = -1; + isstereo = tTopo->tibIsStereo(detrawid); isback = -1; if (tTopo->tibIsExternalString(detrawid)) isexternalstring = 1; else isexternalstring = 0; @@ -135,6 +134,7 @@ void SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs(SiStripQuality* case StripSubdetector::TID : layer_ring = tTopo->tidRing(detrawid); disc = tTopo->tidWheel(detrawid); + isstereo = tTopo->tidIsStereo(detrawid); if (tTopo->tidIsBackRing(detrawid)) isback = 1; else isback = 0; if (tTopo->tidIsZMinusSide(detrawid)) iszminusside = 1; @@ -161,6 +161,7 @@ void SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs(SiStripQuality* case StripSubdetector::TOB : layer_ring = tTopo->tobLayer(detrawid); disc = -1; + isstereo = tTopo->tobIsStereo(detrawid); isback = -1; if (tTopo->tobIsZMinusSide(detrawid)) iszminusside = 1; else iszminusside = 0; @@ -180,6 +181,7 @@ void SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs(SiStripQuality* case StripSubdetector::TEC : layer_ring = tTopo->tecRing(detrawid); disc = tTopo->tecWheel(detrawid); + isstereo = tTopo->tecIsStereo(detrawid); if (tTopo->tecIsBackPetal(detrawid)) isback = 1; else isback = 0; if (tTopo->tecIsZMinusSide(detrawid)) iszminusside = 1; diff --git a/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc index c980385263d98..48048336bb0d9 100644 --- a/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc +++ b/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc @@ -703,13 +703,12 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::setBasicTreeParamete detrawid = detid; subdetid = DetectorID.subdetId(); - if (SiStripDetId(detid).stereo() !=0 ) isstereo = 1; // It's a stereo module - else isstereo = 0; // It's an rphi module switch (DetectorID.subdetId()) { case StripSubdetector::TIB : layer_ring = tTopo->tibLayer(detid); disc = -1; + isstereo = tTopo->tibIsStereo(detid); isback = -1; if (tTopo->tibIsExternalString(detid)) isexternalstring = 1; else isexternalstring = 0; @@ -723,6 +722,7 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::setBasicTreeParamete case StripSubdetector::TID : layer_ring = tTopo->tidRing(detid); disc = tTopo->tidWheel(detid); + isstereo = tTopo->tidIsStereo(detid); if (tTopo->tidIsBackRing(detid)) isback = 1; else isback = 0; if (tTopo->tidIsZMinusSide(detid)) iszminusside = 1; @@ -736,6 +736,7 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::setBasicTreeParamete case StripSubdetector::TOB : layer_ring = tTopo->tobLayer(detid); disc = -1; + isstereo = tTopo->tobIsStereo(detid); isback = -1; if (tTopo->tobIsZMinusSide(detid)) iszminusside = 1; else iszminusside = 0; @@ -748,6 +749,7 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::setBasicTreeParamete case StripSubdetector::TEC : layer_ring = tTopo->tecRing(detid); disc = tTopo->tecWheel(detid); + isstereo = tTopo->tecIsStereo(detid); if (tTopo->tecIsBackPetal(detid)) isback = 1; else isback = 0; if (tTopo->tecIsZMinusSide(detid)) iszminusside = 1; diff --git a/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc index 7e433c681cde0..05332f346d998 100644 --- a/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc +++ b/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc @@ -1,6 +1,4 @@ #include "CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h" -#include "DataFormats/SiStripDetId/interface/SiStripDetId.h" -#include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" @@ -83,13 +81,12 @@ void SiStripHotStripAlgorithmFromClusterOccupancy::extractBadStrips(SiStripQuali detrawid = detid; subdetid = detectorId.subdetId(); number_strips = (int)(it->second.get())->GetNbinsX(); - if (SiStripDetId(detrawid).stereo() !=0 ) isstereo = 1; // It's a stereo module - else isstereo = 0; // It's an rphi module switch (detectorId.subdetId()) { case StripSubdetector::TIB : layer_ring = tTopo->tibLayer(detrawid); disc = -1; + isstereo = tTopo->tibIsStereo(detrawid); isback = -1; if (tTopo->tibIsExternalString(detrawid)) isexternalstring = 1; else isexternalstring = 0; @@ -102,6 +99,7 @@ void SiStripHotStripAlgorithmFromClusterOccupancy::extractBadStrips(SiStripQuali case StripSubdetector::TID : layer_ring = tTopo->tidRing(detrawid); disc = tTopo->tidWheel(detrawid); + isstereo = tTopo->tidIsStereo(detrawid); if (tTopo->tidIsBackRing(detrawid)) isback = 1; else isback = 0; if (tTopo->tidIsZMinusSide(detrawid)) iszminusside = 1; @@ -114,6 +112,7 @@ void SiStripHotStripAlgorithmFromClusterOccupancy::extractBadStrips(SiStripQuali case StripSubdetector::TOB : layer_ring = tTopo->tobLayer(detrawid); disc = -1; + isstereo = tTopo->tobIsStereo(detrawid); isback = -1; if (tTopo->tobIsZMinusSide(detrawid)) iszminusside = 1; else iszminusside = 0; @@ -125,6 +124,7 @@ void SiStripHotStripAlgorithmFromClusterOccupancy::extractBadStrips(SiStripQuali case StripSubdetector::TEC : layer_ring = tTopo->tecRing(detrawid); disc = tTopo->tecWheel(detrawid); + isstereo = tTopo->tecIsStereo(detrawid); if (tTopo->tecIsBackPetal(detrawid)) isback = 1; else isback = 0; if (tTopo->tecIsZMinusSide(detrawid)) iszminusside = 1;