athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-11-19T03:06:35+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/38334Increasing default large-R truth jet threshold2020-11-19T03:06:35+01:00Zach MarshallIncreasing default large-R truth jet thresholdThe default threshold should be higher. It was 50 GeV in the past, and
this was missed in porting to master. Decreases the size of truth
derivations by about 10%.The default threshold should be higher. It was 50 GeV in the past, and
this was missed in porting to master. Decreases the size of truth
derivations by about 10%.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38332ElectronPhotonID: Fix CMake typos2020-11-19T03:03:02+01:00Tadej Novaktadej.novak@cern.chElectronPhotonID: Fix CMake typosFixes issues produced by !38212.
/cc @fwinklFixes issues produced by !38212.
/cc @fwinklhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38328Adding DFCommonMuonsPreselection to muons common slimming2020-11-18T03:04:01+01:00James CatmoreAdding DFCommonMuonsPreselection to muons common slimmingAfter some discussion it is agreed that the muon quality flag DFCommonMuonsPreselection, which is computed at the derivation level, should be included in the common slimming list (and consequently in DAOD_PHYS). This MR adds the variable...After some discussion it is agreed that the muon quality flag DFCommonMuonsPreselection, which is computed at the derivation level, should be included in the common slimming list (and consequently in DAOD_PHYS). This MR adds the variable to the relevant place.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38324Fixed compiler warnings in PhysicsAnalysis2020-11-18T03:13:47+01:00Thomas StreblerFixed compiler warnings in PhysicsAnalysisSelf-explanatorySelf-explanatoryhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38297Fix xAOD::EventInfo and xAOD::EventShape slimming2020-11-21T03:03:18+01:00Tadej Novaktadej.novak@cern.chFix xAOD::EventInfo and xAOD::EventShape slimmingFix `xAOD::EventInfo` and `xAOD::EventShape` slimming. The python logic was a bit strange and I updated it to be more reasonable. Not sure if this is a proper fix for missing variables as reported in ATEAM-670.
Keeping it in Draft until...Fix `xAOD::EventInfo` and `xAOD::EventShape` slimming. The python logic was a bit strange and I updated it to be more reasonable. Not sure if this is a proper fix for missing variables as reported in ATEAM-670.
Keeping it in Draft until @ssnyder has a look.
/cc @jcatmorehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38271Add FTAG6 ART test for release 222020-11-18T03:05:06+01:00Dan GuestAdd FTAG6 ART test for release 22This adds an ART test for `FTAG6`. For now this is the only `FTAG` derivation that runs in master. It uses an input file that I found in the CI test that produces `DAOD_PHYS`.This adds an ART test for `FTAG6`. For now this is the only `FTAG` derivation that runs in master. It uses an input file that I found in the CI test that produces `DAOD_PHYS`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38267Add FTAG6 for b-tagging optimization studies2020-11-17T03:06:13+01:00Dan GuestAdd FTAG6 for b-tagging optimization studiesThis adds a derivation based on `DAOD_PHYS`, but with some changes specific to FTAG optimizations:
- Turn off all track thinning
- Turn on trigger information
The derivation is only ever intended to run on limited simulated datasets, ...This adds a derivation based on `DAOD_PHYS`, but with some changes specific to FTAG optimizations:
- Turn off all track thinning
- Turn on trigger information
The derivation is only ever intended to run on limited simulated datasets, thus size isn't a concern (for now).https://gitlab.cern.ch/atlas/athena/-/merge_requests/38256Declare HighLevelBTag decorations for AthenaMT monitoring scheduling2020-11-17T03:02:12+01:00Peter OnyisiDeclare HighLevelBTag decorations for AthenaMT monitoring schedulingAllow reliable scheduling of JetTagMonitoring in RAWtoALLAllow reliable scheduling of JetTagMonitoring in RAWtoALLhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38255DerivationFrameworkMCTruth clang llvm9 fix warnings on inconsistent enum2020-11-17T03:03:02+01:00Christos Anastopouloschristos.anastopoulos@cern.chDerivationFrameworkMCTruth clang llvm9 fix warnings on inconsistent enum```
/build/atnight/localbuilds/nightlies/master/athena/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/GenFilterTool.cxx:60:10: warning: comparison of two values with different enumeration types in switch statement ('M...```
/build/atnight/localbuilds/nightlies/master/athena/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/GenFilterTool.cxx:60:10: warning: comparison of two values with different enumeration types in switch statement ('MCTruthPartClassifier::ParticleOrigin' and 'MCTruthPartClassifier::ParticleType') [-Wenum-compare-switch]
case Unknown:
^~~~~~~
```
Mentioning @ssnyder who is looking on some of thosehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38229Add definition of GenFiltHT with neutrinos included2020-11-20T03:05:26+01:00Oliver MajerskyAdd definition of GenFiltHT with neutrinos includedThis MR introduces another definition of HT filter in derivation framework, called `GenFiltHTinclNu`, which includes neutrinos from W/Z/Tau decays.
This definition is found to agree with the HT definition from EVGEN for those samples wh...This MR introduces another definition of HT filter in derivation framework, called `GenFiltHTinclNu`, which includes neutrinos from W/Z/Tau decays.
This definition is found to agree with the HT definition from EVGEN for those samples which had switched on the option to include neutrinos from W/ZTau decays in the HT definition, for example the all-hadronic HT-sliced PP8 ttbar samples (DSID 410429 and 410444).
The original `GenFiltHT` definition is also kept, since we also have samples (e.g. non-allhad ttbar HT-sliced samples) which were generated with HT definition without including the neutrinos.
The original report can be found in the [PMG top processes mailing list archive](https://groups.cern.ch/group/atlas-phys-pmg-top/Lists/Archive/Flat.aspx?RootFolder=%2Fgroup%2Fatlas%2Dphys%2Dpmg%2Dtop%2FLists%2FArchive%2FGenFiltHT%20mismatch%20between%20EVGEN%20and%20dAOD%20%28all%2Dhadronic%20ttbar%29&FolderCTID=0x0120020027381BA886A7584383BE447D2399EB26)https://gitlab.cern.ch/atlas/athena/-/merge_requests/38212ElectronPhotonID: cmake cleanup2020-11-18T11:34:09+01:00Frank WinklmeierElectronPhotonID: cmake cleanupRemove `atlas_depends_on_subdirs` and update link dependencies to what
is actually used by the source files.Remove `atlas_depends_on_subdirs` and update link dependencies to what
is actually used by the source files.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38142BTag z0 decorator2020-11-26T03:06:23+01:00Thomas StreblerBTag z0 decoratorThis MR updates the BTagTrackAugmenterAlg to save not only z0sinTheta but also z0 variable + significance for detailed tracking-level studies.
FYI @rateixei @fdibello @sanmay @cvarniThis MR updates the BTagTrackAugmenterAlg to save not only z0sinTheta but also z0 variable + significance for detailed tracking-level studies.
FYI @rateixei @fdibello @sanmay @cvarnihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38141Enabling truth jets in TRUTH derivations2020-11-17T14:35:00+01:00Zach MarshallEnabling truth jets in TRUTH derivationsThis gets truth jet building working again in truth derivations. The
state after this MR is:
-) The correct large-R jets are built and have the required decorations
-) The correst small-R jets are build, but they currently lack the
desi...This gets truth jet building working again in truth derivations. The
state after this MR is:
-) The correct large-R jets are built and have the required decorations
-) The correst small-R jets are build, but they currently lack the
desired truth flavor decorations
-) As discussed elsewhere, some extra branches exist in truth DAODs made
with master, because branch dropping seems to not be working quite right
yet
-) There are errors coming from CutFlowSvc to do with a mis-match in the
number of weights. I'm not quite sure how to solve this one; it looks
like CutFlowSvc has moved and been re-worked in master, so I might ask
for a little help with this one.
Note that I've disabled most of the jet-related items for derivations
running off of AODs. That's because the truth jet building code
currently conflicts with what the jet group is running, and it's not yet
clear to me how to fix this all. I hope the jet group will clean up a
bit in the next few days/weeks, and then we'll be able to harmonize.
@tadej or @lcorpe , if you're able to look at the CutFlowSvc part (or know someone who could), it'd be much appreciated! I think this is going to turn out to be an event weights issue.
@cdelitzs and I discussed the jet bit, so tagging to put this on her radar.
Not sure who to tag about the small-R flavor labels, but Chris might know for jet/MET, which is a start.
If anyone wants to run a derivation:
```
Reco_tf.py --inputEVNTFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DerivationFrameworkART/EVNT.17955321._002707.pool.root.1 --outputDAODFile art.pool.root --reductionConf TRUTH3 --maxEvents 100
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/38140merge xAOD::ReturnCode into StatusCode, migrate all users2020-11-20T03:02:01+01:00Nils Erik Krumnackmerge xAOD::ReturnCode into StatusCode, migrate all usersThis has been a long time coming, but one of the reasons for having
AsgMessaging as a separate package from AsgTools is to allow
xAODRootAccess to depend on it and use the same status codes and
messaging as the rest of analysis base. Th...This has been a long time coming, but one of the reasons for having
AsgMessaging as a separate package from AsgTools is to allow
xAODRootAccess to depend on it and use the same status codes and
messaging as the rest of analysis base. This should take part of the
former.
I had to add the RECOVERABLE code to the main status code, but since
that is also part of the Gaudi StatusCode that seems like a reasonable
change/extension.
Most of this MR is just a global search replace to move all
users from TReturnCode to StatusCode, and apart from fixing up a
couple of places related to the status code itself I did not try to
fix/improve any code in the process. Please keep the review itself focused on the status code changes as well.
I had discussed this particular change with @akraszna a while back. Not sure if he has any specific comments on the way I did it.
Unfortunately this MR also revealed a bug in the `RETURN_CHECK()` macro, which is/was used in a number of unit tests and made them incorrectly report success if they should have reported failure. More specifically, if it discovers the wrapped call fails it would return a `TReturnCode::kFailure`/`StatusCode::FAILURE`, which when converted to `int` has the value 0, which when used as a return value from `main()` gets interpreted as success by `ctest`. For the most part I replaced the `RETURN_CHECK()` calls in unit tests with `ANA_CHECK()` which avoids this particular issue. However, except for a few cases in which it was straightforward, I did not attempt to fix the actual tests, which are often very specialized and likely require domain experts to fix.
Adding the ~"full-unit-tests" label, as this touches some very core classes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38068EGamma ambiguity. Add a few comments, format a bit, use override final2020-11-11T03:03:22+01:00Christos Anastopouloschristos.anastopoulos@cern.chEGamma ambiguity. Add a few comments, format a bit, use override finalEGamma ambiguity.
Add a few comments, format a bit, use override final, default dtor, removed unneeded finalizeEGamma ambiguity.
Add a few comments, format a bit, use override final, default dtor, removed unneeded finalizehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38046Add Soft Secondary Vertex Collections to TOPQ12021-01-19T21:39:22+01:00Judith HoferAdd Soft Secondary Vertex Collections to TOPQ1Hello,
we would like to add the soft secondary vertices from the tc-lvt and t-lvt algorithms to the TOPQ1 derivation.
The jira ticket for this addition to TOPQ1 is https://its.cern.ch/jira/browse/TOPQDERIV-104.
Best,
JudithHello,
we would like to add the soft secondary vertices from the tc-lvt and t-lvt algorithms to the TOPQ1 derivation.
The jira ticket for this addition to TOPQ1 is https://its.cern.ch/jira/browse/TOPQDERIV-104.
Best,
Judithhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38040master - Store tau secondary vertex information2020-11-11T03:03:25+01:00Christian Grefemaster - Store tau secondary vertex informationAdd the tau secondary vertex information to the default branches that are being stored. This is necessary to calculate tau lifetimes, spin- and mass-related observables. Similar to !38039 for 21.2
pinging @mojeda, @lfiorini, @martindl, ...Add the tau secondary vertex information to the default branches that are being stored. This is necessary to calculate tau lifetimes, spin- and mass-related observables. Similar to !38039 for 21.2
pinging @mojeda, @lfiorini, @martindl, @qbuathttps://gitlab.cern.ch/atlas/athena/-/merge_requests/3803921.2 - store tau secondary vertex in derivations2020-11-11T03:05:59+01:00Christian Grefe21.2 - store tau secondary vertex in derivationsAdd the tau secondary vertex information to the default branches that are being stored. This is necessary to calculate tau lifetimes, spin- and mass-related observables.
pinging @mojeda, @lfiorini, @martindl, @qbuatAdd the tau secondary vertex information to the default branches that are being stored. This is necessary to calculate tau lifetimes, spin- and mass-related observables.
pinging @mojeda, @lfiorini, @martindl, @qbuathttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38027BTagging: Fix null pointer dereferences.2020-11-10T03:04:08+01:00Scott SnyderBTagging: Fix null pointer dereferences.Fix a couple potential null pointer references caught by the
undefined behavior sanitizer.Fix a couple potential null pointer references caught by the
undefined behavior sanitizer.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38016Update BPHY132020-11-11T03:06:00+01:00Xin ChenUpdate BPHY13Update BPHY13.py to enable passing "doBlinding" user flag via "--preExec" option to Reco_tr.py.
The associated JIRA: https://its.cern.ch/jira/browse/ATLBPHYS-159Update BPHY13.py to enable passing "doBlinding" user flag via "--preExec" option to Reco_tr.py.
The associated JIRA: https://its.cern.ch/jira/browse/ATLBPHYS-159Xin ChenHao PangYue XuMingming XiaXin Chen