athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-06-12T15:42:24+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/63517Updating JETM7 DAOD scheme with missing trigger information2023-06-12T15:42:24+02:00Carlos Moreno MartinezUpdating JETM7 DAOD scheme with missing trigger informationIncluding missing trigger information in DAOD scheme JETM7, needed for trigger matching at the analysis level.
Tagging @sschramm @vcepaitiIncluding missing trigger information in DAOD scheme JETM7, needed for trigger matching at the analysis level.
Tagging @sschramm @vcepaitihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63490AnalysisTop: Update R21 HI Jet Uncertainties2023-06-06T16:20:28+02:00Chris ScheulenAnalysisTop: Update R21 HI Jet UncertaintiesThis MR updates the Heavy-ion jet uncertainty prescriptions to the most recent recommendations.
The MR addresses ANALYSISTO-1320.This MR updates the Heavy-ion jet uncertainty prescriptions to the most recent recommendations.
The MR addresses ANALYSISTO-1320.Chris ScheulenChris Scheulenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63247Add truth track jets into STDM132023-06-06T09:42:14+02:00Miha Muskinjamiha.muskinja@cern.chAdd truth track jets into STDM13This MR adds additional truth jet collections into the STDM13 derivation. This is needed for the new charm quark fragmentation function measurement. I ran a local test over the entire `mc16_13TeV.700338.Sh_2211_Wenu_maxHTpTV2_BFilter.rec...This MR adds additional truth jet collections into the STDM13 derivation. This is needed for the new charm quark fragmentation function measurement. I ran a local test over the entire `mc16_13TeV.700338.Sh_2211_Wenu_maxHTpTV2_BFilter.recon.AOD.e8351_s3126_r9364/AOD.26349758._000141.pool.root` file. Here is the size comparison of old vs new STDM13.
# Old
```
******************************************************************************
*Tree :CollectionTree: CollectionTree *
*Entries : 19492 : Total = 10232951533 bytes File Size = 2665233715 *
* : : Tree compression factor = 3.84 *
******************************************************************************
```
# New
```
******************************************************************************
*Tree :CollectionTree: CollectionTree *
*Entries : 19492 : Total = 10478040042 bytes File Size = 2702015203 *
* : : Tree compression factor = 3.88 *
******************************************************************************
```
The size has increased by roughly 1.5%. These are the new truth-jet branches for `R = 0.4`. They are all repeated for `R = [0.6, 0.8, 1.0]`.
```
*............................................................................*
*Br 123 :AntiKt4TruthChargedJets : DataVector<xAOD::Jet_v1> *
*Entries : 19492 : Total Size= 406594 bytes File Size = 79554 *
*Baskets : 128 : Basket Size= 14848 bytes Compression= 5.07 *
*............................................................................*
*Br 148 :AntiKt4TruthChargedJetsAux. : xAOD::JetAuxContainer_v1 *
*Entries : 19492 : Total Size= 37927750 bytes File Size = 6272628 *
*Baskets : 137 : Basket Size= 1230336 bytes Compression= 6.05 *
*............................................................................*
*Br 482 :AntiKt4TruthChargedJetsAuxDyn.ConeTruthLabelID : vector<int> *
*Entries : 19492 : Total Size= 879406 bytes File Size = 168802 *
*Baskets : 128 : Basket Size= 8704 bytes Compression= 5.19 *
*............................................................................*
*Br 483 :AntiKt4TruthChargedJetsAuxDyn.HadronConeExclTruthLabelID : *
* | vector<int> *
*Entries : 19492 : Total Size= 880726 bytes File Size = 169801 *
*Baskets : 128 : Basket Size= 8704 bytes Compression= 5.17 *
*............................................................................*
*Br 484 :AntiKt4TruthChargedJetsAuxDyn.PartonTruthLabelID : vector<int> *
*Entries : 19492 : Total Size= 879670 bytes File Size = 117748 *
*Baskets : 128 : Basket Size= 8704 bytes Compression= 7.45 *
*............................................................................*
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/63306adding missing electron iso WPs (Tight_VarRad, Loose_VarRad, TightTrackOnly_V...2023-05-26T21:42:18+02:00Nils Julius Abichtadding missing electron iso WPs (Tight_VarRad, Loose_VarRad, TightTrackOnly_VarRad)adding missing electron iso WPs (Tight_VarRad, Loose_VarRad, TightTrackOnly_VarRad)adding missing electron iso WPs (Tight_VarRad, Loose_VarRad, TightTrackOnly_VarRad)https://gitlab.cern.ch/atlas/athena/-/merge_requests/63283AnalysisTop: Add possibility of separate QGFracFiles for p + Pb and Pb + p HI...2023-05-25T21:42:12+02:00Chris ScheulenAnalysisTop: Add possibility of separate QGFracFiles for p + Pb and Pb + p HI collision setupsThis MR adds the possibility into AnalysisTop to add separate quark/gluon fraction files for p + Pb and Pb + p heavy-ion collision setups via the `JetUncertainties_QGFracFile` option as requested in ANALYSISTO-1312. From now on, this opt...This MR adds the possibility into AnalysisTop to add separate quark/gluon fraction files for p + Pb and Pb + p heavy-ion collision setups via the `JetUncertainties_QGFracFile` option as requested in ANALYSISTO-1312. From now on, this option accepts a comma-separated list of two files for these setups in addition to a single file. The comma-separated list should be supplied in the following format:
```
JetUncertainties_QGFracFile <pPb_QGFracFile>,<Pbp_QGFracFile>
```
In case of HI-collisions, the run-number check already performed for the p + Pb and Pb + p jet calibration configurations is also extended to these files, so that the correct quark/gluon fraction file is chosen according to the following check:
- `runnumber >= 313063 && runnumber <= 313435`: p + Pb setup, use first file from the list
- `runnumber >= 313572 && runnumber <= 314170`: Pb + p setup, use second file from the list
- Neither: Throw error if multiple QGFracFiles are submitted.
In case of a single q/g fraction file, it is used for both setups. Additionally, AnalysisTop throws an error in case an unexpected number of files is supplied for the HI-setups.
This MR addresses ANALYSISTO-1312.Chris ScheulenChris Scheulenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62977add HI optimized track selection2023-05-19T03:42:23+02:00Petr Balekadd HI optimized track selectionAdding `HITightOptimized` and `HILooseOptimized` pre-defined track selection cuts.
The threshold for `d0` and `z0SinTheta` have fine binning in eta and pT, providing better track reconstruction efficiency and lower fake rate than the cur...Adding `HITightOptimized` and `HILooseOptimized` pre-defined track selection cuts.
The threshold for `d0` and `z0SinTheta` have fine binning in eta and pT, providing better track reconstruction efficiency and lower fake rate than the current `HITight` and `HILoose`.
Originally made by Luke Krauth (@lkrauth) as his qualification task. See the relevant JIRA ticket: ATLIDTRKCP-149
Tagging @soumya @stapiaarhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63127Updating egamma calibration model to R21 precision recommendation2023-05-17T15:42:19+02:00Steffen Kornsteffen.korn@cern.chUpdating egamma calibration model to R21 precision recommendationThis MR updates the E/gamma energy scale and resolution calibration to the final release 21 Run-2 precision recommendations.
The calibration file is updated from `es2018_R21_v0` to `es2022_R21_Precision`.
For more details see the descr...This MR updates the E/gamma energy scale and resolution calibration to the final release 21 Run-2 precision recommendations.
The calibration file is updated from `es2018_R21_v0` to `es2022_R21_Precision`.
For more details see the description [here](https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/ElectronPhotonFourMomentumCorrection#Run_2_release_21_precision_recom).https://gitlab.cern.ch/atlas/athena/-/merge_requests/63013Rel21 e/gamma calibration recommendation update: L1 gain2023-05-12T21:42:30+02:00Ahmed TarekRel21 e/gamma calibration recommendation update: L1 gainUpdating L1 gain systematic uncertainties curve for R21 calibration precision recommendations: details can be found [here](https://indico.cern.ch/event/1285278/contributions/5400839/attachments/2645460/4579137/L1Gain%20systematic%20updat...Updating L1 gain systematic uncertainties curve for R21 calibration precision recommendations: details can be found [here](https://indico.cern.ch/event/1285278/contributions/5400839/attachments/2645460/4579137/L1Gain%20systematic%20updated%20to%20new%20E1_E2%20(2023-05-11).pdf). The change results in large reduction of L1 gain systematics for unconverted photons.
Tagging @smanzoni @turra @ludovica @fnechanshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62894Add PromptLeptonImprovedVeto to STDM132023-05-12T12:12:28+02:00Evgeny SoldatovAdd PromptLeptonImprovedVeto to STDM13This modifies STDM13 and adds PromptLeptonImprovedVeto isolation variables into the derivation.This modifies STDM13 and adds PromptLeptonImprovedVeto isolation variables into the derivation.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62623Updated HION9 including R=0.4 triggers and removing jet constituents.2023-05-04T21:42:32+02:00Anabel RomeroUpdated HION9 including R=0.4 triggers and removing jet constituents.Updated HION9 to include the R=0.4 triggers and remove the jet constituents.Updated HION9 to include the R=0.4 triggers and remove the jet constituents.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62402Adding loose single electron trigger to STDM trigger list2023-04-28T09:42:21+02:00Lisa Marie BaltesAdding loose single electron trigger to STDM trigger listAdding loose single electron trigger to STDM trigger list.Adding loose single electron trigger to STDM trigger list.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62590Externals Update, 21.2 branch (2023.04.24.)2023-04-28T09:40:07+02:00Attila KrasznahorkayExternals Update, 21.2 branch (2023.04.24.)Updated all projects to [atlasexternals-1.0.82](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/1.0.82). The change wrt. [atlasexternals-1.0.81](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/1.0.81) is (https://gitlab.cern.ch/atl...Updated all projects to [atlasexternals-1.0.82](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/1.0.82). The change wrt. [atlasexternals-1.0.81](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/1.0.81) is (https://gitlab.cern.ch/atlas/atlasexternals/-/compare/1.0.81...1.0.82) that `atlas_install_headers(...)` was made to work correctly when using `-DATLAS_USE_CUSTOM_CPACK_INSTALL_SCRIPT=FALSE`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34287Bring standalone element link behaviour into line with athena2023-04-26T19:39:23+02:00Jon BurrBring standalone element link behaviour into line with athenaThe default constructor for `ElementLinkBase` is different in the standalone implementation and the athena implementation. This MR fixes this so that default constructed links have their index set to -1 (the `INVALID` value).
This has...The default constructor for `ElementLinkBase` is different in the standalone implementation and the athena implementation. This MR fixes this so that default constructed links have their index set to -1 (the `INVALID` value).
This has the useful effect that it means that it is possible to distinguish links which have been deliberately constructed as null and those which had valid targets but those targets were removed (most likely by the derivation framework). In order to make using this fact easier and more explicit in code I also added `wasTargetRemoved` functions to both implementations, as well as a few supporting functions to the standalone `ElementLinkBase` class (including the `isDefault` function which is useful in its own right).
This already has a potential client in the tau analysis code (ATLTAU-1712).
Tagging @akraszna, @dguest, @mihuebne, @christoshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62562Derivations BPHY: Clean up code and warning in VertexTrackIsolation2023-04-25T15:42:40+02:00Adam Edward BartonDerivations BPHY: Clean up code and warning in VertexTrackIsolation- Removed an unnecessary warning.
- Additional clean ups- Removed an unnecessary warning.
- Additional clean upshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62572V0Finder: Avoid unnecessary looping2023-04-24T21:42:16+02:00Adam Edward BartonV0Finder: Avoid unnecessary loopingSpeeds up some derivations
cc @bouhovaSpeeds up some derivations
cc @bouhovahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61972Externals Update, 21.2 branch (2023.03.30.)2023-04-20T15:38:40+02:00Attila KrasznahorkayExternals Update, 21.2 branch (2023.03.30.)This MR is a sibling of !61968 in a way...
Updated all projects to [atlasexternals-1.0.81](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/1.0.81). The changes wrt. [atlasexternals-1.0.79](https://gitlab.cern.ch/atlas/atlasexternals/...This MR is a sibling of !61968 in a way...
Updated all projects to [atlasexternals-1.0.81](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/1.0.81). The changes wrt. [atlasexternals-1.0.79](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/1.0.79) are (https://gitlab.cern.ch/atlas/atlasexternals/-/compare/1.0.79...1.0.81):
- Introduced `Findscipy.cmake` for setting up the runtime environment of [scipy](https://scipy.org/);
- Made it possible to **not** use the `cpack_install.sh` script during [CPack](https://cmake.org/cmake/help/latest/module/CPack.html) packaging.
It's the latter that's relevant for the analysis releases at the moment. Since just like in !61968 for ~master, this MR sets `ATLAS_USE_CUSTOM_CPACK_INSTALL_SCRIPT` to `FALSE` for all of the analysis releases. (Even for [AnalysisTop](https://gitlab.cern.ch/atlas/athena/-/tree/21.2/Projects/AnalysisTop), just to cover all bases.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/62403DerivationFrameworkMCTruth: adding DSIDs to the list for heavy flavour origin...2023-04-18T15:42:26+02:00Roman LysakDerivationFrameworkMCTruth: adding DSIDs to the list for heavy flavour origin classifierThere are newly produced ttbb samples with pT hard variations (https://its.cern.ch/jira/browse/ATLMCPROD-10527).
ttH analysis (ANALYSISTO-1304) needs these samples to require HF information.
This update adds the datasets IDs for ttbb s...There are newly produced ttbb samples with pT hard variations (https://its.cern.ch/jira/browse/ATLMCPROD-10527).
ttH analysis (ANALYSISTO-1304) needs these samples to require HF information.
This update adds the datasets IDs for ttbb samples from the above ticket to the filter list for the the heavy-flavour hadron decoration tools in the truth derivation framework.
tagging: @calpigia @boeriuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62086Bug fix in VrtSecFuzzy seed cluster merging2023-04-14T15:42:29+02:00Risa UshiodaBug fix in VrtSecFuzzy seed cluster mergingThe bug in the 2-trk seed merging step in VrtSecFuzzy (https://gitlab.cern.ch/atlas/athena/-/merge_requests/49656) was fixed.
Previously the seed cluster merging was done only once.
I have modified algorithm so that the seed cluster mer...The bug in the 2-trk seed merging step in VrtSecFuzzy (https://gitlab.cern.ch/atlas/athena/-/merge_requests/49656) was fixed.
Previously the seed cluster merging was done only once.
I have modified algorithm so that the seed cluster merging is repeated until all seed clusters become independent (i.e. They don't have any common seeds.).https://gitlab.cern.ch/atlas/athena/-/merge_requests/62301SUSYTools: making number of toys for TrigGlobalEffTools configurable2023-04-14T11:10:57+02:00Michael HolzbockSUSYTools: making number of toys for TrigGlobalEffTools configurableThis MR makes the number of toys for the tools which calculates the global trigger efficiencies configurable in SUSYTools (where nToys=0 means for the tool to use explicit formulas).
Apologies for the non-trivial diff, my editor removed...This MR makes the number of toys for the tools which calculates the global trigger efficiencies configurable in SUSYTools (where nToys=0 means for the tool to use explicit formulas).
Apologies for the non-trivial diff, my editor removed a couple of white spaces at line ends, hopefully that doesn't distract too much!
Tagging @cmerlass and @mrimoldi.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61524Fix maxPVrefit2023-04-11T15:42:37+02:00Hao PangFix maxPVrefitFix maxPVrefit to 10 to reduce backgoundsFix maxPVrefit to 10 to reduce backgoundsHao PangHao Pang