athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-05-07T15:57:57+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/41744AtlasPyFwdBwdPorts: fix pytest related build problems2021-05-07T15:57:57+02:00Frank WinklmeierAtlasPyFwdBwdPorts: fix pytest related build problemsRemove the `pytest` requirement from `mccabe` and `flake8` which all of
a sudden started to create problems. Since we only build these packages
and never run their tests this dependency is not really needed. It was
also removed upstream,...Remove the `pytest` requirement from `mccabe` and `flake8` which all of
a sudden started to create problems. Since we only build these packages
and never run their tests this dependency is not really needed. It was
also removed upstream, see e.g. https://github.com/PyCQA/mccabe/pull/75.
Fixes ATLINFR-4022.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41714L1 trigger tower reprocessing tools for legacy system2021-04-06T13:26:11+02:00Ben CarlsonL1 trigger tower reprocessing tools for legacy systemCopying changes from 21.1-dev back to 21.3 for trigger tower reprocessing
ATR-16373Copying changes from 21.1-dev back to 21.3 for trigger tower reprocessing
ATR-16373https://gitlab.cern.ch/atlas/athena/-/merge_requests/41598small bug fix for printout warning that is not actually an error2021-03-22T17:14:10+01:00Ben Carlsonsmall bug fix for printout warning that is not actually an errorFix a small bug found in ATR-23034 that impacts the output... which currently gives an error...
@jburrFix a small bug found in ATR-23034 that impacts the output... which currently gives an error...
@jburrhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41448L1Calo floating point simulation: emulation, MET algorithm noise parameters, ...2021-03-22T17:14:10+01:00Ben CarlsonL1Calo floating point simulation: emulation, MET algorithm noise parameters, trigger sequence (21.3)- Allow TrigT1CaloFexPerf to be used in trigger sequence (fixes ATR-22961)
- Use updated noise paths
ATR-22750
ATR-19948- Allow TrigT1CaloFexPerf to be used in trigger sequence (fixes ATR-22961)
- Use updated noise paths
ATR-22750
ATR-19948https://gitlab.cern.ch/atlas/athena/-/merge_requests/40737fixing typo in SupercellBCIDEmAlg entries2021-03-05T20:40:57+01:00Ben Carlsonfixing typo in SupercellBCIDEmAlg entrieshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40692Scale gain in MM digi with hv values from file2021-02-20T12:30:13+01:00Patrick ScholerScale gain in MM digi with hv values from fileThis MR enables the use of the smearing tool to change the gain in the MM digi based on the HV read from filesThis MR enables the use of the smearing tool to change the gain in the MM digi based on the HV read from fileshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40627Fixing the calculation of the cross talk in the Micromegas digitization2021-02-16T10:54:50+01:00Patrick ScholerFixing the calculation of the cross talk in the Micromegas digitizationThis MR fixes the simulation of the cross talk. Now the charge on the central strip is scaled down by the amount of cross talk to the neighboring strips. Before the amount of shared charge was determined on the full charge and subtracted...This MR fixes the simulation of the cross talk. Now the charge on the central strip is scaled down by the amount of cross talk to the neighboring strips. Before the amount of shared charge was determined on the full charge and subtracted from the central strip, leading to unrealistic charge ratios and negative charges on the central strip.
Adding ~urgent since new samples with this MR need to be created quicklyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40593Fix sTGC-QL3 geometry clash (ATLASSIM-5002)2021-02-17T22:06:25+01:00Alexandre LaurierFix sTGC-QL3 geometry clash (ATLASSIM-5002)Fix a geometry clash in the NSW sTGC caused by the QL3 sectors as outlined here (ATLASSIM-5002).
An update to the QL3 geometry is also done by way of updating the xml files which described the NSW. The trapezoidal shapes had two of 6 ve...Fix a geometry clash in the NSW sTGC caused by the QL3 sectors as outlined here (ATLASSIM-5002).
An update to the QL3 geometry is also done by way of updating the xml files which described the NSW. The trapezoidal shapes had two of 6 vertexes 15mm offset from the nominal values.
The two xml files are exact copies of the latest versions, except where yCutout="545.3" have been updated to yCutout="560.4".https://gitlab.cern.ch/atlas/athena/-/merge_requests/40189Fix sc simple maker2021-02-05T18:10:24+01:00Denis Oliveira DamazioFix sc simple makerVery interesting bad feature of CaloDDE->IdentifierHash. I wonder if this happens in other places (What do you think @pavol?? Maybe there are many places where I might have done this wrongly).
It looks like caloDDE->IdentifierHash return...Very interesting bad feature of CaloDDE->IdentifierHash. I wonder if this happens in other places (What do you think @pavol?? Maybe there are many places where I might have done this wrongly).
It looks like caloDDE->IdentifierHash returns a hash within the SubCalo, instead of doing
so within the whole calorimeter. @lbaltes (I hope I got the right one), got the point (Thanks a lot) and I propose here a fix for the specific algorithm she was talking about. This is probably the reason why we have some issues yet to be understood in the HEC and FCAL superCells.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40181Keep MuonAuxContainer_v4 default in 21.X2021-02-08T09:48:35+01:00Tadej Novaktadej.novak@cern.chKeep MuonAuxContainer_v4 default in 21.XTo allow compatibility with other branches keep `MuonAuxContainer_v4` default in `21.X` branches.
/cc @nkoehler @bcarlson @jchapmanTo allow compatibility with other branches keep `MuonAuxContainer_v4` default in `21.X` branches.
/cc @nkoehler @bcarlson @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39812Fixes to pedestal correction related trigger algorithm sequence2021-02-08T09:48:35+01:00Ben CarlsonFixes to pedestal correction related trigger algorithm sequence- For MC simulation, I adjusted the sequence to run the PC from HITS to RDO, as implemented in MR37875. Here I change the names pulled from the trigger sequence to reflect the pedestal corrected containers. Note that the PC applied from ...- For MC simulation, I adjusted the sequence to run the PC from HITS to RDO, as implemented in MR37875. Here I change the names pulled from the trigger sequence to reflect the pedestal corrected containers. Note that the PC applied from HITS to RDO has been validated, and seem to perform well. See: https://indico.cern.ch/event/993730/
- For the emulation (data and MC), adjusted the sequence to use the new `SuperCellBCIDEmAlg` algorithm introduced in MR38859. This means the PC now works on emulated MC and on data. Please note that this fix does resolve some issues with the pedestal correction for the emulation tool and for data, but **the known issues with an estimate of the supercell time in data persist. To be clear, we cannot trust the emulation until we address the timing issue (that is in progress by Lisa Baltes and myself, but not related to this merge request)** ATR-22168, ATR-20845
- The MR38395 is no longer needed and has been closed, as this involves some fixes for a different angle to this problem, that we decided to not pursue.
- I have tested these changes using the MC reconstruction tag and using the trigger reprocessing command on data.
**Test to run on MC simulation**
`Reco_tf.py --AMIConfig="r12259" --maxEvents="10" \
--inputHITSFile="/eos/atlas/user/b/bcarlson/Run3Tmp/mc16_13TeV.361020.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ0W.simul.HITS.e3569_s3126/HITS.10728672._000474.pool.root.1" \
--inputHighPtMinbiasHitsFile="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/validate_sampleT/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.simu\
l.HITS.e4981_s3087_s3111/HITS.10701335._000217.pool.root.1" \
--inputLowPtMinbiasHitsFile="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/validate_sampleT/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.simul.\
HITS.e4981_s3087_s3111/HITS.10701323._005536.pool.root.1" \
--outputRDOFile="RDO.r12259.pool.root"--outputESDFile="ESD.r12259.pool.root" --outputAODFile="AOD.r12259.pool.root" --jobNumber="1" \
`
**Test to run on data**
`Trig_reco_tf.py --athena athena.py --inputBS_RDOFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.MissingTowers._lb0151\
._SFO-6._0001.1 --outputBSFile out.data --athenaopts='-c "setMenu=\"Physics_pp_v8\";rerunLVL1=False;rerunLVL1PhaseI=True;"' --maxEvents 10`https://gitlab.cern.ch/atlas/athena/-/merge_requests/39241Adding configurable number of seed layers and reducing number of seeds combin...2021-02-08T09:48:36+01:00Stefano RosatiAdding configurable number of seed layers and reducing number of seeds combinationsThe number of layers to be considered in the segment seeds building is reduced from the loose value used in the first version. CPU time is reduced, keeping the same efficiency.
Also the number of seed layers is now made configurable.The number of layers to be considered in the segment seeds building is reduced from the loose value used in the first version. CPU time is reduced, keeping the same efficiency.
Also the number of seed layers is now made configurable.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38871Fixes in the Hough transform for the nsw2021-02-08T09:48:37+01:00Stefano RosatiFixes in the Hough transform for the nswThis fix speeds up the hough transform for the NSW case.
Adding @mcarnesaThis fix speeds up the hough transform for the NSW case.
Adding @mcarnesahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37566Flags to disable pedestal corrections on data, flags to configure min superce...2021-02-08T09:48:40+01:00Ben CarlsonFlags to disable pedestal corrections on data, flags to configure min supercell ET and min tower ET, gBlock size in forward region- Flag to disable pedestal correction for data, so that the job does not crash when run on data. This addresses ATR-20845 and ATR-22168 through a bit of a hack to disable the pedestal correction.
- Flags to veto range of low ET supercell...- Flag to disable pedestal correction for data, so that the job does not crash when run on data. This addresses ATR-20845 and ATR-22168 through a bit of a hack to disable the pedestal correction.
- Flags to veto range of low ET supercells
- Flags to require a minimum tower ET
- Change gBlock size in forward region to a single tower size for jets without jets MET ATR-22128https://gitlab.cern.ch/atlas/athena/-/merge_requests/37430Fixed seeding for jFEX simulation by removing coordinate shift2021-02-08T09:48:41+01:00Duc TaFixed seeding for jFEX simulation by removing coordinate shiftRemoving coordinate shift in the jFEX jet seeding algorithm that we think is causing rectangular seeds.Removing coordinate shift in the jFEX jet seeding algorithm that we think is causing rectangular seeds.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34772Set EM granularity to 1GeV in CTPEmulation2020-08-12T03:05:12+02:00Joerg StelzerSet EM granularity to 1GeV in CTPEmulationSet EM granularity to 1 for emulation of the CTP response for eFEX EM objects
Addresses ATR-21457 and ATR-21261Set EM granularity to 1 for emulation of the CTP response for eFEX EM objects
Addresses ATR-21457 and ATR-21261https://gitlab.cern.ch/atlas/athena/-/merge_requests/34764Fix definition of L1_4jJ15.0ETA25 item (ATR-21484)2020-08-12T03:05:12+02:00Joerg StelzerFix definition of L1_4jJ15.0ETA25 item (ATR-21484)The multiplicity was specified incorrectly (3 instead of 4) leading to a higher rate than expected)
Closes ATR-21484The multiplicity was specified incorrectly (3 instead of 4) leading to a higher rate than expected)
Closes ATR-21484https://gitlab.cern.ch/atlas/athena/-/merge_requests/34759PROCTools: Updating q221 21.3 reference file, see ATLASRECTS-55832020-08-12T03:05:13+02:00Alaettin Serhan MetePROCTools: Updating q221 21.3 reference file, see ATLASRECTS-5583Closes ATLASRECTS-5583Closes ATLASRECTS-5583https://gitlab.cern.ch/atlas/athena/-/merge_requests/34631TrigL1CaloUpgrade: eFEX egamma update2020-10-28T12:32:42+01:00Alan WatsonTrigL1CaloUpgrade: eFEX egamma update@bcarlson @viveiros
Updates to e/gamma algorithm (or any other based in TrigT1CaloBaseFex)
* update seeding algorithm to match firmware
- unlikely user will see any effect
* update handling of regions with unusual supercell ge...@bcarlson @viveiros
Updates to e/gamma algorithm (or any other based in TrigT1CaloBaseFex)
* update seeding algorithm to match firmware
- unlikely user will see any effect
* update handling of regions with unusual supercell geometry
(1.4-1.5, 1.8-2.0, 2.4-2.5)
- some visible changes in all algorithm aspects around barrel-endcap transition
- visible changes in L1Width in regions 1.8-2.0, 2.4-2.5
- RetaL12 will also change for |eta|>2.3
* update L1Width with integer weights and special handling of 1.8-2.0 region
- large change in scale of variable
- 1.8-2.0 no longer has narrower distribution than the norm (as does not
use finer granularity than will be available in reality)
* update RHad algorithm to match the clusters used in the firmware
- modest changes in values
For reference, here is a summary:
https://indico.cern.ch/event/939184/contributions/3946427/attachments/2073972/3482312/egamma_Simulation_Update.pdfhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33863Remove FTK tests and fix the local running for release 21.32020-08-12T03:05:15+02:00Mark SuttonRemove FTK tests and fix the local running for release 21.3The FTK tests were still in the sample, this change removed them from the building.
Also the selection of the data to run on if running the test scripts locally depended
on some xml decoding wich no longer works in release 21.3, so these...The FTK tests were still in the sample, this change removed them from the building.
Also the selection of the data to run on if running the test scripts locally depended
on some xml decoding wich no longer works in release 21.3, so these changes extract
NB: the files in the test directory, namely test/test_*.sh, are all autogenerated from the file utils/template.sh. It is this template.sh file that has changed so please DO NOT REVIEW any of the files in the test directory.
This package is not used in standard athena - it is only used for the ID Trigger ART tests.