diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h index bf4c8fd9153ee223985c25bf283dae11ddeca57c..a8e5b995574b6229676f2839271216f583067e21 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h +++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h @@ -31,14 +31,11 @@ namespace LVL1{ ASG_TOOL_INTERFACE( LVL1::IL1CaloLArTowerEnergy ) public: - virtual bool initL1CaloLArTowerEnergy(const CaloCellContainer& cellContainer, const TriggerTowerCollection &triggerTowerCollection) = 0; - virtual float EtLArg(const Identifier& TTid) const = 0; virtual bool hasMissingFEB(const Identifier& TTid) const = 0; virtual bool hasMissingFEB(const LArOnOffIdMapping& cabling, const Identifier& TTid) const = 0; protected: - virtual void reset() = 0; virtual double IDeta(const Identifier& TTid) const = 0; }; } // end of namespace diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h index aedb5a96b969e06f5ab128b4bd2fda2c691e02cb..4860cb155301cd3687453a7f656071e46778364d 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h +++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h @@ -79,7 +79,6 @@ namespace LVL1{ virtual float emTTCellsEt(const TriggerTower* tt) const = 0; virtual std::vector<float> emTTCellsEtByLayer(const TriggerTower* tt) const = 0; virtual std::vector<float> emTTCellsEtByReceiver(const TriggerTower* tt,const int mode=0) const = 0; - virtual float emLArTowerEnergy(const TriggerTower* tt) const = 0; virtual std::vector<const CaloCell*> hadCells(const TriggerTower* tt) const = 0; virtual int hadNCells(const TriggerTower* tt) const = 0; @@ -94,7 +93,6 @@ namespace LVL1{ virtual float hadTTCellsEt(const TriggerTower* tt) const = 0; virtual std::vector<float> hadTTCellsEtByLayer(const TriggerTower* tt) const = 0; virtual std::vector<float> hadTTCellsEtByReceiver(const TriggerTower* tt,const int mode=0) const = 0; - virtual float hadLArTowerEnergy(const TriggerTower* tt) const = 0; virtual float tileCellEnergy(const TriggerTower* tt,IdTTL1CellMapType& map) const = 0; // High Voltage Information @@ -168,9 +166,6 @@ namespace LVL1{ virtual void LArHV(const SG::ReadCondHandleKey<ILArHVScaleCorr>& scaleCorrKey, const SG::ReadCondHandleKey<LArOnOffIdMapping>& cablingKey) = 0; virtual void caloCells(const CaloCellContainer* cells) = 0; - virtual void larDigits(const LArDigitContainer* lar) = 0; - virtual void tileDigits(const TileDigitsContainer* tile) = 0; - virtual void l1CaloLArTowerEnergy(const CaloCellContainer* cells, const TriggerTowerCollection* ttc) = 0; virtual Identifier emID(const double eta,const double phi) const = 0; virtual Identifier hadID(const double eta,const double phi) const = 0; diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h index 6d6442c73174f5951682fcb77b8d35337dd27bf8..6bc3be33533eaf53fbf8edba6cdc561a5a18cc88 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h +++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h @@ -11,7 +11,6 @@ #include "StoreGate/ReadCondHandleKey.h" #include "Identifier/Identifier.h" -#include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h" #include "TrigT1CaloEvent/TriggerTowerCollection.h" #include "CaloTriggerTool/CaloTriggerTowerService.h" #include "TrigT1CaloCalibTools/L1CaloCells2TriggerTowers.h" @@ -54,50 +53,24 @@ public: virtual StatusCode initialize() override; virtual StatusCode finalize() override; - virtual bool initL1CaloLArTowerEnergy(const CaloCellContainer& cellContainer, const TriggerTowerCollection &triggerTowerCollection) override; - virtual float EtLArg(const Identifier& TTid) const override; virtual bool hasMissingFEB(const Identifier& TTid) const override; virtual bool hasMissingFEB(const LArOnOffIdMapping& cabling, const Identifier& TTid) const override; protected: - virtual void reset() override; virtual double IDeta(const Identifier& TTid) const override; private: - - // properties - std::string m_triggerTowerCollectionName; // name of transient TriggerTower container - std::string m_caloCellContainerName; // name of transient CaloCell container. - std::string m_l1CaloCells2TriggerTowersToolName; - - L1CaloCondSvc *m_condSvc; const CaloLVL1_ID *m_lvl1Helper; const CaloIdManager *m_caloMgr; const LArOnlineID *m_LArOnlineHelper; CaloTriggerTowerService* m_ttService; - ToolHandle<LVL1::IL1CaloCells2TriggerTowers> m_cells2tt; ToolHandle< ILArBadFebMasker > m_badFebMasker; // Handle to badChannelTool - ToolHandle<LVL1::IL1TriggerTowerTool> m_ttTool; // Handle to L1TriggerTowerTool SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey {this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"}; - - - typedef std::map<Identifier, double> mapTT; - typedef std::map<double, std::pair<double, int> > mapSum; - - //definition of the maps containing the EtCells of each TT - mapTT m_map_Etcells_em; - mapTT m_map_Etcells_had; - - - //definition of the maps containing the average EtCells in phi - mapSum m_map_sumEtcells_phi_em; - mapSum m_map_sumEtcells_phi_had; - }; } // end of namespace diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h index d4e7de8d58314ff5ee2c75b88cfa18c0fe9b9d11..9d8b06365bb023e966666ba530b9ac3f730be285 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h +++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h @@ -37,7 +37,6 @@ #include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h" #include "TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h" #include "TrigT1CaloCalibToolInterfaces/IL1CaloFcal23Cells2RxMappingTool.h" -#include "TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h" #include "TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h" // Calo includes @@ -122,7 +121,6 @@ public: virtual float emTTCellsEt(const TriggerTower* tt) const override; virtual std::vector<float> emTTCellsEtByLayer(const TriggerTower* tt) const override; virtual std::vector<float> emTTCellsEtByReceiver(const TriggerTower* tt, const int mode = 0) const override; - virtual float emLArTowerEnergy(const TriggerTower* tt) const override; virtual std::vector<const CaloCell*> hadCells(const TriggerTower* tt) const override; virtual int hadNCells(const TriggerTower* tt) const override; @@ -137,7 +135,6 @@ public: virtual float hadTTCellsEt(const TriggerTower* tt) const override; virtual std::vector<float> hadTTCellsEtByLayer(const TriggerTower* tt) const override; virtual std::vector<float> hadTTCellsEtByReceiver(const TriggerTower* tt, const int mode = 0) const override; - virtual float hadLArTowerEnergy(const TriggerTower* tt) const override; virtual float tileCellEnergy(const TriggerTower* tt, IdTTL1CellMapType& map) const override; @@ -215,9 +212,6 @@ public: virtual void LArHV(const SG::ReadCondHandleKey<ILArHVScaleCorr>& scaleCorrKey, const SG::ReadCondHandleKey<LArOnOffIdMapping>& cablingKey) override; virtual void caloCells(const CaloCellContainer* cells) override; - virtual void larDigits(const LArDigitContainer* lar) override; - virtual void tileDigits(const TileDigitsContainer* tile) override; - virtual void l1CaloLArTowerEnergy(const CaloCellContainer* cells, const TriggerTowerCollection* ttc) override; Identifier ID(const double eta, const double phi, int layer) const; virtual Identifier emID(const double eta, const double phi) const override; virtual Identifier hadID(const double eta, const double phi) const override; @@ -266,7 +260,6 @@ private: const TTOnlineID* m_ttOnlineIdHelper; const CaloLVL1_ID* m_lvl1Helper; L1CaloCondSvc* m_l1CondSvc; - ToolHandle<LVL1::IL1CaloLArTowerEnergy> m_larEnergy; const LArOnlineID* m_larOnlineID; ToolHandle<ICaloSuperCellIDTool> m_scidtool; diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloPprPlotManager.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloPprPlotManager.h index d37ed6a47a9dcd43f58ea57d0e8ae54145a46b00..cbebb77835d5c85e02492d00cb6ad3ae752c9192 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloPprPlotManager.h +++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloPprPlotManager.h @@ -55,7 +55,6 @@ class MsgStreamMember; namespace LVL1 { class IL1TriggerTowerTool; class IL1CaloOfflineTriggerTowerTools; -class IL1CaloxAODOfflineTriggerTowerTools; class TriggerTower; } @@ -166,7 +165,6 @@ protected: ToolHandle<LVL1::TrigT1CaloLWHistogramTool> m_histTool; ToolHandle<LVL1::IL1CaloOfflineTriggerTowerTools> m_ttToolOffline; - ToolHandle<LVL1::IL1CaloxAODOfflineTriggerTowerTools> m_xAODttToolOffline; ToolHandle<LVL1::IL1TriggerTowerTool> m_ttToolOnline; const EventInfo* m_eventInfo; diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx index bd69cdb497b9bc9a7d3e1f50433363829f6f1a3e..d9bf2170b1f21604b7172a6eb33ca6b41a5dc775 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx +++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx @@ -10,14 +10,11 @@ namespace LVL1{ L1CaloLArTowerEnergy::L1CaloLArTowerEnergy( const std::string& name ) : asg::AsgTool( name ), - m_condSvc(nullptr), m_lvl1Helper(nullptr), m_caloMgr(nullptr), m_LArOnlineHelper(nullptr), m_ttService(nullptr), - m_cells2tt("LVL1::L1CaloCells2TriggerTowers/L1CaloCells2TriggerTowers"), - m_badFebMasker("LArBadFebMasker"), - m_ttTool("LVL1::L1TriggerTowerTool/LVL1::L1TriggerTowerTool") + m_badFebMasker("LArBadFebMasker") { } @@ -27,10 +24,6 @@ namespace LVL1{ StatusCode sc; - //get a pointer to L1CaloCond services - sc = service("L1CaloCondSvc", m_condSvc); - if(sc.isFailure()){ATH_MSG_ERROR( "Cannot access L1CaloCondSvc!" );return sc;} - sc = detStore()->retrieve(m_caloMgr) ; if(sc.isFailure()){ATH_MSG_ERROR( "Cannot access caloMgr");return sc;} @@ -44,8 +37,6 @@ namespace LVL1{ return StatusCode::FAILURE; } - ATH_CHECK(m_cells2tt.retrieve()); - ATH_CHECK(m_badFebMasker.retrieve()); //Retrieve cabling & tt services @@ -70,146 +61,6 @@ namespace LVL1{ - bool L1CaloLArTowerEnergy::initL1CaloLArTowerEnergy(const CaloCellContainer &caloCellContainer, const TriggerTowerCollection &triggerTowerCollection) { - - StatusCode sc; - - this->reset(); - - SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey); - - // access database - each event conditions may have changed ... - sc = m_ttTool->retrieveConditions(); - if(!sc.isSuccess()) { - ATH_MSG_ERROR( "Cannot retrieve Conditions in L1TriggerTowerTool." ); - return false; - } - - // init trigger tower to cell mapping - needed each event? - if(!m_cells2tt->initCaloCellsTriggerTowers(caloCellContainer)) { - ATH_MSG_ERROR( "Can not initialize L1CaloCells2TriggerTowers with CaloCellContainer "<< m_caloCellContainerName ); - return false; - } - - Identifier TTid; - unsigned int coolId; - - double caloEnergy, sinTheta; - - mapSum::iterator it_map; - - const LVL1::TriggerTower *tt; - TriggerTowerCollection::const_iterator p_itTT = triggerTowerCollection.begin(); - TriggerTowerCollection::const_iterator p_itTTEnd = triggerTowerCollection.end(); - - //Loop to fill the maps - for(;p_itTT != p_itTTEnd; ++p_itTT) { - - tt = *p_itTT; - - // electromagnetic sampling - TTid = m_ttTool->identifier(tt->eta(), tt->phi(), 0); - coolId = m_ttTool->channelID(TTid).id(); - - if(!this->hasMissingFEB(**cabling, TTid) && !m_ttTool->disabledChannel(coolId)) { - - sinTheta = 1. / std::cosh(tt->eta()); - caloEnergy = 1e-3 * m_cells2tt->energy(TTid) * sinTheta; - - m_map_Etcells_em.insert( std::pair<Identifier,double> (TTid,caloEnergy) ); - - it_map = m_map_sumEtcells_phi_em.find(tt->eta()); - if(it_map == m_map_sumEtcells_phi_em.end()) { - std::pair<double,int> Et (caloEnergy,1); - m_map_sumEtcells_phi_em.insert ( std::pair<double,std::pair<double,int> >(tt->eta(),Et) ); - } - else { - std::pair<double,int> Et = (*it_map).second; - Et.first += caloEnergy; - Et.second += 1; - m_map_sumEtcells_phi_em[tt->eta()] = Et; - } - } - - // hadronic sampling - TTid = m_ttTool->identifier(tt->eta(), tt->phi(), 1); - coolId = m_ttTool->channelID(TTid).id(); - - if(m_ttTool->disabledChannel(coolId)) continue; - - sinTheta = 1. / std::cosh(tt->eta()); - caloEnergy = 1e-3 * m_cells2tt->energy(TTid) * sinTheta; - - m_map_Etcells_had.insert( std::pair<Identifier,double> (TTid,caloEnergy) ); - - bool bIsTile = m_lvl1Helper->is_tile(TTid); - if(bIsTile) continue; - if(hasMissingFEB(**cabling, TTid)) continue; - - it_map = m_map_sumEtcells_phi_had.find(tt->eta()); - if(it_map == m_map_sumEtcells_phi_had.end()) { - std::pair<double,int> Et (caloEnergy,1); - m_map_sumEtcells_phi_had.insert ( std::pair<double,std::pair<double,int> >(tt->eta(),Et) ); - } - else { - std::pair<double,int> Et = (*it_map).second; - Et.first += caloEnergy; - Et.second += 1; - m_map_sumEtcells_phi_had[tt->eta()] = Et; - } - } - return true; - } - - float L1CaloLArTowerEnergy::EtLArg(const Identifier& TTid) const { - - SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey); - - float energy = 0; - - mapTT::const_iterator it_mapTT; - mapSum::const_iterator it_mapSum; - - int sampling = m_lvl1Helper->sampling(TTid); - double eta = this->IDeta(TTid); - - //electromagnetic sampling - if(sampling==0) { - if(this->hasMissingFEB(**cabling, TTid)) { - it_mapSum = m_map_sumEtcells_phi_em.find(eta); - std::pair<double,int> Et = (*it_mapSum).second; - energy = Et.first/Et.second; - } - else { - it_mapTT = m_map_Etcells_em.find(TTid); - energy = (*it_mapTT).second; - } - } - // hadronic sampling - if(sampling==1) { - - bool bIsTile = m_lvl1Helper->is_tile(TTid); - if(bIsTile) - { - it_mapTT = m_map_Etcells_had.find(TTid); - energy = (*it_mapTT).second; - } - else { - if(this->hasMissingFEB(**cabling, TTid)) { - it_mapSum = m_map_sumEtcells_phi_had.find(eta); - std::pair<double,int> Et = (*it_mapSum).second; - energy = Et.first/Et.second; - } - else { - it_mapTT = m_map_Etcells_had.find(TTid); - energy = (*it_mapTT).second; - } - } - } - - return energy; - } - double L1CaloLArTowerEnergy::IDeta(const Identifier& TTid) const { int region = m_lvl1Helper->region(TTid); int ieta = m_lvl1Helper->eta(TTid); @@ -263,12 +114,4 @@ namespace LVL1{ return result; } - - void L1CaloLArTowerEnergy::reset() { - - m_map_sumEtcells_phi_em.clear(); - m_map_sumEtcells_phi_had.clear(); - m_map_Etcells_em.clear(); - m_map_Etcells_had.clear(); - } } // end of namespace diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx index 9375863403c1e3de29170dd8b1147c0d76b76eed..b6421ed6af926533a0dcc8dab12c6224260bc4ac 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx @@ -17,7 +17,6 @@ namespace LVL1 { asg::AsgTool( name ), m_l1CaloTTIdTools("LVL1::L1CaloTTIdTools/L1CaloTTIdTools"), m_cells2tt("LVL1::L1CaloCells2TriggerTowers/L1CaloCells2TriggerTowers"), - m_larEnergy("LVL1::L1CaloLArTowerEnergy/L1CaloLArTowerEnergy"), m_scidtool ("CaloSuperCellIDTool"), m_scaleCorrKey(""), m_cablingKey(""), @@ -416,11 +415,6 @@ namespace LVL1 { } - float L1CaloOfflineTriggerTowerTools::emLArTowerEnergy(const TriggerTower *tt)const{ - Identifier Id = this->emID(tt->eta(),tt->phi()); - return m_larEnergy->EtLArg(Id); - } - std::vector<std::vector<const CaloCell*> > L1CaloOfflineTriggerTowerTools::sortEMCrackCells(const std::vector<const CaloCell*> &cells) const{ std::vector<std::vector<const CaloCell*> > output; std::vector<const CaloCell*> emb; @@ -605,11 +599,6 @@ namespace LVL1 { return output; } - float L1CaloOfflineTriggerTowerTools::hadLArTowerEnergy(const TriggerTower *tt) const{ - Identifier Id = this->hadID(tt->eta(),tt->phi()); - return m_larEnergy->EtLArg(Id); - } - float L1CaloOfflineTriggerTowerTools::tileCellEnergy(const TriggerTower* tt,IdTTL1CellMapType& map) const{ Identifier Id = this->hadID(tt->eta(),tt->phi()); if(m_lvl1Helper->is_tile(Id) == false){return 0.0;} @@ -1696,7 +1685,6 @@ namespace LVL1 { ATH_CHECK( detStore()->retrieve(m_larOnlineID,"LArOnlineID") ); ATH_CHECK( m_l1CaloTTIdTools.retrieve() ); ATH_CHECK( m_cells2tt.retrieve() ); - ATH_CHECK( m_larEnergy.retrieve() ); ATH_CHECK( detStore()->retrieve (m_caloMgr, "CaloIdManager") ); ATH_CHECK( m_scidtool.retrieve() ); @@ -1761,16 +1749,4 @@ namespace LVL1 { m_cells2tt->initCaloCellsTriggerTowers(*cells); } - void L1CaloOfflineTriggerTowerTools::larDigits(const LArDigitContainer* lar){ - m_cells2tt->initLArDigitsTriggerTowers(*lar); - } - - void L1CaloOfflineTriggerTowerTools::tileDigits(const TileDigitsContainer* tile){ - m_cells2tt->initTileDigitsTriggerTowers(*tile); - } - - void L1CaloOfflineTriggerTowerTools::l1CaloLArTowerEnergy(const CaloCellContainer *cells, const TriggerTowerCollection *ttc) { - m_larEnergy->initL1CaloLArTowerEnergy(*cells, *ttc); - } - } // end of namespace diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx index fc82a43f68ed90ac453b2e61a0431d3a3772efac..db8a94892235f26cb81c39f53c4336bfd982d7dc 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx +++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ @@ -29,7 +29,6 @@ #include "TrigT1CaloMonitoringTools/TrigT1CaloLWHistogramTool.h" #include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h" #include "TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h" -#include "TrigT1CaloCalibToolInterfaces/IL1CaloxAODOfflineTriggerTowerTools.h" #include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h" #include "TrigT1CaloEvent/TriggerTowerCollection.h"