athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-04-05T09:14:51+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/22418WIP: FreeAccumulator for unit tests2019-04-05T09:14:51+02:00Rupert TombsWIP: FreeAccumulator for unit testsProposition for a way to clearly allow ComponentAccumulators to be deleted without error.
Create TestUtility.py defining FreeAccumulator. Use FreeAccumulator for SCT_Digitization config test.
This is intended to remove the need for...Proposition for a way to clearly allow ComponentAccumulators to be deleted without error.
Create TestUtility.py defining FreeAccumulator. Use FreeAccumulator for SCT_Digitization config test.
This is intended to remove the need for acc.popPrivateTools(); acc.wasMerged() lines in unit tests which create but do not need to merge ComponentAccumulators.
Minor cleanup to SCT_DigitizationConfigNew_test.py.
Q:
Does this give enough clarity?
Is there a better location, such as inside ComponentAccumulator class?
Should acc be returned?https://gitlab.cern.ch/atlas/athena/-/merge_requests/22482WIP: Add explicit move semantics to objects used in std::vector - may improve...2019-04-08T18:33:51+02:00Adam Edward BartonWIP: Add explicit move semantics to objects used in std::vector - may improve performanceThese objects are using directly in std::vector in trigger code. Adding explicit move semantics should improve performance as they may not be automatically generated otherwise.These objects are using directly in std::vector in trigger code. Adding explicit move semantics should improve performance as they may not be automatically generated otherwise.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/22501WIP: Configure in view collections merging2019-04-09T08:11:27+02:00Tomasz BoldWIP: Configure in view collections mergingWith this MR the output saving configuration is advanced.
An algorithm that is responsible for:
- views merging and EL fixing is scheduled according to the EDM config
- for POOL formats a tool is configured that creates missing (e...With this MR the output saving configuration is advanced.
An algorithm that is responsible for:
- views merging and EL fixing is scheduled according to the EDM config
- for POOL formats a tool is configured that creates missing (empty) collectionshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21139WIP: LargeR Sliding Window Jet Algorithm2019-04-09T09:06:27+02:00Sophio PataraiaWIP: LargeR Sliding Window Jet Algorithmas we have discussed I have pushed minor extension of Sliding Window Jet reconstruction algorithm/workflow, to call it twice once for small-R jet and once for large-R jet. Only different between two instances are Jet radius the rest is s...as we have discussed I have pushed minor extension of Sliding Window Jet reconstruction algorithm/workflow, to call it twice once for small-R jet and once for large-R jet. Only different between two instances are Jet radius the rest is same.
tagging @bcarlson @viveiros @ckaldero
Best regards,
Sophiehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21012WIP: TrigL1CaloUpgrade: Update to the eFEX algorithm to match the latest isol...2019-04-09T09:16:25+02:00Philipp Sebastian OttWIP: TrigL1CaloUpgrade: Update to the eFEX algorithm to match the latest isolation and clustering studiesThe files 'TrigT1CaloBaseFex.cxx' and 'TrigT1CaloEFex.cxx' are updated
to match the latest isolation and clustering studies.
The major changes include:
-- The option to switch between an energy weighted cluster formation and
a c...The files 'TrigT1CaloBaseFex.cxx' and 'TrigT1CaloEFex.cxx' are updated
to match the latest isolation and clustering studies.
The major changes include:
-- The option to switch between an energy weighted cluster formation and
a cluster formation driven by the most energetic phi neighbour with respect
to the seed cell
-- The inclusion of additional isolation variables: Lateral width in the first
layer (wstot), hadronic isolation (RHad), and energy isolation for cells
along eta in the second layer (REta)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20730WIP:convert L1 e/gamma trigger to tau2019-04-09T09:41:38+02:00Yu EsumiWIP:convert L1 e/gamma trigger to tauStill work in progress, will marge to 21.3Still work in progress, will marge to 21.3https://gitlab.cern.ch/atlas/athena/-/merge_requests/22476Removing tau trigger dependency on TrigTauDiscriminant, and cleanup2019-04-09T10:34:32+02:00Bertrand Martin Dit LatourRemoving tau trigger dependency on TrigTauDiscriminant, and cleanupHello,
This MR removes the dependency on TrigTauDiscriminant for the evaluation of the jet BDT ID in tau triggers.
Once this MR is merged, TrigTauDiscriminant can be deleted from master (ATR-19015).
Old tau trigger configurations ha...Hello,
This MR removes the dependency on TrigTauDiscriminant for the evaluation of the jet BDT ID in tau triggers.
Once this MR is merged, TrigTauDiscriminant can be deleted from master (ATR-19015).
Old tau trigger configurations have been cleaned up.
Code has been made slightly more readable (use of lists).
Some discontinued chains have been removed from the menu (e.g. tight1, tracktwoEFmvaTES,...), and one has been added to Physics_pp_v7_primaries (tau25_mediumRNN_tracktwoMVA that we can now schedule in master!). I don't put the "changes-trigger-counts" label because the counts of existing triggers should not change (we'll just have new counts from the RNN chain).
Tagging @guindon and @carquin , and @aranzazu and @jmontejo for menu changes.
This MR should be merged after !22450 .
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20367Adding precision tracking to bjets ATR-192632019-04-09T12:37:54+02:00Matous VozakAdding precision tracking to bjets ATR-19263Adding ambiguity solver algorithm with xAOD TrackParticle conversion alg to bjet menu. The ticket for the migration process can be found in ATR-19263 @jmasikAdding ambiguity solver algorithm with xAOD TrackParticle conversion alg to bjet menu. The ticket for the migration process can be found in ATR-19263 @jmasikhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21822WIP: 21.9: Continue porting over necessary changes for step 3 geometries2019-04-09T18:22:14+02:00Nicholas StylesWIP: 21.9: Continue porting over necessary changes for step 3 geometriesContinuing from !21365 to port over updates needed for Step 3 geometries into 21.9. Basis for the changes is:
[BarrelInclinedRef-00-00-90-16](https://svnweb.cern.ch/trac/atlasoff/browser/InnerDetector/InDetDetDescr/PixelLayouts/BarrelIn...Continuing from !21365 to port over updates needed for Step 3 geometries into 21.9. Basis for the changes is:
[BarrelInclinedRef-00-00-90-16](https://svnweb.cern.ch/trac/atlasoff/browser/InnerDetector/InDetDetDescr/PixelLayouts/BarrelInclinedRef/tags/BarrelInclinedRef-00-00-90-16)
[EndcapRingRef-00-00-18-01](https://svnweb.cern.ch/trac/atlasoff/browser/InnerDetector/InDetDetDescr/PixelLayouts/EndcapRingRef/tags/EndcapRingRef-00-00-18-01)
[PixelLayoutUtils-00-00-12](https://svnweb.cern.ch/trac/atlasoff/browser/InnerDetector/InDetDetDescr/PixelLayouts/PixelLayoutUtils/tags/PixelLayoutUtils-00-00-12)
Please let me know if any of these are not appropriate starting points. On top of what was in these tags, I have removed any dependence on the `LayoutTranslationTool` and re-implemented any changes that had already been made in 21.9 on top of the previous imports.
This all compiles but has run time problems when I try to run the standard step 2.2 test:
```
16:50:45 XML: Could not find PixelStaveGeo StaveSupportEOSMaterialGeo in XML file
16:50:45 MemStatAuditor INFO Memory usage has changed after GeoModelSvc Initialize virtual size = 1065.77 MB resident set size = 617.418 MB deltaVsize = 13 MB
16:50:45 GeoModelSvc FATAL in sysInitialize(): standard std::exception is caught
16:50:45 GeoModelSvc ERROR Invalid material:
16:50:45 ServiceManager ERROR Unable to initialize Service: GeoModelSvc
16:50:45 Py:Athena INFO leaving with code 33: "failure in initialization"
```
I assume this must be due to the newly-added `getStaveSupportEOSMaterial` method not finding anything at `StaveSupportEOSMaterialGeo` and so returning an empty string. I *think* this is because `GeoPixelLayerPlanarRefTool` now calls `PixelInclRefStaveXMLHelper staveDBHelper(m_layer, basics);` but maybe a pixel geometry expert could comment - especially if they have a suggestion how we can make this backwards-compatible... it seems to have come in [here](https://svnweb.cern.ch/trac/atlasoff/changeset?reponame=&new=813816%40InnerDetector%2FInDetDetDescr%2FPixelLayouts%2FBarrelInclinedRef%2Ftrunk%2Fsrc%2FGeoPixelLayerPlanarRefTool.cxx&old=780736%40InnerDetector%2FInDetDetDescr%2FPixelLayouts%2FBarrelInclinedRef%2Ftrunk%2Fsrc%2FGeoPixelLayerPlanarRefTool.cxx)
FYI @npetters @asalzbur @ncalace @goblirsc @lmijovic @nova @fcostanzhttps://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/22553Sweeping !22494 from 21.3 to master.
adding rdo time,charge and channel to PR...2019-04-11T17:44:44+02:00Atlas NightlybuildSweeping !22494 from 21.3 to master.
adding rdo time,charge and channel to PRD validation nTuplesadding rdo time,charge and channel to PRD validation nTuples
See merge request atlas/athena!22494adding rdo time,charge and channel to PRD validation nTuples
See merge request atlas/athena!22494https://gitlab.cern.ch/atlas/athena/-/merge_requests/22401Migrated several JobTransforms related modules to Python3 using futurize2020-11-25T15:15:51+01:00Pascal Rene Baehrpascal.baehr@cern.chMigrated several JobTransforms related modules to Python3 using futurizeShort term the code should work in both versions of Python,
the futurize tool was used for basic migration. This adds some overhead with additional libraries
which should be removed once a full transition to Python 3 is done.
Addition...Short term the code should work in both versions of Python,
the futurize tool was used for basic migration. This adds some overhead with additional libraries
which should be removed once a full transition to Python 3 is done.
Additionally various error prone cases where the "is" operator has been used were changed and
now use the "==" operator instead.
Most of the modules were properly tested with the existing unit tests from PyJobTransforms. Since the scope of the changes is quite big a few modules might have been missed there. Changes were mostly made with basic the basic futurize migration strategy, autopep8 for code style, followed by adding manual fixes.
I consider the work for those modules done, additional test scenarios could be discussed before fully merging the changes into master.
EDIT: Proper testing would involve getting everything to run solely on Python 3, which I couldn't make work yet on lxplus.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22620WIP:fix on cpET2019-04-12T18:49:25+02:00Chiao-Ying LinWIP:fix on cpETThe CP ADC count was changed, and this is to correct the number for itThe CP ADC count was changed, and this is to correct the number for ithttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21702WIP: changes for implementing l1topo triggers and small change for ATR-173282019-04-12T14:23:53+02:00Aparajita DattaguptaWIP: changes for implementing l1topo triggers and small change for ATR-17328Hi,
The changes made are for:
ATR-19355: Implement L1Topo trigger 0INVM10-3MU4ab
ATR-18815: Implemet L1topo trigger 0INVM10-0DR15-EM8abi-MU10ab and 0INVM10-0DR15-EM12abi-MU6ab
ATR-17328: 1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi -> 2DISAMB-...Hi,
The changes made are for:
ATR-19355: Implement L1Topo trigger 0INVM10-3MU4ab
ATR-18815: Implemet L1topo trigger 0INVM10-0DR15-EM8abi-MU10ab and 0INVM10-0DR15-EM12abi-MU6ab
ATR-17328: 1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi -> 2DISAMB-J25ab-0DR28-TAU20abi-TAU12abi
Tagging @aranzazu and @jmontejo for review:
As suggested I reordered the triggers in TriggerMenu/python/l1topomenu/Menu_MC_pp_v8.py to find the available slots
and added the three triggers and corresponding JIRA numbers accordingly.
I'd also appreciate a double check of the parameter settings for the implementations in TriggerMenu/python/l1topomenu/TopoAlgoDef.py
For example, for L1750 and L1751 in TopoAlgoDef.py do we need InputWidth1, InputWidth2 and MaxTob1,MaxTob2 parameters like we have for 0INVM10-0DR15-EM12abi-MU6ab on L1770? I tried using the parameters based on what is implemented in https://gitlab.cern.ch/atlas/athena/commit/6f6063427b1e7a6b5db4a4daf0b33075507c7681 for ATR-19355 and in https://gitlab.cern.ch/atlas/athena/commit/b312f1027b5d01da1de6f6f1b02ae79096114780 for ATR-18815
I also see the use of "bitid" for example on L1643 of TopoAlgoDef.py, it wasn't clear if I should be adding this field for the new implementation.
It also wasn't clear when NumResultBits=1 should be used and when it should be set to: len(toponames), I used NumResultBits=1 based on implementations for similar triggers.
Thanks,
Aparajitahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20802WIP: 21.3 l1simulation2019-04-12T14:44:34+02:00Joerg StelzerWIP: 21.3 l1simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22582Calo noise alg clients12019-04-12T15:34:13+02:00Walter LamplCalo noise alg clients1This MR migrates the CaloTopoClusterMaker to the new CaloNoise conditions object, removing the dependency on the thread-unsafe CaloNoiseTool.
On top of this, a number of obsolete features of the TopoClusterMaker are removed. This was d...This MR migrates the CaloTopoClusterMaker to the new CaloNoise conditions object, removing the dependency on the thread-unsafe CaloNoiseTool.
On top of this, a number of obsolete features of the TopoClusterMaker are removed. This was discussed on the calo-perf mailing list.
While testing this, I found that the implementation of the CaloNoise::getEffectiveSigma (that is used to account for the double-gaussian noise observed in the TileCal during some periods) was wrong. This MR fixes also this problem. I verified that the resulting CaloCalTopoClusters container remains identical.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22618TrkGlobalChi2Fitter: Cleanup of the GlobalChi2Fitter code2019-04-12T22:26:42+02:00Stephen Nicholas SwatmanTrkGlobalChi2Fitter: Cleanup of the GlobalChi2Fitter codeHere's a bit of a large merge request, but it's not as scary as it looks. Most of the changes are in `28d0af77` which should be purely syntactical; it contains a manual effort to make every single file in the GlobalChi2Fitter code base p...Here's a bit of a large merge request, but it's not as scary as it looks. Most of the changes are in `28d0af77` which should be purely syntactical; it contains a manual effort to make every single file in the GlobalChi2Fitter code base properly formatted and readable. For the rest, this merge request removes a largely redundant class (made redundant by a several past changes to how the fitter works) and a bunch of data members.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22664Adding H7 common jO fragments2019-04-14T19:16:54+02:00Tetiana MoskaletsAdding H7 common jO fragmentsAdding common jO fragments with shower scale variations to Generators/Herwig7_i/share/common/Adding common jO fragments with shower scale variations to Generators/Herwig7_i/share/common/https://gitlab.cern.ch/atlas/athena/-/merge_requests/22672atr-195762019-04-15T16:12:00+02:00Mario Campanelliatr-19576Added several chains to the Physics_v7 primary menuAdded several chains to the Physics_v7 primary menu