athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-09-08T17:57:39+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/46371Changes to reflect forthcoming updates to eFEX TOB and xTOB formats2021-09-08T17:57:39+02:00Alan WatsonChanges to reflect forthcoming updates to eFEX TOB and xTOB formatsThis request includes updates to the eFEX TOB/xTOB EDM classes to bring them up to date with planned xTOB format changes (addition of module and shelf number in the second word). This also reduces object size and storage requirements sin...This request includes updates to the eFEX TOB/xTOB EDM classes to bring them up to date with planned xTOB format changes (addition of module and shelf number in the second word). This also reduces object size and storage requirements since it removes the need to store these as separate data words. The idea is to include these changes before any large-scale MC production using this code starts in order to avoid the need for schema evolution in the near future.
It also includes an update to the eFEX TAU TOB/xTOB class to support the new "hadronic fraction" variable (added for LLP triggers), as well as a fix to update the TAU objects to use the final eFEX numbering scheme.
Finally it includes a change to the TOBword getters in the EM TOB, changing the names from capitalised to lower case. This is arguably cosmetic, but since the corresponding getters in the eTAU and in the jFEX and gFEX TOB classes are all lower-case it would be source of error and confusion for one object to be different. Since one of these getters is already used in the L1Topo simulation an update to that algorithm is included as well.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38492Draft: HepMC3 nightly fixes2021-08-02T19:35:33+02:00Andrii VerbytskyiDraft: HepMC3 nightly fixesFixes to the nightly builds with HepMC3Fixes to the nightly builds with HepMC3https://gitlab.cern.ch/atlas/athena/-/merge_requests/42529Draft: fastdigi and reco developments for HGTD2021-07-12T23:26:50+02:00Alexander LeopoldDraft: fastdigi and reco developments for HGTDApologies in advance to the reviewers, as this will be a bigger one (but in WIP mode still...)
To advance with the migration of the HGTD reco from 20.20 to 21.9 in parallel to the digi developments, @ncalace proposed implementing a simp...Apologies in advance to the reviewers, as this will be a bigger one (but in WIP mode still...)
To advance with the migration of the HGTD reco from 20.20 to 21.9 in parallel to the digi developments, @ncalace proposed implementing a simplified fast-digi. With this comes the need for a new structure to represent hits in HGTD, that has to inherit from `Trk::PrepRawData` similar to `PixelCluster`, `SCT_Cluster`, `MuonCluster`,... For this I have started to implement the `HGTD_Cluster` (and its persistification classes + the converters). A first version of the fast digi is available as well already, the reco migration will follow. This MR will be discussed in the Upgrade SW Integration meetings, and addresses the [JIRA](https://its.cern.ch/jira/browse/ATLSWUPGR-96) ticket.
Tagging: @cohm @dshope @tawang @tadej @nstyles @asalzbur @sch @wyswyshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/44970Updated InDetTrackHoleSearchTool for ITk [ATLIDTRKCP-343]2021-07-07T18:42:45+02:00Thomas StreblerUpdated InDetTrackHoleSearchTool for ITk [ATLIDTRKCP-343]This MR implements the porting of the ITk specific configuration of the InDetTrackHoleSearchTool from release 21.9. Run 3 reconstruction is unaffected. The track summaries are updated to add ITk-specific hit counters.
FYI @ncalace @nstylesThis MR implements the porting of the ITk specific configuration of the InDetTrackHoleSearchTool from release 21.9. Run 3 reconstruction is unaffected. The track summaries are updated to add ITk-specific hit counters.
FYI @ncalace @nstyleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39308Draft: Safer version of shallow copy2021-04-21T16:54:32+02:00Dan GuestDraft: Safer version of shallow copyThis is more a discussion piece than anything else: we could make it more exception safe etc if we want to go this way. @ssnyder is there any reason a function like this should not exist?This is more a discussion piece than anything else: we could make it more exception safe etc if we want to go this way. @ssnyder is there any reason a function like this should not exist?https://gitlab.cern.ch/atlas/athena/-/merge_requests/40990jFEXSmallRJet EDM for L1Calo Bitwise Offline Simulation2021-03-29T11:46:28+02:00Varsiha SothilingamjFEXSmallRJet EDM for L1Calo Bitwise Offline SimulationCompleted Small R Jet EDM for jFEX. Also implemented in main algorithm.
MR also contains some minor changes and tidying up in algorithm files.
@jkempsteCompleted Small R Jet EDM for jFEX. Also implemented in main algorithm.
MR also contains some minor changes and tidying up in algorithm files.
@jkempstehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42008Draft: A first try for adding an EventContext aware shallowCopy. The bit clun...2021-03-26T23:40:46+01:00Christos Anastopouloschristos.anastopoulos@cern.chDraft: A first try for adding an EventContext aware shallowCopy. The bit clunky part...A first try for adding an EventContext aware shallowCopy.
The bit clunky part is the AnalysisBase cases where we do not really have an ``EventContext``
that can be used.
We move the implementation in one common functions
Then we have...A first try for adding an EventContext aware shallowCopy.
The bit clunky part is the AnalysisBase cases where we do not really have an ``EventContext``
that can be used.
We move the implementation in one common functions
Then we have
- Function accepting cont and EventContext, this is available only for ``Athena``, returning smart ptr.
- Function accepting cont and ptr to EventContext, this is usable from AnalysisBase , although the ptr is ``nullptr`` there. Returns smart ptr.
- The existing function signature no smart ptr for now (Compatibility).
If at some stage we have a complete ``EventContext`` type and we can create one we can make the one with ref also dual-use.
Christoshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/26193WIP: updating the VP1Light Project to "master" on CC72021-03-22T18:45:16+01:00Riccardo Maria Bianchiriccardo.maria.bianchi@cern.chWIP: updating the VP1Light Project to "master" on CC7The VP1Light project has to compile on CC7, macOS, and Ubuntu.
This MR implements and tests the compilation of the VP1Light project on macOS 10.14.5, CC7, SLC6, and Ubuntu 18.0.4
Mostly VP1-related or minor changes here, apart from som...The VP1Light project has to compile on CC7, macOS, and Ubuntu.
This MR implements and tests the compilation of the VP1Light project on macOS 10.14.5, CC7, SLC6, and Ubuntu 18.0.4
Mostly VP1-related or minor changes here, apart from some explicitly linked library needed for macOS compilation and the `#ifndef XAOD_STANDALONE` guards to get `xAODTrigger/Root/TrigComposite_v1.cxx` compiled in standalone mode. For that, I would ping @akraszna, because the `AnalysisBase` release could be affected by the changes to the `xAODTrigger` package.
----
*NOTE*
This MR requires the new Externals packages GeoModelCore (https://gitlab.cern.ch/GeoModelDev/GeoModelCore) and GeoModelIO (https://gitlab.cern.ch/GeoModelDev/GeoModelIO) from the new standalone GeoModel.
Therefore, this MR will be a WIP until the new Externals MR containing the new packages will be merged: https://gitlab.cern.ch/atlas/atlasexternals/merge_requests/536https://gitlab.cern.ch/atlas/athena/-/merge_requests/20388Merge tag 21.0.91-21.0.92 into 21.92021-03-12T17:23:50+01:00John Derek ChapmanMerge tag 21.0.91-21.0.92 into 21.9This merge request merges the changes from the ~"21.0" branch between [release/21.0.90](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.90)
and [release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) into the ~"...This merge request merges the changes from the ~"21.0" branch between [release/21.0.90](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.90)
and [release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) into the ~"21.9" branch. This is done via a merge of
[release/21.3.9](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.9).
[release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) is a Tier0 release. It's FT0-violating. It includes the FT0V MRs:
athenaprivate1!16171, athenaprivate1!15893, athenaprivate1!15117, athenaprivate1!16009, athenaprivate1!16049
[release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) is a Tier0 release. It's FT0-violating. It includes the FT0V MRs:
athenaprivate1!15481, athenaprivate1!16537 The latter of which is the merge of ~"21.1" into ~"21.0"https://gitlab.cern.ch/atlas/athena/-/merge_requests/26395WIP:Add NCellPerLayer decorator to jets in AOD2021-02-22T21:16:02+01:00Jeff DandoyWIP:Add NCellPerLayer decorator to jets in AODFollowing Chris Young's studies on forward jet BCID dependence ([here](https://indico.cern.ch/event/824112/#3-emec-iw-jets)), we'd like to add the number of cells associated with a jet in each layer, to possibly allow for a bcid-dependen...Following Chris Young's studies on forward jet BCID dependence ([here](https://indico.cern.ch/event/824112/#3-emec-iw-jets)), we'd like to add the number of cells associated with a jet in each layer, to possibly allow for a bcid-dependent energy correction, dependent on the number of affected cells in a given calorimeter technology associated to a jet.
Changes are made following strategy of the EnergyPerSampling variable. Tested on 500 events from a recent SUSY signal sample (with diboson like final states), leading to a 0.5% size increase.
~~The only concern is that when adding the new jet moment in the [middle of JetAttributes.h](https://gitlab.cern.ch/jdandoy/athena/blob/JetNCellPerLayer/Event/xAOD/xAODJet/xAODJet/JetAttributes.h#L114), it leads to a crash in the RAWtoESD job for many HLT jets containers (xAOD::JetTrigAuxContainer_v2), which have an error like the following:~~
~~Fatal [RootTreeContainer] STL C++ Exception: SG::ExcAuxTypeMismatch: Type mismatch for aux variable `::ECPSFraction' (984); old type is float new type is int~~
~~ECPSFraction is a jet moment that comes a short distance later in the list. It seems something may depend on the ordering of these enums, but it's not clear to me where. For now the new jet moment is added at the bottom of the list, and the jobs run successfully. It would be nice to understand this issue and move the new enum to the appropriate place in the list, and to ensure there are no unintended consequences of the merge. Any advice from the experts would be appreciated.~~
Set back to WIP, to make sure the NCellsPerSampling is also saved in the CaloCalTopoClustersAux
Sincerely,
Jeff
Tagging @sschramm @cyoung @mhodgkin @khoo @loch @williams @wbalunas.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39761Draft: Sweeping !39731 from 21.0-mc16d to master.
Requesting queue with more ...2021-02-22T19:53:11+01:00Atlas NightlybuildDraft: Sweeping !39731 from 21.0-mc16d to master.
Requesting queue with more cores to avoid failure for test_reprocessing_with_derived_outputs.shRequesting queue with more cores to avoid failure for test_reprocessing_with_derived_outputs.sh
See merge request atlas/athena!39731Requesting queue with more cores to avoid failure for test_reprocessing_with_derived_outputs.sh
See merge request atlas/athena!39731https://gitlab.cern.ch/atlas/athena/-/merge_requests/37361WIP: Migrate a few clients from using the TrackingGeometrySvc to conditions data2021-01-28T14:19:10+01:00Goetz GayckenWIP: Migrate a few clients from using the TrackingGeometrySvc to conditions dataThis commit allows the GlobalChi2Fitter and the TrkMaterialProviderTool to optionally use the TrackingGeometry conditions data instead of the TrackingGeometrySvc. Moreover the ID configuration is prepared to switch between using the serv...This commit allows the GlobalChi2Fitter and the TrkMaterialProviderTool to optionally use the TrackingGeometry conditions data instead of the TrackingGeometrySvc. Moreover the ID configuration is prepared to switch between using the service and the conditions data.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39722WIP: [ATR-22325][ATR-22597] Remove trigger thinning for R2 data (not thread s...2021-01-26T19:14:20+01:00Tim MartinWIP: [ATR-22325][ATR-22597] Remove trigger thinning for R2 data (not thread safe)For reasons described more on [ATR-22325], R2 trigger navigation thinning is not thread safe. Nor is it trivial to make it thread safe.
As this format is soon to be deprecated in favour of R2->R3 format-shifted navigation, I instead her...For reasons described more on [ATR-22325], R2 trigger navigation thinning is not thread safe. Nor is it trivial to make it thread safe.
As this format is soon to be deprecated in favour of R2->R3 format-shifted navigation, I instead here just remove the unsafe calls.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39628Sweeping !39595 from 21.0-mc16d to master.
Cherry picking !27086 in 21.0 mc16...2021-01-12T16:03:06+01:00Atlas NightlybuildSweeping !39595 from 21.0-mc16d to master.
Cherry picking !27086 in 21.0 mc16d (ATLPHYSVAL-705)Cherry picking !27086 in 21.0 mc16d (ATLPHYSVAL-705)
See merge request atlas/athena!39595Cherry picking !27086 in 21.0 mc16d (ATLPHYSVAL-705)
See merge request atlas/athena!39595https://gitlab.cern.ch/atlas/athena/-/merge_requests/37206Fix some unit tests in 21.0-mc16d branch2021-01-06T15:49:14+01:00John Derek ChapmanFix some unit tests in 21.0-mc16d branchThis merge request backports a number of fixes for unit tests from ~"21.0" to ~"21.0-mc16d". Mostly just reference file updates, although some non-functional tests are disabled in addition.This merge request backports a number of fixes for unit tests from ~"21.0" to ~"21.0-mc16d". Mostly just reference file updates, although some non-functional tests are disabled in addition.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36214WIP: Migration of all codes to HepMC32020-11-23T12:50:34+01:00Andrii VerbytskyiWIP: Migration of all codes to HepMC3WIP: Migration of all codes to HepMC3WIP: Migration of all codes to HepMC3https://gitlab.cern.ch/atlas/athena/-/merge_requests/32152WIP: Migration of the AthSimulation project to HepMC3, part II2020-11-23T12:49:56+01:00Andrii VerbytskyiWIP: Migration of the AthSimulation project to HepMC3, part IIActual utilization of HepMC3.Actual utilization of HepMC3.https://gitlab.cern.ch/atlas/athena/-/merge_requests/31952WIP: Migration of the AthGeneration project to HepMC3, part II2020-11-23T12:49:33+01:00Andrii VerbytskyiWIP: Migration of the AthGeneration project to HepMC3, part IIActual usage of HepMC3Actual usage of HepMC3https://gitlab.cern.ch/atlas/athena/-/merge_requests/37964xAODEventFormatCnv: cmake fixes2020-11-10T20:49:52+01:00Scott SnyderxAODEventFormatCnv: cmake fixes- Missing find_package for ROOT.
- Extra selection argument.
- Put definition of _selectionAlg before its use.
- Don't build the same object into more than one library.
Cleanly separate the component from the public library
for ...- Missing find_package for ROOT.
- Extra selection argument.
- Put definition of _selectionAlg before its use.
- Don't build the same object into more than one library.
Cleanly separate the component from the public library
for the test code.https://gitlab.cern.ch/atlas/athena/-/merge_requests/37525xAODTau: add a lightweight EDM, TauCluster2020-11-05T10:48:43+01:00Xiaozhong HuangxAODTau: add a lightweight EDM, TauClusterAdd TauCluster, which contains the four momentum pointing at the tau
vertex, dR w.r.t the tau axix, and an ElementLink to the original
CaloCluster used in jet reconstrution. The original link to the CaloCluster
is removed since it is not...Add TauCluster, which contains the four momentum pointing at the tau
vertex, dR w.r.t the tau axix, and an ElementLink to the original
CaloCluster used in jet reconstrution. The original link to the CaloCluster
is removed since it is not used at all.
After this MR is merged, we could associate the TauCluster to the
tau candidate, so that we do not need to obtain the clusters from
scratch and perform the vertex correction every time !