diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py
index 7dc04482185be8ef179077eb3fba1c8146c1e2f4..f47473bbe10f544d24bab72e75e9f41225203b21 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py
+++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py
@@ -137,11 +137,6 @@ def tauMonitoringCaloOnly():
monTool.defineHistogram('ChPiEMEOverCaloEME', path='EXPERT', type='TH1F', title="EF EM energy of charged pions over calorimetric EM energy;ChPiEME over CaloEME; nRoIs", xbins=40, xmin=-20., xmax=20.)
monTool.defineHistogram('innerTrkAvgDist', path='EXPERT', type='TH1F', title="EF inner track average distance; innerTrkAvgDist; nRoIs", xbins=40, xmin=-0.05, xmax=0.5)
monTool.defineHistogram('nCand', path='EXPERT', type='TH1F', title="Number of tau candidates;Number of tau candidates; nevents", xbins=10, xmin=-1.0, xmax=9.)
- monTool.defineHistogram('ActualInteractions', path='EXPERT', type='TH1F', title="Number of actual interaction per bunch crossing;ActualInteractions;nevents", xbins=80, xmin=0.0, xmax=80.)
- monTool.defineHistogram('AvgInteractions', path='EXPERT', type='TH1F', title="Number of average interaction per bunch crossing;AvgInteractions;nevents", xbins=80, xmin=0.0, xmax=80.)
- monTool.defineHistogram('beamspot_x', path='EXPERT', type='TH1F', title="Beamspot position;Beamspot x;nevents", xbins=50, xmin=-10.0, xmax=10.)
- monTool.defineHistogram('beamspot_y', path='EXPERT', type='TH1F', title="Beamspot position;Beamspot y;nevents", xbins=50, xmin=-10.0, xmax=10.)
- monTool.defineHistogram('beamspot_z', path='EXPERT', type='TH1F', title="Beamspot position;Beamspot z;nevents", xbins=100, xmin=-500.0, xmax=500.)
monTool.defineHistogram('PhiL1', path='EXPERT', type='TH1F', title="L1 RoI Phi; L1 RoI Phi; nRoIs", xbins=65, xmin=-3.1415936-0.098174/2., xmax=3.1415936+0.098174/2.)
monTool.defineHistogram('EtaL1', path='EXPERT', type='TH1F', title="L1 RoI Eta; L1 RoI Eta; nRoIs", xbins=51, xmin=-2.55, xmax=2.55)
monTool.defineHistogram('EtaL1, PhiL1', path='EXPERT', type='TH2F', title="L1 ROI Eta vs Phi in TrigTauRecMerged FEX; #eta; #phi",
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx
index 11021919d78c22140d2e597f95e672f174bfece6..eec012767adc03c990838f230383a4ab2427dab0 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx
+++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx
@@ -31,8 +31,6 @@
#include "xAODTau/TauTrackContainer.h"
#include "xAODTau/TauTrackAuxContainer.h"
-#include "LumiBlockComps/ILumiBlockMuTool.h"
-
#include "TrigTauRecMergedMT.h"
#include "AthenaMonitoringKernel/Monitored.h"
@@ -46,12 +44,10 @@
TrigTauRecMergedMT::TrigTauRecMergedMT(const std::string& name,ISvcLocator* pSvcLocator)
:AthAlgorithm(name, pSvcLocator),
m_tools(this),
- m_endtools(this),
- m_lumiBlockMuTool("LumiBlockMuTool/LumiBlockMuTool")
+ m_endtools(this)
{
declareProperty("Tools", m_tools, "List of ITauToolBase tools" );
declareProperty("EndTools", m_endtools, "List of End ITauToolBase tools" );
- declareProperty("LumiBlockMuTool", m_lumiBlockMuTool, "Luminosity Tool" );
}
TrigTauRecMergedMT::~TrigTauRecMergedMT()
@@ -106,16 +102,6 @@ StatusCode TrigTauRecMergedMT::initialize()
}
}
- if (m_lumiBlockMuTool.retrieve().isFailure()) {
- ATH_MSG_WARNING("Unable to retrieve LumiBlockMuTool");
- }
- else {
- ATH_MSG_DEBUG("Successfully retrieved LumiBlockMuTool");
- }
-
- // Retrieve beam conditions
- CHECK(m_beamSpotKey.initialize());
-
if ( not m_monTool.name().empty() ) {
ATH_CHECK( m_monTool.retrieve() );
}
@@ -178,11 +164,6 @@ StatusCode TrigTauRecMergedMT::execute()
auto SumPtTrkFrac = Monitored::Scalar<float>("SumPtTrkFrac",-999.9);
auto innerTrkAvgDist = Monitored::Scalar<float>("innerTrkAvgDist",-1.0);
auto Ncand = Monitored::Scalar<int>("nCand",0);
- auto ActualInteractions = Monitored::Scalar<float>("ActualInteractions",-999.9);
- auto AvgInteractions = Monitored::Scalar<float>("AvgInteractions",-999.9);
- auto beamspot_x = Monitored::Scalar<float>("beamspot_x",-999.9);
- auto beamspot_y = Monitored::Scalar<float>("beamspot_y",-999.9);
- auto beamspot_z = Monitored::Scalar<float>("beamspot_z",-999.9);
auto EtaL1 = Monitored::Scalar<float>("EtaL1",-99.9);
auto PhiL1 = Monitored::Scalar<float>("PhiL1",-99.9);
auto EtaEF = Monitored::Scalar<float>("EtaEF",-99.9);
@@ -194,8 +175,7 @@ StatusCode TrigTauRecMergedMT::execute()
auto monitorIt = Monitored::Group( m_monTool, nCells, nTracks, dEta, dPhi, emRadius, hadRadius,
EtFinal, Et, EtHad, EtEm, EMFrac, IsoFrac, centFrac, nWideTrk, ipSigLeadTrk, trFlightPathSig, massTrkSys,
dRmax, numTrack, trkAvgDist, etovPtLead, PSSFraction, EMPOverTrkSysP, ChPiEMEOverCaloEME, SumPtTrkFrac,
- innerTrkAvgDist, Ncand, ActualInteractions, AvgInteractions, beamspot_x, beamspot_y, beamspot_z, EtaL1,
- PhiL1, EtaEF, PhiEF );
+ innerTrkAvgDist, Ncand, EtaL1, PhiL1, EtaEF, PhiEF );
// Retrieve store.
ATH_MSG_DEBUG("Executing TrigTauRecMergedMT");
@@ -222,41 +202,6 @@ StatusCode TrigTauRecMergedMT::execute()
return StatusCode::SUCCESS;
}
- double mu = 0.0;
- double avg_mu = 0.0;
- if(m_lumiBlockMuTool){
- mu = m_lumiBlockMuTool->actualInteractionsPerCrossing(); // (retrieve mu for the current BCID)
- avg_mu = m_lumiBlockMuTool->averageInteractionsPerCrossing();
- ActualInteractions = mu;
- AvgInteractions = avg_mu;
- ATH_MSG_DEBUG(" Retrieved Mu Value : " << mu);
- ATH_MSG_DEBUG(" Average Mu Value : " << avg_mu);
- }
-
-
- //-------------------------------------------------------------------------
- // Get beamspot
- //-------------------------------------------------------------------------
-
- // Copy the first vertex from a const object
- xAOD::Vertex theBeamspot;
- theBeamspot.makePrivateStore();
-
- SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey, ctx };
- if(beamSpotHandle.isValid()){
-
- // Alter the position of the vertex
- theBeamspot.setPosition(beamSpotHandle->beamPos());
-
- beamspot_x=theBeamspot.x();
- beamspot_y=theBeamspot.y();
- beamspot_z=theBeamspot.z();
-
- // Create a AmgSymMatrix to alter the vertex covariance mat.
- const auto& cov = beamSpotHandle->beamVtx().covariancePosition();
- theBeamspot.setCovariancePosition(cov);
- }
-
// get TauJetContainer from SG
const xAOD::TauJetContainer *pTauContainer = nullptr;
const xAOD::TauTrackContainer *pTauTrackContainer = nullptr;
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h
index fa9435ad5812b53ae8ec673b465a9df04ce5aa9f..ca58d8b7ef5d0fa7891b40da327c64d1f334bfa4 100755
--- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h
+++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h
@@ -25,12 +25,6 @@
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-namespace HLT {
- class TriggerElement;
-}
-
-class ILumiBlockMuTool;
-
class TrigTauRecMergedMT: public AthAlgorithm {
public:
@@ -75,15 +69,6 @@ class TrigTauRecMergedMT: public AthAlgorithm {
/** internal tool store */
ToolHandleArray<ITauToolBase> m_endtools;
- /** Luminosity Tool */
- ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool;
-
- /** Beam spot Object */
- SG::ReadCondHandleKey<InDet::BeamSpotData> m_beamSpotKey { this, "BeamSpotKey", "BeamSpotData", "SG key for beam spot" };
-
- /** vector of Timers */
- std::vector<TrigTimer* > m_mytimers;
-
// Monitoring tool
ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };