athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-08-12T03:05:15+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/33856Adding stgc pads2020-08-12T03:05:15+02:00Stefano RosatiAdding stgc padsSTGC pads were missing in the RDO->PRD converters, adding them.
Not building pad clusters for now: we'll check with the detector group of possible ways to remove cross talk effects.
Adding @pscholer and @kluit
JIRA ticket:
https://...STGC pads were missing in the RDO->PRD converters, adding them.
Not building pad clusters for now: we'll check with the detector group of possible ways to remove cross talk effects.
Adding @pscholer and @kluit
JIRA ticket:
https://its.cern.ch/jira/browse/ATLASRECTS-5551https://gitlab.cern.ch/atlas/athena/-/merge_requests/33357Updated path to jFEX configuration for pileup subtraction2020-08-12T03:05:17+02:00Ben CarlsonUpdated path to jFEX configuration for pileup subtractionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/32938Add the xAOD TruthParticles to the TrigInDetAnalysis2020-08-12T03:05:18+02:00Mark SuttonAdd the xAOD TruthParticles to the TrigInDetAnalysisThe truth classes implemented in the TrigInDetAnalysis code were only those classes
available in ESD and RDO since the TrigInDetValidation comparisons with truth pretty
much were only ever needed to evaluate the running of the trigger it...The truth classes implemented in the TrigInDetAnalysis code were only those classes
available in ESD and RDO since the TrigInDetValidation comparisons with truth pretty
much were only ever needed to evaluate the running of the trigger itself.
As such, it was never implemented to use the xAOD::TruthParticle classes directly from
xAOD.
These changes fix that, and allow the writing of the xAOD::TruthParticles from xAOD.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32734Fix BeamSpot job options for the ML TrigInDetValidation tests2020-08-12T03:05:18+02:00Mark SuttonFix BeamSpot job options for the ML TrigInDetValidation testsWrong instance of the FTF was specific in the job options - also a change
to the template to not download the python files needed a removal of a line
copying the downloaded files
NB: none of the required CI tests actually run, or ar...Wrong instance of the FTF was specific in the job options - also a change
to the template to not download the python files needed a removal of a line
copying the downloaded files
NB: none of the required CI tests actually run, or are affected by any of the code in this package. https://gitlab.cern.ch/atlas/athena/-/merge_requests/32582Fix SuperCell AutoCorrTotal2020-05-25T08:05:21+02:00Pavol StrizenecFix SuperCell AutoCorrTotalThis is to fix ATR-21321 (and ATR-21261). The MinBias key used for SuperCells was corrected (should not be default)This is to fix ATR-21321 (and ATR-21261). The MinBias key used for SuperCells was corrected (should not be default)https://gitlab.cern.ch/atlas/athena/-/merge_requests/32482pufit fix2020-05-25T08:05:23+02:00Ben Carlsonpufit fix Change E->Et.
@jburr Change E->Et.
@jburrhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/32463bug fix for gFEX pileup correction2020-05-25T08:05:23+02:00Ben Carlsonbug fix for gFEX pileup correctionFixing small bug in JGTowerReader that computes pileup for gFEX.Fixing small bug in JGTowerReader that computes pileup for gFEX.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32442Add additional beamspot tests to validate the ML extensions2020-08-12T03:05:19+02:00Mark SuttonAdd additional beamspot tests to validate the ML extensionsThese tests add modified versions of the beamspot tests which run a full scan track reconstruction.
There are two additional jobs, one without the machine learning extensions, and the other including
the ML extensions.
The xml fi...These tests add modified versions of the beamspot tests which run a full scan track reconstruction.
There are two additional jobs, one without the machine learning extensions, and the other including
the ML extensions.
The xml files are used to keep the details of the jobs - for historical reasons, since the RTT used xml.
The test_*.sh files are autogenerated from the xml files.
The two additional new xml files
```
TrigInDetValidation_beamspot_ttbar_pu80_fs.xml
TrigInDetValidation_beamspot_ttbar_pu80_fsml.xml
```
are copies of the original file
```
TrigInDetValidation_beamspot_ttbar_pu80_zfinder.xml
```
and as such should not really be reviewed as there are only in fact three lines which are different ...
```
% diff TrigInDetValidation_beamspot_ttbar_pu80_{zfinder,fs}.xml
1c1
< <athena trendId='all_pu80' userJobId='TrigInDetValidation_beamspot_ttbar_pu80_zfinder'>
> <athena trendId='all_pu80' userJobId='TrigInDetValidation_beamspot_ttbar_pu80_fs'>
4c4
< <commandLineFlags>EventMax=1000;fastZFinder=True;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
> <commandLineFlags>EventMax=1000;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
35c35
< <argvalue>data-all.root data-beamspot_ttbar_pu80_zfinder-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-test-plots </argvalue>
> <argvalue>data-all.root data-beamspot_ttbar_pu80_fs-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-test-plots </argvalue>
```
and so on. Similarly the generated test scripts ...
```
test/test_trigindetvalidation_beamspot_ttbar_pu80_fs.sh
test/test_trigindetvalidation_beamspot_ttbar_pu80_fs.sh
```
again are autogenerated and so should probably not be reviewed.
However, there are some changes to the generation script to take into account some comments from https://gitlab.cern.ch/atlas/athena/-/merge_requests/32417
None of the code here is executed as standard athena - they are scripts to be used for the ID Trigger ART tests, and as such contain no compilable code, and no code that is executed in any of the other CI tests, so should be unaffected by the status of any of the make or required tests.
FIXME: using the original XML files as a source of the details of the job configuration is far from ideal and was done only because the RTT used XML. Now that the RTT is no longer with us, we need at some point, come up with some new way to store the relevant information for the generation, perhaps based on json files or something similar. This would be a longer term project that these changeshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/31873fixing typo in NSWCalibTool and MmRdoToPrepDataTool2020-05-25T08:05:24+02:00Patrick Scholerfixing typo in NSWCalibTool and MmRdoToPrepDataToolThis MR fixes typos introduced in https://gitlab.cern.ch/atlas/athena/-/merge_requests/31326 which created MMPRDs with a local positon of `dx` and a wrong time since the default t0 had the wrong sign. Also fixing the units of `reciprocal...This MR fixes typos introduced in https://gitlab.cern.ch/atlas/athena/-/merge_requests/31326 which created MMPRDs with a local positon of `dx` and a wrong time since the default t0 had the wrong sign. Also fixing the units of `reciprocalSpeedOfLight` and actually making it the reciprocal.
Adding ~urgent since this breaks MM reco.
This fix is ~"alsoTargeting:21.9" and ~"alsoTargeting:master" but labels are not put since the sweep should maybe happen with the sweep of the original MR
Adding @mcarnesa, @nkoehler, @rosati https://gitlab.cern.ch/atlas/athena/-/merge_requests/31850Include supercell database paths2020-05-25T08:05:25+02:00Ben CarlsonInclude supercell database pathsFixing the bug reported in ATR-20846
Including the supercell cabling:
https://gitlab.cern.ch/atlas/athena/-/blob/21.3/LArCalorimeter/LArROD/share/LArConfigureCablingSCFolder.py
Added to the L1Calo sequence:
https://gitlab.c...Fixing the bug reported in ATR-20846
Including the supercell cabling:
https://gitlab.cern.ch/atlas/athena/-/blob/21.3/LArCalorimeter/LArROD/share/LArConfigureCablingSCFolder.py
Added to the L1Calo sequence:
https://gitlab.cern.ch/atlas/athena/-/blob/21.3/Trigger/TrigT1/TrigT1CaloFexSim/python/L1SimulationSequence.py#L81https://gitlab.cern.ch/atlas/athena/-/merge_requests/31723Adding new Run 3 L1Calo containers2020-04-29T03:04:13+02:00Ben CarlsonAdding new Run 3 L1Calo containersThis merge request puts the containers added in MR31380 into the AOD by default.
Adding containers below. Size estimates are estimates based on similar containers:
gFEX gBlocks 0.1kb/event
jFEX pileup subtracted small jets...This merge request puts the containers added in MR31380 into the AOD by default.
Adding containers below. Size estimates are estimates based on similar containers:
gFEX gBlocks 0.1kb/event
jFEX pileup subtracted small jets: 0.16kbs/event
jFEX pileup subtracted large jets: 0.46kbs/event
jFEX forward electrons: 1kb/event
jFEX taus: 1.7kbs/event
The event sizes can be fine tuned later by raising thresholds for which objects are saved, which is why there are differences. Given the sensitivity to pileup and noise, they may also change slightly between production setups (e.g., pileup profile).
https://gitlab.cern.ch/atlas/athena/-/merge_requests/31502Saving timing for all supercells2020-04-29T03:04:14+02:00Ben CarlsonSaving timing for all supercellsThe timing cut is currently computed only for supercells with E > 50 MeV:
https://gitlab.cern.ch/atlas/athena/-/blob/21.3/LArCalorimeter/LArROD/src/LArRawChannelBuilderToolOFC.cxx#L41
The default can be changed for supercells in th...The timing cut is currently computed only for supercells with E > 50 MeV:
https://gitlab.cern.ch/atlas/athena/-/blob/21.3/LArCalorimeter/LArROD/src/LArRawChannelBuilderToolOFC.cxx#L41
The default can be changed for supercells in the supercell getter.
It turns out – that makes a HUGE difference in the performance when you cut on the time, as there is a significant bias toward negative ET supercells. Using gTowers as an example:
avg gTower ET: all supercells have timing = 140 MeV
avg gTower ET: only supercells with E > 50 GeV have timing = -720 MeVhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/31380gFEX bug fixes, jFEX taus, jFEX forward electrons, jFEX large-R jets w/ p.u.sub.2020-04-29T03:04:13+02:00Ben CarlsongFEX bug fixes, jFEX taus, jFEX forward electrons, jFEX large-R jets w/ p.u.sub.General:
* Removed total noise multipliers. These kept track of the sum of noise in a given algorithm, which is not something we intend to do. Either cut the tower out, or cut the jet/seed out...
jFEX Fwd Electron/Tau:
* Ad...General:
* Removed total noise multipliers. These kept track of the sum of noise in a given algorithm, which is not something we intend to do. Either cut the tower out, or cut the jet/seed out...
jFEX Fwd Electron/Tau:
* Added jFEX tau algorithm template
* Added jFEX forward electron algorithm template
jFEX:
* Added new algorithm for taus and electrons
* Implemented Large-R jets with pileup subtraction [MR31138](https://gitlab.cern.ch/atlas/athena/merge_requests/31138/)
* Common seeding for small and Large-R jets (no need to run it multiple times)
* Configure p.u. subtracted jets with same towers are MET.
gFEX:
* Fix bugs pointed out [Ben Carlson](https://indico.cern.ch/event/895469/contributions/3777150/attachments/1999141/3336148/Carlson_gFEXJet_March5_2020.pdf) and [David Miller](https://indico.cern.ch/event/892641/contributions/3766952/attachments/1995278/3328612/Miller_gFEXMETandJetAlgs_27Feb2020.pdf)
* Uniformly remove negative energy or not
* For rho calculation, veto towers with ET > 10 GeV, then remove those towers from the average
* Changed gBlocks to use ET, either only ET > 0 or all ET. Before was using |ET|
* Changed jet radius size to 0.9, which gives 69 towers as expected
* Option so that if rho < 0, do not subtract anything for jets
* Configure J w/o J to use or not use PU subtraction rather than hard code
Note: trigger EDM changes will be discussed separately in MR31723https://gitlab.cern.ch/atlas/athena/-/merge_requests/30410fixes in NSWCalibTool configuration2020-03-02T21:13:04+01:00Stefano Rosatifixes in NSWCalibTool configurationFix of the NSWCalibTool configuration, fixes ticket https://its.cern.ch/jira/browse/ATLASRECTS-5309
(NSW reco broken in 21.3)Fix of the NSWCalibTool configuration, fixes ticket https://its.cern.ch/jira/browse/ATLASRECTS-5309
(NSW reco broken in 21.3)https://gitlab.cern.ch/atlas/athena/-/merge_requests/30119Include time and provenance to the Super-Cells emulated from cells.2020-04-29T03:04:16+02:00Denis Oliveira DamazioInclude time and provenance to the Super-Cells emulated from cells.ATR-19948. This code estimates the time of the Super-Cell in case we are in emulation mode.
ATR-19948. This code estimates the time of the Super-Cell in case we are in emulation mode.
https://gitlab.cern.ch/atlas/athena/-/merge_requests/29755Run 3 L1Calo tau algorithms2020-04-29T03:04:17+02:00Nicholas LuongoRun 3 L1Calo tau algorithmsAdding Oregon and Tel-Aviv algorithms for the Run 3 L1calo taus to be computed in the eFEX to TrigT1CaloRun3TauFex.cxx. Energy sums and isolation variables are calculated. This is a very simple implementation of the algorithm which is st...Adding Oregon and Tel-Aviv algorithms for the Run 3 L1calo taus to be computed in the eFEX to TrigT1CaloRun3TauFex.cxx. Energy sums and isolation variables are calculated. This is a very simple implementation of the algorithm which is still undergoing development.
To take advantage of timing handling, TrigT1CaloBaseFex::CaloCellET is now used when TH2Ds are filled with supercell information.https://gitlab.cern.ch/atlas/athena/-/merge_requests/28796Make the tst ceiling the default in 21.32020-01-28T03:04:29+01:00Jon BurrMake the tst ceiling the default in 21.3This MR makes the TST ceiling approach the default in 21.3. It swaps out the `tstceil` keyword for a `muonor` keyword, which triggers the old behaviour. It also adds a container containing that result to the EDM, with the `tstceil` resul...This MR makes the TST ceiling approach the default in 21.3. It swaps out the `tstceil` keyword for a `muonor` keyword, which triggers the old behaviour. It also adds a container containing that result to the EDM, with the `tstceil` result being written into the default container.
For now I just exchanged the old `tstceil` chains with `muonor` chains but there's a valid question over whether or not we really want to keep them.
This also includes a bugfix for the uninitialized variable problem in pufit that was noticed in master.
This should not be merged until after !28010 as I will have to recreate the references after that MR.https://gitlab.cern.ch/atlas/athena/-/merge_requests/28697jFEX pileup subtraction for small jets and MET2020-04-29T03:04:15+02:00Duc TajFEX pileup subtraction for small jets and METAdded jFEX_rhoMET calculation to TrigT1CaloFexSim package.
See: https://indico.cern.ch/event/845486/contributions/3552572/attachments/1901839/3139836/Simulation030919.pdf
Validated implemented software it gives the expected per...Added jFEX_rhoMET calculation to TrigT1CaloFexSim package.
See: https://indico.cern.ch/event/845486/contributions/3552572/attachments/1901839/3139836/Simulation030919.pdf
Validated implemented software it gives the expected performance. [Efficiency_MET.pdf](/uploads/3874082829806d51d9439ce290284375/Efficiency_MET.pdf)https://gitlab.cern.ch/atlas/athena/-/merge_requests/28512Updating PRD converters for the NSW2020-01-01T03:03:44+01:00Stefano RosatiUpdating PRD converters for the NSWAdding the cluster quantities to the MM and STGC PrepRawData converters. No backwards compatibility with previously produced ESD with the NSW but that's no problem, as only a few validation samples have been produced until now.Adding the cluster quantities to the MM and STGC PrepRawData converters. No backwards compatibility with previously produced ESD with the NSW but that's no problem, as only a few validation samples have been produced until now.https://gitlab.cern.ch/atlas/athena/-/merge_requests/28283Move to const DataHandle to fix trigger ART tests (ATR-20597)2020-01-01T03:03:50+01:00Nicolas KoehlerMove to const DataHandle to fix trigger ART tests (ATR-20597)Hi,
this MR fixes the failing trigger ART tests in ~"21.3" (ATR-20597) by using const DataHandles in the muon converters.
The change needs to be swept also to ~"21.9" but not to ~master (since there another technical approach is used).
...Hi,
this MR fixes the failing trigger ART tests in ~"21.3" (ATR-20597) by using const DataHandles in the muon converters.
The change needs to be swept also to ~"21.9" but not to ~master (since there another technical approach is used).
Marking the MR as ~urgent since ART tests are failing in current nightlies.
Adding @jchapman and @hartj
Best, Nico