diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
index 3e541c935248406352810942a41e4ab8666a23bb..014f1666201fe5c8e7ce2471b413907845503ec6 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
@@ -3,7 +3,6 @@
# -*- coding: utf-8 -*-
from TrigT2MinBias.TrigT2MinBiasConf import T2ZdcFex, T2ZdcHypo
from TrigT2MinBias.TrigT2MinBiasConf import T2MbtsFex, T2MbtsHypo
-from TrigT2MinBias.TrigT2MinBiasConf import MbtsFexMT
from TrigT2MinBias.TrigT2MinBiasConf import TrigCountSpacePoints, TrigCountSpacePointsHypo
from TrigT2MinBias.TrigT2MinBiasConf import TrigCountTrtHits, TrigCountTrtHitsHypo
@@ -1141,46 +1140,6 @@ class MbMbtsFexMonitoring(TrigGenericMonitoringToolConfig):
xbins = 17, xmin=-0.5, xmax=16.5,
ybins = 17, ymin=-0.5, ymax=16.5)]
-class MbtsFexMTMonitoring(TrigGenericMonitoringToolConfig):
- def __init__ (self, name="MbtsFexMTMonitoring"):
- super(MbMbtsFexMTMonitoring, self).__init__(name)
- self.defineTarget( ["Online", "Validation", "Cosmic"])
- # self.Histograms += [ defineHistogram('TriggerEnergies,TriggerTimes',
- # type='TH2F',
- # title="MBTS Energy and Time from DSP;Energy [pC]; Time relative to L1 [ns];",
- # xbins = 51, xmin=-5.5, xmax=45.5,
- # ybins = 100, ymin=-100., ymax=100.)]
- #
- # self.Histograms += [ defineHistogram('BCID, TimeDiff_A_C',
- # type='TH2F',
- # title='Mbts Time Difference vs BCID; BCID; time difference [ns];',
- # xbins = 3564, xmin=-0.5, xmax=3563.5,
- # ybins = 20, ymin=-40., ymax=40.)]
- #
- # self.Histograms += [ defineHistogram('TriggerID,TriggerEnergies',
- # type='TH2F',
- # title='Mbts Energy vs MBTS ID; MBTS ID; Energy [pC];',
- # xbins = 32, xmin=0, xmax=32,
- # ybins = 51, ymin=-5.5, ymax=45.5)]
- #
- # self.Histograms += [ defineHistogram('TriggerID,TriggerTimes',
- # type='TH2F',
- # title='MBTS Time vs MBTS ID; MBTS ID;Time relative to L1 [ns];',
- # xbins = 32, xmin=0, xmax=32,
- # ybins = 100, ymin=-100., ymax=100.)]
- #
- # self.Histograms += [ defineHistogram('TimeDiff_A_C',
- # type='TH1F',
- # title="MBTS Fex time difference of mean times A-C;time diff [ns];",
- # xbins = 100, xmin=-100., xmax=100.)]
- #
- # self.Histograms += [ defineHistogram('MultiplicityEBA, MultiplicityEBC',
- # type='TH2I',
- # title="Mbts Fex Multiplicity; multiplicity A-side;multiplicity C-side;",
- # xbins = 17, xmin=-0.5, xmax=16.5,
- # ybins = 17, ymin=-0.5, ymax=16.5)]
-
-
class MbMbtsHypoMonitoring(TrigGenericMonitoringToolConfig):
def __init__ (self, name="MbMbtsHypoMonitoring"):
super(MbMbtsHypoMonitoring, self).__init__(name)
@@ -1228,20 +1187,6 @@ L2MbMbtsFex = MbMbtsFex("L2MbMbtsFex")
fexes["L2MbMbtsFex"] = L2MbMbtsFex
-class MbtsFexMT( MbtsFexMT ):
- __slots__ = []
- def __init__ (self, name ):
- super(MbtsFexMT, self).__init__(name)
- # self.Threshold = trigT2MinBiasProperties.mbtsThreshold() # pC
- # time = TrigTimeHistToolConfig("MbtsFexMTTimers")
- # time.NumberOfHistBins = 100
- # time.TimerHistLimits = [0, 50]
- self.AthenaMonTools += [ MbtsFexMTMonitoring()]
-
-L2MbtsFexMT = MbtsFexMT("L2MbtsFexMT")
-fexes["L2MbtsFexMT"] = L2MbtsFexMT
-
-
class MbMbtsHypo ( T2MbtsHypo ):
__slots__ = []
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
index 5d35bd8efd93aad0fb55c470cab6f78fcbf00636..ad5182cf4224ced8e7093034d0bef8e872563aae 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
@@ -17,3 +17,14 @@ def SpCountMonitoring():
monTool.defineHistogram('SctSpEndcapA', path='EXPERT', type='TH1I', title='SctSpEndcapA', xbins = 200, xmin=-0.5, xmax=1999.5)
monTool.defineHistogram('totNumPixSP, totNumSctSP', path='EXPERT', type='TH2I', title='SP ; pix SP after ToT cut; sct SP', xbins = 50, xmin=-0.5, xmax=49.5, ybins = 50, ymin=-0.5, ymax=49.5)
return monTool
+
+
+def MbtsFexMTMonitoring():
+
+ from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
+ monTool = GenericMonitoringTool('MonTool')
+ monTool.defineHistogram('triggerEnergies', path='EXPERT', type='TH1D', title='triggerEnergies',xbins=100, xmin=-0, xmax=2000)
+ monTool.defineHistogram('triggerEta', path='EXPERT', type='TH1D', title='triggerEta', xbins = 250, xmin=-5, xmax=5)
+ monTool.defineHistogram('triggerPhi', path='EXPERT', type='TH1I', title='triggerPhi',xbins=100, xmin=-3.2, xmax=3.2)
+ monTool.defineHistogram('triggerTimes', path='EXPERT', type='TH1I', title='triggerTimes',xbins=100, xmin=-0, xmax=2000)
+ return monTool
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/MbtsFexMT.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/MbtsFexMT.cxx
index c7823d1e891acbdd3dc6efe61ebe7392563647de..9d7af7c8e60f85d8e77846c47c6ff40c9bff3d89 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/MbtsFexMT.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/MbtsFexMT.cxx
@@ -19,11 +19,8 @@ StatusCode MbtsFexMT::initialize()
{
ATH_CHECK( m_calocellcollectionKey.initialize() );
ATH_CHECK(m_MbtsKey.initialize());
- ATH_CHECK( m_cellContainerKey.initialize() );
ATH_CHECK( m_TileHelperKey.initialize() );
ATH_CHECK( m_dataAccessSvc.retrieve() );
- CHECK( m_tileDecoder.retrieve() );
- CHECK( m_bcidAvgKey.initialize() );
if (! m_monTool.empty() ) ATH_CHECK( m_monTool.retrieve() );
return StatusCode::SUCCESS;
@@ -61,6 +58,8 @@ StatusCode MbtsFexMT::execute(const EventContext& context) const
double triggerEta{} ;
double triggerPhi{} ;
+std::vector<float> trigEnergy;
+std::vector<float> trigTime;
for ( auto CaloContainerIndx : *CaloContainer) {
@@ -70,7 +69,7 @@ StatusCode MbtsFexMT::execute(const EventContext& context) const
Identifier triggerID = CaloContainerIndx->ID();
if ( CaloContainerIndx->caloDDE()->is_tile() ) continue;
- Identifier id = tilecell->ID();
+ // Identifier id = tilecell->ID();
triggerTimes=tilecell->time();
// MBTS Id type is "side" +/- 1
@@ -82,8 +81,6 @@ unsigned int channel_id = tileHelper->channel(triggerID);
// MBTS Id module is "phi" 0-7
unsigned int module_id = tileHelper->module(triggerID);
-// unsigned int nTriggerTimes = tileHelper.size();
-
ATH_MSG_DEBUG("type_id = " << type_id);
ATH_MSG_DEBUG("channel_id = " << channel_id);
ATH_MSG_DEBUG("module_id = " << module_id);
@@ -102,22 +99,12 @@ if( module_id > 7 ){
continue;
}
-for (size_t i=0;i<mbts.size(); ++i){
- ATH_MSG_DEBUG(tilecell->eta() << " " << tilecell->phi() << " " << tilecell->caloDDE()->getSampling() << " " << tilecell->energy() );}
-
- for ( auto hltcell : cal) {
- const CaloDetDescrElement* hltdde = hltcell->caloDDE();
- if ( hltdde && hltdde->is_tile() ) continue;
- if ( triggerID == hltcell->ID() ) {
- triggerEnergies = tilecell->energy();
- triggerEta = tilecell->eta();
- triggerPhi = tilecell->phi();
-
- ATH_MSG_DEBUG("Cell info: " << tilecell->energy() << " " << " " << tilecell->eta() << " " << tilecell->phi());
+triggerEnergies = CaloContainerIndx->energy();
+triggerEta = CaloContainerIndx->eta();
+triggerPhi = CaloContainerIndx->phi();
+trigEnergy.push_back(triggerEnergies);
+trigTime.push_back(triggerTimes);
-
- }
- }
} // end of for CaloContainerIndx
@@ -130,21 +117,30 @@ for (size_t i=0;i<mbts.size(); ++i){
// Recording Data
SG::WriteHandle<xAOD::TrigCompositeContainer> mbtsHandle (m_MbtsKey, context);
- auto MbtsContainer = std::make_unique< xAOD::TrigCompositeContainer >();
- auto MbtsAuxContainer = std::make_unique< xAOD::TrigCompositeAuxContainer>();
- MbtsContainer->setStore(MbtsAuxContainer.get());
- xAOD::TrigComposite * MBTSCont = new xAOD::TrigComposite();
- MbtsContainer->push_back(MBTSCont);
+ auto MbtsTrigCompositeContainer = std::make_unique< xAOD::TrigCompositeContainer >();
+ auto MbtsTrigCompositeAuxContainer = std::make_unique< xAOD::TrigCompositeAuxContainer>();
+ MbtsTrigCompositeContainer->setStore(MbtsTrigCompositeAuxContainer.get());
+
+ xAOD::TrigComposite * MBTSCompCont = new xAOD::TrigComposite();
+
+
+ xAOD::TrigT2MbtsBits * MBTSCont = new xAOD::TrigT2MbtsBits();
+
+ MbtsTrigCompositeContainer->push_back(MBTSCompCont);
+
+ // MBTSCont->makePrivateStore();
+ MBTSCont->setTriggerEnergies(trigEnergy);
+ MBTSCont->setTriggerTimes(trigTime);
- MBTSCont->setDetail("triggerEnergies", triggerEnergies);
- MBTSCont->setDetail("triggerTimes",triggerTimes);
- MBTSCont->setDetail("triggerPhi", triggerEta);
- MBTSCont->setDetail("triggerEta", triggerPhi);
+ MBTSCompCont->setDetail("triggerEnergies", triggerEnergies);
+ MBTSCompCont->setDetail("triggerTimes",triggerTimes);
+ MBTSCompCont->setDetail("triggerPhi", triggerEta);
+ MBTSCompCont->setDetail("triggerEta", triggerPhi);
- ATH_CHECK(mbtsHandle.record( std::move( MbtsContainer), std::move( MbtsAuxContainer ) ) );
+ ATH_CHECK(mbtsHandle.record( std::move( MbtsTrigCompositeContainer), std::move( MbtsTrigCompositeAuxContainer ) ) );
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/MbtsFexMT.h b/Trigger/TrigAlgorithms/TrigT2MinBias/src/MbtsFexMT.h
index 3c443fde9fd673b5fc1447d9b9efd57a617cc9c3..c541a38e50c32004149bc219d5164d90e1b35fc4 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/MbtsFexMT.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/MbtsFexMT.h
@@ -10,6 +10,8 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#include "xAODTrigger/TrigCompositeAuxContainer.h"
#include "AthenaMonitoringKernel/Monitored.h"
#include "TrigTimeAlgs/TrigTimerSvc.h"
+#include "xAODTrigMinBias/TrigT2MbtsBits.h"
+#include "xAODTrigMinBias/TrigT2MbtsBitsAuxContainer.h"
#include "xAODTrigMinBias/TrigT2MbtsBitsContainer.h"
#include "xAODTrigMinBias/TrigT2MbtsBitsAuxContainer.h"
#include "TileIdentifier/TileTBID.h"
@@ -73,9 +75,6 @@ public:
private:
- ServiceHandle<TileROD_Decoder> m_tileDecoder { this, "tileDecoder", "Tool to decode Tile raw data" };
- SG::ReadHandleKey<CaloBCIDAverage> m_bcidAvgKey ;
- SG::WriteHandleKey<CaloConstCellContainer > m_cellContainerKey;
SG::WriteHandleKey<xAOD::TrigCompositeContainer> m_MbtsKey{this,"MbtsKey","Undefined",""};
SG::ReadHandleKey<TileTBID> m_TileHelperKey{this,"TileHelperKey", "DetectorStore+TileTBID"," "};
ServiceHandle<ITrigCaloDataAccessSvc> m_dataAccessSvc;
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
index e1789ce3655520a956fc21da1ddd6098ee48c456..356691fbb727159833c97b1b564bb09dced3abf2 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
@@ -128,7 +128,6 @@ from TrigT2MinBias.TrigT2MinBiasConfig import MbtsFexMT
alg=MbtsFexMT()
alg.RoIs="EMViewRoIs"
allViewAlgorithms += alg
-viewSeq += allViewAlgorithms
if TriggerFlags.doCalo: