athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-11-18T11:33:59+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/46915MR to replace closed !46846 with commits squashed2022-11-18T11:33:59+01:00Pavol StrizenecMR to replace closed !46846 with commits squashedThis is the same change as in already discussed and reviewed !46846 but with commits squashed:
This MR should bring all recent development done by @ekay in configuring the calibration data processing jobs also for SuperCells.
Changes ar...This is the same change as in already discussed and reviewed !46846 but with commits squashed:
This MR should bring all recent development done by @ekay in configuring the calibration data processing jobs also for SuperCells.
Changes are not touching anything from the standard reco, only for special jobs run by LAr on CAF.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46990TileMonitoring: Remove old-style Tile MBTS monitoring tool2021-10-09T19:04:44+02:00Siarhei HarkushaTileMonitoring: Remove old-style Tile MBTS monitoring toolOld-style Tile MBTS monitoring tool (TileMBTSMonTool) has been removed
since it uses deprecated LVL1ConfigSvc and it is not used anyway now.
Even if old-style monitoring is used in production jobs,
actually new-style one is used since a ...Old-style Tile MBTS monitoring tool (TileMBTSMonTool) has been removed
since it uses deprecated LVL1ConfigSvc and it is not used anyway now.
Even if old-style monitoring is used in production jobs,
actually new-style one is used since a long time ago.
JO used in standalone reconstruction and monitoring of Tile Calorimeter
has been updated accordingly.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46992TileMonitoring: Add possiblity fill Tile monitoring histograms for individual...2021-10-09T19:06:14+02:00Siarhei HarkushaTileMonitoring: Add possiblity fill Tile monitoring histograms for individual E cellsTile cell monitoring algorithm for Run 3 has been modified to add possiblity
to fill histograms for individual Gap Scintilators (E1-E4) with energy distribution.
This possibility is switched off by default, it will be used to check new G...Tile cell monitoring algorithm for Run 3 has been modified to add possiblity
to fill histograms for individual Gap Scintilators (E1-E4) with energy distribution.
This possibility is switched off by default, it will be used to check new Gap scintilators.
Tile bad channel tool has been removed, since it is not used anymore here.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46904Complete migration of L1Topo decision algs with muon inputs and further clean up2021-10-09T19:03:40+02:00Daniele ZanziComplete migration of L1Topo decision algs with muon inputs and further clean up- fix l1topo algos with new muon lists (ATR-23508): now that MU5VFab and MU3Vab are two separate lists, most items with muons are using 2 input lists instead of 1, as in Run2. This means some selections need to be applied in chains using...- fix l1topo algos with new muon lists (ATR-23508): now that MU5VFab and MU3Vab are two separate lists, most items with muons are using 2 input lists instead of 1, as in Run2. This means some selections need to be applied in chains using these two lists in order to avoid that the selection is passed using the same muon candidate, eg min INVM or DR...
- further clean up in the topo alg configurations
- addition of support/backup chains for close muons (ATR-22243)
Updated TODO list to complete the migration of the Phase1 L1Topo decision algs in ATR-23196https://gitlab.cern.ch/atlas/athena/-/merge_requests/46935Change the return type of sTgcDigitMaker helper functions to StatusCode2021-10-09T19:06:11+02:00Chav Chhiv Chauchav.chhiv.chau@cern.chChange the return type of sTgcDigitMaker helper functions to StatusCodeHelper functions that read parameters from txt files print out fatal messages upon failure. It was suggested in MR !46903 to edit these functions to return StatusCode. Additional changes are: deletion of an unused function efficiencyChec...Helper functions that read parameters from txt files print out fatal messages upon failure. It was suggested in MR !46903 to edit these functions to return StatusCode. Additional changes are: deletion of an unused function efficiencyCheck(const int) and suppression of some messages. This function efficiencyCheck, in addition to be unused, has a bug that can potentially cause confusion.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46984CaloClusterLogPos rm unneeded references/includes of CaloDetDescrManager2021-10-09T19:04:05+02:00Christos Anastopouloschristos.anastopoulos@cern.chCaloClusterLogPos rm unneeded references/includes of CaloDetDescrManagerCaloClusterLogPos rm unneeded references/includes of CaloDetDescrManager
ping @tsulaiaCaloClusterLogPos rm unneeded references/includes of CaloDetDescrManager
ping @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46993TileMonitoring: Add possibility to set up options from command line for Run 32021-10-09T19:05:31+02:00Siarhei HarkushaTileMonitoring: Add possibility to set up options from command line for Run 3Configurations of all Tile monitoring algorithms for Run 3
have updated to add possiblity to set up options from command line.
Indentation in configuration of combined Tile monitoring for Run 3 has been fixed.Configurations of all Tile monitoring algorithms for Run 3
have updated to add possiblity to set up options from command line.
Indentation in configuration of combined Tile monitoring for Run 3 has been fixed.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46981LArCafJobs: fix TrigDecisionTool configuration2021-10-09T19:04:34+02:00Frank WinklmeierLArCafJobs: fix TrigDecisionTool configuration- use the Cfg function from the TrigDecisionTool package directly
- do not customize the TrigConfigSvc (it is setup already correctly)
- replace private data file with central test data- use the Cfg function from the TrigDecisionTool package directly
- do not customize the TrigConfigSvc (it is setup already correctly)
- replace private data file with central test datahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46983InDetMonitoringATN: delete obsolete ATN testing package2021-10-09T19:07:10+02:00Frank WinklmeierInDetMonitoringATN: delete obsolete ATN testing packagePackage has not seen any relevant updates in many years and ATN testing
is gone since a very long time (came across this when migrating deprecated trigger configuration python code).
cc ID SW coordinators @sroe @goetzPackage has not seen any relevant updates in many years and ATN testing
is gone since a very long time (came across this when migrating deprecated trigger configuration python code).
cc ID SW coordinators @sroe @goetzhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46446TriggerMenuMT Retrieve & use HLT jet collection name in HLT Bjet2021-10-09T19:08:10+02:00Claire AntelTriggerMenuMT Retrieve & use HLT jet collection name in HLT Bjet[ATR-22333](https://its.cern.ch/jira/browse/ATR-22333)
# Purpose
Currently the b-tag related output containers are named the same irrespective of which jet collection they were produced from. We want output containers named based on t...[ATR-22333](https://its.cern.ch/jira/browse/ATR-22333)
# Purpose
Currently the b-tag related output containers are named the same irrespective of which jet collection they were produced from. We want output containers named based on the full jet collection name. This MR implements this in two steps:
- (a) Jet changes: Function to retrieve full jet container name from jet chain dictionary.
- (b) Bjet changes: Use of full jet container name in output collection names.
Basically
- Old container name: `HLT_bJets`
- New container name: `HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf_bJets`
Also
- Old container name: `HLT_BTagging`
- New container name: `HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf_BTagging`
etc.
# Details
## Jet changes
Function to retrieve the full jet container implemented in `TriggerMenuMT/JetChainConfiguration.py` . Uses as far as possible pre-existing functions to assemble jet name. Jet name retrieved via so
```python
jet_cfg = JetChainConfiguration(chainDict)
jet_name = jet_cfg.jetName
```
## Bjet changes
* `GenerateBjetChainDefs` calls `jet_cfg.jetName` function to retrieve and pass jet collection name through to bjet slice.
* `BjetChainConfiguration`, `BjetMenuSequences`, `BjetFlavourTaggingConfiguration` adapted to use new jet name structure.
* `TriggerEDMRun3` updated.
* Conditions DB alias update in `runHLT_standalone.py`
# This affects...
- Affects `TriggerMenuMT` Jet and Bjet python configuration files.
- Affects `TrigEDMConfig`: Adds new b-tag collections (EMTopo & PFlow based), removes old ones.
- Adaptations needed in b-jet monitoring and derivation framework.
# Tests run
`runHLT_standalone.py`
```
athena.py -l INFO -c "setMenu='LS2_v1'; forceEnableAllChains=True;doEmptyMenu=True;doBjetSlice=True;doWriteBS=True;doWriteRDOTrigger=False;" --imf --perfmon --threads=1 --evtMax=10 --filesInput=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315/RDO.17533168._000001.pool.root.1 TriggerJobOpts/runHLT_standalone.py
athena.py -l INFO -c "setMenu='Cosmic_run3_v1'; forceEnableAllChains=True;doEmptyMenu=True;doBjetSlice=True;doWriteBS=True;doWriteRDOTrigger=False;" --imf --perfmon --threads=1 --evtMax=10 --filesInput=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315/RDO.17533168._000001.pool.root.1 TriggerJobOpts/runHLT_standalone.py
athena.py -l INFO -c "setMenu='LS2_v1'; forceEnableAllChains=True;doEmptyMenu=True;doWriteBS=True;doWriteRDOTrigger=False;" --imf --perfmon --threads=1 --evtMax=10 --filesInput=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315/RDO.17533168._000001.pool.root.1 TriggerJobOpts/runHLT_standalone.py
```
minimal `runTrigART.py`
```
runTrigART.py -m -j4
```
Only WARNINGS (not linked to my changes in any obvious way).
`ctests`: All passhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46999Do not retrieve unused object.2021-10-09T19:07:12+02:00Goetz GayckenDo not retrieve unused object.This fixes one problem in the data11 nightly test (ATLASRECTS-6338).
The ZdcHardwareID is currently not used, so there is no need to try to
retrieve it. The latter would fail in the data11 test.
The package seems unmaintained and serio...This fixes one problem in the data11 nightly test (ATLASRECTS-6338).
The ZdcHardwareID is currently not used, so there is no need to try to
retrieve it. The latter would fail in the data11 test.
The package seems unmaintained and seriously needs an expert looking into it. At the moment I follow suite and keep on out-commenting obsolete parts.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46994Do not even check for MP or MT if disabled in executor2021-10-09T19:07:37+02:00Tadej Novaktadej.novak@cern.chDo not even check for MP or MT if disabled in executorTo improve the flexibility of our configuration and prevent anything strange happening with merge jobs, only check for MP or MT if disabled in executor.
`--threads=X` still get propagated from the main step's `athenaopts`, but this shou...To improve the flexibility of our configuration and prevent anything strange happening with merge jobs, only check for MP or MT if disabled in executor.
`--threads=X` still get propagated from the main step's `athenaopts`, but this should be discussed how to be changed first. Will open a ticket.
/cc @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46991TileCalibAlgs: Add Tile digi noise calibration configuration for Run 32021-10-09T19:07:46+02:00Siarhei HarkushaTileCalibAlgs: Add Tile digi noise calibration configuration for Run 3Configuration of Tile digi noise calibration algorithm has been added for Run 3.
Test of Tile digi noise calibration algorithm configuration has been added for Run 3.Configuration of Tile digi noise calibration algorithm has been added for Run 3.
Test of Tile digi noise calibration algorithm configuration has been added for Run 3.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46998Second trial to include the BCID for Full scan mode.2021-10-09T19:03:48+02:00Denis Oliveira DamazioSecond trial to include the BCID for Full scan mode.Since it is very hard to manage these references, I am trying, a second time here.
Hope I was fast enough..Since it is very hard to manage these references, I am trying, a second time here.
Hope I was fast enough..https://gitlab.cern.ch/atlas/athena/-/merge_requests/47002RecJobTransforms: do not force trigger on in RDOtoBS2021-10-09T19:04:28+02:00Frank WinklmeierRecJobTransforms: do not force trigger on in RDOtoBSDo not force the trigger ON in `RDOtoBS`. RecExCommon handles this
correctly (and turns it off if there is no trigger content in the
input). Leftover from previous migration in !39114.
Closes ATR-24255.Do not force the trigger ON in `RDOtoBS`. RecExCommon handles this
correctly (and turns it off if there is no trigger content in the
input). Leftover from previous migration in !39114.
Closes ATR-24255.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47003Remove MT=1 RecJobTransformtests2021-10-09T19:06:48+02:00Mark HodgkinsonRemove MT=1 RecJobTransformtestsRemove MT=1 tests, such that we only test MT=8 (default workflow).
Also update rdotobs test to use mc20 RDO file.Remove MT=1 tests, such that we only test MT=8 (default workflow).
Also update rdotobs test to use mc20 RDO file.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46982CaloFillRectangularCluster migrate to using CaloDetDescrMgr from cond store2021-10-09T19:06:20+02:00Christos Anastopouloschristos.anastopoulos@cern.chCaloFillRectangularCluster migrate to using CaloDetDescrMgr from cond storeCaloFillRectangularCluster migrate to using CaloDetDescrMgr from cond store
ping @tsulaiaCaloFillRectangularCluster migrate to using CaloDetDescrMgr from cond store
ping @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46980TrackDepositInCaloTool migrate to retrieving CaloDetDescrMgr via Cond Handle2021-10-09T19:06:42+02:00Christos Anastopouloschristos.anastopoulos@cern.chTrackDepositInCaloTool migrate to retrieving CaloDetDescrMgr via Cond HandleTrackDepositInCaloTool migrate to retrieving CaloDetDescrMgr via Cond Handle.
Pinging @tsulaiaTrackDepositInCaloTool migrate to retrieving CaloDetDescrMgr via Cond Handle.
Pinging @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46995Adding relbcid to MM RDO2021-10-21T19:52:01+02:00Patrick ScholerAdding relbcid to MM RDOThis merge request adds the relBCID to the RDO of the Micromegas. This is needed to be able to process real data. For now, the digitization does not decompose the time measurement into the relBCID at TDO but maybe should do so at some p...This merge request adds the relBCID to the RDO of the Micromegas. This is needed to be able to process real data. For now, the digitization does not decompose the time measurement into the relBCID at TDO but maybe should do so at some point in the future.
This MR breaks the readability of old RDO files.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46996DSConfigSvc: change deprecation warning to error2021-10-09T19:06:09+02:00Frank WinklmeierDSConfigSvc: change deprecation warning to errorThe `DSConfigSvc` should not longer be used by clients. Change the deprecation warning to an error with the goal to remove the service ultimately.
Relates to ATR-23580.The `DSConfigSvc` should not longer be used by clients. Change the deprecation warning to an error with the goal to remove the service ultimately.
Relates to ATR-23580.