Commit 78aba5d1 authored by Denis Oliveira Damazio's avatar Denis Oliveira Damazio Committed by Graeme Stewart
Browse files

include new algorithm for TT FCAL energy calculation (TrigCaloRec-00-04-58)

	* Tagging TrigCaloRec-00-04-57.
	* Comply with ATLAS naming conventions.
	* Tagging TrigCaloRec-00-04-56.
	* endreq -> endmsg.
	* Fix fastjet deprecation warning.


Former-commit-id: 188cdda4
parent e9c6729e
......@@ -32,6 +32,7 @@ atlas_depends_on_subdirs( PUBLIC
Event/EventKernel
Event/NavFourMom
Event/xAOD/xAODTrigCalo
Event/xAOD/xAODHIEvent
Event/xAOD/xAODTrigL1Calo
LArCalorimeter/LArIdentifier
LArCalorimeter/LArTools
......@@ -43,11 +44,11 @@ atlas_add_library( TrigCaloRecLib
src/*.cxx
PUBLIC_HEADERS TrigCaloRec
LINK_LIBRARIES CaloEvent AthenaBaseComps AthenaKernel SGTools IRegionSelector xAODCaloEvent GaudiKernel TrigCaloEvent TrigSteeringEvent AthenaMonitoringLib TrigT2CaloCommonLib TrigInterfacesLib TrigTimeAlgsLib CaloDetDescrLib CaloRecLib CaloUtilsLib LArToolsLib
PRIVATE_LINK_LIBRARIES CaloGeoHelpers CaloIdentifier EventKernel NavFourMom xAODTrigCalo xAODTrigL1Calo LArIdentifier TrigT1Interfaces )
PRIVATE_LINK_LIBRARIES CaloGeoHelpers CaloIdentifier EventKernel NavFourMom xAODTrigCalo xAODHIEvent xAODTrigL1Calo LArIdentifier TrigT1Interfaces )
atlas_add_component( TrigCaloRec
src/components/*.cxx
LINK_LIBRARIES CaloEvent AthenaBaseComps AthenaKernel AthenaMonitoringLib SGTools IRegionSelector xAODCaloEvent GaudiKernel TrigT2CaloCommonLib TrigCaloEvent TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib CaloDetDescrLib CaloGeoHelpers CaloIdentifier CaloRecLib CaloUtilsLib EventKernel NavFourMom xAODTrigCalo xAODTrigL1Calo LArIdentifier LArToolsLib TrigT1Interfaces TrigCaloRecLib )
LINK_LIBRARIES CaloEvent AthenaBaseComps AthenaKernel AthenaMonitoringLib SGTools IRegionSelector xAODCaloEvent GaudiKernel TrigT2CaloCommonLib TrigCaloEvent TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib CaloDetDescrLib CaloGeoHelpers CaloIdentifier CaloRecLib CaloUtilsLib EventKernel NavFourMom xAODTrigCalo xAODHIEvent xAODTrigL1Calo LArIdentifier LArToolsLib TrigT1Interfaces TrigCaloRecLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
......
......@@ -49,7 +49,7 @@ class RoIFCalEmCellContMaker : public IAlgToolEFCalo {
ToolHandle<ICalorimeterNoiseTool> m_noiseTool;
LArCablingService * m_cablingSvc;
int do_LArCells_noise_suppression; //<! 0 (1) -> no (yes)
int m_do_LArCells_noise_suppression; //<! 0 (1) -> no (yes)
float m_cutvalue;
LArTT_Selector<LArCellCont>::const_iterator m_iBegin;
......
......@@ -49,7 +49,7 @@ class RoIFCalHadCellContMaker : public IAlgToolEFCalo {
ToolHandle<ICalorimeterNoiseTool> m_noiseTool;
LArCablingService * m_cablingSvc;
int do_LArCells_noise_suppression; //<! 0 (1) -> no (yes)
int m_do_LArCells_noise_suppression; //<! 0 (1) -> no (yes)
float m_cutvalue;
LArTT_Selector<LArCellCont>::const_iterator m_iBegin;
......
......@@ -50,7 +50,7 @@ class RoILArEMCellContMaker : public IAlgToolEFCalo {
ToolHandle<ICalorimeterNoiseTool> m_noiseTool;
LArCablingService * m_cablingSvc;
int do_LArCells_noise_suppression; //<! 0 (1) -> no (yes)
int m_do_LArCells_noise_suppression; //<! 0 (1) -> no (yes)
float m_cutvalue;
bool m_absEinSigma;
......
......@@ -49,7 +49,7 @@ class RoILArHadCellContMaker : public IAlgToolEFCalo {
ToolHandle<ICalorimeterNoiseTool> m_noiseTool;
LArCablingService * m_cablingSvc;
int do_LArCells_noise_suppression; //<! 0 (1) -> no (yes)
int m_do_LArCells_noise_suppression; //<! 0 (1) -> no (yes)
float m_cutvalue;
bool m_absEinSigma;
......
......@@ -47,7 +47,7 @@ class RoITileCellContMaker : public IAlgToolEFCalo {
//IT2GeometryTool *m_geometryTool;
ITrigDataAccess *m_data;
ToolHandle<ICalorimeterNoiseTool> m_noiseTool;
int do_TileCells_noise_suppression; //<! 0 (1) -> no (yes)
int m_do_TileCells_noise_suppression; //<! 0 (1) -> no (yes)
float m_cutvalue;
bool m_absEinSigma;
bool m_twogaussiannoise;
......
......@@ -86,7 +86,7 @@ class TrigCaloCellMaker : public HLT::FexAlgo {
ToolHandle<ITrigDataAccess> m_data;
/** Produced Calorimeter Cell Container. */
CaloCellContainer* pCaloCellContainer;
CaloCellContainer* m_caloCellContainer;
// monitored variables
......@@ -95,7 +95,7 @@ class TrigCaloCellMaker : public HLT::FexAlgo {
/** data preparation error */
unsigned int m_conversionError[6];
TrigCaloQuality * pTrigCaloQuality;
TrigCaloQuality * m_trigCaloQuality;
double m_EtaL2, m_PhiL2;
bool m_fullScanEnabled;
......
......@@ -61,7 +61,7 @@ class TrigCaloClusterMaker : public HLT::FexAlgo {
std::vector<CaloClusterCollectionProcessor*> m_clusterMakerPointers; //pointers to tools
std::vector<CaloClusterProcessor*> m_clusterCorrectionPointers; //pointers to tools
xAOD::CaloClusterContainer* m_pCaloClusterContainer;
TrigCaloQuality* pTrigCaloQuality;
TrigCaloQuality* m_pTrigCaloQuality;
// double m_Eta;
// double m_Phi;
......
......@@ -70,7 +70,7 @@ class TrigCaloTowerMaker : public HLT::FexAlgo {
TrigTimer* m_towerContTimer;
/** Produced Calorimeter Tower Container. */
CaloTowerContainer* pCaloTowerContainer;
CaloTowerContainer* m_pCaloTowerContainer;
/** Tower Container size (for monitoring purpouses). */
double m_TowerContainerSize;
......@@ -80,7 +80,7 @@ class TrigCaloTowerMaker : public HLT::FexAlgo {
public:
inline CaloTowerContainer* GetTowerContainer() const {return pCaloTowerContainer;}
inline CaloTowerContainer* GetTowerContainer() const {return m_pCaloTowerContainer;}
};
#endif
......@@ -82,7 +82,7 @@ class TrigFullCaloCellMaker : public HLT::AllTEAlgo {
std::vector<TrigTimer*> m_timer;
/** Produced Calorimeter Cell Container. */
CaloCellContainer* pCaloCellContainer;
CaloCellContainer* m_pCaloCellContainer;
/** Cell Container size (for monitoring purpouses). */
double m_CellContainerSize;
......@@ -95,7 +95,7 @@ class TrigFullCaloCellMaker : public HLT::AllTEAlgo {
//public:
//
// inline CaloCellContainer* GetCellContainer() const {return pCaloCellContainer;}
// inline CaloCellContainer* GetCellContainer() const {return m_pCaloCellContainer;}
};
#endif
......@@ -68,7 +68,7 @@ private:
std::vector<CaloClusterCollectionProcessor*> m_clusterMakerPointers; //pointers to tools
std::vector<CaloClusterProcessor*> m_clusterCorrectionPointers; //pointers to tools
xAOD::CaloClusterContainer* m_pCaloClusterContainer, *AllTECaloClusterContainer;
xAOD::CaloClusterContainer* m_pCaloClusterContainer, *m_AllTECaloClusterContainer;
double m_ClusterContainerSize;
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
/* *******************************************************
* NAME : TrigL1FCALTTSumFex.h
* PACKAGE : Trigger/TrigAlgorithms/TrigCaloRec
*
* AUTHOR : Denis Oliveira Damazio
* CREATED : 2016, September
*
*********************************************************/
#ifndef TRIGCALOREC_TRIGL1FCALTTSUMFEX_H
#define TRIGCALOREC_TRIGL1FCALTTSUMFEX_H
#include "TrigInterfaces/FexAlgo.h"
class TrigL1FCALTTSumFex : public HLT::FexAlgo {
public :
TrigL1FCALTTSumFex( const std::string& name, ISvcLocator* pSvcLocator );
~TrigL1FCALTTSumFex();
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltFinalize();
HLT::ErrorCode hltExecute ( const HLT::TriggerElement* inputTE, HLT::TriggerElement* outputTE);
private :
std::string m_HIEventShapeContainerKey;
};
#endif
......@@ -81,7 +81,7 @@ private:
unsigned int m_BadChanPerFEB;
int m_CellQualityCut;
//unsigned int m_MinBadFEB;
xAOD::CaloClusterContainer* AllTECaloClusterContainer;
xAOD::CaloClusterContainer* m_AllTECaloClusterContainer;
};
#endif
......@@ -52,6 +52,7 @@ use LArIdentifier LArIdentifier-* LArCalorimeter
use LArTools LArTools-* LArCalorimeter
use xAODTrigL1Calo xAODTrigL1Calo-* Event/xAOD
use xAODTrigCalo xAODTrigCalo-* Event/xAOD
use xAODHIEvent xAODHIEvent-* Event/xAOD
#macro cppdebugflags '$(cppdebugflags_s)'
#macro_remove componentshr_linkopts "-Wl,-s"
......
......@@ -1090,3 +1090,42 @@ class TrigL1BSTowerHypoConfig (TrigL1BSTowerHypo):
towertime = TrigTimeHistToolConfig("TrigL1BSTower_Time")
self.AthenaMonTools = [ toweronline, towertime]
### Predefined HLTCalo Alg Sequences (For Menu Development): ###
def TopoClustering_ROI():
te_in = ""
te_out = ""
algseq = [TrigCaloCellMaker_tau(), TrigCaloClusterMaker_topo()]
return [te_in, algseq, te_out]
def TopoClustering_PS():
te_in = ""
te_out = "TopoClusters_PS"
algseq = [TrigCaloCellMaker_jet_super(doNoise=0, AbsE=True), TrigCaloClusterMaker_topo()]
return [te_in, algseq, te_out]
def TopoClustering_FS():
te_in = ""
te_out = "TopoClusters_FS"
algseq = [PESA__DummyUnseededAllTEAlgo("DummyAlgo"), TrigCaloCellMaker_jet_fullcalo(doNoise=0, AbsE=True, doPers=True), TrigCaloClusterMaker_topo()]
return [te_in, algseq, te_out]
def SLW_Clustering():
te_in = ""
te_out = ""
algseq = [TrigCaloCellMaker_eGamma(), TrigCaloTowerMaker_eGamma(), TrigCaloClusterMaker_slw()]
return [te_in, algseq, te_out]
......@@ -107,7 +107,8 @@ StatusCode FullCaloCellContMaker::execute(CaloCellContainer &pCaloCellContainer)
if (m_timersvc) (m_timer.at(0))->start();
// reset error
m_error=(EFFULLCALO<<28);
//m_error=(EFFULLCALO<<28);
m_error = 0;
/* use LoadFullCollections
in TrigDataAccess */
......@@ -184,7 +185,7 @@ StatusCode FullCaloCellContMaker::addFullLArCells(CaloCellContainer& pCaloCellCo
// if (m_timersvc) m_timer[iDet][1]->resume();
if ( (m_data->LoadFullCollections(m_iBegin,m_iEnd, detectorID, prepare)).isFailure()) return StatusCode::FAILURE;
if (m_data->report_error()) {
m_error |= m_data->report_error() + (EFFULLCALO<<28);
m_error |= m_data->report_error(); // + (EFFULLCALO<<28);
//if (m_timersvc) m_timer[iDet][1]->stop();
//return StatusCode::SUCCESS; //don't return if problem with unpacking occurs
}
......@@ -199,7 +200,7 @@ StatusCode FullCaloCellContMaker::addFullLArCells(CaloCellContainer& pCaloCellCo
//if ( m_CaloDetDescrManager == 0 )
// {
//std::cout << "ERROR : cannot allocate CaloDetDescrManager"
// << endreq;
// << endmsg;
// return StatusCode::FAILURE;
// }
......@@ -247,7 +248,7 @@ StatusCode FullCaloCellContMaker::addFullTileCells(CaloCellContainer& pCaloCellC
// if (m_timersvc) m_timer[iDet][1]->resume();
if( (m_data->LoadFullCollections(m_itBegin,m_itEnd, iR, !iR)).isFailure()) return StatusCode::FAILURE;
if (m_data->report_error()) {
m_error |= m_data->report_error() + (EFFULLCALO<<28);
m_error |= m_data->report_error(); // + (EFFULLCALO<<28);
// if (m_timersvc) m_timer[iDet][1]->pause();
//continue; // do not stop and process other layer.
}
......@@ -298,7 +299,7 @@ StatusCode FullCaloCellContMaker::addFullDetCells(CaloCellContainer& pCaloCellCo
// Prepare data, load collections
if ( (m_data->LoadFullCollections(m_icBegin,m_icEnd)).isFailure()) return StatusCode::FAILURE;
if (m_data->report_error()) {
m_error |= m_data->report_error() + (EFFULLCALO<<28);
m_error |= m_data->report_error(); // + (EFFULLCALO<<28);
//if (m_timersvc) m_timer[iDet][1]->stop();
}
......
......@@ -40,7 +40,7 @@ RoIFCalEmCellContMaker::RoIFCalEmCellContMaker(const std::string & type, const s
m_cablingSvc(NULL)
{
declareProperty("DoLArCellsNoiseSuppression", do_LArCells_noise_suppression = 1);
declareProperty("DoLArCellsNoiseSuppression", m_do_LArCells_noise_suppression = 1);
declareProperty("CaloNoiseTool",m_noiseTool,"Tool Handle for noise tool");
declareProperty("CutValue",m_cutvalue = 2,"Cell accepted if e>m_cutvalue*larcellnoise");
......@@ -56,7 +56,7 @@ StatusCode RoIFCalEmCellContMaker::initialize(){
return StatusCode::FAILURE;
}
if (do_LArCells_noise_suppression!=0){
if (m_do_LArCells_noise_suppression!=0){
if (m_noiseTool.retrieve().isFailure()) return StatusCode::FAILURE;
......@@ -92,7 +92,8 @@ StatusCode RoIFCalEmCellContMaker::finalize(){
StatusCode RoIFCalEmCellContMaker::execute(CaloCellContainer &pCaloCellContainer,
const IRoiDescriptor& roi ) {
// reset error
m_error = (EFFCALEM<<28);
// m_error = (EFFCALEM<<28);
m_error = 0 ;
if (m_timersvc) {
(m_timer.at(0))->start();
......@@ -116,7 +117,7 @@ StatusCode RoIFCalEmCellContMaker::execute(CaloCellContainer &pCaloCellContainer
//return StatusCode::FAILURE;
}
if(m_data->report_error()) {
m_error=m_data->report_error()+(EFFCALEM<<28);
m_error=m_data->report_error(); //+(EFFCALEM<<28);
if (m_timersvc) (m_timer.at(2))->pause();
return StatusCode::SUCCESS;
}
......@@ -125,7 +126,7 @@ StatusCode RoIFCalEmCellContMaker::execute(CaloCellContainer &pCaloCellContainer
if (m_timersvc) (m_timer.at(3))->resume();
LArTT_Selector<LArCellCont>::const_iterator it;
if (do_LArCells_noise_suppression!=0){
if (m_do_LArCells_noise_suppression!=0){
//const CaloDetDescrManager* m_CaloDetDescrManager = CaloDetDescrManager::instance();
//if ( m_CaloDetDescrManager == 0 ) {
......
......@@ -39,7 +39,7 @@ RoIFCalHadCellContMaker::RoIFCalHadCellContMaker(const std::string & type, const
m_cablingSvc(NULL)
{
declareProperty("DoLArCellsNoiseSuppression", do_LArCells_noise_suppression = 1);
declareProperty("DoLArCellsNoiseSuppression", m_do_LArCells_noise_suppression = 1);
declareProperty("CaloNoiseTool",m_noiseTool,"Tool Handle for noise tool");
declareProperty("CutValue",m_cutvalue = 2,"Cell accepted if e>m_cutvalue*larcellnoise");
......@@ -55,7 +55,7 @@ StatusCode RoIFCalHadCellContMaker::initialize(){
return StatusCode::FAILURE;
}
if (do_LArCells_noise_suppression!=0){
if (m_do_LArCells_noise_suppression!=0){
if (m_noiseTool.retrieve().isFailure()) return StatusCode::FAILURE;
......@@ -90,7 +90,8 @@ StatusCode RoIFCalHadCellContMaker::finalize(){
StatusCode RoIFCalHadCellContMaker::execute(CaloCellContainer &pCaloCellContainer,
const IRoiDescriptor& roi ) {
// reset error
m_error = (EFFCALHAD<<28);
//m_error = (EFFCALHAD<<28);
m_error = 0;
if (m_timersvc) {
(m_timer.at(0))->start();
......@@ -111,7 +112,7 @@ StatusCode RoIFCalHadCellContMaker::execute(CaloCellContainer &pCaloCellContaine
//return StatusCode::FAILURE;
}
if (m_data->report_error()) {
m_error=m_data->report_error() + (EFFCALHAD<<28);
m_error=m_data->report_error();// + (EFFCALHAD<<28);
if (m_timersvc) (m_timer.at(2))->pause();
//continue;
}
......@@ -120,7 +121,7 @@ StatusCode RoIFCalHadCellContMaker::execute(CaloCellContainer &pCaloCellContaine
if (m_timersvc) (m_timer.at(3))->resume();
LArTT_Selector<LArCellCont>::const_iterator it;
if (do_LArCells_noise_suppression!=0){
if (m_do_LArCells_noise_suppression!=0){
//const CaloDetDescrManager* m_CaloDetDescrManager = CaloDetDescrManager::instance();
//if ( m_CaloDetDescrManager == 0 ) {
......
......@@ -38,7 +38,7 @@ RoILArEMCellContMaker::RoILArEMCellContMaker(const std::string & type, const std
m_cablingSvc(NULL)
{
declareProperty("DoLArCellsNoiseSuppression", do_LArCells_noise_suppression = 1);
declareProperty("DoLArCellsNoiseSuppression", m_do_LArCells_noise_suppression = 1);
declareProperty("CaloNoiseTool",m_noiseTool,"Tool Handle for noise tool");
declareProperty("CutValue",m_cutvalue = 2,"Cell accepted if e>m_cutvalue*larcellnoise");
declareProperty("AbsEinSigma",m_absEinSigma = 0,"0=asymmetric noise-sigma cut(default)");
......@@ -54,7 +54,7 @@ StatusCode RoILArEMCellContMaker::initialize(){
return StatusCode::FAILURE;
}
if (do_LArCells_noise_suppression!=0){
if (m_do_LArCells_noise_suppression!=0){
if (m_noiseTool.retrieve().isFailure()) return StatusCode::FAILURE;
......@@ -85,7 +85,8 @@ StatusCode RoILArEMCellContMaker::finalize(){
StatusCode RoILArEMCellContMaker::execute(CaloCellContainer &pCaloCellContainer,
const IRoiDescriptor& roi ) {
// reset error
m_error=(EFTTEM<<28);
//m_error=(EFTTEM<<28);
m_error=0;
if (m_timersvc) {
(m_timer.at(0))->start();
......@@ -106,7 +107,7 @@ StatusCode RoILArEMCellContMaker::execute(CaloCellContainer &pCaloCellContainer,
//return StatusCode::FAILURE;
}
if (m_data->report_error()) {
m_error=m_data->report_error() + (EFTTEM<<28);
m_error=m_data->report_error(); // + (EFTTEM<<28);
if (m_timersvc) (m_timer.at(2))->pause();
//continue;
}
......@@ -116,7 +117,7 @@ StatusCode RoILArEMCellContMaker::execute(CaloCellContainer &pCaloCellContainer,
if (m_timersvc) (m_timer.at(3))->resume();
LArTT_Selector<LArCellCont>::const_iterator it;
if (do_LArCells_noise_suppression!=0){
if (m_do_LArCells_noise_suppression!=0){
for(it = m_iBegin;it != m_iEnd; ++it) {
//const CaloDetDescrElement* caloDDE = (*it)->caloDDE();
//double larcellnoise = m_noiseTool->getNoise(caloDDE,ICalorimeterNoiseTool::TOTALNOISE);
......
......@@ -39,7 +39,7 @@ RoILArHadCellContMaker::RoILArHadCellContMaker(const std::string & type, const s
m_cablingSvc(NULL)
{
declareProperty("DoLArCellsNoiseSuppression", do_LArCells_noise_suppression = 1);
declareProperty("DoLArCellsNoiseSuppression", m_do_LArCells_noise_suppression = 1);
declareProperty("CaloNoiseTool",m_noiseTool,"Tool Handle for noise tool");
declareProperty("CutValue",m_cutvalue = 2,"Cell accepted if e>m_cutvalue*larcellnoise");
declareProperty("AbsEinSigma",m_absEinSigma = 0,"0=asymmetric noise-sigma cut(default)");
......@@ -55,7 +55,7 @@ StatusCode RoILArHadCellContMaker::initialize(){
return StatusCode::FAILURE;
}
if (do_LArCells_noise_suppression!=0){
if (m_do_LArCells_noise_suppression!=0){
if (m_noiseTool.retrieve().isFailure()) return StatusCode::FAILURE;
......@@ -92,7 +92,8 @@ StatusCode RoILArHadCellContMaker::execute(CaloCellContainer &pCaloCellContainer
const IRoiDescriptor& roi ) {
// reset error
m_error=(EFTTHEC<<28);
//m_error=(EFTTHEC<<28);
m_error=0;
if (m_timersvc) {
(m_timer.at(0))->start();
......@@ -113,7 +114,7 @@ StatusCode RoILArHadCellContMaker::execute(CaloCellContainer &pCaloCellContainer
//return StatusCode::FAILURE;
}
if (m_data->report_error()) {
m_error=m_data->report_error() + (EFTTHEC<<28);
m_error=m_data->report_error(); // + (EFTTHEC<<28);
if (m_timersvc) (m_timer.at(2))->pause();
//continue;
}
......@@ -123,7 +124,7 @@ StatusCode RoILArHadCellContMaker::execute(CaloCellContainer &pCaloCellContainer
if (m_timersvc) (m_timer.at(3))->resume();
LArTT_Selector<LArCellCont>::const_iterator it;
if (do_LArCells_noise_suppression!=0){
if (m_do_LArCells_noise_suppression!=0){
for(it = m_iBegin;it != m_iEnd; ++it) {
//const CaloDetDescrElement* caloDDE = (*it)->caloDDE();
//double larcellnoise = m_noiseTool->getNoise(caloDDE,ICalorimeterNoiseTool::TOTALNOISE);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment