athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-10-17T11:08:13+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/66436start reading jFEX database values from September 20232023-10-17T11:08:13+02:00Paul Thompsonstart reading jFEX database values from September 2023The jFEX noise cut database was fixed in September 2023 so we use it from then to improve data-resimulation matching when tuning noise cuts in HI running.
This targets 23.0 - still a chance to make it to tier-0 monitoring before the 2023...The jFEX noise cut database was fixed in September 2023 so we use it from then to improve data-resimulation matching when tuning noise cuts in HI running.
This targets 23.0 - still a chance to make it to tier-0 monitoring before the 2023 data taking finishes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66268Fix gFex simulation running issue2023-10-06T15:54:58+02:00Cecilia TosciriFix gFex simulation running issueThis MR fixes a problem with running the gFex simulation. `gTowerMakerFromGfexTowers` is needed at the beginning of the gFex simulation in order to create `gTowers`.This MR fixes a problem with running the gFex simulation. `gTowerMakerFromGfexTowers` is needed at the beginning of the gFex simulation in order to create `gTowers`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66240main-coverity-L1CaloFEXByteStream2023-10-06T15:56:18+02:00Shaun Roemain-coverity-L1CaloFEXByteStream[minor] Small cleanups, suppress one coverity defect.
One additional defect extant; advice sought from the developer ( ATLASRECTS-7762 )[minor] Small cleanups, suppress one coverity defect.
One additional defect extant; advice sought from the developer ( ATLASRECTS-7762 )https://gitlab.cern.ch/atlas/athena/-/merge_requests/66217L1CaloFEX: Pass large arrays by ref2023-10-06T15:55:27+02:00Adam Edward BartonL1CaloFEX: Pass large arrays by refPassing arrays of length > 100 by copy is sub optimal.Passing arrays of length > 100 by copy is sub optimal.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66209gFexInputByteStreamTool: Fix Clang 16 bracer warning2023-10-06T15:56:01+02:00Adam Edward BartongFexInputByteStreamTool: Fix Clang 16 bracer warningClang 16 prefers even MORE bracers.Clang 16 prefers even MORE bracers.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66187ATLASRECTS-7761: DecorHandles lock when going out of scope2023-10-06T15:58:53+02:00Christos Anastopouloschristos.anastopoulos@cern.chATLASRECTS-7761: DecorHandles lock when going out of scopeATLASRECTS-7761:
WriteDecorHandles lock when going out of scope.
So we can not have them created inside a for loop(given a condition)
Should help with failing SPOT testsATLASRECTS-7761:
WriteDecorHandles lock when going out of scope.
So we can not have them created inside a for loop(given a condition)
Should help with failing SPOT testshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66143gFEX input ByteStream decoder update2023-10-06T15:58:03+02:00Cecilia ToscirigFEX input ByteStream decoder updateThis MR includes some updates of the ByteStream decoder of the gFEX input to reflect some changes in the firmware or to fix known bugs in the fibers-to-gTowers mapping. The required changes are documented here: https://its.cern.ch/jira/b...This MR includes some updates of the ByteStream decoder of the gFEX input to reflect some changes in the firmware or to fix known bugs in the fibers-to-gTowers mapping. The required changes are documented here: https://its.cern.ch/jira/browse/ATLGFEX-124. In particular, the MR includes:
- Updates of the TREX and FCAL mapping
- Use of the left shift for truncation rather than division
- Definition of separate arrays for gTowers of 50 MeV (to be used in the pile-up correction calculation), and gTowers of 200 MeV (default, used by the algorithms)
- Definition of a new container for the 50 MeV towers
- Changes for saving the saturation bithttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65987L1calo efex tau bdt reduce eta asymmetry2023-10-06T15:56:27+02:00David ReikherL1calo efex tau bdt reduce eta asymmetrySince the heuristic algorithm produces a small seed with values in [0,3] and uses that to give a fine resolution for the TOB eta while the BDT algorithm sets this small seed value to 0, there is a slight asymmetry in eta for BDT TOBs wit...Since the heuristic algorithm produces a small seed with values in [0,3] and uses that to give a fine resolution for the TOB eta while the BDT algorithm sets this small seed value to 0, there is a slight asymmetry in eta for BDT TOBs with the way it's currently computed. For example, here's a plot of delta eta between tau jet and matched BDT TOB:![Pasted_image_20230921165032](/uploads/73aa539f59df0719f327c39334380691/Pasted_image_20230921165032.png)
To mitigate this:
1. Set the default seed value for BDT TOBs to 1 instead of 0.
L1Topo algorithms should not be affected for a hard-coded seed value of 1. The only use of this seed value (that I could find) at L1Topo is through the `iEtaTopo()` method here: https://gitlab.cern.ch:8443/atlas/athena/-/blob/main/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/cTauMultiplicity.cxx#L189 and here: https://gitlab.cern.ch:8443/atlas/athena/-/blob/main/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/cTauMultiplicity.cxx#L224.
2. The `eta()` method of the `eFexTauRoI` EDM will return a coarser value of eta for BDT TOBs than for heuristic TOBs. This value will be the eta of the center point of the 3x3 rectangle.
3. Also added enums for Heuristic and BDT algorithms for convenience and clarity in the tau EDM object.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65894L1calo efex new tau bdt model version2023-10-06T16:38:51+02:00David ReikherL1calo efex new tau bdt model version- Add a new eFEX tau BDT model version.
- Fix failing test due to BDT version change
- Add error message in case model file is not found (before this there was an ambiguous json syntax error)
- Update new model in configuration- Add a new eFEX tau BDT model version.
- Fix failing test due to BDT version change
- Add error message in case model file is not found (before this there was an ambiguous json syntax error)
- Update new model in configurationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/656302023-09-06: merge of 23.0 into main2023-10-06T16:35:53+02:00Adam Edward Barton2023-09-06: merge of 23.0 into mainThis sweep contains the following MRs:
* !65617 Casting an integer division - ATLASRECTS-7739 ~Trigger
* !65588 Fix Typo in Zdc Module Location Tag ~Trigger
* !65553 Fix initialization of event-level variables in RpdSubtractCentroidTo...This sweep contains the following MRs:
* !65617 Casting an integer division - ATLASRECTS-7739 ~Trigger
* !65588 Fix Typo in Zdc Module Location Tag ~Trigger
* !65553 Fix initialization of event-level variables in RpdSubtractCentroidTool ~ForwardDetectors
* !65590 Fix egamma monGroups in pp lowMu menu ~Trigger, ~TriggerMenu
* !65551 fix HIClusters content and HIflags ~JetEtmiss, ~Reconstruction
* !65563 Add configuration to write extended PRD for TRT ~Derivation, ~Egamma, ~ITk, ~InnerDetector, ~Reconstruction, ~Tracking
* !65559 bugfix: protect ZdcSim with ReadHandle Key for Zdc CalibEnergy ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65617Casting an integer division - ATLASRECTS-77392023-09-06T17:23:27+02:00Sergi Rodriguez BoscaCasting an integer division - ATLASRECTS-7739This MR is meant to cast an integer division properly.This MR is meant to cast an integer division properly.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65602L1CaloFEXAlgos: Fix usage of WriteDecorHandle.2023-09-06T08:39:02+02:00Scott SnyderL1CaloFEXAlgos: Fix usage of WriteDecorHandle.When a WriteDecorHandle is deleted, the decoration gets locked.
So need to move the WDH declarations out of the element loop, so they're
only created/destroyed once.
This was previously working due to a bug that resulted in decorations...When a WriteDecorHandle is deleted, the decoration gets locked.
So need to move the WDH declarations out of the element loop, so they're
only created/destroyed once.
This was previously working due to a bug that resulted in decorations sometimes
appearing not to be locked. See ATEAM-909.https://gitlab.cern.ch/atlas/athena/-/merge_requests/655822023-09-05: merge of 23.0 into main2023-09-06T08:22:20+02:00Adam Edward Barton2023-09-05: merge of 23.0 into mainThis sweep contains the following MRs:
* !65561 Bugfix for ZdcTrigger Monitoring ~DQ, ~Trigger, ~TriggerMinBias
* !65499 new ZdcGeometryDB and addition of file-based calibrations in ZdcAnalysis ~ForwardDetectors
* !65520 fix to ZdcNtu...This sweep contains the following MRs:
* !65561 Bugfix for ZdcTrigger Monitoring ~DQ, ~Trigger, ~TriggerMinBias
* !65499 new ZdcGeometryDB and addition of file-based calibrations in ZdcAnalysis ~ForwardDetectors
* !65520 fix to ZdcNtuple adding bunch group information, plus a fix to ZdcAnalysis ~ForwardDetectors
* !65539 Update LR jet LM logic - ATLASRECTS-7689 ~JetEtmiss, ~Trigger
* !65444 Updated BremRecovery tracking flags ~Egamma, ~InnerDetector, ~Tracking, ~Trigger, ~TriggerID
* !65530 DRAW_EGZ : Tidy and make the Zefe more similar to the Zee ~Analysishttps://gitlab.cern.ch/atlas/athena/-/merge_requests/655452023-09-04: merge of 23.0 into main2023-09-05T07:46:00+02:00Adam Edward Barton2023-09-04: merge of 23.0 into mainThis sweep contains the following MRs:
* !65534 ATLASRECTS-3481 : rm cout from ZdcCablingService ~ForwardDetectors
* !65538 23.0 zdc low and high gain data swap fix ~ForwardDetectors
* !65525 HI : Disable by default egamma Forward. A...This sweep contains the following MRs:
* !65534 ATLASRECTS-3481 : rm cout from ZdcCablingService ~ForwardDetectors
* !65538 23.0 zdc low and high gain data swap fix ~ForwardDetectors
* !65525 HI : Disable by default egamma Forward. As is now it does not work for subtracted clusters input ~Reconstruction
* !65522 test_mc18_heavy_ion_notrigger : also move to CA ~Reconstruction
* !65490 Plot RoI map for the first leg only in multi-leg triggers [ATR-26626] ~DQ, ~Trigger
* !65469 jFEX cleaning coded ~Trigger
* !65505 jFEX BS errors ATLASRECTS-7724 ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65505jFEX BS errors ATLASRECTS-77242023-09-04T15:26:39+02:00Sergi Rodriguez BoscajFEX BS errors ATLASRECTS-7724This is meant to update the jFEX BS decoders.
It now checks the ROD Trailers where there are some bits reserved for ROD error map.
For TOBs:
- If any of the error bits is set will return a ERROR and returning FAILURE. Event goes to debu...This is meant to update the jFEX BS decoders.
It now checks the ROD Trailers where there are some bits reserved for ROD error map.
For TOBs:
- If any of the error bits is set will return a ERROR and returning FAILURE. Event goes to debug stream
For jFEX Input data:
- If any error bit is set, prints a WARNING and do not decode the input. Data is corrupted, but does not stop the reconstruction.
Additionally
- I updates the Monitoring histogram accordingly, with location: `ROD Error` and title the bit set to 1: `Corrective Trailer`,`Payload CRC`,`Header CRC`,`Length mismatch`,`Header mismatch` or `Processor Timeout`
- Error/Warning message is more clear now.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65469jFEX cleaning coded2023-09-04T15:26:39+02:00Sergi Rodriguez BoscajFEX cleaning codedThis MR is meant to clean the jFEX code since some declarations were wrong, as well as some unclear gettersThis MR is meant to clean the jFEX code since some declarations were wrong, as well as some unclear gettershttps://gitlab.cern.ch/atlas/athena/-/merge_requests/654042023-08-29: merge of 23.0 into main2023-08-30T09:31:02+02:00Frank Winklmeier2023-08-29: merge of 23.0 into mainThis sweep contains the following MRs:
* !65370 Fix pt decoding below 1 GeV in mb chains applying cut on track pt (e.g. exclusive chains) ~Trigger, ~TriggerMenu, ~TriggerMinBias, ~changes-trigger-counts
* !65376 Demoting warning to deb...This sweep contains the following MRs:
* !65370 Fix pt decoding below 1 GeV in mb chains applying cut on track pt (e.g. exclusive chains) ~Trigger, ~TriggerMenu, ~TriggerMinBias, ~changes-trigger-counts
* !65376 Demoting warning to debug ~MuonSpectrometer
* !65366 DataQualityConfigurations: Update MinBias han configuration ~DQ, ~TriggerMinBias
* !65328 Fix HI hanconfig for the ID Trigger ~DQ
* !65192 L1Topo Updating gFEX XE Container reading ~Trigger
* !65355 Including chains in trig-eg HI monitoring ~DQ, ~Egamma, ~Trigger
* !65309 TrigMinBiasMonitoring: Add HLT_mb_sp_nototpix chains to DQ monitoring ~DQ, ~Trigger, ~TriggerMinBias
* !65353 ZdcLEDAnalysisTool - do not default to an unsupported config ~ForwardDetectors
* !65315 ZDC analysis: Improved defaults for 2023 reconstruction, change default ForceLowGain to false ~ForwardDetectors
* !65358 jFEX updating saturation flags and moniroting ~DQ, ~JetEtmiss, ~Trigger
* !63350 Tier-0 updates for Z counting ~DQ
* !65260 Update IDGlobal DQ heavy ion configs ~DQ
* !65312 Update special configuration for RHadron samples to be compatible with quasi-stable particle simulation (ATLASSIM-6687) ~Simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65358jFEX updating saturation flags and moniroting2023-08-29T14:06:50+02:00Sergi Rodriguez BoscajFEX updating saturation flags and monirotingThis MR is meant to update the saturation flags for jFEX simulation as well as add one more plot for its monitoring.
jFEX saturation Flags:
- jTau, jJ, jTE and jXE will have the bit saturated when at least one SCell in the TOB calculati...This MR is meant to update the saturation flags for jFEX simulation as well as add one more plot for its monitoring.
jFEX saturation Flags:
- jTau, jJ, jTE and jXE will have the bit saturated when at least one SCell in the TOB calculation has it set.
- Observed one discrepancy in the firmware for jXE - The sat bit is always 0 regardless if there is one SCell saturated.
- Solve one problem in the DataTower decoding algorithm. Saturation was incorrectly set due to the wrong saturation ordering.
jFEX monitoring:
- Added one 1D plot to show the LB in which a mismatch happenshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65338L1CaloFEXSim+TrigTauMonitoring+LArCalibDataQuality: Fix clang warnings.2023-08-26T06:06:47+02:00Scott SnyderL1CaloFEXSim+TrigTauMonitoring+LArCalibDataQuality: Fix clang warnings.Unused private data members.
Unused lambda capture.
Unused variable.Unused private data members.
Unused lambda capture.
Unused variable.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65330Daily merge of 23.0 into main2023-08-26T05:35:28+02:00Vakhtang TsulaiaDaily merge of 23.0 into mainConflict in `References.py` because we are sweeping FT0 violating changes into the ~main. Will need to update refs
his sweep contains the following MRs:
* !65283 fix conditional setting of flags.Reco.EnableZDC ~Reconstruction
* !65291...Conflict in `References.py` because we are sweeping FT0 violating changes into the ~main. Will need to update refs
his sweep contains the following MRs:
* !65283 fix conditional setting of flags.Reco.EnableZDC ~Reconstruction
* !65291 updating HImodes of reconstruction for RUN3 2023 ~Reconstruction
* !65205 Improvements of HI jet triggers (ATR-24706) ~JetEtmiss, ~Run3-DataReco-output-changed, ~Tools, ~Trigger, ~TriggerEDM, ~TriggerMenu, ~changes-trigger-counts, ~frozen-tier0-violating
* !65298 Update the heavyion HLTglobal han config [ATR-28130] ~DQ, ~Trigger
* !65121 ATR-27822 Reduce VBFDelayed stream overlap with Main ~Trigger, ~TriggerMenu
* !65286 Updates for the jFEX pileup subtraction algorithm ~Trigger