athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-08-25T20:40:06+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/65286Updates for the jFEX pileup subtraction algorithm2023-08-25T20:40:06+02:00Sergi Rodriguez BoscaUpdates for the jFEX pileup subtraction algorithmThis MR is meant to solve one problem with the PU algo in the FWD region where FCAL1 is EM and the rest of FCAL is HAD. Before it was considered in the same layer.This MR is meant to solve one problem with the PU algo in the FWD region where FCAL1 is EM and the rest of FCAL is HAD. Before it was considered in the same layer.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65261Daily merge of 23.0 into main2023-08-24T01:03:22+02:00Vakhtang TsulaiaDaily merge of 23.0 into mainNo conflicts
This sweep contains the following MRs:
* !65226 Adding chain count checking in HI MC trigger test, ATR-28118 ~Trigger, ~changes-trigger-counts
* !65231 TriggerJobOpts+TrigValidation: remove obsolete rewriteLVL1 modifier ~...No conflicts
This sweep contains the following MRs:
* !65226 Adding chain count checking in HI MC trigger test, ATR-28118 ~Trigger, ~changes-trigger-counts
* !65231 TriggerJobOpts+TrigValidation: remove obsolete rewriteLVL1 modifier ~Trigger
* !65232 TLA grid ART test fix ~Trigger
* !65218 Fixes to low mu pp menu (ATR-27744) ~Trigger, ~TriggerMenu
* !65214 TauTrig: update sinthetaTJVA variable in the monitoring ~DQ, ~Tau, ~Trigger
* !65163 L1CaloFEXSim gFEX: pass by reference ~Trigger
* !65244 [TriggerMenu] Added MinimumBias ALFA perf chains to PhysicsP1 HI Menu ~Trigger, ~TriggerMenu
* !65215 AthenaMonitoring: don't recompute MET when running over Heavy Ion AOD ~Core, ~DQ
* !65238 add DRAW_TAULH output to Run 3 data TCT tests ~Tools
* !65194 added global ZdcSum for hosting event-level quantities, e.g. per-LUCROD BCID ~ForwardDetectors
* !65230 SimulationJobOptions: put location of param_card.dat on the DATAPATH, so that the file is found by get_files for RHadrons production ~Generators, ~Simulation
* !65235 fix HIRecConfig ~Reconstruction
* !65234 Fixing LArLATOMEDecoder ~LAr
* !65155 Merge request for ZDC monitoring ~ForwardDetectorshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65216Daily merge of 23.0 into main2023-08-23T07:10:45+02:00Vakhtang TsulaiaDaily merge of 23.0 into mainConflict in `References.py`
This sweep contains the following MRs:
* !65107 migration of TrigValidTool and reducing some log output ~Build, ~ForwardDetectors, ~Trigger
* !65193 Include mongroups mechanism in the TrigEgammaMonitoring ~...Conflict in `References.py`
This sweep contains the following MRs:
* !65107 migration of TrigValidTool and reducing some log output ~Build, ~ForwardDetectors, ~Trigger
* !65193 Include mongroups mechanism in the TrigEgammaMonitoring ~DQ, ~Egamma, ~Trigger
* !65189 Fix issue with condition on DataType for container name setting ~DQ, ~MuonSpectrometer
* !65197 athena: fix handling of command line arguments with spaces in CA mode ~Core
* !65199 add DRAW-processing Tier0ChainTest ~Tools
* !65167 simplify viewdataVerifier dependencies and remove duplicates ~Trigger, ~TriggerID
* !65198 TriggerJobOpts.runHLT: add support for postExecs ~Trigger
* !65200 Move UTT tests to SlepSlep sample ~Trigger
* !65204 TrigAnalysisTest: increase test timeout ~Trigger
* !65180 Add some UTT chains to the Tier0 ID Trigger tests ~DQ, ~Trigger
* !64920 Updating jFEX simulation to use CondAlgo and CondData - Not active yet ~EDM, ~JetEtmiss, ~Trigger
* !65181 Move TLA test to grid and physics_Main inputs ~Trigger
* !65172 Fix dE/dx track and hit-based displaced vertex trigger: ATR-28087 ~Trigger, ~TriggerID
* !65084 Add hypo for time-significance based selection of HLT jets ~Build, ~DQ, ~Egamma, ~ForwardDetectors, ~JetEtmiss, ~Tau, ~Trigger, ~TriggerID, ~TriggerJet, ~TriggerMenu, ~TriggerMinBias, ~changes-trigger-counts
* !65169 TriggerJobOpts: delete unused Modifiers ~Trigger
* !65175 TrigP1Test: add athenaHLT newJO runHLT test ~Trigger
* !65190 sTGCRawDataMonAlg: fix output names in pad trigger plots (removal of blank spaces) ~DQ, ~MuonSpectrometer
* !65160 New Tool to Analyze ZDC LED Calibration Data ~ForwardDetectors
* !64779 Changes for LAr calibration processing ~LAr, ~Run3-MCOverlay-output-changed, ~Run3-MCReco-output-changed, ~Tools, ~frozen-tier0-violating
* !65158 Fix LAr CAF processing ~LArhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65163L1CaloFEXSim gFEX: pass by reference2023-08-23T20:48:51+02:00Bertrand Martin Dit LatourL1CaloFEXSim gFEX: pass by referenceHello,
This MR is passing arrays by ref instead of value.
I also noticed that a block of code seems unused (calls to `blkOutAB`), and where I suspect the arrays should be passed by reference not by value (else it seems to me `blkOutAB` ...Hello,
This MR is passing arrays by ref instead of value.
I also noticed that a block of code seems unused (calls to `blkOutAB`), and where I suspect the arrays should be passed by reference not by value (else it seems to me `blkOutAB` is doing nothing).
Tagging @ctosciri and @serodrig to clarify the intended behaviour.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/651512023-08-19: Daily sweep of 23.0 into main2023-08-19T14:34:42+02:00Tadej Novaktadej.novak@cern.ch2023-08-19: Daily sweep of 23.0 into mainThis sweep contains the following MRs:
* !64893 Inital move of findHitDV to TrigHitDVHypoAlg ~Trigger, ~TriggerID
* !65083 TrigT1TGC - Clean up unused enumeration and classes and fix the wrong number of enum members (for ATR-28056) ~Eg...This sweep contains the following MRs:
* !64893 Inital move of findHitDV to TrigHitDVHypoAlg ~Trigger, ~TriggerID
* !65083 TrigT1TGC - Clean up unused enumeration and classes and fix the wrong number of enum members (for ATR-28056) ~Egamma, ~Trigger
* !65131 TrigAnalysisTest: rename ART test used to monitor EDM ~Trigger
* !65124 add an option to switch off the retrieval of MBTS cell details ~Calorimeter, ~DQ, ~EventDisplay, ~Tile
* !65117 Optionally decorate tau TOBs with supercell information ~Trigger
* !65119 Fix min energy threshold for BDT ~Trigger
* !65092 Manual cherry-pick: implement rewriteLVL1 feature in CA ~Trigger
* !65093 TriggerJobOpts: delete runHLT_standalone_newJO.py ~Trigger
* !65085 Add remaining jet triggers to low mu menu, ATR-27744 ~Trigger, ~TriggerMenu
* !65056 remove internal tracking objects from the menu ~Egamma, ~Tau, ~Trigger, ~TriggerID, ~TriggerMenu, ~TriggerMinBias
* !65066 TriggerJobOpts+TriggerTest: move flag defaults into ART tests ~Trigger
* !65076 Split decoding and processing in Run 2 and Run 3 ZDC reconstruction algorithms (& several fixes) ~ForwardDetectors
* !65059 Provide interface to prevent merging of some histograms; use std::regex ~DQhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65119Fix min energy threshold for BDT2023-08-19T11:16:21+02:00David ReikherFix min energy threshold for BDTThis is a cosmetic fix, the minimum energy for the BDT TOBs is checked elsewhere.This is a cosmetic fix, the minimum energy for the BDT TOBs is checked elsewhere.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65117Optionally decorate tau TOBs with supercell information2023-08-19T11:16:21+02:00David ReikherOptionally decorate tau TOBs with supercell informationOptionally dump supercell information as `eFexTauRoI` decorators called `SuperCell` if a boolean is set in the configuration for either of the tau algorithms.
This is required for tau BDT algorithm re-training.
Some cosmetic changes due...Optionally dump supercell information as `eFexTauRoI` decorators called `SuperCell` if a boolean is set in the configuration for either of the tau algorithms.
This is required for tau BDT algorithm re-training.
Some cosmetic changes due to applying clang formatting.https://gitlab.cern.ch/atlas/athena/-/merge_requests/650902023-08-17: Daily sweep of 23.0 into main2023-09-04T14:08:18+02:00Tadej Novaktadej.novak@cern.ch2023-08-17: Daily sweep of 23.0 into mainThis sweep contains the following MRs:
* !64630 TrigValTools and TrigInDetValidation: update ART test RDOs to MC23c ~Trigger, ~changes-trigger-counts
* !65041 TrigCost: Add cost monitored duration to the data description ~Trigger
* !6...This sweep contains the following MRs:
* !64630 TrigValTools and TrigInDetValidation: update ART test RDOs to MC23c ~Trigger, ~changes-trigger-counts
* !65041 TrigCost: Add cost monitored duration to the data description ~Trigger
* !65057 TrigValSteering: add support for CA jobs and flags ~Trigger
* !65061 Revert: athenaHLT: change default HLT result size limit to 32 MB ~Trigger
* !65078 athena: fix skipEvents command line option ~Core
* !65047 L1CaloFEXSim: make gFEX methods const ~Trigger
* !64984 Enable dumping of detailed seed/track-candidate/measurement information for all tracking passes ~InnerDetector
* !65070 TrigValidation: fix broken ART tests ~Trigger
* !64783 Initial changes to get RHadron simulation working in MC23 ~Core, ~Simulation
* !65045 CITest: add MC trigger test with HI menu ~Test, ~Trigger
* !65010 Flag to run precision tracking in jet super-ROI ~JetEtmiss, ~Trigger, ~TriggerEDM, ~TriggerID, ~TriggerJet, ~TriggerMenu
* !65050 TrigValTools: add summary option to runTrigART.py ~Trigger
* !65037 remove InDetTrigRecExample package ~Egamma, ~InnerDetector, ~Reconstruction, ~Tau, ~Tracking, ~Trigger, ~TriggerID, ~TriggerMenu
* !64939 Handle out-of-time pileup and introduce calibration factors into RPD analysis ~ForwardDetectors
* !64147 ALFARobMonitor multi-LB hist publish by default ~Trigger, ~TriggerMenu
* !64996 InDetTrigRecExample cleanup ~Egamma, ~InnerDetector, ~Reconstruction, ~Tau, ~Trigger, ~TriggerID, ~TriggerMenu
* !65013 Updated Menu for alfa ~Trigger, ~TriggerMenu
* !65021 TrigGepPerf : cppcheck and clang fixes ~JetEtmiss, ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65084Add hypo for time-significance based selection of HLT jets2023-08-22T21:20:04+02:00Christian OhmAdd hypo for time-significance based selection of HLT jets(Replacement for https://gitlab.cern.ch/atlas/athena/-/merge_requests/64732, since the fork that was based on does not have the right visibility settings. The starting point here already implements changes from comments by @lidiaz and @m...(Replacement for https://gitlab.cern.ch/atlas/athena/-/merge_requests/64732, since the fork that was based on does not have the right visibility settings. The starting point here already implements changes from comments by @lidiaz and @martindl in that MR)
This MR adds the `TimeSignificanceCondition` class to select delayed jets from decays of long-lived particles at the HLT based on the significance of their delay, as discussed in ATR-28103. To be developed further before being put into production, but once marked ready the additions in this should be possible to merge in without causing any problems.
Longer-term improvements most importantly would include picking parameters for pT-dependent time resolution from a db or similar (instead of hardcoded). Tagging @mapatzwa who did the implementation for [his MSc thesis](http://cds.cern.ch/record/2865684), and @xingguo and @miochoa as jet trigger signature coordinators (and @cantel who previously held this role).
Also tagging @sfyrla and @jmontejo for info, as they've done work on similar things recently.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65047L1CaloFEXSim: make gFEX methods const2023-08-17T17:47:37+02:00Bertrand Martin Dit LatourL1CaloFEXSim: make gFEX methods constHello,
This MR is preparing for the migration to reentrant algorithms for gFEX. Methods are made const (the easy ones). More work will be needed.
Also, some variables are now passed by const ref instead of by value.
Tagging @serodrig a...Hello,
This MR is preparing for the migration to reentrant algorithms for gFEX. Methods are made const (the easy ones). More work will be needed.
Also, some variables are now passed by const ref instead of by value.
Tagging @serodrig and @ctosciri .
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64959L1CaloFEXSim: make remaining eFEX algorithms reentrant2023-08-15T10:13:08+02:00Bertrand Martin Dit LatourL1CaloFEXSim: make remaining eFEX algorithms reentrantHello,
This MR is making the last eFEX algorithms reentrant. Besides, a few methods were passing variables by reference instead of const ref/value, which is now fixed.
Cheers,
BertrandHello,
This MR is making the last eFEX algorithms reentrant. Besides, a few methods were passing variables by reference instead of const ref/value, which is now fixed.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64958gFexDriver Clean Up2023-08-11T19:39:26+02:00Cecilia ToscirigFexDriver Clean UpThis MR is meant to clean up the `gFexDriver` algorithm, and solve the error reported in ATR-28066, also discussed in https://gitlab.cern.ch/atlas/athena/-/merge_requests/64533#note_7007367.
The `m_gSuperCellTowerMapperTool` that was wr...This MR is meant to clean up the `gFexDriver` algorithm, and solve the error reported in ATR-28066, also discussed in https://gitlab.cern.ch/atlas/athena/-/merge_requests/64533#note_7007367.
The `m_gSuperCellTowerMapperTool` that was wrongly called in the `gFexDriver` has now been removed, and there is no need to configure it in the `L1CaloFEXSimCfg.py`, anymore (removing Sergi's fix in !64938).
Also, the `gTowerContainer` was wrongly saved to SG in both the `gFEXDriver` and the `gTowerMakerFromGfexTowers`. Now the container is only saved in `gTowerMakerFromGfexTowers`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64920Updating jFEX simulation to use CondAlgo and CondData - Not active yet2023-08-22T21:20:04+02:00Sergi Rodriguez BoscaUpdating jFEX simulation to use CondAlgo and CondData - Not active yetThis MR is meant to update the jFEX simulation to use the appropriate CondAlgo, to read the COOL DataBase, and CondData, to read it in the simulation.
Although all the classes and herders are placed **they are storing for now the defau...This MR is meant to update the jFEX simulation to use the appropriate CondAlgo, to read the COOL DataBase, and CondData, to read it in the simulation.
Although all the classes and herders are placed **they are storing for now the default ("old") values** (no trigger count changes expected!), as you can see [here](https://gitlab.cern.ch/serodrig/athena/-/blob/b2d056047ae313273c6df34c81e2032ae412b053/Trigger/TrigT1/L1CaloFEX/L1CaloFEXCond/python/L1CaloFEXCondConfig.py#L22) int the `L1CaloFEXCondConfig.py`.
Once we are ready to uncomment the line mention above, due to some DB loading parameters mistakes we should expect counts changes only **in data**. Additionally, if tower is not found in DB reading mode, it will send 0s for all parameters as pre-defined in the corresponding header.
Old data needs to be discussed and sorted correspondingly (DB was not existing or wrong parameters were set - pinging @tamartin @sshaw
@thompson @mwessels for this)
**For MC**, the CondData will return the default values _always_- Tested by myself
Pinging also @martindl (since he was doing some migration to re-entrantalgos) and @fwinkl and also @markhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64884L1CaloFEXSim: cleanup unused headers2023-08-11T09:42:14+02:00Bertrand Martin Dit LatourL1CaloFEXSim: cleanup unused headersHello,
This MR is mostly dropping headers that are not used, in the eFEX domain. Some side changes are made to prepare for algorithm re-entrancy (e.g. turn methods to const).
More to come, I submit this batch not to make the MR too big....Hello,
This MR is mostly dropping headers that are not used, in the eFEX domain. Some side changes are made to prepare for algorithm re-entrancy (e.g. turn methods to const).
More to come, I submit this batch not to make the MR too big.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64851L1CaloFEXSim: make method const2023-08-11T09:42:21+02:00Bertrand Martin Dit LatourL1CaloFEXSim: make method constHello,
This MR is making a few methods const. That will help migrate some algorithms to re-entrant, hopefully. There is more to come, but I submit a first batch not to make the MR too big.
Cheers,
BertrandHello,
This MR is making a few methods const. That will help migrate some algorithms to re-entrant, hopefully. There is more to come, but I submit a first batch not to make the MR too big.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64842Solve a problem with fwd seeding in jJ2023-08-10T18:04:46+02:00Sergi Rodriguez BoscaSolve a problem with fwd seeding in jJThis MR was to changed the jJ seeding for the FWD algorithm, the condition to correct the jet with the upper-left tower was wrongly written, instead of an OR logic gate must be AND logic gateThis MR was to changed the jJ seeding for the FWD algorithm, the condition to correct the jet with the upper-left tower was wrongly written, instead of an OR logic gate must be AND logic gatehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64836L1CaloFEXSim: make jTowerMakerFromJfexTowers algorithm reentrant2023-08-11T09:42:28+02:00Bertrand Martin Dit LatourL1CaloFEXSim: make jTowerMakerFromJfexTowers algorithm reentrantHello,
This MR is making the jTowerMakerFromJfexTowers algorithm reentrant.
Cheers,
BertrandHello,
This MR is making the jTowerMakerFromJfexTowers algorithm reentrant.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64640Updating L1Calo DQ web display for cosmics and HI: eFEX, jFEX and gFEX2023-08-15T11:39:39+02:00Sergi Rodriguez BoscaUpdating L1Calo DQ web display for cosmics and HI: eFEX, jFEX and gFEXThis MR is meant to add all the plots to the T0Hist web display and express_express when it is run at P1.
It was implemented for collisions, but not for comics or HI.
Tagging @thompson, @jmaurerThis MR is meant to add all the plots to the T0Hist web display and express_express when it is run at P1.
It was implemented for collisions, but not for comics or HI.
Tagging @thompson, @jmaurerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64535Updating L1Calo DQ web display2023-07-25T08:52:31+02:00Sergi Rodriguez BoscaUpdating L1Calo DQ web displayThis MR is meant to update the L1Calo DQ web display with jFEX plots as well as eFEX DataVsSim plots.This MR is meant to update the L1Calo DQ web display with jFEX plots as well as eFEX DataVsSim plots.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64519Updating eFex histo names2023-07-23T08:59:29+02:00Sergi Rodriguez BoscaUpdating eFex histo namesThis MR is meant to change the names of some eFEX histograms to add h_ into the front, following ATLAS style.
This MR is a prior to the T0Hist han config updates in order to be able to not mess up the DQ web display.
tagging @will @thom...This MR is meant to change the names of some eFEX histograms to add h_ into the front, following ATLAS style.
This MR is a prior to the T0Hist han config updates in order to be able to not mess up the DQ web display.
tagging @will @thompson