Skip to content
Commits on Source (9)
Hide whitespace changes
Inline Side-by-side
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt100gev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_100GeV_task12089641.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=6000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt10gev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_10GeV_task12089631.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=6000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt1tev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_1TeV_task12089645.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=6000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt200gev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_200GeV_task12089651.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=6000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt20gev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_20GeV_task12089632.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=3000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt2tev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_2TeV_task12089647.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=6000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3gev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_3GeV_task12089572.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=6000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3tev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_3TeV_task12089649.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=6000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt500gev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_500GeV_task12089642.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=6000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt50gev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_50GeV_task12089639.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=6000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt5gev.sh
View file @ bfd2c1ad
......@@ -8,11 +8,11 @@
# art-include: 21.3/Athena
#
# art-input: user.zhidong.SingleMuon_5GeV_task12089629.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 10
# art-input-nfiles: 3
# art-output: trk*.txt
set -e
fileList="['${ArtInFile//,/', '}']"
echo "List of files = ", $fileList
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=20000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
athena.py -c "from AthenaCommon.AthenaCommonFlags import athenaCommonFlags; athenaCommonFlags.EvtMax=6000; athenaCommonFlags.FilesInput = $fileList" -b MooPerformance/MooPerformance_topOptions.py
PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/CMakeLists.txt
View file @ bfd2c1ad
......@@ -13,6 +13,7 @@ atlas_depends_on_subdirs( PUBLIC
PhysicsAnalysis/AnalysisCommon/PATCore
PhysicsAnalysis/DerivationFramework/DerivationFrameworkInterfaces
Trigger/TrigAnalysis/TrigDecisionTool
Event/xAOD/xAODEventInfo
PRIVATE
Control/AthenaKernel
PhysicsAnalysis/CommonTools/ExpressionEvaluation )
......@@ -25,7 +26,7 @@ atlas_add_library( DerivationFrameworkToolsLib
src/*.cxx
PUBLIC_HEADERS DerivationFrameworkTools
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthenaBaseComps xAODBase GaudiKernel PATCoreLib TrigDecisionToolLib ExpressionEvaluationLib
LINK_LIBRARIES AthenaBaseComps xAODBase GaudiKernel PATCoreLib TrigDecisionToolLib ExpressionEvaluationLib xAODEventInfo
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel )
atlas_add_component( DerivationFrameworkTools
......
PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/DerivationFrameworkTools/PrescaleTool.h
View file @ bfd2c1ad
......@@ -25,7 +25,7 @@ namespace DerivationFramework {
virtual bool eventPassesFilter() const;
private:
mutable int m_prescale, m_eventCounter;
unsigned int m_prescale;
};
}
......
PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/PrescaleTool.cxx
View file @ bfd2c1ad
......@@ -11,6 +11,7 @@
// Use of ExpressionParsing to analyse a more complex string
#include "DerivationFrameworkTools/PrescaleTool.h"
#include "xAODEventInfo/EventInfo.h"
namespace DerivationFramework {
......@@ -30,7 +31,6 @@ namespace DerivationFramework {
ATH_MSG_FATAL("Prescale of less than 1 makes no sense");
return StatusCode::FAILURE;
}
m_eventCounter = 0;
return StatusCode::SUCCESS;
}
......@@ -41,9 +41,10 @@ namespace DerivationFramework {
bool PrescaleTool::eventPassesFilter() const
{
const xAOD::EventInfo* ei = 0;
CHECK( evtStore()->retrieve( ei , "EventInfo" ) );
bool accept(false);
if (m_eventCounter % m_prescale == 0) accept = true;
++m_eventCounter;
if (ei->eventNumber() % m_prescale == 0) accept = true;
return accept;
}
......
Projects/AthDataQuality/version.txt
View file @ bfd2c1ad
21.0.99.1
\ No newline at end of file
21.0.100.1
\ No newline at end of file
Reconstruction/MuonIdentification/MuonCombinedBaseTools/CMakeLists.txt
View file @ bfd2c1ad
......@@ -15,7 +15,6 @@ atlas_depends_on_subdirs( PRIVATE
Event/EventPrimitives
Event/FourMomUtils
Event/xAOD/xAODCaloEvent
Event/xAOD/xAODEventInfo
Event/xAOD/xAODMuon
Event/xAOD/xAODMuonCnv
Event/xAOD/xAODTracking
......@@ -55,7 +54,8 @@ atlas_depends_on_subdirs( PRIVATE
Tracking/TrkEvent/TrkTrack
Tracking/TrkEvent/TrkTrackSummary
Tracking/TrkExtrapolation/TrkExInterfaces
Tracking/TrkTools/TrkToolInterfaces )
Tracking/TrkTools/TrkToolInterfaces
InnerDetector/InDetConditions/InDetBeamSpotService)
# External dependencies:
find_package( CLHEP )
......@@ -67,5 +67,5 @@ atlas_add_component( MuonCombinedBaseTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} CaloEvent AthLinks AthenaBaseComps Identifier EventPrimitives FourMomUtils xAODCaloEvent xAODEventInfo xAODMuon xAODTracking xAODTruth GaudiKernel MagFieldInterfaces MuonReadoutGeometry MuonIdHelpersLib MuonCompetingRIOsOnTrack MuonRIO_OnTrack MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSegmentMakerUtils MuonSelectorToolsLib ICaloTrkMuIdTools MuGirlInterfaces MuidInterfaces MuonCombinedEvent MuonCombinedToolInterfaces muonEvent MuidEvent ParticleTruth RecoToolInterfaces TrackToCaloLib TrkGeometry TrkSurfaces TrkCaloExtension TrkEventPrimitives TrkEventUtils TrkMaterialOnTrack TrkParameters TrkParametersIdentificationHelpers TrkSegment TrkTrack TrkTrackSummary TrkExInterfaces TrkToolInterfaces )
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} CaloEvent AthLinks AthenaBaseComps Identifier EventPrimitives FourMomUtils xAODCaloEvent xAODEventInfo xAODMuon xAODTracking xAODTruth GaudiKernel MagFieldInterfaces MuonReadoutGeometry MuonIdHelpersLib MuonCompetingRIOsOnTrack MuonRIO_OnTrack MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSegmentMakerUtils MuonSelectorToolsLib ICaloTrkMuIdTools MuGirlInterfaces MuidInterfaces MuonCombinedEvent MuonCombinedToolInterfaces muonEvent MuidEvent ParticleTruth RecoToolInterfaces TrackToCaloLib TrkGeometry TrkSurfaces TrkCaloExtension TrkEventPrimitives TrkEventUtils TrkMaterialOnTrack TrkParameters TrkParametersIdentificationHelpers TrkSegment TrkTrack TrkTrackSummary TrkExInterfaces TrkToolInterfaces InDetBeamSpotServiceLib )
Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.cxx
View file @ bfd2c1ad
......@@ -15,7 +15,7 @@
#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
#include "TrkToolInterfaces/ITrackAmbiguityProcessorTool.h"
#include "MuonRecToolInterfaces/IMuonTrackExtrapolationTool.h"
#include "xAODEventInfo/EventInfo.h"
#include "InDetBeamSpotService/IBeamCondSvc.h"
namespace MuonCombined {
......@@ -26,7 +26,8 @@ namespace MuonCombined {
m_printer("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"),
m_trackBuilder("Rec::CombinedMuonTrackBuilder/CombinedMuonTrackBuilder"),
m_trackExtrapolationTool("ExtrapolateMuonToIPTool/ExtrapolateMuonToIPTool"),
m_ambiguityProcessor("Trk::TrackSelectionProcessorTool/MuonAmbiProcessor")
m_ambiguityProcessor("Trk::TrackSelectionProcessorTool/MuonAmbiProcessor"),
m_beamService("BeamCondSvc", name)
{
declareInterface<IMuonCandidateTool>(this);
declareProperty("Printer",m_printer );
......@@ -34,6 +35,7 @@ namespace MuonCombined {
declareProperty("TrackBuilder",m_trackBuilder );
declareProperty("TrackExtrapolationTool",m_trackExtrapolationTool );
declareProperty("AmbiguityProcessor",m_ambiguityProcessor );
declareProperty("BeamSpotSvc", m_beamService);
}
MuonCandidateTool::~MuonCandidateTool()
......@@ -46,6 +48,7 @@ namespace MuonCombined {
if( !m_trackBuilder.empty() ) ATH_CHECK(m_trackBuilder.retrieve());
if( !m_trackExtrapolationTool.empty() ) ATH_CHECK(m_trackExtrapolationTool.retrieve());
ATH_CHECK(m_ambiguityProcessor.retrieve());
ATH_CHECK(m_beamService.retrieve());
return StatusCode::SUCCESS;
}
......@@ -56,16 +59,11 @@ namespace MuonCombined {
void MuonCandidateTool::create( const xAOD::TrackParticleContainer& tracks, MuonCandidateCollection& outputCollection ) const {
ATH_MSG_DEBUG("Producing MuonCandidates for " << tracks.size() );
unsigned int ntracks = 0;
const xAOD::EventInfo* eventInfo;
float beamSpotX = 0.;
float beamSpotY = 0.;
float beamSpotZ = 0.;
if(evtStore()->retrieve(eventInfo).isSuccess()){
beamSpotX = eventInfo->beamPosX();
beamSpotY = eventInfo->beamPosY();
beamSpotZ = eventInfo->beamPosZ();
}
float beamSpotX = m_beamService->beamPos()[Amg::x];
float beamSpotY = m_beamService->beamPos()[Amg::y];
float beamSpotZ = m_beamService->beamPos()[Amg::z];
ATH_MSG_DEBUG( " Beamspot position bs_x " << beamSpotX << " bs_y " << beamSpotY << " bs_z " << beamSpotZ);
......
Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.h
View file @ bfd2c1ad
......@@ -11,6 +11,8 @@
#include "xAODTracking/TrackParticleContainer.h"
#include "MuonCombinedEvent/InDetCandidateCollection.h"
class IBeamCondSvc;
namespace Trk {
class ITrackAmbiguityProcessorTool;
}
......@@ -43,6 +45,7 @@ namespace MuonCombined {
ToolHandle<Rec::ICombinedMuonTrackBuilder> m_trackBuilder;
ToolHandle<Muon::IMuonTrackExtrapolationTool> m_trackExtrapolationTool;
ToolHandle<Trk::ITrackAmbiguityProcessorTool> m_ambiguityProcessor;
ServiceHandle< IBeamCondSvc > m_beamService;
unsigned int m_extrapolationStrategy;
};
......