diff --git a/PhysicsAnalysis/NtupleDumper/python/NtupleDumperConfig.py b/PhysicsAnalysis/NtupleDumper/python/NtupleDumperConfig.py index cc68970f9447e8b93433d93153b349247bcdad8a..af6432263e508560530f80ff987961bfcb6d725d 100644 --- a/PhysicsAnalysis/NtupleDumper/python/NtupleDumperConfig.py +++ b/PhysicsAnalysis/NtupleDumper/python/NtupleDumperConfig.py @@ -23,7 +23,7 @@ def NtupleDumperAlgCfg(flags, OutName, **kwargs): actsExtrapolationTool = CompFactory.FaserActsExtrapolationTool("FaserActsExtrapolationTool") actsExtrapolationTool.MaxSteps = 10000 actsExtrapolationTool.TrackingGeometryTool = actsTrackingGeometryTool - + NtupleDumperAlg = CompFactory.NtupleDumperAlg("NtupleDumperAlg",**kwargs) NtupleDumperAlg.ExtrapolationTool = actsExtrapolationTool acc.addEventAlgo(NtupleDumperAlg) diff --git a/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.cxx b/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.cxx index 6880f5dce596a18be3f51aaf014f548ce409bb54..d964b1d2c0807f26c8d89c5d15f46d53646f25cf 100644 --- a/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.cxx +++ b/PhysicsAnalysis/NtupleDumper/src/NtupleDumperAlg.cxx @@ -577,7 +577,6 @@ StatusCode NtupleDumperAlg::initialize() return StatusCode::SUCCESS; } - StatusCode NtupleDumperAlg::execute(const EventContext &ctx) const { clearTree(); @@ -683,7 +682,7 @@ StatusCode NtupleDumperAlg::execute(const EventContext &ctx) const m_clock_phase = (clockHandle->phase() / 3.14159) * 12.5; } } - + // process all waveform data for all scintillator and calorimeter channels // Not all are guaranteed to exist, so fill the ones that are valid SG::ReadHandle<xAOD::WaveformHitContainer> vetoNuContainer { m_vetoNuContainer, ctx }; @@ -1053,6 +1052,7 @@ StatusCode NtupleDumperAlg::execute(const EventContext &ctx) const m_calo_total_E_EM_fudged = m_calo_total_E_EM_fudged * m_caloMC_FudgeFactor; } + // load in calibrated preshower container SG::ReadHandle<xAOD::CalorimeterHitContainer> preshowerCalibratedContainer { m_preshowerCalibratedContainer, ctx }; ATH_CHECK(preshowerCalibratedContainer.isValid()); @@ -1066,7 +1066,8 @@ StatusCode NtupleDumperAlg::execute(const EventContext &ctx) const ATH_MSG_DEBUG("Calibrated preshower: ch is " << ch << ", edep is " << hit->E_dep() << ", E_EM is " << hit->E_EM() << ", Nmip is " << hit->Nmip() << ", fit_to_raw_ratio is " << hit->fit_to_raw_ratio()); } - + + // enforce blinding such that events that miss the veto layers and have a large calo signal are skipped and not in the output root file // Only blind colliding BCIDs (+/- 1) bool blinded_event = false; diff --git a/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt b/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt index db8532180b9369bee916499d6d02a233a96c9008..497dde277337bee18f81a3682569101c6d5c3a1d 100644 --- a/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt +++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt @@ -13,7 +13,8 @@ atlas_add_poolcnv_library( WaveEventAthenaPoolPoolCnv WaveRawEvent/RawWaveformContainer.h LINK_LIBRARIES Identifier GeneratorObjectsTPCnv AthAllocators AthContainers AthenaBaseComps AthenaKernel SGTools StoreGateLib AthenaPoolCnvSvcLib - AthenaPoolUtilities AtlasSealCLHEP GaudiKernel WaveRawEvent + AthenaPoolUtilities GaudiKernel WaveRawEvent + # AtlasSealCLHEP ) atlas_add_dictionary( WaveEventAthenaPoolCnvDict diff --git a/package_filters.txt b/package_filters.txt index c3167d0ab1df2c713b94f6d221dd8d7f1b027414..6844b948776c541c4a9be589bad3a5e34c85f11a 100644 --- a/package_filters.txt +++ b/package_filters.txt @@ -149,13 +149,14 @@ -Tracking/.* +Trigger/FaserTrigEventCnv/FaserTriggerByteStream #-Trigger/.* -+Waveform/WaveDigiTools -+Waveform/WaveEventCnv/WaveByteStream -+Waveform/WaveformConditions/WaveformConditionsTools -+Waveform/WaveRawEvent -+Waveform/WaveRecAlgs -+Waveform/WaveRecTools --Waveform/.* +#+Waveform/WaveDigiTools +#+Waveform/WaveEventCnv/WaveByteStream +#+Waveform/WaveEventCnv +#+Waveform/WaveformConditions +#+Waveform/WaveRawEvent +#+Waveform/WaveRecAlgs +#+Waveform/WaveRecTools ++Waveform/.* +faser-common/EventFormats +faser-common/Exceptions +faser-common/Logging