athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-22T08:40:53+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/69854Db implementation strip veto2024-03-22T08:40:53+01:00Bhupesh DixitDb implementation strip vetoAdded a readme that describes the process and the steps for masking the Strip Modules.Added a readme that describes the process and the steps for masking the Strip Modules.Nicholas StylesNicholas Styleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69859ConfigBlocks: update how options are set and remove make functions2024-03-22T08:30:18+01:00Joseph Earl LambertConfigBlocks: update how options are set and remove make functionsAll configurable parameters are now options.
Added features to each block and `ConfigFactory` so that
all of the options can be set at the same time as the block is
created in the same way as the make functions.
Removed all make functi...All configurable parameters are now options.
Added features to each block and `ConfigFactory` so that
all of the options can be set at the same time as the block is
created in the same way as the make functions.
Removed all make functions that only act to set arguments since this
can be done without any extra code now.
Code using the `TextConfig`, `ConfigFactory` or the block configuration using classes
should be unaffected. Code that calls the make functions that where removed
will need to be update (makeSomeConfig -> SomeBlock and no longer pass the seq).
To create the block and set all options using the factory:
```
from AnalysisAlgorithmsConfig.ConfigFactory import ConfigFactory
config = ConfigFactory()
...
configSeq += config.makeConfig('GeneratorLevelAnalysis',
saveCutBookkeepers=True,
runNumber=284500)
```
Can also pass some this way and then set others individually like before.
To create the block and set all options using the blocks:
```
from AsgAnalysisAlgorithms.AsgAnalysisConfig import GeneratorAnalysisBlock
configSeq.append( GeneratorAnalysisBlock(
saveCutBookkeepers=True,
runNumber=284500) )
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/69870Cherry-pick 4846494a to 23.02024-03-18T12:26:01+01:00Chad Stephen LantzCherry-pick 4846494a to 23.0Manual sweep of !69676 to 23.0 : ZDC RPD centroid max ADC fixManual sweep of !69676 to 23.0 : ZDC RPD centroid max ADC fixhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69871ZDC Monte Carlo Truth Algorithm2024-03-18T12:02:36+01:00Chad Stephen LantzZDC Monte Carlo Truth AlgorithmAdds MC truth from CaloCalibrationHits to ZdcRec and ZdcNtupleAdds MC truth from CaloCalibrationHits to ZdcRec and ZdcNtuplehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69878Changed ZDC module placement to allow for the RPD foot2024-03-18T10:16:13+01:00Chad Stephen LantzChanged ZDC module placement to allow for the RPD footMoved module placement to within each module to give the RPD information about the mother volume so the RPD foot could extend to the bottom of the volume.Moved module placement to within each module to give the RPD information about the mother volume so the RPD foot could extend to the bottom of the volume.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69883Draft: low B-field configuration2024-03-20T09:30:00+01:00Sarka TodorovaDraft: low B-field configurationcollection of code updates for processing and reprocessing of samples with alternative B field setup
( CA version )collection of code updates for processing and reprocessing of samples with alternative B field setup
( CA version )https://gitlab.cern.ch/atlas/athena/-/merge_requests/69906Draft: Monitoring tool (algo) for FPGATrackSim conversion2024-03-19T10:56:23+01:00Ioannis MaznasDraft: Monitoring tool (algo) for FPGATrackSim conversionInitial implementation of a monitoring algorithm tailored to visualize map and distributions of xAOD clusters resulting from `FPGATrackSim` conversion (!68189).
tagging @jahreda @tboldInitial implementation of a monitoring algorithm tailored to visualize map and distributions of xAOD clusters resulting from `FPGATrackSim` conversion (!68189).
tagging @jahreda @tboldhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69919Draft: Treat elastic decay chains as a single particle for associated hit cou...2024-03-18T17:06:14+01:00Goetz GayckenDraft: Treat elastic decay chains as a single particle for associated hit counting.When counting si hits associated to truth particles treat truth particles of elastic decays as defined by the ElasticTruthTrajectoryBuilder as a single truth trajectory. The latter is used by the DetailedTrackTruthMaker which is used to ...When counting si hits associated to truth particles treat truth particles of elastic decays as defined by the ElasticTruthTrajectoryBuilder as a single truth trajectory. The latter is used by the DetailedTrackTruthMaker which is used to match truth particles and tracks. This increases the si-hit count per "truth" particle. As a consequence slightly more truth particles will pass the si-hit cut leading to a possibly lower technical efficiency in InDetPhysValMonitoring.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69920Draft: Reclustering of R=0.4 to R=1.0 PFlow jets in PHYS2024-03-19T09:57:53+01:00Baptiste Ravinabaptiste.ravina@cern.chDraft: Reclustering of R=0.4 to R=1.0 PFlow jets in PHYSAdd a new jet collection to DAOD_PHYS, by re-clustering R=0.4 EMPFlow jets into R=1.0.Add a new jet collection to DAOD_PHYS, by re-clustering R=0.4 EMPFlow jets into R=1.0.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69947Draft: special case to avoid TRT photon Conversion in MVA calibration2024-03-20T19:32:17+01:00Ruggero TurraDraft: special case to avoid TRT photon Conversion in MVA calibrationIn the egammaMVA calibration, converted / unconverted photons are calibrated with different BDT, trained separately.
Within egamma we decided to change the definition of converted due to the large fake rate of TRT-converted photons (the...In the egammaMVA calibration, converted / unconverted photons are calibrated with different BDT, trained separately.
Within egamma we decided to change the definition of converted due to the large fake rate of TRT-converted photons (they will be calibrated as unconverted).
The new definition is here: https://gitlab.cern.ch/atlas/athena/-/merge_requests/69947/diffs#7a5a09141bbe2cc17955a2622ce18135f68e96d8_78_68, basically:
```
const xAOD::Photon* ph = static_cast<const xAOD::Photon*>(&eg);
bool isConvCalib = xAOD::EgammaHelpers::isConvertedPhoton(ph) &&
xAOD::EgammaHelpers::conversionRadius(ph) < m_maxConvR;
if (m_removeTRTConvBarrel) {
// special case in rel24 Run3 to avoid TRT converted photons in the barrel
using enum xAOD::EgammaParameters::ConversionType;
const xAOD::EgammaParameters::ConversionType conversionType = xAOD::EgammaHelpers::conversionType(ph);
const bool isTRTConv = (conversionType == singleTRT) || (conversionType == doubleTRT); // 2 or 4
const bool isTRTEndcap = std::abs(ph->eta()) > 0.8;
isConvCalib = isConvCalib && (isTRTEndcap || !isTRTConv);
}
```
in short `isConvCalib = isConvCalib & (isTRTEndcap || !isTRTConv)`
Please @gunal , @ludovica double check it.
I am not very proud of this change since we are hard-coding a special case (the default case 0<R<800 mm) was already hard-coded, using the new property `RemoveTRTConvBarrel`. I don't know if we want to invest in doing something better e.g.
```
ToolHandle<IConvertedPhotonSelector> m_conversionSelector;
```
```
struct IConvertedPhotonSelector
{
bool isConverted(const xAOD::Photon&);
};
```
This MR targets master, but in the comment I wrote `// special case in rel24 Run3 to avoid TRT converted photons in the barrel`. Egamma conveners should clarify how this is going to enter: 1) only at analysis level (i.e. rel25=main) or 2) at the reconstruction level (i.e. rel24 and rel25=main). Depending on the answer other clients should be configured. I guess that in any case at the analysis level we want `RemoveTRTConvBarrel=true` only for Run3 (all the years I guess) (@krumnack may be interested). Please @ludovica @kristin clarify.
@christos @mungo @ahabouel @adonofri @smanzoni @lnasellahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69954Draft: Improvements to HepMcParticleLink and extension of unit tests for SiHi...2024-03-22T19:14:55+01:00John Derek ChapmanDraft: Improvements to HepMcParticleLink and extension of unit tests for SiHitCollectionCnv.Further robustness improvements for `HepMcParticleLink` in the case that position-based constructors are used and
constructors using the event number=0 workaround. (Fixes unit test failures in the dbg build.)
Updated `HepMcParticleLink_...Further robustness improvements for `HepMcParticleLink` in the case that position-based constructors are used and
constructors using the event number=0 workaround. (Fixes unit test failures in the dbg build.)
Updated `HepMcParticleLink_test` to test the `==` operator for a HepMcParticleLink instances created with wider set of possible constructor arguments.
Updated `SiHitCollectionCnv_pX_test` unit tests to check the behaviour with SiHits using barcode/id = 0 (typically delta-rays). This has implications for HITS file compression if it doesn't work properly, so is worth testing.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69957save only ditaus with 2 subjets candidates2024-03-28T15:45:48+01:00Antonio De Mariasave only ditaus with 2 subjets candidatesThis MR is meant to remove the 1 subject + 1 electron/muon selection to save a ditau object, keeping only ditaus with >= 1 subjet. The collimated 1 electron/muon + 1 tau is already covered by the Tau Ele OLR and Tau Muon OLR collections....This MR is meant to remove the 1 subject + 1 electron/muon selection to save a ditau object, keeping only ditaus with >= 1 subjet. The collimated 1 electron/muon + 1 tau is already covered by the Tau Ele OLR and Tau Muon OLR collections.
Tagging @martindl and @ntamirhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69978Draft: Decoupling of Trigger analysis and SF application in configuration2024-03-28T19:32:37+01:00Philipp RinckeDraft: Decoupling of Trigger analysis and SF application in configurationTrigger analysis configurations are currently coupling the trigger selection and the trigger scale factor computation.
While the trigger scale factor computation requires calibrated objects and can only be run after the whole object cal...Trigger analysis configurations are currently coupling the trigger selection and the trigger scale factor computation.
While the trigger scale factor computation requires calibrated objects and can only be run after the whole object calibration sequence, the trigger selection should be applied as early as possible to avoid wasting CPU on the object calibration for events failing the trigger.
This MR implements a decoupling of those algorithms in two separate configs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69983Draft: work on new EventLoop configuration mechanism2024-03-21T08:35:56+01:00Nils Erik KrumnackDraft: work on new EventLoop configuration mechanismThe main goal here is to allow running part of the configuration on the
worker node. Since this is already a breaking change to some extent I
figured I do a bit more of a rework at the same time. However,
hopefully in the grand scheme ...The main goal here is to allow running part of the configuration on the
worker node. Since this is already a breaking change to some extent I
figured I do a bit more of a rework at the same time. However,
hopefully in the grand scheme users can still do a very straightforward
translation.
For now please only look at `FullCPAlgorithmsTest_elconfig.py` which has
some comments etc. The remaining files are mostly here so that I can
test that this at least runs and works.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69999Draft: Revise ISFTruthIncident unit test2024-03-26T14:08:15+01:00John Derek ChapmanDraft: Revise ISFTruthIncident unit testRevise the ISFTruthIncident unit test, so that it takes place with an `McEventCollection` present in StoreGate.
In this initial version the McEventCollection is a dummy one, but it could be improved to include the parent particle of the...Revise the ISFTruthIncident unit test, so that it takes place with an `McEventCollection` present in StoreGate.
In this initial version the McEventCollection is a dummy one, but it could be improved to include the parent particle of the TruthIncident.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70020Draft: Simplify pixel clusterization & calibration configuration2024-03-23T08:12:53+01:00Louis-Guillaume Gagnonlouis.guillaume.gagnon@cern.chDraft: Simplify pixel clusterization & calibration configurationA proposal to simplify the mess of Position/Error strategy flags on the ACTS-ITk side.A proposal to simplify the mess of Position/Error strategy flags on the ACTS-ITk side.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70041Draft: TriggerEDMRun3: AODCOMM removal Round 2 (ATR-28561, ATR-28781), Unuse...2024-03-25T12:18:34+01:00Claire AntelDraft: TriggerEDMRun3: AODCOMM removal Round 2 (ATR-28561, ATR-28781), Unused/empty AOD removal (ATR-29047)`TriggerEDMRun3`:
- Remove `HLT_TopoCaloClustersFS` from AOD
- Relabel UTT containers AODCOMM->AODFULL: `HLT_dEdxTrk`, `HLT_DisTrkCand`
- Relabel EGamma Fast obj containers AODCOMM->AODFULL: `HLT_FastPhotons`, `HLT_FastElectrons`, `HL...`TriggerEDMRun3`:
- Remove `HLT_TopoCaloClustersFS` from AOD
- Relabel UTT containers AODCOMM->AODFULL: `HLT_dEdxTrk`, `HLT_DisTrkCand`
- Relabel EGamma Fast obj containers AODCOMM->AODFULL: `HLT_FastPhotons`, `HLT_FastElectrons`, `HLT_FastElectrons_LRT`
- Removing never used Jet/BJet/BPhys containers from all but BS: `HLT_AntiKt4EMTopo/PFlowJets_subresjesgscIS_ftf_BTaggingSecVtx`, `HLT_AntiKt4EMTopo/PFlowJets_subresjesgscIS_ftf_BTaggingJFVtx`, `HLT_DiElecPrecision`, `HLT_NoMuonDiElecPrecision`, several jet containers.
`TrigAnalysisTest`:
- adjust ART Run3DQ tests to use `Trigger.AODEDMSet='ESD'`: `test_trigAna_RDOtoRun3DQ_v1Dev_build.py`, `test_trigAna_RDOtoRun3DQ_v1Dev_grid.py`
This is so that they don't break after removing HLT containers from AOD that are being monitored (At TIER0, do DQ step in RAWtoALL, thus remains unaffected).https://gitlab.cern.ch/atlas/athena/-/merge_requests/70054Draft: FTAG: update source label for study on effect of secondaries on flavou...2024-03-29T13:56:09+01:00Nils Benedikt KrengelDraft: FTAG: update source label for study on effect of secondaries on flavour taggingThis MR makes the following changes:
- It adds separate functions to check whether a particle is from a K-short decay or Lambda Decay in the `InDetTrackTruthOriginDefs.h` (before only both could be checked at the same time with `isV0Deca...This MR makes the following changes:
- It adds separate functions to check whether a particle is from a K-short decay or Lambda Decay in the `InDetTrackTruthOriginDefs.h` (before only both could be checked at the same time with `isV0Decay`)
- Added categories of hadronic interaction and other decay to `ftagTruthSourceLabel`
- Based the implementation of `ftagTruthSourceLabel` now on the tools provided by `InDetTrackTruthOriginDefs.h` and not using the truth particle directly anymore (similar to implementation of `ftagTruthOriginLabel`)
- Removed the truth source accessor in the track truth decorator ([the ftag dumper](https://gitlab.cern.ch/atlas-flavor-tagging-tools/training-dataset-dumper/-/blob/main/FTagDumper/python/dumper.py?ref_type=heads#L195) will need some attention)Nils Benedikt KrengelNils Benedikt Krengelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70056Draft: Extend unit tests for HepMcParticleLink and SiHitCollectionCnv_pX.2024-03-25T18:35:35+01:00John Derek ChapmanDraft: Extend unit tests for HepMcParticleLink and SiHitCollectionCnv_pX.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70064PhysicsAnalysis: required modifications to allow for online and conditional b...2024-03-27T09:03:42+01:00Sven MenkePhysicsAnalysis: required modifications to allow for online and conditional b-tagging treatment in TopPhysThe recommendations for b-tagging scale factors and efficiencies that combine offline WPs with online WPs require changes to JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency and 11 TopPhys packages in order to include b-tag...The recommendations for b-tagging scale factors and efficiencies that combine offline WPs with online WPs require changes to JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency and 11 TopPhys packages in order to include b-tagging systematics and MC to data scale factors in 21.1-based top analyses. The proposed changes here allow to combine one offline WP with a online WP via the provided conditional (online given offline) probabilities provided by the CP-group. The offline trigger confirmation requires furthermore to combine two offline WP (from the same tagger) with the online WP. Also this functionality is provided in the MR.