Skip to content
Snippets Groups Projects
Commit 6a97f1a7 authored by Nikita Belyaev's avatar Nikita Belyaev
Browse files

MR release

parent 2c0045d0
No related branches found
No related tags found
No related merge requests found
......@@ -23,7 +23,6 @@ atlas_depends_on_subdirs( PUBLIC
Tracking/TrkEvent/TrkSpacePoint
Tracking/TrkEvent/TrkTrack
Tracking/TrkTools/TrkToolInterfaces
#Trigger/TrigAnalysis/TrigAnalysisInterfaces
PRIVATE
LumiBlock/LumiBlockComps
Control/AthContainers
......@@ -53,41 +52,6 @@ atlas_depends_on_subdirs( PUBLIC
Event/EventInfo
AtlasTest/TestTools)
#atlas_depends_on_subdirs( PUBLIC
# Control/AthenaMonitoring
# GaudiKernel
# InnerDetector/InDetRawEvent/InDetRawData
# LumiBlock/LumiBlockComps
# Control/AthenaBaseComps
# Trigger/TrigEvent/TrigDecisionInterface
# PRIVATE
# Control/StoreGate
# Commission/CommissionEvent
# Control/AthContainers
# DetectorDescription/AtlasDetDescr
# DetectorDescription/Identifier
# Event/EventPrimitives
# Event/xAOD/xAODEventInfo
# Event/xAOD/xAODTrigger
# InnerDetector/InDetConditions/InDetConditionsSummaryService
# InnerDetector/InDetConditions/TRT_ConditionsServices
# InnerDetector/InDetDetDescr/InDetIdentifier
# InnerDetector/InDetDetDescr/InDetReadoutGeometry
# InnerDetector/InDetRecEvent/InDetRIO_OnTrack
# InnerDetector/InDetRecTools/TRT_DriftFunctionTool
# InnerDetector/InDetRecTools/TRT_TrackHoleSearch
# Tools/LWHists
# Tracking/TrkEvent/TrkTrack
# Tracking/TrkEvent/TrkTrackSummary
# Tracking/TrkTools/TrkToolInterfaces #Control/AthenaMonitoring
# Control/AthenaCommon
# Control/AthenaConfiguration
# Control/AthenaKernel
# Control/SGMon/SGAudCore
# Database/AthenaPOOL/AthenaPoolUtilities
# Event/EventInfo
# Trigger/TrigAnalysis/TrigAnalysisInterfaces
# AtlasTest/TestTools)
# External dependencies:
find_package( Eigen )
......@@ -103,15 +67,13 @@ atlas_add_library( TRTMonitoringRun3Lib
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaBaseComps xAODEventInfo InDetPrepRawData GaudiKernel TRT_ConditionsServicesLib InDetReadoutGeometry InDetRawData TrkTrack TrkToolInterfaces AthenaMonitoringLib CommissionEvent TrkSpacePoint
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel SGTools SGAudCore AthenaPoolUtilities LumiBlockCompsLib EventInfo LWHists TrkTrackSummary InDetRIO_OnTrack InDetIdentifier TrkRIO_OnTrack TrkParameters TrkMeasurementBase TrkEventUtils TrkSurfaces PathResolver EventPrimitives Identifier AtlasDetDescr AthContainers )
#"WITH TRIGGER LIBRARIES" PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel SGTools SGAudCore AthenaPoolUtilities LumiBlockCompsLib EventInfo LWHists TrkTrackSummary InDetRIO_OnTrack InDetIdentifier TrkRIO_OnTrack TrkParameters TrkMeasurementBase TrkEventUtils TrkSurfaces PathResolver xAODTrigger EventPrimitives Identifier AtlasDetDescr AthContainers )
atlas_add_component( TRTMonitoringRun3
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODEL_LIBRARIES} TRTMonitoringRun3Lib AthenaMonitoringLib SGAudCore SGTools AthenaPoolUtilities GaudiKernel EventInfo InDetRawData InDetPrepRawData LumiBlockCompsLib CommissionEvent AthContainers AtlasDetDescr Identifier xAODEventInfo EventPrimitives TRT_ConditionsServicesLib InDetReadoutGeometry InDetRIO_OnTrack LWHists TrkTrack TrkTrackSummary TrkToolInterfaces AthenaKernel InDetIdentifier MagFieldInterfaces PathResolver TrkSurfaces TrkEventUtils TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkSpacePoint)
#"WITH TRIGGER LIBRARIES" LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODEL_LIBRARIES} TRTMonitoringRun3Lib AthenaMonitoringLib SGAudCore SGTools AthenaPoolUtilities GaudiKernel EventInfo InDetRawData InDetPrepRawData LumiBlockCompsLib CommissionEvent AthContainers AtlasDetDescr Identifier xAODEventInfo xAODTrigger EventPrimitives TRT_ConditionsServicesLib InDetReadoutGeometry InDetRIO_OnTrack LWHists TrkTrack TrkTrackSummary TrkToolInterfaces AthenaKernel InDetIdentifier MagFieldInterfaces PathResolver TrkSurfaces TrkEventUtils TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkSpacePoint)
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
......
......@@ -26,7 +26,6 @@
#include "InDetRawData/InDetRawDataCLASS_DEF.h"
// Tool interfaces
//#include "LumiBlockComps/ILuminosityTool.h"
#include "TrkToolInterfaces/ITrackSummaryTool.h"
#include "TrkToolInterfaces/ITrackHoleSearchTool.h"
#include "TRT_DriftFunctionTool/ITRT_DriftFunctionTool.h"
......@@ -68,7 +67,6 @@ public:
TRTMonitoringRun3_Tool( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~TRTMonitoringRun3_Tool();
virtual StatusCode initialize() override;
virtual StatusCode fillTRTRDOs( const TRT_RDO_Container& rdoContainer ) const;
virtual StatusCode fillTestTRTTrackHistograms( const TrackCollection& trackCollection) const;
virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
private:
......@@ -194,12 +192,7 @@ private:
int m_nHitsperLB_E[2];
int m_nHLHitsperLB_E[2];
/*
ToolHandle<Trk::IPropagator> m_propagatorTool;
Trk::IPropagator *m_propagator;
ToolHandle<Trk::IExtrapolator> m_extrapolatorTool;
Trk::IExtrapolator *m_extrapolator;
*/ //obsolete
float m_maxDistToStraw;
float m_DistToStraw;
bool m_trt_only_trks;
......@@ -237,9 +230,7 @@ private:
int m_every_xth_track;
std::string m_datatype;
const AtlasDetectorID* m_idHelper;
Gaudi::Property<bool> m_doRandom {this,"RandomHist",false}; //< Trigger chain string pulled from the job option and parsed into a vector?
......@@ -251,18 +242,10 @@ private:
int strawLayerNumber(int strawLayerNumber, int LayerNumber) const;
int strawNumber(int strawNumber, int strawlayerNumber, int LayerNumber) const;
int strawNumberEndCap(int strawNumber, int strawLayerNumber, int LayerNumber, int phi_stack, int side) const;
int chipToBoard(int chip) const;
int chipToBoard_EndCap(int chip) const;
float radToDegrees(float radValue) const;
// Services
//ServiceHandle<IToolSvc> p_toolSvc;
ToolHandle<ITRT_StrawStatusSummaryTool> m_sumTool;
//ServiceHandle<ITRT_DAQ_ConditionsSvc> m_DAQSvc;
//ServiceHandle<ITRT_ByteStream_ConditionsSvc> m_BSSvc;
//ServiceHandle<ITRT_ConditionsSvc> m_condSvc_BS;
//ServiceHandle<ITRT_StrawNeighbourSvc> m_TRTStrawNeighbourSvc;
//ToolHandle<ITRT_CalDbTool> m_TRTCalDbTool;
const TRT_ID *m_pTRTHelper;
const InDetDD::TRT_DetectorManager* m_mgr;
......@@ -272,31 +255,8 @@ private:
SG::ReadHandleKey<TrackCollection> m_trackCollectionKey {this, "TRTTracksObjectName", "Tracks", "Name of tracks container"};
SG::ReadHandleKey<TrackCollection> m_combTrackCollectionKey{this, "track_collection_hole_finder", "CombinedInDetTracks", "Name of tracks container used for hole finder"};
//SG::ReadHandleKey<TrackCollection> m_trackCollectionKey {this, "TRTTracksObjectName", "Tracks", "Name of tracks container"};
//SG::ReadHandleKey<TrackCollection> m_trackCollectionKey {this, "TrackCollection", "Tracks", "Name of tracks container"};
//SG::ReadHandleKey<TrackCollection> m_tracksName{this, "tracksName", "CombinedInDetTracks"}; //From SCTLorentzMonAlg.h
//SG::ReadHandleKey<TrackCollection> m_combTrackCollectionKey{this, "track_collection_hole_finder", "CombinedInDetTracks", "Name of tracks container used for hole finder"};
//SG::ReadHandleKey<TrackCollection> m_combTrackCollectionKey{this, "TrackCollection", "Tracks", "Name of tracks container used for hole finder"};
SG::ReadHandleKey<xAOD::EventInfo> m_xAODEventInfoKey {this, "xAODEventInfo", "EventInfo", "Name of EventInfo object"};
SG::ReadHandleKey<InDetTimeCollection> m_TRT_BCIDCollectionKey {this, "TRTBCIDCollectionName", "TRT_BCID", "Name of TRT BCID collection"};
//SG::ReadHandleKey<ComTime> m_comTimeObjectKey {this, "ComTimeObjectName", "TRT_Phase", "Name of ComTime object"};
//SG::ReadHandleKey<xAOD::TrigDecision> m_trigDecisionKey {this, "TrigDecisionObjectName", "xTrigDecision", "Name of trigger decision object"};
// Tools
//ToolHandle<Trk::ITrackSummaryTool> m_TrackSummaryTool{this, "TrkSummaryTool", "Trk::TrackSummaryTool/InDetTrackSummaryTool", "Track summary tool name"};
//ToolHandle<Trk::ITrackHoleSearchTool> m_trt_hole_finder{this, "trt_hole_search", "TRTTrackHoleSearchTool", "Track hole search tool name"};
//ToolHandle<ILuminosityTool> m_lumiTool{this, "LuminosityTool", "LuminosityTool", "Luminosity tool name"};
//ToolHandle<ITRT_DriftFunctionTool> m_drifttool;
//ServiceHandle<MagField::IMagFieldSvc> m_field;
//SG::ReadHandleKey<TrackCollection> m_trackCollectionKey{this, "TrackCollection", "in"};
//SG::ReadHandleKey<TrackCollection> m_trackCollectionKey{this, "TRTTracksObjectName", "Tracks", "Name of tracks container"};
//SG::ReadHandleKey<TrackCollection> m_trackCollections{this, "Trk::TrackCollection_tlp5_CombinedInDetTracks", "in"};
//SG::ReadHandleKey<TrackCollection> m_trackCollectionKey;
//SG::ReadHandleKey<TrackCollection> m_TracksName;
//SG::ReadHandleKey<TrackCollection> m_trackCollectionKey{this, "TrackCollection", "in"};//SG::ReadHandleKey<TrackCollection> m_trackCollectionKey{this, "TRTTracksObjectName", "Tracks", "Name of tracks container"};
};
#endif
//#include "AthenaMonitoring/AthenaMon.h"
//#include "AthenaMonitoring/AthenaMonManager.h"
//#include "AthenaMonitoring/ManagedMonitorToolTest.h"
//#include "AthenaMonitoring/DQAtlasReadyFilterTool.h"
//#include "AthenaMonitoring/DQFilledBunchFilterTool.h"
//#include "AthenaMonitoring/DQDummyFilterTool.h"
//#include "AthenaMonitoring/DQBadLBFilterTool.h"
//#include "AthenaMonitoring/DQBadLBFilterAlg.h"
//#include "AthenaMonitoring/TriggerTranslatorSimple.h"
//#include "AthenaMonitoring/GenericMonitoringTool.h"
#include "TRTMonitoringRun3/TRTMonitoringRun3_Tool.h"
//DECLARE_COMPONENT( AthenaMon )
//DECLARE_COMPONENT( AthenaMonManager )
//DECLARE_COMPONENT( ManagedMonitorToolTest )
//DECLARE_COMPONENT( DQAtlasReadyFilterTool )
//DECLARE_COMPONENT( DQFilledBunchFilterTool )
//DECLARE_COMPONENT( DQDummyFilterTool )
//DECLARE_COMPONENT( DQBadLBFilterTool )
//DECLARE_COMPONENT( DQBadLBFilterAlg )
//DECLARE_COMPONENT( TriggerTranslatorToolSimple )
//DECLARE_COMPONENT( GenericMonitoringTool )
DECLARE_COMPONENT( TRTMonitoringRun3_Tool )
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment