athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-07-17T03:04:05+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/34749Digitization: python 3 fixes2020-07-17T03:04:05+02:00Scott SnyderDigitization: python 3 fixesprint statement -> function.print statement -> function.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34748InDetRecExample: python 3 / python 3.8 fixes2020-07-17T03:02:03+02:00Scott SnyderInDetRecExample: python 3 / python 3.8 fixesSome missed print statement to function conversions.
Use `==' not `is' when comparing to string literals.
This fixes warnings seen with python 3.8.Some missed print statement to function conversions.
Use `==' not `is' when comparing to string literals.
This fixes warnings seen with python 3.8.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34747G4AtlasApps: python 3 fixes2020-07-17T03:04:35+02:00Scott SnyderG4AtlasApps: python 3 fixesstring.splitstring.splithttps://gitlab.cern.ch/atlas/athena/-/merge_requests/34745TrigT1CaloCalibConditions: Fix python 3.8 warning.2020-07-17T03:04:26+02:00Scott SnyderTrigT1CaloCalibConditions: Fix python 3.8 warning.Use `==' instead of `is' when comparing to string literals.Use `==' instead of `is' when comparing to string literals.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34744TriggerJobOpts: Fix python 3 warning.2020-07-17T03:04:14+02:00Scott SnyderTriggerJobOpts: Fix python 3 warning.Unused variable.Unused variable.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34742PyUtils: Fix python 3 warnings.2020-07-17T03:03:28+02:00Scott SnyderPyUtils: Fix python 3 warnings.Fix warnings about regexp syntax.Fix warnings about regexp syntax.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34741PyDumper: Work around issue with cling 6.20.06.2020-07-22T17:31:46+02:00Scott SnyderPyDumper: Work around issue with cling 6.20.06.In root 6.20.06, cling was sometimes parsing xAOD classes in wrong order,
causing it to get confused on forward declarations. This was leading
to crashes on tests that make event dumps.
Explicitly fetch some classes at the start of the...In root 6.20.06, cling was sometimes parsing xAOD classes in wrong order,
causing it to get confused on forward declarations. This was leading
to crashes on tests that make event dumps.
Explicitly fetch some classes at the start of the dumper to work around this.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34740Implement L2muComb plots to Offline MuonMonitoringMT, ATR-203172020-07-21T03:04:32+02:00Moe WakidaImplement L2muComb plots to Offline MuonMonitoringMT, ATR-20317I want to merge this change into master.
I implemented L2CombinedMuon plots to Trigger/TrigMonitoring/TrigMuonMonitoringMT. L2CombinedMuon plots are almost the same as legacy code [https://gitlab.cern.ch/atlas/athena/-/blob/master/Tri...I want to merge this change into master.
I implemented L2CombinedMuon plots to Trigger/TrigMonitoring/TrigMuonMonitoringMT. L2CombinedMuon plots are almost the same as legacy code [https://gitlab.cern.ch/atlas/athena/-/blob/master/Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuCombMon.cxx](https://gitlab.cern.ch/atlas/athena/-/blob/master/Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuCombMon.cxx)
Added L2SA RoI plot (corresponding to HLT_Roi_L2SAMuon).
* L2SARoI_dR_toRecMuonCB
* L2SARoI_dEta_vs_Eta_toRecMuonCB
* L2SARoI_dPhi_vs_Eta_toRecMuonCB
I tested using below command (myESD.pool.root is made from
`valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e4993_s3474_r11322/RDO.18782565._000431.pool.root.1`
in the environment of master,2020-05-01T2139)
`Run3DQTestingDriver.py --loglevel DEBUG --dqOffByDefault Input.Files="['myESD.pool.root']" DQ.Steering.doHLTMon=True DQ.Steering.HLT.doGeneral=False DQ.Steering.HLT.doCalo=False DQ.Steering.HLT.doEgamma=False DQ.Steering.HLT.doMET=False DQ.Steering.HLT.doJet=False DQ.Steering.HLT.doBjet=False DQ.Steering.HLT.doBphys=False DQ.Steering.HLT.doMuon=True Output.HISTFileName=HIST.root`
and web display of HIST.root is here.[https://mwakida.web.cern.ch/mwakida/ATR-20317/webdisplay3/](https://mwakida.web.cern.ch/mwakida/ATR-20317/webdisplay3/)
The documentation of the functions is [https://mwakida.web.cern.ch/mwakida/ATR-20317/html/de/df9/classMuonMatchingTool.html](https://mwakida.web.cern.ch/mwakida/ATR-20317/html/de/df9/classMuonMatchingTool.html).
tagging @nakahama, @sshaw, @ynoguchi, and @giagu for info.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34737Update menu and mon2020-07-21T03:04:44+02:00Fernando MonticelliUpdate menu and monThis MR adds few chains for the purpose of validating Egamma triggers both in the LS2_V1 menu and in the configuration of the monitoring in preparation for next round of validation as discussed in ATR-21415
Pinging @cjmeyer @safarzad @...This MR adds few chains for the purpose of validating Egamma triggers both in the LS2_V1 menu and in the configuration of the monitoring in preparation for next round of validation as discussed in ATR-21415
Pinging @cjmeyer @safarzad @jpandurohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/34736Fix use of updated rois on each step2020-07-21T03:02:55+02:00Edson Carquin LopezFix use of updated rois on each stepRoi redimensioning implementation for the tau trigger is (hopefully) fixed.
tagging @malconad @guindon @ademaria
Related to issue ATR-19535, and also probably to issue ATR-21416Roi redimensioning implementation for the tau trigger is (hopefully) fixed.
tagging @malconad @guindon @ademaria
Related to issue ATR-19535, and also probably to issue ATR-21416https://gitlab.cern.ch/atlas/athena/-/merge_requests/34733Resolve ATLASRECTS-5475, MT protection for HIEventShapeMap2020-07-30T03:02:45+02:00Riccardo LongoResolve ATLASRECTS-5475, MT protection for HIEventShapeMapThis MR solves [ATLASRECTS-5475](https://its.cern.ch/jira/browse/ATLASRECTS-5475) w/ the implementation of a new HIEventShapeMapTool to move to a MT safe implementation.
No more modification of the map - now initialized w/ the informat...This MR solves [ATLASRECTS-5475](https://its.cern.ch/jira/browse/ATLASRECTS-5475) w/ the implementation of a new HIEventShapeMapTool to move to a MT safe implementation.
No more modification of the map - now initialized w/ the information about the geometry available for shape (e.g. TOWER and COMPACT). The changes are propagated also to HI trigger.
The old HIEventShapeMap is currently still in place as "legacy code".Riccardo LongoRiccardo Longohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/34732New config for ISF_SimulationSelectors Fatras dependencies2020-08-04T03:03:37+02:00Rupert TombsNew config for ISF_SimulationSelectors Fatras dependenciesTowards configuring ISF_SimulationSelectors, add and update some configuration of Fatras services.
Adds some Sim.Fatras flags to configure this configuration.
Also enable post-build flake8 for ISF_SimulationSelectors, and correct M...Towards configuring ISF_SimulationSelectors, add and update some configuration of Fatras services.
Adds some Sim.Fatras flags to configure this configuration.
Also enable post-build flake8 for ISF_SimulationSelectors, and correct MT dependence of Simulator services.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34730HLT MTCalibPeb test: allow deterministic RNG seed and make RootComp a require...2020-07-17T03:05:14+02:00Rafal Bielskirafal.bielski@cern.chHLT MTCalibPeb test: allow deterministic RNG seed and make RootComp a required step1. Add an option in MTCalibPebHypoTool to re-seed the RNG with deterministic seed calculated from run/event number and the name of the tool instance (which is HLT chain name). This is needed for reproducible test outputs.
2. Make the his...1. Add an option in MTCalibPebHypoTool to re-seed the RNG with deterministic seed calculated from run/event number and the name of the tool instance (which is HLT chain name). This is needed for reproducible test outputs.
2. Make the histogram comparison to reference a required step in the TrigP1Test CalibPeb tests. Suggested by @fwinkl.
3. Remove one redundant CalibPeb test.
4. Add ROBDataProviderSvc histograms to ignore patterns in `rootcomp.py`. They are not reproducible because in AthenaMT algorithms may be executed in different order and the data caching inside the service leads to different histogram inputs. This also closes ATR-21137. cc @wiedenmahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/34729ATLLONECAL-338 first migrated L1Calo PPM monitoring plots2020-07-17T03:04:18+02:00Kate WhalenATLLONECAL-338 first migrated L1Calo PPM monitoring plotsThis is the first attempt at migrating the L1Calo legacy PPM monitoring to the new format for Run 3. Includes some ADC hitmaps and LUT hitmaps and distributions.
FYI: @thompson @afaulkneThis is the first attempt at migrating the L1Calo legacy PPM monitoring to the new format for Run 3. Includes some ADC hitmaps and LUT hitmaps and distributions.
FYI: @thompson @afaulknehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/34728ISF new style config2020-10-03T03:06:57+02:00Daniel Louis NoelISF new style configNow matches the old style outputNow matches the old style outputhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/34727Fill in missing new config for tools and services required for ISF Services, ...2020-07-17T03:02:30+02:00Rupert TombsFill in missing new config for tools and services required for ISF Services, Fix flake8 warnings in ISF Services (old config)Resolve TODOs left by !34362 in ISF Services configuration.
Move some functions between (Core/not Core) files to avoid circular dependence. Correct imports from these.
Change tool configuration functions to return ComponentAccumula...Resolve TODOs left by !34362 in ISF Services configuration.
Move some functions between (Core/not Core) files to avoid circular dependence. Correct imports from these.
Change tool configuration functions to return ComponentAccumulator with tools attached.
Add flake8 cmake options for affected packages.
Address warnings generated by the flake8 tests introduced in old config.
New and old configuration commits are separate.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34726TrigBphysHypo: Clean up includes and dependencies2020-07-16T16:22:01+02:00Adam Edward BartonTrigBphysHypo: Clean up includes and dependenciesThe TrigBphysHypo package is slow to compile and uses a lot of memory. Here redundant includes and dependencies are trimmed to try and mitigate this.The TrigBphysHypo package is slow to compile and uses a lot of memory. Here redundant includes and dependencies are trimmed to try and mitigate this.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34723Further CMakeLists.txt tidying for Simulation and Digitization packages2020-07-16T03:03:50+02:00John Derek ChapmanFurther CMakeLists.txt tidying for Simulation and Digitization packagesThis merge request removes the `atlas_depends_on_subdirs(...)` syntax from the `CMakeLists.txt` files of another set of Digitization packages. It also cleans up the linking for some Simulation packages where multiple libraries are built.This merge request removes the `atlas_depends_on_subdirs(...)` syntax from the `CMakeLists.txt` files of another set of Digitization packages. It also cleans up the linking for some Simulation packages where multiple libraries are built.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34722Revert "Merge branch 'master-PixelConditionsData-v2' into 'master'"2020-07-16T03:03:46+02:00Susumu OdaRevert "Merge branch 'master-PixelConditionsData-v2' into 'master'"This reverts merge request !34612
!34658 removed ATLAS_THREAD_NOT_SAFE from MultiHisto::Write.This reverts merge request !34612
!34658 removed ATLAS_THREAD_NOT_SAFE from MultiHisto::Write.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34721Changes in TrigIndetValidation art tests2020-07-16T03:03:16+02:00Julie KirkChanges in TrigIndetValidation art testsFix typo in TrigInDetValidation_AODtoTrkNtuple.py - missing ","
Add extra post-processing to test_trigID_all_ttbar_pu80_grid.pyFix typo in TrigInDetValidation_AODtoTrkNtuple.py - missing ","
Add extra post-processing to test_trigID_all_ttbar_pu80_grid.py