athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-11-17T03:03:02+01:00https://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 Chenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37986Fixing warnings in derivation jobs2020-11-11T20:21:54+01:00Zach MarshallFixing warnings in derivation jobsThis fixes a handful of warnings:
-) From EventInfoCnvTool, when certain truth collections are not
available. This is expected in any job running on EVNT
-) In PrimmaryDPDFlags, some lines were duplicated (completely
identical), leadin...This fixes a handful of warnings:
-) From EventInfoCnvTool, when certain truth collections are not
available. This is expected in any job running on EVNT
-) In PrimmaryDPDFlags, some lines were duplicated (completely
identical), leading to a warning when the flags are imported
-) In RecExCommon_flags, athena common flags values were checked
independent of whether they had statusOn. Now the code checks for
statusOn before checking the value of the flag
-) In Reco_tf.py, both digitization and overlay were loading the basic
digitization flags into the transform. Now only the overlay portion does
the loading of these flags.https://gitlab.cern.ch/atlas/athena/-/merge_requests/37977Updating truth jet configuration for DF_MCT2020-11-11T03:02:42+01:00Zach MarshallUpdating truth jet configuration for DF_MCTThis updates to a more explicit jet configuration style, avoiding use of
the jet tool manager and so on. Note that much of the code is still
disabled, but this should not affect the output of PHYS derivations, and
should only be a step i...This updates to a more explicit jet configuration style, avoiding use of
the jet tool manager and so on. Note that much of the code is still
disabled, but this should not affect the output of PHYS derivations, and
should only be a step in the right direction here. Both TRUTH and PHYS
derivations should still be working with this MR in.
This is the last big chunk of !37659, and some little switches will remain
after this is merged.
For info: @wbalunas , @sawyer , @khoo , @jcatmorehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37955bug in the tc-lvt soft secondary vertex tagger scheduling in FTAG1 (21.2)2020-11-10T03:05:16+01:00Judith Hoferbug in the tc-lvt soft secondary vertex tagger scheduling in FTAG1 (21.2)Hello,
I found a bug in the scheduling of the tc-lvt soft secondary vertex tagger in the FTAG1 derivation. (The property was set for the wrong tool in that line.)
In a test sample (one of our signal samples) the change in the code resul...Hello,
I found a bug in the scheduling of the tc-lvt soft secondary vertex tagger in the FTAG1 derivation. (The property was set for the wrong tool in that line.)
In a test sample (one of our signal samples) the change in the code resulted in some differences in the output.
Let me know if I should also open a jira ticket for this.
Best,
Judithhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37935migrate ftag analysis tools from 21.2 to master https://its.cern.ch/jira/brow...2020-11-11T03:04:21+01:00Jonathan Shlomijonathan.shlomi@weizmann.ac.ilmigrate ftag analysis tools from 21.2 to master https://its.cern.ch/jira/browse/AFT-514merge the changes to the analysis tools from the last 3 years from 21.2 to mastermerge the changes to the analysis tools from the last 3 years from 21.2 to masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37914readding library in DerivationFrameworkMuons CmakeLists2020-11-06T03:04:41+01:00Marco Vanadiareadding library in DerivationFrameworkMuons CmakeListsFixing CMakeLists file to build a linkable library for the DerivationFrameworkMuons package as needed by the MCP software https://gitlab.cern.ch/atlas-mcp/MuonPerformanceAnalysis
This MR is also removing references to CLHEP
CC @nkoehle...Fixing CMakeLists file to build a linkable library for the DerivationFrameworkMuons package as needed by the MCP software https://gitlab.cern.ch/atlas-mcp/MuonPerformanceAnalysis
This MR is also removing references to CLHEP
CC @nkoehler @jojunggehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37901JetTagging: cmake cleanup2020-11-06T03:04:07+01:00Frank WinklmeierJetTagging: cmake cleanupcmake cleanup of `PhysicsAnalysis/JetTagging` packages:
- remove `atlas_depends_on_subdirs`
- update external and library dependencies
- enable flake8 where relevantcmake cleanup of `PhysicsAnalysis/JetTagging` packages:
- remove `atlas_depends_on_subdirs`
- update external and library dependencies
- enable flake8 where relevanthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37886Add TrigRingerRings to EGAM3, EGAM4 and EGAM9 derivations2020-11-05T03:06:20+01:00Juan Lieber MarinAdd TrigRingerRings to EGAM3, EGAM4 and EGAM9 derivationsThis MR has been discussed in [ATR-22115](https://its.cern.ch/jira/browse/ATR-22115) and aims to add TrigRingerRings container to EGAM3, EGAM4 and EGAM9 derivations to adapt the Ringer Algorithm technique for photon studies.
Pinging @fe...This MR has been discussed in [ATR-22115](https://its.cern.ch/jira/browse/ATR-22115) and aims to add TrigRingerRings container to EGAM3, EGAM4 and EGAM9 derivations to adapt the Ringer Algorithm technique for photon studies.
Pinging @fernando , @cjmeyer , @gmarchiohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37882Updates to SUSY6 for reprocessed data + secondary vertexing algorithm for cha...2020-12-06T23:47:17+01:00Matthew GignacUpdates to SUSY6 for reprocessed data + secondary vertexing algorithm for charged particle decaysHi,
This MR contains several updates needed for the disappearing track analysis to analyze the reprocessed data (DATREP-183):
1) Update AMITag to run over the newly reprocessed data and signal samples (ATLMCPROD-8784).
2) Add in VrtSec...Hi,
This MR contains several updates needed for the disappearing track analysis to analyze the reprocessed data (DATREP-183):
1) Update AMITag to run over the newly reprocessed data and signal samples (ATLMCPROD-8784).
2) Add in VrtSecDecay vertexing algorithm into 21.2. Update to allow expansions to >2 track vertices.
3) Configure secondary vertexing algorithm to reconstruct material interactions for background rejection studies.
4) Thinning algorithms for newly created vertex containers to keep DAOD increase size minimal.
5) Update TrackParametersKVU to decorate track if the PV constraint came from a Pileup or PV vertex.
An assessment on the increase in size was performed and found to result in a minimal DAOD size increase (~5%). Moreover, since the additions in this MR are only toggled for select reprocessed data and MC samples, this small increase will only affect SUSY6 requests running over this limited AOD set; the content of other SUSY6 requests should be unaffected.
Cheers,
Matthew
Tagging @rysawada, @mmorinag , @onofrio , @cjsmith