Skip to content

Commit

Permalink
Merge pull request #34794 from perrotta/fixesAndDeadCodeRemovalInDqmL…
Browse files Browse the repository at this point in the history 
…1tmonitor

Remove dead code and apply one fix in DQM/L1TMonitor
  • Loading branch information
@cmsbuild
cmsbuild committed Aug 10, 2021
2 parents 17fc5ea + 0d8acbd commit 9ac280b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 50 deletions.
29 changes: 7 additions & 22 deletions DQM/L1TMonitor/src/L1TBPTX.cc
View file
Expand Up @@ -415,44 +415,29 @@ void L1TBPTX::analyze(const Event& iEvent, const EventSetup& eventSetup) {
triggerName = "tech_" + std::to_string(bit);
}

int evBxStart = -2;
int evBxEnd = 2;

if (offset < 0) {
evBxStart += -1 * offset;
}
if (offset > 0) {
evBxEnd += -1 * offset;
}

for (unsigned a = 0; a < gtFdlVectorData.size(); a++) {
int testBx = gtFdlVectorData[a].localBxNr() - offset;
bool lhcBxFilled = m_beamConfig.beam1[testBx] && m_beamConfig.beam2[testBx];
bool algoFired = false;

if (isAlgo) {
if (gtFdlVectorData[a].gtDecisionWord()[bit]) {
if (gtFdlVectorData[a].gtDecisionWord()[bit])
algoFired = true;
}

} else {
if (gtFdlVectorData[a].gtTechnicalTriggerWord()[bit]) {
if (gtFdlVectorData[a].gtTechnicalTriggerWord()[bit])
algoFired = true;
}
}

if (lhcBxFilled) {
m_effDenominator[triggerName]++;
if (algoFired)
m_effNumerator[triggerName]++;
}
if (lhcBxFilled && algoFired) {
m_effNumerator[triggerName]++;
}

if (algoFired) {
m_missFireNumerator[triggerName]++;
}
if (algoFired && !lhcBxFilled) {
m_missFireNumerator[triggerName]++;
m_missFireDenominator[triggerName]++;
if (!lhcBxFilled)
m_missFireNumerator[triggerName]++;
}
}
}
Expand Down
40 changes: 12 additions & 28 deletions DQM/L1TMonitor/src/L1TdeGCT.cc
View file
Expand Up @@ -421,7 +421,7 @@ void L1TdeGCT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
it->rank(rankarr);
float rnkv = rankarr[0];

double wei = 1.;
double wei;

unsigned int mask = (~0x0);

Expand All @@ -433,16 +433,14 @@ void L1TdeGCT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
}

//type: 0:agree 1:loc.agree, 2:loc.disagree, 3:data.only, 4:emul.only
if (it->type() < 4)
if (type < 4)
sysncand[0]->Fill(ccid);
if (it->type() < 5 && it->type() != 3)
if (type < 5 && type != 3)
sysncand[1]->Fill(ccid);

errortype[ccid]->Fill(type);

wei = 1.;
if (!type)
wei = 0.;
wei = (type == 0) ? 0. : 1.;
if (etav != nullVal && phiv != nullVal)
etaphi[ccid]->Fill(etav, phiv, wei);
if (etav != nullVal)
Expand All @@ -452,15 +450,12 @@ void L1TdeGCT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
rnk[ccid]->Fill(rnkv, wei);

//exclude e-only cands (only data)
wei = 1.;
if (type == 4)
wei = 0.;
wei = (type == 4) ? 0. : 1.;
if (etav != nullVal)
etaData[ccid]->Fill(etav, wei);
if (phiv != nullVal)
phiData[ccid]->Fill(phiv, wei);
rnkData[ccid]->Fill(rnkv, wei);
wei = 1;

// GCT trigger bits
unsigned int word[2];
Expand All @@ -484,10 +479,8 @@ void L1TdeGCT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)

///bitset loop
for (int ibit = 0; ibit < 32; ibit++) {
wei = 1.;
//comparison gives no info if there's only 1 candidate
if (type == 3 || type == 4)
wei = 0.;
wei = (type == 3 || type == 4) ? 0. : 1.;
if (dbits[ibit])
dword[ccid]->Fill(ibit, wei);
if (ebits[ibit])
Expand All @@ -496,7 +489,6 @@ void L1TdeGCT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
deword[ccid]->Fill(ibit, wei);
//if(dembits[ibit])masked[sid]->Fill(ibit,wei);
}
wei = 1;
}

//error rates per GCT trigger object type
Expand Down Expand Up @@ -606,7 +598,7 @@ void L1TdeGCT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
it->rank(rankarr);
float rnkv = rankarr[0];

double wei = 1.;
double wei;

unsigned int mask = (~0x0);

Expand All @@ -618,14 +610,12 @@ void L1TdeGCT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
}

//type: 0:agree 1:loc.agree, 2:loc.disagree, 3:data.only, 4:emul.only
if (it->type() < 4)
if (type < 4)
sysncand[0]->Fill(ccid);
if (it->type() < 5 && it->type() != 3)
if (type < 5 && type != 3)
sysncand[1]->Fill(ccid);
errortype_stage1layer2[ccid]->Fill(type);
wei = 1.;
if (!type)
wei = 0.;
wei = (type == 0) ? 0. : 1.;
if (etav != nullVal && phiv != nullVal)
etaphi_stage1layer2[ccid]->Fill(etav, phiv, wei);
if (etav != nullVal)
Expand All @@ -635,15 +625,12 @@ void L1TdeGCT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
rnk_stage1layer2[ccid]->Fill(rnkv, wei);

//exclude e-only cands (only data)
wei = 1.;
if (type == 4)
wei = 0.;
wei = (type == 4) ? 0. : 1.;
if (etav != nullVal)
etaData_stage1layer2[ccid]->Fill(etav, wei);
if (phiv != nullVal)
phiData_stage1layer2[ccid]->Fill(phiv, wei);
rnkData_stage1layer2[ccid]->Fill(rnkv, wei);
wei = 1;

// GCT trigger bits
unsigned int word_stage1layer2[2];
Expand All @@ -667,10 +654,8 @@ void L1TdeGCT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)

///bitset loop
for (int ibit = 0; ibit < 32; ibit++) {
wei = 1.;
//comparison gives no info if there's only 1 candidate
if (type == 3 || type == 4)
wei = 0.;
wei = (type == 3 || type == 4) ? 0. : 1.;
if (dbits[ibit])
dword_stage1layer2[ccid]->Fill(ibit, wei);
if (ebits[ibit])
Expand All @@ -679,7 +664,6 @@ void L1TdeGCT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
deword_stage1layer2[ccid]->Fill(ibit, wei);
//if(dembits[ibit])masked[sid]->Fill(ibit,wei);
}
wei = 1;
}
//error rates per GCT trigger object type
int hasCol[nStage1Layer2Coll_] = {0};
Expand Down

0 comments on commit 9ac280b

Please sign in to comment.