athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-01-11T17:58:14+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20190EventLoop Leak Check, 21.2 branch (2019.01.07.)2019-01-11T17:58:14+01:00Attila KrasznahorkayEventLoop Leak Check, 21.2 branch (2019.01.07.)This is of course mainly for @krumnack to review...
As we discussed in the last S&C Week in December, we should introduce some basic memory leak detection into EventLoop to make analysers detect coding errors more easily in local test...This is of course mainly for @krumnack to review...
As we discussed in the last S&C Week in December, we should introduce some basic memory leak detection into EventLoop to make analysers detect coding errors more easily in local test jobs. So that memory leaks would not only be detected once they try running on a large set of files on the grid. (Or on some other batch system.)
For this I simply used [TSystem::GetProcInfo](https://root.cern.ch/doc/v614/classTSystem.html#a94435ec82181ec2defb552e7fa19e2b5) to record the amount of resident/virtual memory used by the analysis process after the initialisation/finalisation of the job. And then taught `EL::DirectWorker` and `EL::BatchWorker` to each deal with this info in their own way.
As a first thing I've set up the code to treat >10 kB/event leaks in local jobs as errors. Everything else is not an error by default. (So, local leaks smaller than this, and leaks of any size in batch jobs.) Unfortunately I know already that even this generous setting makes a few of our existing unit tests fail. So I'm actually looking for a suggestion: Should we put the code in like this, expecting that it will take a bit until all unit tests are fixed up, or should I disable failures using `DirectDriver` for now as well by default?
I was also wondering whether to always print the memory leak values at the end of the jobs or not. For now I decided to always print them.
Or course coding suggestions are also appreciated.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20391Cherry pick to remove hardcoded lwtnn2019-01-16T18:00:26+01:00Dan GuestCherry pick to remove hardcoded lwtnnWe didn't ever cherry pick https://gitlab.cern.ch/atlas/athena/commit/0645de5fe942a832cb262ce00270e9f90afb9290 to 21.2. This should resolve some things we're discussing in https://gitlab.cern.ch/atlas/athena/merge_requests/20305We didn't ever cherry pick https://gitlab.cern.ch/atlas/athena/commit/0645de5fe942a832cb262ce00270e9f90afb9290 to 21.2. This should resolve some things we're discussing in https://gitlab.cern.ch/atlas/athena/merge_requests/20305https://gitlab.cern.ch/atlas/athena/-/merge_requests/20413Adding the jet cleaning vars back into SUSY6 and SUSY152019-01-18T17:26:52+01:00Rebecca CarneyAdding the jet cleaning vars back into SUSY6 and SUSY15Adding the jet cleaning vars into the SlimmingHelper ExtraVariables list for SUSY15 and SUSY6 derivation scripts in the DerivationFrameworkSUSY package.
Have checked this works by making both derivations and I see that the variables are...Adding the jet cleaning vars into the SlimmingHelper ExtraVariables list for SUSY15 and SUSY6 derivation scripts in the DerivationFrameworkSUSY package.
Have checked this works by making both derivations and I see that the variables are now part of the AntiKt4EMTopo jets collection, as expected.
Derivations for both SUSY6 and SUSY15 that show this are in my lxplus public folder:
```
/afs/cern.ch/user/r/rcarney/public/jetCleaningMR
```
with the name: `DAOD_SUSY15.test.root` and `DAOD_SUSY6.test.root`.
This test was done with the January 17th 2019 nightly as well as the AthDerivation,21.2.41.0 release.
The jet cleaning variables added back in are necessary for the DV+MET, DV+JETS, and dEdx analyses and were removed from smartSlimming 7 months ago.
The variables added are:
* EMFrac
* AverageLArQF
* FracSamplingMax
* FracSamplingMaxIndex
* HECFrac
* HECQuality
* LArQuality
* NegativeE
Tagging RPVLL SUSY conveners, who are aware of the situation: @leejr @hoide
Also tagging: @cohm @ljeanty @spagan @jroloff @mglisic @fbackman
https://gitlab.cern.ch/atlas/athena/-/merge_requests/20755WIP: Added actual mu to the AnalysisTop output2019-01-30T15:26:29+01:00Tomas DadoWIP: Added actual mu to the AnalysisTop outputPreviously we only stored average mu values. We need the actual mu values as well, these are needed for control plots when the actual mu reweighting is used.
Also fixed indentation in EventSaverFlatNtuple.cxx as this file was a mess. ...Previously we only stored average mu values. We need the actual mu values as well, these are needed for control plots when the actual mu reweighting is used.
Also fixed indentation in EventSaverFlatNtuple.cxx as this file was a mess. That is why there are _many_ whitespace changes but the actual code changes are very small.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21162Update isolation scale-factor recommendation for low-pt muons in SUSYTools2019-02-17T13:07:30+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chUpdate isolation scale-factor recommendation for low-pt muons in SUSYToolsHi @ykeisuke and @oabouzei,
MCP has released its latest set of recommendations. One of the major changes in that round is that for isolation scale-factors the particle-id working point matters if people are using low-pt muons. For this ...Hi @ykeisuke and @oabouzei,
MCP has released its latest set of recommendations. One of the major changes in that round is that for isolation scale-factors the particle-id working point matters if people are using low-pt muons. For this one a different scale-factor map is loaded than for the others.
Cheers,
Johanneshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20798Updating EXOT27 to include inputs for TAR jets2019-02-20T00:25:54+01:00Jason Robert VeatchUpdating EXOT27 to include inputs for TAR jetsThis adds the necessary anti-kt R = 0.2 jets and associated tracks for TAR jets to EXOT27 for use in the mono-S(WW) analysis. Please see https://its.cern.ch/jira/browse/AMH-59 for more details. Additionally, anti-kt R = 0.2 jet calibra...This adds the necessary anti-kt R = 0.2 jets and associated tracks for TAR jets to EXOT27 for use in the mono-S(WW) analysis. Please see https://its.cern.ch/jira/browse/AMH-59 for more details. Additionally, anti-kt R = 0.2 jet calibrations are added to ExtendedJetCommon. These calibrations are not used in these changes to EXOT27, but may be useful in future modifications or other derivations. Minor issues in the comments in DeltaRTool that were found are also fixed.
Tagging @fnapolit, @dguest, and @jburr.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20973WIP: Adding tool to retrieve generator level MET2019-02-22T10:03:20+01:00Jon BurrWIP: Adding tool to retrieve generator level METI added a new tool that adds the generator level MET as a float.
I also figured out/remembered that the generator level particles all have barcodes less than 10000 so I put a mode into the tool that calculates it either way. I double ch...I added a new tool that adds the generator level MET as a float.
I also figured out/remembered that the generator level particles all have barcodes less than 10000 so I put a mode into the tool that calculates it either way. I double checked by running over 10000 events of one of the filtered samples and the MET values were always exactly equal and bounded by the expected filter values, so we can probably just pick one version and stick with it.
Adding @dguest, @sargyrop and @anghosh for comments.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21115SUSY15 modifications for VH4b Analysis2019-02-26T14:19:04+01:00Amber Roepe-GierSUSY15 modifications for VH4b AnalysisProposed modification of SUSY15.py file in the SUSY Derivation Framework. The motivations, code changes, and size increases can be found in the attached slides. Please let us know of any feedback![SUSY15_Modification.pdf](/uploads/2d2298...Proposed modification of SUSY15.py file in the SUSY Derivation Framework. The motivations, code changes, and size increases can be found in the attached slides. Please let us know of any feedback![SUSY15_Modification.pdf](/uploads/2d229836f2d1858512b173a135d6d1ab/SUSY15_Modification.pdf) @jstupak @verducci @leejrhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21705Revert "Merge branch 'athena-my21.2-2019-03-06' into '21.2'"2019-03-07T14:57:31+01:00Nils Erik KrumnackRevert "Merge branch 'athena-my21.2-2019-03-06' into '21.2'"This reverts merge request !21691
That one broke stuff, so let's revert it.This reverts merge request !21691
That one broke stuff, so let's revert it.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21837Switching to expert tagger list for VRTrackjets for adding flipped taggers2019-03-12T10:16:45+01:00Sanmay GangulySwitching to expert tagger list for VRTrackjets for adding flipped taggersChanging the taggerlist for VRTrackjets from StandardTaggers to ExpertTaggers in order to include flipped taggersChanging the taggerlist for VRTrackjets from StandardTaggers to ExpertTaggers in order to include flipped taggershttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21543fix bug for missing jets in ttH mode2019-03-15T11:02:16+01:00R D Schafferfix bug for missing jets in ttH modeIn H4l, we were comparing the STXS truth jets vs AntiKt4TruthWZJets and noticed that for ttH that the jets coming from some of the W's were missing. This is because the ttH W's collected were not the last one in the parent/child hierarch...In H4l, we were comparing the STXS truth jets vs AntiKt4TruthWZJets and noticed that for ttH that the jets coming from some of the W's were missing. This is because the ttH W's collected were not the last one in the parent/child hierarchy and so they failed the test that the W's must have quark as children.
I know that @nberger and @okiverny are working on a new version, so this fix should be incorporated there as well. Also I see that @zmarshal put in this version...
This is used in the derivation release.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22511ATLSUSYDPD-1850 21.2 Add Xbb Tagger to SUSY12019-04-09T04:09:53+02:00Rachael Ann CreagerATLSUSYDPD-1850 21.2 Add Xbb Tagger to SUSY1Adding Xbb tagging for VR jets to SUSY1 for fully-hadronic electroweak SUSY group studies. Size increase documented in JIRA ticket (ATLSUSYDPD-1850)Adding Xbb tagging for VR jets to SUSY1 for fully-hadronic electroweak SUSY group studies. Size increase documented in JIRA ticket (ATLSUSYDPD-1850)Jeff DandoyJeff Dandoyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20489WIP: Add new electron iso track core subtraction2019-04-10T16:09:50+02:00Matthew Henry KleinWIP: Add new electron iso track core subtractionAdds updated electron track core calculators and adds them to electron smart slimming list. This is a work in progress and may change.Adds updated electron track core calculators and adds them to electron smart slimming list. This is a work in progress and may change.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21857WIP: Externals Update, 21.2 branch (2019.03.12.)2019-04-16T16:50:47+02:00Attila KrasznahorkayWIP: Externals Update, 21.2 branch (2019.03.12.)Updated all projects to [atlasexternals-1.0.49](https://gitlab.cern.ch/atlas/atlasexternals/tags/1.0.49). The full list of changes (https://gitlab.cern.ch/atlas/atlasexternals/compare/1.0.48...1.0.49) is:
- Added `FindHJets.cmake` for...Updated all projects to [atlasexternals-1.0.49](https://gitlab.cern.ch/atlas/atlasexternals/tags/1.0.49). The full list of changes (https://gitlab.cern.ch/atlas/atlasexternals/compare/1.0.48...1.0.49) is:
- Added `FindHJets.cmake` for finding the HJets generator (meant for the 21.6 branch, should not affect this one);
- Fixed the generation of `.d` files for Ninja, to make dictionary generation behave correctly with this build tool (thanks to @fwinkl);
- Added some extra python find-modules to AtlasLCG;
- Stopped setting up the `Cairo` and `Pango` packages when using `graphviz`.
The last one is meant to get [emacs](https://www.gnu.org/software/emacs/) to work once again in the AthAnalysis/AthDerivation runtime environment. Note that this should make it unnecessary to rely on the alias set up by asetup. Though keeping that alias around will not hurt.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23110Remove error message if files from dev area loaded2019-05-12T10:04:47+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chRemove error message if files from dev area loadedHi @akraszna,
in the MuonPerformanceAnalysis we've introduced now the pile-up reweighting during n-tuple production since the run-II data-taking is over. In order not to maintain our own config files, we'd like to rely on the central ...Hi @akraszna,
in the MuonPerformanceAnalysis we've introduced now the pile-up reweighting during n-tuple production since the run-II data-taking is over. In order not to maintain our own config files, we'd like to rely on the central files maintained by the SUSY group. The problem is that the `PathResolver` is prompting an Error message in `AthDerivation` making our jobs to fail on the grid.
I've removed the `ifdef flag` in this MR such that we can also use the central pile-up and cross-section files from `AthDerivation`
Tagging: @fsforza, @szambito, @egramsta, @guirriec, @boeriu, @krumnack, @nkoehler https://gitlab.cern.ch/atlas/athena/-/merge_requests/23233Add mt2 package2019-05-20T12:04:33+02:00Dan GuestAdd mt2 packageThis tool is used by a lot of people, but for some reason it's not part of a release. Maybe we should add it?
Pinging @bnachman, @lester, @zmarshal, @jojunggeThis tool is used by a lot of people, but for some reason it's not part of a release. Maybe we should add it?
Pinging @bnachman, @lester, @zmarshal, @jojunggehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/23333downgrade warning to INFO since it doesn't seem important2019-05-23T11:09:44+02:00Dan Guestdowngrade warning to INFO since it doesn't seem importantHaving spent a while trying to track down the meaning of this warning
```
ToolSvc.SUSYTools WARNING Your baseline tau - lep OR/Veto settings look suspicious! You have enabled tau-e/mu OR (cone based), but set (EleOLR,MuonOLR)=(0,0) i...Having spent a while trying to track down the meaning of this warning
```
ToolSvc.SUSYTools WARNING Your baseline tau - lep OR/Veto settings look suspicious! You have enabled tau-e/mu OR (cone based), but set (EleOLR,MuonOLR)=(0,0) in your config file! PLEASE CHECK!
```
I can only conclude that this isn't very important: quoting a few people I've asked, we have (@ykeisuke)
```
Just ignoring the warning or set tau-lep OR to false should eliminate the warning
```
and according to @jojungge
```
In principle, you buy the risk of fake-taus which are in fact electrons or muons. I've observed this as well in the XAMPPmultilep && XAMPPstau packages and ignored it quite successful
```
I don't think we should have warnings if the expert advice is to ignore them, so I'm changing it to `INFO`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23873(ATLSUSYDPD-1919) added TruthWZ jets2019-06-03T15:46:47+02:00Rachael Ann Creager(ATLSUSYDPD-1919) added TruthWZ jetsAdded `AntiKt4TruthWZJets` to SUSY1. 3.2% size increase per event (see JIRA for more information).Added `AntiKt4TruthWZJets` to SUSY1. 3.2% size increase per event (see JIRA for more information).Rachael Ann CreagerRachael Ann Creagerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20144WIP: Tool for decorating ID tracks with a covariance matrix2019-06-07T18:03:13+02:00James CatmoreWIP: Tool for decorating ID tracks with a covariance matrixThis tool can be used to decorate ID tracks with a covariance matrix, according to some criteria, for writing into DAODs. The eventual aim is to drop the full covariance from the tracks at DAOD level and instead rely on these decorations...This tool can be used to decorate ID tracks with a covariance matrix, according to some criteria, for writing into DAODs. The eventual aim is to drop the full covariance from the tracks at DAOD level and instead rely on these decorations, for which the full matrix would only be written for a small subset of tracks. Since the criteria for writing or not writing the covariance is not yet agreed (currently it is association with a primary vertex) and since it is not yet clear whether decoration with a new matrix or modification of the existing one is the best approach, this is left as WIP for now.https://gitlab.cern.ch/atlas/athena/-/merge_requests/24210WIP: Add syst for r21 vs r20.7 differences to defaults2019-06-14T23:40:20+02:00Federico SforzaWIP: Add syst for r21 vs r20.7 differences to defaultsDear all,
this merge request updates the default calibration files to "Recs2019_05_30", which include an additional systematic uncertainty extracted from the MC-to-MC comparison of rel20.7 vs rel21.
The studies are documented here:...Dear all,
this merge request updates the default calibration files to "Recs2019_05_30", which include an additional systematic uncertainty extracted from the MC-to-MC comparison of rel20.7 vs rel21.
The studies are documented here: https://indico.cern.ch/event/784539/contributions/3449224/attachments/1852942/3042527/190528_r21_vs_r20p7.pdf
Several analyses (e.g. H->mm) are already using this systematic uncertainty, that was indeed needed from some time.
Best,
Federico (for MCP)