Update for running the emulator with bx!=0

cms-sw · Aug 1, 2017 · c6f07a1 · c6f07a1
1 parent 86691ac
commit c6f07a1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/L1Trigger/L1TGlobal/src/CorrCondition.cc b/L1Trigger/L1TGlobal/src/CorrCondition.cc
@@ -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 ) {
@@ -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) {
@@ -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 ) {
@@ -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];
 
@@ -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 ) {
@@ -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) {
@@ -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();

diff --git a/L1Trigger/L1TGlobal/src/CorrWithOverlapRemovalCondition.cc b/L1Trigger/L1TGlobal/src/CorrWithOverlapRemovalCondition.cc
@@ -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];
 
@@ -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];
 
@@ -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];
 
@@ -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) {
@@ -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];
 
@@ -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) {
@@ -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) {
@@ -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 ) {
@@ -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) {