Skip to content

Commit

Permalink
add pred vs size
Browse files Browse the repository at this point in the history
  • Loading branch information
VinInn committed Jul 7, 2017
1 parent 6907e25 commit 575003d
Show file tree
Hide file tree
Showing 2 changed files with 110 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -236,16 +236,58 @@
Specification().groupBy("PXBarrel/PXLayer").save()
)
)

SiPixelPhase1ClustersSizeVsEtaOnTrackInner = SiPixelPhase1ClustersSizeVsEtaOnTrackOuter.clone(
name = "sizeyvseta_on_track_inner",
title = "Cluster Size along Beamline vs. Track #eta (OnTrack) inner ladders",
)


SiPixelPhase1TrackClustersOnTrackSizeYOuter = SiPixelPhase1ClustersSizeVsEtaOnTrackOuter.clone(
name = "sizey_on_track_outer",
title = "Cluster Size along Beamline vs. prediction (OnTrack) outer ladders",
xlabel = "prediction",
ylabel = "length [pixels]",
range_min = 0, range_max = 30, range_nbins = 60
)
SiPixelPhase1TrackClustersOnTrackSizeYInner = SiPixelPhase1TrackClustersOnTrackSizeYOuter.clone(
name = "sizey_on_track_inner",
title = "Cluster Size along Beamline vs. prediction (OnTrack) inner ladders",
)


SiPixelPhase1TrackClustersOnTrackSizeXOuter = SiPixelPhase1TrackClustersOnTrackSizeYOuter.clone(
name = "sizex_on_track_outer",
title = "Cluster Size along radial vs. prediction (OnTrack) outer ladders",
range_min = 0, range_max = 6, range_nbins = 12,
range_y_min = 0, range_y_max = 6, range_y_nbins = 6

)
SiPixelPhase1TrackClustersOnTrackSizeXInner = SiPixelPhase1TrackClustersOnTrackSizeXOuter.clone(
name = "sizex_on_track_inner",
title = "Cluster Size along radial vs. prediction (OnTrack) inner ladders",
)


SiPixelPhase1TrackClustersOnTrackSizeXYOuter = SiPixelPhase1TrackClustersOnTrackSizeYOuter.clone(
name = "sizexy_on_track_outer",
title = "prediction - Cluster Size x vs y (OnTrack) outer ladders",
xlabel = "y diff",
ylabel = "x diff",
range_min = -6, range_max = 6, range_nbins = 24,
range_y_min = -6, range_y_max = 6, range_y_nbins = 24
)
SiPixelPhase1TrackClustersOnTrackSizeXYInner = SiPixelPhase1TrackClustersOnTrackSizeXYOuter.clone(
name = "sizexy_on_track_inner",
title = "prediction - Cluster Size x vs y (OnTrack) outer ladders"
)




SiPixelPhase1TrackClustersOnTrackChargeOuter = DefaultHistoTrack.clone(
name = "chargeOuter",
title = "Corrected Cluster Charge (OnTrack) outer ladders",
range_min = 0, range_max = 1500e3, range_nbins = 150,
range_min = 0, range_max = 150e3, range_nbins = 150,
xlabel = "Charge (electrons)",

specs = VPSet(
Expand All @@ -257,6 +299,20 @@
title = "Corrected Cluster Charge (OnTrack) inner ladders"
)

SiPixelPhase1TrackClustersOnTrackShapeOuter = DefaultHistoTrack.clone(
name = "shapeFilterOuter",
title = "Shape filter (OnTrack) Outer Ladders",
range_min = 0, range_max = 2, range_nbins = 2,
xlabel = "shapeFilter",
specs = VPSet(
Specification().groupBy("PXBarrel/PXLayer").save()
)
)
SiPixelPhase1TrackClustersOnTrackShapeInner = SiPixelPhase1TrackClustersOnTrackShapeOuter.clone(
name = "shapeFilterInner",
title = "Shape filter (OnTrack) Inner Ladders",
)



SiPixelPhase1TrackClustersConf = cms.VPSet(
Expand All @@ -273,7 +329,19 @@
SiPixelPhase1ClustersSizeVsEtaOnTrackOuter,
SiPixelPhase1ClustersSizeVsEtaOnTrackInner,
SiPixelPhase1TrackClustersOnTrackChargeOuter,
SiPixelPhase1TrackClustersOnTrackChargeInner
SiPixelPhase1TrackClustersOnTrackChargeInner,

SiPixelPhase1TrackClustersOnTrackShapeOuter,
SiPixelPhase1TrackClustersOnTrackShapeInner,

SiPixelPhase1TrackClustersOnTrackSizeXOuter,
SiPixelPhase1TrackClustersOnTrackSizeXInner,
SiPixelPhase1TrackClustersOnTrackSizeYOuter,
SiPixelPhase1TrackClustersOnTrackSizeYInner,

SiPixelPhase1TrackClustersOnTrackSizeXYOuter,
SiPixelPhase1TrackClustersOnTrackSizeXYInner

)


Expand Down
45 changes: 39 additions & 6 deletions DQM/SiPixelPhase1TrackClusters/src/SiPixelPhase1TrackClusters.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,21 @@ enum { // copy paste from cfy: the only safe way to doit....
SiPixelPhase1ClustersSizeVsEtaOnTrackOuter,
SiPixelPhase1ClustersSizeVsEtaOnTrackInner,
SiPixelPhase1TrackClustersOnTrackChargeOuter,
SiPixelPhase1TrackClustersOnTrackChargeInner
SiPixelPhase1TrackClustersOnTrackChargeInner,

SiPixelPhase1TrackClustersOnTrackShapeOuter,
SiPixelPhase1TrackClustersOnTrackShapeInner,

SiPixelPhase1TrackClustersOnTrackSizeXOuter,
SiPixelPhase1TrackClustersOnTrackSizeXInner,
SiPixelPhase1TrackClustersOnTrackSizeYOuter,
SiPixelPhase1TrackClustersOnTrackSizeYInner,

SiPixelPhase1TrackClustersOnTrackSizeXYOuter,
SiPixelPhase1TrackClustersOnTrackSizeXYInner,


SiPixelPhase1TrackClustersEnumSize
};

public:
Expand Down Expand Up @@ -73,9 +87,9 @@ SiPixelPhase1TrackClusters::SiPixelPhase1TrackClusters(const edm::ParameterSet&

void SiPixelPhase1TrackClusters::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {

if (histo.size() != SiPixelPhase1TrackClustersOnTrackChargeInner+1) {
if (histo.size() != SiPixelPhase1TrackClustersEnumSize) {
edm::LogError("SiPixelPhase1TrackClusters") << "incompatible configuration " << histo.size()
<< '<' << SiPixelPhase1TrackClustersOnTrackChargeInner+1 << std::endl;
<< "!=" << SiPixelPhase1TrackClustersEnumSize << std::endl;
return;
}

Expand Down Expand Up @@ -160,17 +174,36 @@ void SiPixelPhase1TrackClusters::analyze(const edm::Event& iEvent, const edm::Ev

auto clustgp = pixhit->globalPosition(); // from rechit

auto shape = shapeFilter.isCompatible(*pixhit,localDir,pixelClusterShapeCache);

int part;
ClusterData::ArrayType meas;
std::pair<float,float> pred;
if(shapeFilter.getSizes(*pixhit,localDir,pixelClusterShapeCache, part,meas, pred)) {
auto shape = shapeFilter.isCompatible(*pixhit,localDir,pixelClusterShapeCache);
if(tkTpl.pxbLadder(id)%2==1) {
histo[SiPixelPhase1TrackClustersOnTrackSizeXOuter].fill(pred.first, cluster.sizeX(), id, &iEvent);
histo[SiPixelPhase1TrackClustersOnTrackSizeYOuter].fill(pred.second,cluster.sizeY(), id, &iEvent);
histo[SiPixelPhase1TrackClustersOnTrackSizeXYOuter].fill(pred.second-cluster.sizeY(),pred.first-cluster.sizeX(), id, &iEvent);

histo[SiPixelPhase1TrackClustersOnTrackShapeOuter].fill(shape?1:0,id, &iEvent);
} else {
histo[SiPixelPhase1TrackClustersOnTrackSizeXInner].fill(pred.first, cluster.sizeX(), id, &iEvent);
histo[SiPixelPhase1TrackClustersOnTrackSizeYInner].fill(pred.second,cluster.sizeY(), id, &iEvent);
histo[SiPixelPhase1TrackClustersOnTrackSizeXYInner].fill(pred.second-cluster.sizeY(),pred.first-cluster.sizeX(), id, &iEvent);

histo[SiPixelPhase1TrackClustersOnTrackShapeInner].fill(shape?1:0,id, &iEvent);
}
histo[SiPixelPhase1TrackClustersOnTrackShape].fill(shape?1:0,id, &iEvent);
}

histo[SiPixelPhase1TrackClustersOnTrackNClusters].fill(id, &iEvent);
histo[SiPixelPhase1TrackClustersOnTrackCharge].fill(charge, id, &iEvent);
histo[SiPixelPhase1TrackClustersOnTrackSize].fill(cluster.size(), id, &iEvent);
histo[SiPixelPhase1TrackClustersOnTrackShape].fill(shape?0:1,id, &iEvent);

histo[SiPixelPhase1TrackClustersOnTrackPositionB].fill(clustgp.z(), clustgp.phi(), id, &iEvent);
histo[SiPixelPhase1TrackClustersOnTrackPositionF].fill(clustgp.x(), clustgp.y(), id, &iEvent);

if(tkTpl.pxbLadder(id)%2==0) {
if(tkTpl.pxbLadder(id)%2==1) {
histo[SiPixelPhase1ClustersSizeVsEtaOnTrackOuter].fill(etatk, cluster.sizeY(), id, &iEvent);
histo[SiPixelPhase1TrackClustersOnTrackChargeOuter].fill(charge, id, &iEvent);
} else {
Expand Down

0 comments on commit 575003d

Please sign in to comment.