Skip to content

Commit 40d31c4

Browse files
jhgohjhgoh
committed
replace "noise" occupancy to simpler all-hits occupancy to be clear meaning
1 parent 721739d commit 40d31c4

File tree

3 files changed

+18
-57
lines changed

3 files changed

+18
-57
lines changed

‎Validation/RPCRecHits/interface/RPCRecHitValid.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ class RPCRecHitValid : public DQMEDAnalyzer {
6666
MEP h_matchOccupancyEndcap_detId;
6767
MEP h_refOccupancyBarrel_detId;
6868
MEP h_refOccupancyEndcap_detId;
69-
MEP h_noiseOccupancyBarrel_detId;
70-
MEP h_noiseOccupancyEndcap_detId;
69+
MEP h_allOccupancyBarrel_detId;
70+
MEP h_allOccupancyEndcap_detId;
7171
MEP h_rollAreaBarrel_detId;
7272
MEP h_rollAreaEndcap_detId;
7373

‎Validation/RPCRecHits/src/RPCRecHitValid.cc‎

Lines changed: 10 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -220,17 +220,17 @@ void RPCRecHitValid::bookHistograms(DQMStore::IBooker &booker, edm::Run const &r
220220
nRPCRollEndcap,
221221
0,
222222
nRPCRollEndcap);
223-
h_noiseOccupancyBarrel_detId = booker.book1D(
224-
"NoiseOccupancyBarrel_detId", "Noise occupancy;roll index (can be arbitrary)", nRPCRollBarrel, 0, nRPCRollBarrel);
225-
h_noiseOccupancyEndcap_detId = booker.book1D(
226-
"NoiseOccupancyEndcap_detId", "Noise occupancy;roll index (can be arbitrary)", nRPCRollEndcap, 0, nRPCRollEndcap);
223+
h_allOccupancyBarrel_detId = booker.book1D(
224+
"OccupancyBarrel_detId", "Occupancy;roll index (can be arbitrary)", nRPCRollBarrel, 0, nRPCRollBarrel);
225+
h_allOccupancyEndcap_detId = booker.book1D(
226+
"OccupancyEndcap_detId", "Occupancy;roll index (can be arbitrary)", nRPCRollEndcap, 0, nRPCRollEndcap);
227227

228228
h_matchOccupancyBarrel_detId->getTH1()->SetMinimum(0);
229229
h_matchOccupancyEndcap_detId->getTH1()->SetMinimum(0);
230230
h_refOccupancyBarrel_detId->getTH1()->SetMinimum(0);
231231
h_refOccupancyEndcap_detId->getTH1()->SetMinimum(0);
232-
h_noiseOccupancyBarrel_detId->getTH1()->SetMinimum(0);
233-
h_noiseOccupancyEndcap_detId->getTH1()->SetMinimum(0);
232+
h_allOccupancyBarrel_detId->getTH1()->SetMinimum(0);
233+
h_allOccupancyEndcap_detId->getTH1()->SetMinimum(0);
234234

235235
h_rollAreaBarrel_detId = booker.bookProfile(
236236
"RollAreaBarrel_detId", "Roll area;roll index;Area", nRPCRollBarrel, 0., 1. * nRPCRollBarrel, 0., 1e5);
@@ -483,6 +483,8 @@ void RPCRecHitValid::analyze(const edm::Event &event, const edm::EventSetup &eve
483483
h_.recHitOccupancyBarrel_station->Fill(station);
484484
h_.recHitOccupancyBarrel_wheel_station->Fill(ring, station);
485485

486+
h_allOccupancyBarrel_detId->Fill(detIdToIndexMapBarrel_[detId.rawId()]);
487+
486488
h_.timeBarrel->Fill(time);
487489
} else {
488490
++nRecHitEndcap;
@@ -491,6 +493,8 @@ void RPCRecHitValid::analyze(const edm::Event &event, const edm::EventSetup &eve
491493
h_.recHitOccupancyEndcap_disk->Fill(region * station);
492494
h_.recHitOccupancyEndcap_disk_ring->Fill(region * station, ring);
493495

496+
h_allOccupancyEndcap_detId->Fill(detIdToIndexMapEndcap_[detId.rawId()]);
497+
494498
h_.timeEndcap->Fill(time);
495499
}
496500

@@ -657,49 +661,6 @@ void RPCRecHitValid::analyze(const edm::Event &event, const edm::EventSetup &eve
657661
}
658662
}
659663

660-
// Find noise recHits : RecHits without SimHit match
661-
for (RecHitIter recHitIter = recHitHandle->begin(); recHitIter != recHitHandle->end(); ++recHitIter) {
662-
const RPCDetId recDetId = static_cast<const RPCDetId>(recHitIter->rpcId());
663-
const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(recDetId));
664-
665-
const int region = roll->id().region();
666-
// const int ring = roll->id().ring(); // UNUSED VARIABLE
667-
// const int sector = roll->id().sector();
668-
// const int station = roll->id().station(); // UNUSED VARIABLE
669-
// const int layer = roll->id().layer();
670-
// const int subsector = roll->id().subsector();
671-
672-
const double recX = recHitIter->localPosition().x();
673-
const double recErrX = sqrt(recHitIter->localPositionError().xx());
674-
675-
bool matched = false;
676-
for (SimHitIter simHitIter = simHitHandle->begin(); simHitIter != simHitHandle->end(); ++simHitIter) {
677-
const RPCDetId simDetId = static_cast<const RPCDetId>(simHitIter->detUnitId());
678-
const RPCRoll *simRoll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(simDetId));
679-
if (!simRoll)
680-
continue;
681-
682-
if (simDetId != recDetId)
683-
continue;
684-
685-
const double simX = simHitIter->localPosition().x();
686-
const double dX = fabs(recX - simX);
687-
688-
if (dX / recErrX < 5) {
689-
matched = true;
690-
break;
691-
}
692-
}
693-
694-
if (!matched) {
695-
if (region == 0) {
696-
h_noiseOccupancyBarrel_detId->Fill(detIdToIndexMapBarrel_[recDetId.rawId()]);
697-
} else {
698-
h_noiseOccupancyEndcap_detId->Fill(detIdToIndexMapEndcap_[recDetId.rawId()]);
699-
}
700-
}
701-
}
702-
703664
h_eventCount->Fill(2);
704665
}
705666

‎Validation/RPCRecHits/src/RPCRecHitValidClient.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ void RPCRecHitValidClient::dqmEndJob(DQMStore::IBooker &booker, DQMStore::IGette
6767

6868
MEP me_eventCount = getter.get(subDir_ + "/Occupancy/EventCount");
6969
const double nEvent = me_eventCount ? me_eventCount->getTH1()->GetBinContent(1) : 1;
70-
MEP me_noiseOccupancyBarrel_detId = getter.get(subDir_ + "/Occupancy/NoiseOccupancyBarrel_detId");
70+
MEP me_allOccupancyBarrel_detId = getter.get(subDir_ + "/Occupancy/OccupancyBarrel_detId");
7171
MEP me_rollAreaBarrel_detId = getter.get(subDir_ + "/Occupancy/RollAreaBarrel_detId");
72-
if (me_noiseOccupancyBarrel_detId and me_rollAreaBarrel_detId) {
73-
TH1 *h_noiseOccupancyBarrel_detId = me_noiseOccupancyBarrel_detId->getTH1();
72+
if (me_allOccupancyBarrel_detId and me_rollAreaBarrel_detId) {
73+
TH1 *h_noiseOccupancyBarrel_detId = me_allOccupancyBarrel_detId->getTH1();
7474
TH1 *h_rollAreaBarrel_detId = me_rollAreaBarrel_detId->getTH1();
7575

7676
for (int bin = 1, nBin = h_noiseOccupancyBarrel_detId->GetNbinsX(); bin <= nBin; ++bin) {
@@ -84,10 +84,10 @@ void RPCRecHitValidClient::dqmEndJob(DQMStore::IBooker &booker, DQMStore::IGette
8484
}
8585
}
8686

87-
MEP me_noiseOccupancyEndcap_detId = getter.get(subDir_ + "/Occupancy/NoiseOccupancyEndcap_detId");
87+
MEP me_allOccupancyEndcap_detId = getter.get(subDir_ + "/Occupancy/OccupancyEndcap_detId");
8888
MEP me_rollAreaEndcap_detId = getter.get(subDir_ + "/Occupancy/RollAreaEndcap_detId");
89-
if (me_noiseOccupancyEndcap_detId and me_rollAreaEndcap_detId) {
90-
TH1 *h_noiseOccupancyEndcap_detId = me_noiseOccupancyEndcap_detId->getTH1();
89+
if (me_allOccupancyEndcap_detId and me_rollAreaEndcap_detId) {
90+
TH1 *h_noiseOccupancyEndcap_detId = me_allOccupancyEndcap_detId->getTH1();
9191
TH1 *h_rollAreaEndcap_detId = me_rollAreaEndcap_detId->getTH1();
9292

9393
for (int bin = 1, nBin = h_noiseOccupancyEndcap_detId->GetNbinsX(); bin <= nBin; ++bin) {

0 commit comments

Comments
 (0)