Skip to content

Commit

Permalink
Merge pull request cms-sw#7272 from nickmccoll/MoveToTrackerTopology
Browse files Browse the repository at this point in the history 
Removal of references to depreciated SiStripDetId
  • Loading branch information
@cmsbuild
cmsbuild committed Jan 23, 2015
2 parents b1b4398 + b46e9a0 commit 0011680
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 41 deletions.
1 change: 0 additions & 1 deletion CalibTracker/SiStripQuality/plugins/BuildFile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/SiStripObjects"/>
<use name="CalibFormats/SiStripObjects"/>
<use name="DataFormats/SiStripDetId"/>
<use name="CalibTracker/Records"/>
<use name="CalibTracker/SiStripQuality"/>
<use name="DataFormats/SiStripCluster"/>
Expand Down
23 changes: 12 additions & 11 deletions CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,34 +122,34 @@ 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
//&&&&&&&&&&&&&&&&&

component=tTopo->tibLayer(BC[i].detid);
SetBadComponents(0, component, BC[i]);

} else if ( a.subdetId() == SiStripDetId::TID ) {
} else if ( subDet == StripSubdetector::TID ) {
//&&&&&&&&&&&&&&&&&
//TID
//&&&&&&&&&&&&&&&&&

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
//&&&&&&&&&&&&&&&&&

component=tTopo->tobLayer(BC[i].detid);
SetBadComponents(2, component, BC[i]);

} else if ( a.subdetId() == SiStripDetId::TEC ) {
} else if ( subDet == StripSubdetector::TEC ) {
//&&&&&&&&&&&&&&&&&
//TEC
//&&&&&&&&&&&&&&&&&
Expand All @@ -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;
}
Expand Down
6 changes: 4 additions & 2 deletions CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc
View file
Original file line number Diff line number Diff line change
@@ -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"

Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
17 changes: 7 additions & 10 deletions Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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<uint32_t> 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;
}
Expand Down
1 change: 0 additions & 1 deletion Validation/TrackerRecHits/BuildFile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<use name="SimDataFormats/TrackerDigiSimLink"/>
<use name="SimTracker/TrackerHitAssociation"/>
<use name="CommonTools/TriggerUtils"/>
<use name="DataFormats/SiStripDetId"/>
<use name="DQM/SiStripCommon"/>
<use name="CalibTracker/Records"/>
<use name="CalibFormats/SiStripObjects"/>
Expand Down
17 changes: 7 additions & 10 deletions Validation/TrackerRecHits/src/SiStripRecHitsValid.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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<uint32_t> 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;
}
Expand Down

0 comments on commit 0011680

Please sign in to comment.