diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexMonitorAlgorithm.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexMonitorAlgorithm.py index f63631bb017988b31fcdc7554024fd63d5f35c74..09f4adf46b4427c363e946816ed7eefd7391ef57 100644 --- a/Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexMonitorAlgorithm.py +++ b/Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexMonitorAlgorithm.py @@ -88,7 +88,7 @@ def GfexMonitoringConfig(flags): # 2D histograms if gPath == "gJ": - helper.defineHistogram(f"{containerKey}Eta{ptCutString},{containerKey}Phi{ptCutString};h_etaphiMap{containerKey}{ptCutString}", title="{} {} #eta vs #phi ; #eta; #phi".format(tobTypeStr, ptStrTitle), + helper.defineHistogram(f"{containerKey}Eta{ptCutString},{containerKey}Phi{ptCutString};h_etaphiMap{containerKey}{ptCutString}", title="{} {} #eta vs #phi ; #eta; #phi; Number of TOBs".format(tobTypeStr, ptStrTitle), type='TH2F',fillGroup=groupName, path=f"{expertPath}{gPath}/", hanConfig={ "algorithm": "Gfex_etaPhiMapFilled_gJ", @@ -109,7 +109,7 @@ def GfexMonitoringConfig(flags): opt=['kAddBinsDynamically','kAlwaysCreate'],merge="merge") if (gPath == "gLJ"): - helper.defineHistogram(f"{containerKey}Eta{ptCutString},{containerKey}Phi{ptCutString};h_etaphiMap{containerKey}{ptCutString}", title="{} {} #eta vs #phi ; #eta; #phi".format(tobTypeStr, ptStrTitle), + helper.defineHistogram(f"{containerKey}Eta{ptCutString},{containerKey}Phi{ptCutString};h_etaphiMap{containerKey}{ptCutString}", title="{} {} #eta vs #phi ; #eta; #phi; Number of TOBs".format(tobTypeStr, ptStrTitle), type='TH2F',fillGroup=groupName, path=f"{expertPath}{gPath}/", hanConfig={ "algorithm": "Gfex_etaPhiMapFilled_gLJ", diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexInputMonitorAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexInputMonitorAlgorithm.cxx index a9159715b3520ddfa925f951b3122c197d7d047d..494233f9a433e7065061a629bbf16766c057d041 100644 --- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexInputMonitorAlgorithm.cxx +++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexInputMonitorAlgorithm.cxx @@ -47,7 +47,6 @@ StatusCode GfexInputMonitorAlgorithm::fillHistograms( const EventContext& ctx ) unsigned int nTowers = 0; - //ATH_MSG_INFO("gTOWER" << " Eta " << " Eta Index" << " Phi " << " Phi index " ); for(const xAOD::gFexTower* gfexTowerRoI : *gFexTowerContainer){ Toweret=gfexTowerRoI->towerEt(); @@ -57,16 +56,18 @@ StatusCode GfexInputMonitorAlgorithm::fillHistograms( const EventContext& ctx ) float eta = gfexTowerRoI->eta(); float phi = gfexTowerRoI->phi(); - + if (eta < -3.17 && eta > -3.25){ eta = -3.225;} + if (eta < 3.3 && eta > 3.17){ eta = 3.275;} + + Towereta = eta; + if(gfexTowerRoI->towerEt() >= 200 ){ nTowers++; } - Towereta = eta; - //GREATER THAN 2GEV if (gfexTowerRoI->towerEt() >= 10){ - if (std::abs(eta) >= 3.1 ){ + if (std::abs(eta) >= 3.2 ){ Towerphi = phi- 0.1; binNumber = getBinNumberTower(eta,phi-0.1,0,0); fill("highEtgTowers",Towereta,Towerphi); @@ -85,7 +86,7 @@ StatusCode GfexInputMonitorAlgorithm::fillHistograms( const EventContext& ctx ) } //only for h_gTower_coldtowers_etaphimap else if (gfexTowerRoI->towerEt() <= -10){ - if (std::abs(eta) >= 3.1 ){ + if (std::abs(eta) >= 3.2){ Towerphi = phi- 0.1; binNumber = getBinNumberTower(eta,phi-0.1,0,0); fill("lowEtgTowers",Towereta,Towerphi); diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexMonitorAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexMonitorAlgorithm.cxx index 2cd05dfb0a88b3e795be9a79b758af0fcafcd966..08edccf783788122cf14a146a60e9f7d376ee4f9 100755 --- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexMonitorAlgorithm.cxx +++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexMonitorAlgorithm.cxx @@ -121,10 +121,14 @@ StatusCode GfexMonitorAlgorithm::fillJetHistograms(const std::string& handleKey, float eta = gFexJetRoI->eta(); float phi = gFexJetRoI->phi(); jetPt = gFexJetRoI->gFexTobEt(); + + if (eta < -3.17 && eta > -3.25){ eta = -3.225;} + if (eta < 3.3 && eta > 3.17){ eta = 3.275;} + jetEta = eta; if(jetPt > ptCutValue){ - jetEta = eta; - if (std::abs(eta) >= 3.1 ){ + + if (std::abs(eta) >= 3.2 ){ jetPhi = (phi > 0.0) ? phi + 0.1 : phi - 0.1; float phi_new = (phi > 0.0) ? phi + 0.1 : phi - 0.1; binNumber = getBinNumberJet(eta,phi_new,0,0); @@ -137,7 +141,6 @@ StatusCode GfexMonitorAlgorithm::fillJetHistograms(const std::string& handleKey, } else { jetPhi = phi; - jetEta = eta; binNumber = getBinNumberJet(eta,phi,0,0); fill(m_packageName,jetEta,jetPhi,jetPt); fill(m_packageName,lumiNumber,binNumber);