Skip to content

Commit

Permalink
Merge pull request #19993 from apana/apana-fix_oot_correlations_CMSSW…
Browse files Browse the repository at this point in the history 
…_925patch2

92x L1T uGT fix disagreement fw/emul OOT dcorrelations algorithms
  • Loading branch information
@cmsbuild
cmsbuild committed Aug 3, 2017
2 parents ca2e505 + c6f07a1 commit 07723e8
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 20 deletions.
21 changes: 11 additions & 10 deletions L1Trigger/L1TGlobal/src/CorrCondition.cc
View file
Expand Up @@ -172,7 +172,7 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const {
reqObjResult = muCondition.condLastResult();

cond0Comb = (muCondition.getCombinationsInCond());
cond0bx = (corrMuon->condRelativeBx());
cond0bx = bxEval + (corrMuon->condRelativeBx());
cndObjTypeVec[0] = (corrMuon->objectType())[0];

if (m_verbosity ) {
Expand All @@ -193,7 +193,7 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const {
reqObjResult = caloCondition.condLastResult();

cond0Comb = (caloCondition.getCombinationsInCond());
cond0bx = (corrCalo->condRelativeBx());
cond0bx = bxEval + (corrCalo->condRelativeBx());
cndObjTypeVec[0] = (corrCalo->objectType())[0];

if (m_verbosity) {
Expand All @@ -213,7 +213,7 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const {
reqObjResult = eSumCondition.condLastResult();

cond0Comb = (eSumCondition.getCombinationsInCond());
cond0bx = (corrEnergySum->condRelativeBx());
cond0bx = bxEval + (corrEnergySum->condRelativeBx());
cndObjTypeVec[0] = (corrEnergySum->objectType())[0];

if (m_verbosity ) {
Expand Down Expand Up @@ -252,7 +252,7 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const {
reqObjResult = muCondition.condLastResult();

cond1Comb = (muCondition.getCombinationsInCond());
cond1bx = (corrMuon->condRelativeBx());
cond1bx = bxEval + (corrMuon->condRelativeBx());

cndObjTypeVec[1] = (corrMuon->objectType())[0];

Expand All @@ -273,7 +273,7 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const {
reqObjResult = caloCondition.condLastResult();

cond1Comb = (caloCondition.getCombinationsInCond());
cond1bx = (corrCalo->condRelativeBx());
cond1bx = bxEval + (corrCalo->condRelativeBx());
cndObjTypeVec[1] = (corrCalo->objectType())[0];

if (m_verbosity ) {
Expand All @@ -294,7 +294,7 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const {
reqObjResult = eSumCondition.condLastResult();

cond1Comb = (eSumCondition.getCombinationsInCond());
cond1bx = (corrEnergySum->condRelativeBx());
cond1bx = bxEval + (corrEnergySum->condRelativeBx());
cndObjTypeVec[1] = (corrEnergySum->objectType())[0];

if (m_verbosity) {
Expand Down Expand Up @@ -419,7 +419,7 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const {
switch (cond0Categ) {
case CondMuon: {
lutObj0 = "MU";
candMuVec = m_uGtB->getCandL1Mu();
candMuVec = m_uGtB->getCandL1Mu();
phiIndex0 = (candMuVec->at(cond0bx,obj0Index))->hwPhiAtVtx(); //(*candMuVec)[obj0Index]->phiIndex();
etaIndex0 = (candMuVec->at(cond0bx,obj0Index))->hwEtaAtVtx();
etIndex0 = (candMuVec->at(cond0bx,obj0Index))->hwPt();
Expand Down Expand Up @@ -705,10 +705,11 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const {
//If we are dealing with the same object type avoid the two legs
// either being the same object
if( cndObjTypeVec[0] == cndObjTypeVec[1] &&
obj0Index == obj1Index ) {
obj0Index == obj1Index &&
cond0bx == cond1bx) {

LogDebug("L1TGlobal") << "Corr Condition looking at same leg...skip" << std::endl;
continue;
LogDebug("L1TGlobal") << "Corr Condition looking at same leg...skip" << std::endl;
continue;
}

switch (cond1Categ) {
Expand Down
21 changes: 11 additions & 10 deletions L1Trigger/L1TGlobal/src/CorrWithOverlapRemovalCondition.cc
View file
Expand Up @@ -217,7 +217,7 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE
reqObjResult = muCondition.condLastResult();

cond0Comb = (muCondition.getCombinationsInCond());
cond0bx = (corrMuon->condRelativeBx());
cond0bx = bxEval + (corrMuon->condRelativeBx());

cndObjTypeVec[0] = (corrMuon->objectType())[0];

Expand All @@ -239,7 +239,7 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE
reqObjResult = caloCondition.condLastResult();

cond0Comb = (caloCondition.getCombinationsInCond());
cond0bx = (corrCalo->condRelativeBx());
cond0bx = bxEval + (corrCalo->condRelativeBx());

cndObjTypeVec[0] = (corrCalo->objectType())[0];

Expand All @@ -260,7 +260,7 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE
reqObjResult = eSumCondition.condLastResult();

cond0Comb = (eSumCondition.getCombinationsInCond());
cond0bx = (corrEnergySum->condRelativeBx());
cond0bx = bxEval + (corrEnergySum->condRelativeBx());

cndObjTypeVec[0] = (corrEnergySum->objectType())[0];

Expand Down Expand Up @@ -300,7 +300,7 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE
reqObjResult = muCondition.condLastResult();

cond1Comb = (muCondition.getCombinationsInCond());
cond1bx = (corrMuon->condRelativeBx());
cond1bx = bxEval + (corrMuon->condRelativeBx());
cndObjTypeVec[1] = (corrMuon->objectType())[0];

if (m_verbosity) {
Expand All @@ -320,7 +320,7 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE
reqObjResult = caloCondition.condLastResult();

cond1Comb = (caloCondition.getCombinationsInCond());
cond1bx = (corrCalo->condRelativeBx());
cond1bx = bxEval + (corrCalo->condRelativeBx());

cndObjTypeVec[1] = (corrCalo->objectType())[0];

Expand All @@ -342,7 +342,7 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE
reqObjResult = eSumCondition.condLastResult();

cond1Comb = (eSumCondition.getCombinationsInCond());
cond1bx = (corrEnergySum->condRelativeBx());
cond1bx = bxEval + (corrEnergySum->condRelativeBx());
cndObjTypeVec[1] = (corrEnergySum->objectType())[0];

if (m_verbosity) {
Expand Down Expand Up @@ -383,7 +383,7 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE
reqObjResult = muCondition.condLastResult();

cond2Comb = (muCondition.getCombinationsInCond());
cond2bx = (corrMuon->condRelativeBx());
cond2bx = bxEval + (corrMuon->condRelativeBx());
cndObjTypeVec[2] = (corrMuon->objectType())[0];

if (m_verbosity) {
Expand All @@ -403,7 +403,7 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE
reqObjResult = caloCondition.condLastResult();

cond2Comb = (caloCondition.getCombinationsInCond());
cond2bx = (corrCalo->condRelativeBx());
cond2bx = bxEval + (corrCalo->condRelativeBx());
cndObjTypeVec[2] = (corrCalo->objectType())[0];

if (m_verbosity ) {
Expand All @@ -424,7 +424,7 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE
reqObjResult = eSumCondition.condLastResult();

cond2Comb = (eSumCondition.getCombinationsInCond());
cond2bx = (corrEnergySum->condRelativeBx());
cond2bx = bxEval + (corrEnergySum->condRelativeBx());
cndObjTypeVec[2] = (corrEnergySum->objectType())[0];

if (m_verbosity) {
Expand Down Expand Up @@ -1225,7 +1225,8 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE
//If we are dealing with the same object type avoid the two legs
// either being the same object
if( cndObjTypeVec[0] == cndObjTypeVec[1] &&
obj0Index == obj1Index ) {
obj0Index == obj1Index &&
cond0bx == cond1bx) {

LogDebug("L1TGlobal") << "Corr Condition looking at same leg...skip" << std::endl;
continue;
Expand Down

0 comments on commit 07723e8

Please sign in to comment.