athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-01-08T15:56:19+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/67628Make Input.RunNumber, Input.LumiBlockNumber and Input.TimeStamp in plural as ...2024-01-08T15:56:19+01:00Tadej Novaktadej.novak@cern.chMake Input.RunNumber, Input.LumiBlockNumber and Input.TimeStamp in plural as they are used as listMake `Input.RunNumber`, `Input.LumiBlockNumber` and `Input.TimeStamp` in plural as they are used as list.
The validation of the type will be implemented in a separate MR.
This also fixes run number argument parsing in reco and MC chann...Make `Input.RunNumber`, `Input.LumiBlockNumber` and `Input.TimeStamp` in plural as they are used as list.
The validation of the type will be implemented in a separate MR.
This also fixes run number argument parsing in reco and MC channel number handling in some derivation code as it was used incorrectly.
/cc @jchapman @nstyles @jcatmore @fwinklhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68442Remove legacy sim config main2024-02-14T21:18:57+01:00John Derek ChapmanRemove legacy sim config mainWIP
Testing removal of legacy configuration for simulation, HITS merging and HITS filtering.
After the clean-up there are a number of package containing only unused code (no clients in CA-configuration):
- LArCalorimeter/LArG4/LArG4Fast...WIP
Testing removal of legacy configuration for simulation, HITS merging and HITS filtering.
After the clean-up there are a number of package containing only unused code (no clients in CA-configuration):
- LArCalorimeter/LArG4/LArG4FastSimSvc
- LArCalorimeter/LArGeoModel/LArGeoH62004Algs
- MuonSpectrometer/MuonG4/NSW_Sim
- Simulation/G4Extensions/G4HitFilter
- Simulation/G4Utilities/G4ProfilingTools
- Simulation/ISF/ISF_Geant4/ISF_Geant4CommonServices
- Simulation/ISF/ISF_Tracking/ISF_TrackingTools
- TileCalorimeter/TileG4/TileAncillary/DeadMaterial
- TileCalorimeter/TileG4/TileAncillary/CombinedScintillator
- TileCalorimeter/TileG4/TileAncillary/LarCrate
- TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter
These should be followed up separately to see if they still need to remain in the release.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65651CaloClusterCorrection: Fix CA issue.2023-10-06T16:31:33+02:00Scott SnyderCaloClusterCorrection: Fix CA issue.Remove code that was making tool names unique.
Don't think this is needed any more, and this was incompatible with CA
configuration, where we expect the same call to always produce the
same results.
See ATLASRECTS-7730.Remove code that was making tool names unique.
Don't think this is needed any more, and this was incompatible with CA
configuration, where we expect the same call to always produce the
same results.
See ATLASRECTS-7730.https://gitlab.cern.ch/atlas/athena/-/merge_requests/56242Clean up TrackingVolumes un-needlessy declared as const2022-08-29T14:37:46+02:00Christos Anastopouloschristos.anastopoulos@cern.chClean up TrackingVolumes un-needlessy declared as constClean up TrackingVolume un-needlessy declared as const
In various places we were declaring TrackingVolumes as const, and then we were manipulating them later on in the call chain.
We do no need to create new Tracking Volumes as const a...Clean up TrackingVolume un-needlessy declared as const
In various places we were declaring TrackingVolumes as const, and then we were manipulating them later on in the call chain.
We do no need to create new Tracking Volumes as const as a starting point.
Especially if the next step is manipulate/fill them by passing them to relevant tools ....
So the proper idea seems to be (done in other MT related migrations) :
- Let's create them as non-const
- manipulate/ add to them/ glue them together,
- when we are done access them later on ``as const`` via proper ``const correct`` interfaces.
This MR is step 0, the basic prequisite for cleaning up of all the helpers/processors etc etc.
It avoids a few ``const_cast`` and marks back some methods as ``THREAD_SAFE`` already.
But as this became large on its own the next steps will be separate MRs .
Some of them already open and pending on this one
[https://gitlab.cern.ch/atlas/athena/-/merge_requests/56293]
[https://gitlab.cern.ch/atlas/athena/-/merge_requests/56287]
[https://gitlab.cern.ch/atlas/athena/-/merge_requests/56306]Christos Anastopouloschristos.anastopoulos@cern.chChristos Anastopouloschristos.anastopoulos@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67026Removal of Obosolete ATLFASTII code2023-11-17T10:08:28+01:00John Derek ChapmanRemoval of Obosolete ATLFASTII codeThis MR attempts to remove code which was used by ATLFASTII (and in some cases ATLFAST), but is not used by ATLFAST3.
Will also address ATLASSIM-6133.
There may still be some dangling includes in legacy configuration, but these will be ...This MR attempts to remove code which was used by ATLFASTII (and in some cases ATLFAST), but is not used by ATLFAST3.
Will also address ATLASSIM-6133.
There may still be some dangling includes in legacy configuration, but these will be removed with the rest of the legacy configuration in the near future.https://gitlab.cern.ch/atlas/athena/-/merge_requests/659102023-09-19: merge of 23.0 into main2023-10-06T16:32:00+02:00Vakhtang Tsulaia2023-09-19: merge of 23.0 into mainConflicts:
1. `Calorimeter/CaloRec/python/CaloConfigFlags.py`. Caused by !65810 in ~main and !65694 in ~"23.0". Manually resolved the conflict by keeping additions from both branches. CC @stapiaar and @mhodgkin for info.
2. `ForwardDete...Conflicts:
1. `Calorimeter/CaloRec/python/CaloConfigFlags.py`. Caused by !65810 in ~main and !65694 in ~"23.0". Manually resolved the conflict by keeping additions from both branches. CC @stapiaar and @mhodgkin for info.
2. `ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcLEDAnalysisTool.cxx`. Same code, different formatting. Kept the ~main version.
3. `Generators/Hijing_i/src/Hijing.cxx`. Kept the ~main version with minor formatting changes. CC @ewelina for info
4. `Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py`. Manually resolved conflicts on the line which calls `flags.addFlag()` for `Trigger.Jet.LowPtFilter`. CC @khoo and @fwinkl for info
Excluded from the sweep:
* !65684 Merge branch '23.0-McEventCollection_p7-TP-Convertors' into '23.0' ~Generators (as discussed [here](https://gitlab.cern.ch/atlas/athena/-/merge_requests/65748#note_7120440))
This sweep contains the following MRs:
* !65864 Zdc led ntuple ~ForwardDetectors
* !65879 Bug fixed how to calculate SCT Coverage DQ histogram ~DQ, ~InnerDetector
* !65693 PFlow reconstruction in Heavy-Ions conditions ~JetEtmiss, ~Reconstruction
* !65876 CpmSimMonitorAlgorithm: Fix simulation errors in the CP system due to disabled hadronic inputs during heavy ion running ~DQ, ~Trigger
* !65863 Only run Pixel, SCT and TRT conversion to xAOD for TIDE preselected events. ~Derivation, ~InnerDetector
* !65829 Allow for lower MinFinalPtCut in combinatorial track finder if needed ~InnerDetector, ~Tracking
* !65858 egammaCheckEnergyDepositTool: create separate cfg and tune selection for UPC ~Egamma, ~Reconstruction, ~Tracking
* !65866 no tau/met monitoring for HI mode ~Reconstruction
* !65872 Fix unprotected division in RpdSubtractCentroidTool ~ForwardDetectors, ~frozen-tier0-violating
* !65832 Added config to run V0 secondary vertex finder in reco ~InnerDetector, ~Tracking
* !65768 ZDC: monitoring for LED events ~ForwardDetectors
* !65818 Switch off caching for RPC and TGC RDO To PRD decoding ~MuonSpectrometer, ~Trigger
* !65816 Update tracking CA configs extension for primary pass ~ITk, ~InnerDetector, ~Tracking
* !65815 MC reconstruction for HI: TruthJets ~JetEtmiss, ~Reconstruction
* !65811 Disable SCT/Pixel seeding for standalone Pixel/SCT pass ~InnerDetector, ~Tracking
* !65812 TileCal: minor fix in BadCellsFromCOOL.py ~Tile
* !65793 Rm seemingly un-needed HIP300 flag ~Tracking
* !65689 Preventing HIModulator to schedule "NULL" as eventshapekey ~JetEtmiss, ~Reconstruction, ~Trigger, ~TriggerMenu
* !65776 disable forward electron DQM if those are not reconstructed ~DQ, ~Egamma, ~Reconstruction
* !65745 ZDC: Enable "LHCf" functional form for 2023 analysis ~ForwardDetectors
* !65773 Ppr/PPM/CPMMonitoring: Fix wrong variable type for event numbers and bug related to mismatch-event-counter ~DQ, ~Trigger
* !65763 Introduce a HIP tracking mode ~Reconstruction, ~Tracking
* !65750 TrigMonTHistSvc: add extra lock in deReg method ~Trigger
* !65735 TrigOnlineMonitor: fix remaining ALFA LB histogram ~Trigger
* !65321 SCT heavyions webdisplay config cleanup ~DQ, ~InnerDetector
* !65710 ZdcAnalysis: Fix clang warnings. ~ForwardDetectors
* !65706 Trigger Menu updates for HI (ATR-28019) ~Trigger, ~TriggerMenu
* !65694 Tuning Heavy-Ion reconstruction and AOD output ~Calorimeter, ~JetEtmiss, ~Reconstruction
* !65705 Lower HLT jet clustering threshold by default for HI menu ~Trigger, ~changes-trigger-counts
* !65663 wrong word count in ZDC LUCROD decoding demoted to WARNING ~ForwardDetectors
* !65679 No CaloCalTopoClusters in HImode ~Calorimeter, ~Reconstruction
* !65697 Changes to ZdcLEDAnalysis ~ForwardDetectors
* !65677 Adding missing overlay chain in HI menu ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !65700 Added ZDC LED calibration triggers to the Cosmics menu ~Trigger, ~TriggerMenu
* !65674 Merge branch 'hijing-fix-rel23-ATLHI-483-v2' into 'main' ~Generators
* !65691 fix to LG,HG scales in ZdcAnalysisTool ~ForwardDetectors
* !65690 Modifications to ZdcNtuple to include RPD centroid information ~ForwardDetectors
* !65676 Merge branch 'hijing-fix-rel23-ATLHI-483/main' into 'main' ~Generators
* !65646 Tracking config updates for UPC pixel pass ~InnerDetector, ~Trackinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65679No CaloCalTopoClusters in HImode2023-09-19T21:55:33+02:00Petr BalekNo CaloCalTopoClusters in HImodeThis MR introduces a blacklist of `CaloTopoCluster` containers which won't be written in ESD and AOD. By default, this list is empty and the behaviour is thus unchanged.
In `HImode`, it will prevent writing `CaloCalTopoClusters` (or `C...This MR introduces a blacklist of `CaloTopoCluster` containers which won't be written in ESD and AOD. By default, this list is empty and the behaviour is thus unchanged.
In `HImode`, it will prevent writing `CaloCalTopoClusters` (or `CaloTopoClusters`) and only `SubtractedCaloCalTopoClusters` (or `SubtractedCaloTopoClusters`) will be written.
It also slightly modifies `HIRecConfig.py`, so all the flags in `HImode` are loaded.
Tagging @stapiaar, @mrybar 🎣https://gitlab.cern.ch/atlas/athena/-/merge_requests/65302delete old-style CaloRec_jobOptions2023-08-27T15:08:26+02:00Walter Lampldelete old-style CaloRec_jobOptionsThe old-style configuration of calorimeter reconstruction is now obsolete (after !65301). Even RecExCommon uses the CA-base config through the wrapping mechanism. There are more legacy files in the share directory of CaloRec but they ar...The old-style configuration of calorimeter reconstruction is now obsolete (after !65301). Even RecExCommon uses the CA-base config through the wrapping mechanism. There are more legacy files in the share directory of CaloRec but they are still used by other legacy-fragments in the repository.
Setting ~"full-integration-tests" and ~"full-unit-tests" in case I overlooked something.
cc @menke so he isn't caught by surprise ...https://gitlab.cern.ch/atlas/athena/-/merge_requests/64222Main calo rec topo cluster em2 xtalk fix2023-07-10T18:09:32+02:00Sven MenkeMain calo rec topo cluster em2 xtalk fixRecent Z to ee plots for Run3 showed a small deficit in energy since the switch to time discrimination in topo clustering.
The cause of this was identified as being inductive xtalk related in EM2 cells neighbouring in phi.
The propos...Recent Z to ee plots for Run3 showed a small deficit in energy since the switch to time discrimination in topo clustering.
The cause of this was identified as being inductive xtalk related in EM2 cells neighbouring in phi.
The proposed fix softens the upper time limit for those EM2 cells that are direct phi neighbours to same sampling cells with at least 4 times higher energy that are in time.https://gitlab.cern.ch/atlas/athena/-/merge_requests/63966CaloTopoSplitterHashCluster: replace new/delete with std::optional2023-06-29T17:13:11+02:00Walter LamplCaloTopoSplitterHashCluster: replace new/delete with std::optionalThe title says it all ....The title says it all ....https://gitlab.cern.ch/atlas/athena/-/merge_requests/62410Remove deprecated LLP1 config2023-04-18T19:19:21+02:00Jackson Carl BurzynskiRemove deprecated LLP1 configThe `LLP1.py` version in `share` is deprecated in favour of the CA config. This MR removes it.
cc @dguestThe `LLP1.py` version in `share` is deprecated in favour of the CA config. This MR removes it.
cc @dguesthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62390Remove find_package(Boost) from packages where boost is not used2023-04-19T19:25:19+02:00Andrii VerbytskyiRemove find_package(Boost) from packages where boost is not usedRemove find_package(Boost) from packages where boost is not used.Remove find_package(Boost) from packages where boost is not used.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61950CaloRec: Avoid using CompFactory with old style configurable sequences2023-03-29T20:32:31+02:00John Derek ChapmanCaloRec: Avoid using CompFactory with old style configurable sequencesFixing some inconsistencies in Overlay configuration flagged up in !61936.
Tagging @tadej and @tbold.Fixing some inconsistencies in Overlay configuration flagged up in !61936.
Tagging @tadej and @tbold.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61916Fix Taus using legacy flags2023-03-29T20:32:32+02:00Tadej Novaktadej.novak@cern.chFix Taus using legacy flagsFix Taus using legacy flags.
/cc @martindl @wlamplFix Taus using legacy flags.
/cc @martindl @wlamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61540CaloClusterConfig: Avoid empty aux-item in AOD item list2023-03-21T21:43:23+01:00Walter LamplCaloClusterConfig: Avoid empty aux-item in AOD item listCaloClusterConfig: re-arrange building the list of Aux-items for AOD-writing in order to fix ATLASRECTS-7547CaloClusterConfig: re-arrange building the list of Aux-items for AOD-writing in order to fix ATLASRECTS-7547https://gitlab.cern.ch/atlas/athena/-/merge_requests/61404TestDefaults: rename RAW test file to RAW_RUN22023-03-10T21:41:59+01:00Frank WinklmeierTestDefaults: rename RAW test file to RAW_RUN2Rename `defaultTestFiles.RAW` into `RAW_RUN2` to make it explicit that
this is a Run-2 file.Rename `defaultTestFiles.RAW` into `RAW_RUN2` to make it explicit that
this is a Run-2 file.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61035CaloSurfaceBuilder avoid un-needed allocation/ptr/new delete2023-02-27T09:42:47+01:00Christos Anastopouloschristos.anastopoulos@cern.chCaloSurfaceBuilder avoid un-needed allocation/ptr/new deleteCaloSurfaceBuilder avoid un-needed allocation/ptr/new deleteCaloSurfaceBuilder avoid un-needed allocation/ptr/new deletehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60785AthenaConfiguration: Avoid printing AlgSequence by default in CA-based jobs2023-02-20T21:43:58+01:00Alaettin Serhan MeteAthenaConfiguration: Avoid printing AlgSequence by default in CA-based jobsThis should save about 600-700 lines in the log files in a standard RAWtoALL job.This should save about 600-700 lines in the log files in a standard RAWtoALL job.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60367fix missing base-class initialization2023-02-06T21:43:02+01:00Walter Lamplfix missing base-class initializationFix a bug introduced by clang-tidy in !59688 (missing base-class initialization). cc @christosFix a bug introduced by clang-tidy in !59688 (missing base-class initialization). cc @christoshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59862Pass HepMC3::(Const)GenParticlePtr and HepMC3::(Const)GenVertexPtr by referen...2023-01-20T12:09:44+01:00John Derek ChapmanPass HepMC3::(Const)GenParticlePtr and HepMC3::(Const)GenVertexPtr by reference where possible`HepMC3::(Const)GenParticlePtr` and `HepMC3::(Const)GenVertexPtr` are implemented as `std::shared_ptr` so there is a cost associated with adding and removing entries from list of shared_ptrs "owning" and object.`HepMC3::(Const)GenParticlePtr` and `HepMC3::(Const)GenVertexPtr` are implemented as `std::shared_ptr` so there is a cost associated with adding and removing entries from list of shared_ptrs "owning" and object.