athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-10-08T12:21:32+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/36736WIP: implementing etcut step for electron2020-10-08T12:21:32+02:00Debottam Bakshi GuptaWIP: implementing etcut step for electronAs mentioned in ATR-21211 we want to implement an additional step between precisionCalo and final precisionElectron step that is precisionTracking (which was previously combined with precisionElectron). This additional step has a menuseq...As mentioned in ATR-21211 we want to implement an additional step between precisionCalo and final precisionElectron step that is precisionTracking (which was previously combined with precisionElectron). This additional step has a menusequence which does precisionTracking of the events passing precisionCalo step and as menusequence requires a hypo it uses precisionCalo hypo to apply etcut on calclusters already passing precisionCalo step. The sequences look like (https://gitlab.cern.ch/dbakshig/athena/-/blob/ATR_21211_etCutChain/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py#L66)
```
'etcut' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionEtcut'],
'lhloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionEtcut', 'getPrecisionElectron'],
'lhvloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionEtcut', 'getPrecisionElectron'],
```
adding @fernando , @cjmeyer , @tamartinhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37093WIP: Seed maker ntuple writer2020-10-08T11:43:57+02:00Jay Ajitbhai Sandesarajay.ajitbhai.sandesara@cern.chWIP: Seed maker ntuple writerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36443WIP: Seed maker ntuple writer2020-10-08T09:13:58+02:00Jay Ajitbhai Sandesarajay.ajitbhai.sandesara@cern.chWIP: Seed maker ntuple writerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36997RungeKuttaUtils: mutl3x5Helper add a bit more comments2020-10-07T02:31:40+02:00Christos Anastopouloschristos.anastopoulos@cern.chRungeKuttaUtils: mutl3x5Helper add a bit more commentshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36437Enhance TDT feature retrieval by allowing regex matching2020-10-06T14:43:50+02:00Mark SuttonEnhance TDT feature retrieval by allowing regex matchingIn order to allow exact matching, replace the approximate, default and impossible to turn
off matching with more precise regex matching so that either exact, or approximate matches
me used as the developer wishesIn order to allow exact matching, replace the approximate, default and impossible to turn
off matching with more precise regex matching so that either exact, or approximate matches
me used as the developer wisheshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/34932Cosmic Muons monitoring algorithm2020-10-06T10:49:03+02:00Ivan Sayago GalvanCosmic Muons monitoring algorithmCosmic Muons monitoring algorithm migration to AthenaMTCosmic Muons monitoring algorithm migration to AthenaMThttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33609WIP Migrate-calotopotower2020-10-02T13:41:09+02:00Tasnuva ChowdhuryWIP Migrate-calotopotowerTasnuva ChowdhuryTasnuva Chowdhuryhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36893Fix size of RPC active region in BIS78 and strip material2020-10-01T15:02:47+02:00Matteo NegriniFix size of RPC active region in BIS78 and strip materialFix size of RPC active region in BIS78 and strip materialFix size of RPC active region in BIS78 and strip materialhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36255WIP: TauAnalysisTools from upstream/21.2 to upstream/master via pseudo-merge...2020-10-01T12:35:20+02:00Guillermo Nicolas HamityWIP: TauAnalysisTools from upstream/21.2 to upstream/master via pseudo-merge (ATLTAU-1726)Using git-pseudomerge to merge TauAnalysisTool R21.2->R22 (ATLTAU-1726)
Mostly taking R21.2 changes into R22. BuildTruthTaus moved to tauRecTools,
need tauRecTools migration to complete. Working on compilation.Using git-pseudomerge to merge TauAnalysisTool R21.2->R22 (ATLTAU-1726)
Mostly taking R21.2 changes into R22. BuildTruthTaus moved to tauRecTools,
need tauRecTools migration to complete. Working on compilation.Guillermo Nicolas HamityGuillermo Nicolas Hamityhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36868xAOD Dictionary Fixes (for running on the grid), 21.2 branch (2020.09.30.)2020-10-01T10:32:15+02:00Attila KrasznahorkayxAOD Dictionary Fixes (for running on the grid), 21.2 branch (2020.09.30.)Added calls to `xAOD::LoadDictionaries()` in places needed for running on the grid. Making sure that dictionary issues seen in ROOT 6.20/06 would not be showing up in those jobs.
This is based on a thread that showed up just today on `h...Added calls to `xAOD::LoadDictionaries()` in places needed for running on the grid. Making sure that dictionary issues seen in ROOT 6.20/06 would not be showing up in those jobs.
This is based on a thread that showed up just today on `hn-atlas-PATHelp`.
@krumnack, @gmarchio:
- I believe this will fix the issues seen on the grid;
- We should wait with 21.2.142 for this to conclude.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36634WIP: Replace use of old RegSelSvc by RegSelTools for the ID2020-10-01T00:40:45+02:00Mark SuttonWIP: Replace use of old RegSelSvc by RegSelTools for the IDThe single RegSelSvc is to be replaced by a separate RegSelTool for each subsystem.
This merge request is to implement that migration for the ID code.
NB: Currently this includes about 30 % of the c++ changes required, and only some of...The single RegSelSvc is to be replaced by a separate RegSelTool for each subsystem.
This merge request is to implement that migration for the ID code.
NB: Currently this includes about 30 % of the c++ changes required, and only some of changes to the configuration code to correctly set the RegSelTools on the client, so the code is not all expected to be able to run correctly.
For these changes to work, the python code which configures each of the tools by the
clients will also need to be updated, which will also happen here, but incrementally,
so this is a work in progress until the configuration changes have been applied also.
For information the packages needing changes are
```
InnerDetector/InDetDetDescr/SCT_Cabling *
Innerdetector/InDetEventCnv/PixelRawDataByteStreamCnv *
InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv *
InnerDetector/InDetExample/InDetRecExample *
InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation
InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool *
Reconstruction/TRT_Rec
Reconstruction/iPat/iPatRecExample
Innerdetector/InDetExample/InDetTrigRecExample *
InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat
InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider *
InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder *
InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation *
InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder
InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder
Trigger/TrigTools/TrigOnlineSpacePointTool
Trigger/TriggerCommon/TriggerJobOpts
Trigger/TrigAlgorithms/TrigGenericAlgs *
Trigger/TrigAlgorithms/TrigT2MinBias
Trigger/TrigHypothesis/TrigLongLivedParticlesHypo
```
plus the configuratin for every package that uses any of the above packages which will need to instantiate the RegSelTools for the tool and algorithms configurables.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36857WIP:TEST RUN3 new IBL charge calibration ATLASRECTS-51462020-09-30T11:08:56+02:00Soshi TsunoWIP:TEST RUN3 new IBL charge calibration ATLASRECTS-5146Test RUN3 new IBL charge calibrationTest RUN3 new IBL charge calibrationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36780Adding single-threshold small-R jet chains to LS2 menu, ATR-220962020-09-29T01:55:33+02:00Malik AlievAdding single-threshold small-R jet chains to LS2 menu, ATR-22096Adding single-threshold small-R jet chains j420, 3j200, 4j120, 5j70_0eta240, 5j85, 6j55_0eta240, 6j70, 7j45, 10j40 to the LS2 menu with calo, calo+track and PF options (JIRA: ATR-22096). The added chains are:
HLT_j420_subresjesgscIS_ftf...Adding single-threshold small-R jet chains j420, 3j200, 4j120, 5j70_0eta240, 5j85, 6j55_0eta240, 6j70, 7j45, 10j40 to the LS2 menu with calo, calo+track and PF options (JIRA: ATR-22096). The added chains are:
HLT_j420_subresjesgscIS_ftf_L1J100
HLT_j420_pf_subresjesgscIS_ftf_L1J100
HLT_3j200_subresjesgscIS_ftf_L1J100
HLT_3j200_pf_subresjesgscIS_ftf_L1J100
HLT_4j120_subjesIS_L13J50
HLT_4j120_subresjesgscIS_ftf_L13J50
HLT_4j120_pf_subresjesgscIS_ftf_L13J50
HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15
HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15
HLT_5j85_subjesIS_L14J15
HLT_5j85_subresjesgscIS_ftf_L14J15
HLT_5j85_pf_subresjesgscIS_ftf_L14J15
HLT_6j55_subjesIS_0eta240_L14J15
HLT_6j55_subresjesgscIS_ftf_0eta240_L14J15
HLT_6j55_pf_subresjesgscIS_ftf_0eta240_L14J15
HLT_6j70_subjesIS_L14J15
HLT_6j70_subresjesgscIS_ftf_L14J15
HLT_6j70_pf_subresjesgscIS_ftf_L14J15
HLT_7j45_subjesIS_L14J15
HLT_7j45_subresjesgscIS_ftf_L14J15
HLT_10j40_subjesIS_L14J15
HLT_10j40_subresjesgscIS_ftf_L14J15
HLT_10j40_pf_subresjesgscIS_ftf_L14J15
In addition, the chains j420_L1J20, 3j200_L1J20 and HLT_j420_subjesgscIS_ftf_L1J20 have been removed.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36173swap back and front module phi positions and version control2020-09-28T14:50:06+02:00Marianna Testaswap back and front module phi positions and version controlswap back and front module phi positions in the endcap half-rings.
Version control for this possibility and possibility of putting LH rings in front of RH rings.
Both these two possibilities are needed to match engineering designs.swap back and front module phi positions in the endcap half-rings.
Version control for this possibility and possibility of putting LH rings in front of RH rings.
Both these two possibilities are needed to match engineering designs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36766Truth class fallback max dr2020-09-28T14:15:45+02:00Matthew Henry KleinTruth class fallback max drAdded maximum dR for truth classifier fallback.Added maximum dR for truth classifier fallback.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36250WIP: Fix connection to sequence filter for multi-jet chains2020-09-25T15:51:39+02:00Mark Andrew OwenWIP: Fix connection to sequence filter for multi-jet chainsIn createDataFlow in HLTCFConfig, the chain leg names were being passed to the sequence filters. This doesn't work for multi-jet chains, where there is only one "leg" even in the case of multi-jet requirements. I worked round this by onl...In createDataFlow in HLTCFConfig, the chain leg names were being passed to the sequence filters. This doesn't work for multi-jet chains, where there is only one "leg" even in the case of multi-jet requirements. I worked round this by only splitting into the legs for the case of Combo chains (multi-jet chains are not combo because only a single hypo is needed).
Note, this might have to be revisited once we try to do jet + X (X=muon, electron etc) chains.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36330WIP:Adding e26_lhtight_e15_etcut in LS2_v12020-09-25T14:56:15+02:00Debottam Bakshi GuptaWIP:Adding e26_lhtight_e15_etcut in LS2_v1This MR adds e26_lhtight_e15_etcut in LS2_v1 (ATR-21211) along with some modification precisionElectronHypo, the log file can be found here `/afs/cern.ch/work/d/dbakshig/public/ATR_21211_etCut/e26e15.log`, also because of this MR the cu...This MR adds e26_lhtight_e15_etcut in LS2_v1 (ATR-21211) along with some modification precisionElectronHypo, the log file can be found here `/afs/cern.ch/work/d/dbakshig/public/ATR_21211_etCut/e26e15.log`, also because of this MR the current definition of `etcut` will be changed (https://gitlab.cern.ch/atlas/athena/-/blob/master/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py#L62), it will be
```
'etcut' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron']
```
some highlights from the log file
```
INFO HLT_e26_lhtight_e15_etcut_Zee_L12EM3 #1772990364
INFO -- #1772990364 Events 3 3 3 3 3 1 - -
INFO -- #1772990364 Features 7 36 9 2 -
```
and
```
DEBUG Looking for HLT_e26_lhtight_e15_etcut_Zee_L12EM3 ID#1772990364 in the map. Map contains 2 legs
DEBUG Getting 2 legs to combine, for ID: HLT_e26_lhtight_e15_etcut_Zee_L12EM3 ID#1772990364
DEBUG Leg --
DEBUG leg001_HLT_e26_lhtight_e15_etcut_Zee_L12EM3 ID#688507627 HLTNav_EgammaPrecisionElectronHypoMT , 0
DEBUG leg001_HLT_e26_lhtight_e15_etcut_Zee_L12EM3 ID#688507627 HLTNav_EgammaPrecisionElectronHypoMT , 1
DEBUG Leg --
DEBUG leg000_HLT_e26_lhtight_e15_etcut_Zee_L12EM3 ID#2760947942 HLTNav_EgammaPrecisionElectronHypoMT , 1
DEBUG Combination
DEBUG HLTNav_EgammaPrecisionElectronHypoMT , 0
DEBUG HLTNav_EgammaPrecisionElectronHypoMT , 1
DEBUG Combination
DEBUG HLTNav_EgammaPrecisionElectronHypoMT , 1
DEBUG HLTNav_EgammaPrecisionElectronHypoMT , 1
DEBUG Found two Electrons with mass 90713.5
DEBUG Invariant mass 90713.5 is within [ 'LowerMassElectronClusterCut':50000.0, 'UpperMassElectronClusterCut':130000.] This seleciton passed!
DEBUG Found two Electrons with mass 1.02199
DEBUG Combination failed mass cut: 1.02199 not in [ 'LowerMassElectronClusterCut':50000.0, 'UpperMassElectronClusterCut':130000.]
DEBUG Updat with this combinations passing:
DEBUG leg001_HLT_e26_lhtight_e15_etcut_Zee_L12EM3 ID#688507627 HLTNav_EgammaPrecisionElectronHypoMT , 0
DEBUG leg000_HLT_e26_lhtight_e15_etcut_Zee_L12EM3 ID#2760947942 HLTNav_EgammaPrecisionElectronHypoMT , 1
DEBUG End of Tool -----
DEBUG ComboHypoToolBase: Passing elements are:
DEBUG --- leg001_HLT_e26_lhtight_e15_etcut_Zee_L12EM3 ID#688507627 with 1 elements
DEBUG HLTNav_EgammaPrecisionElectronHypoMT , 0
DEBUG --- leg000_HLT_e26_lhtight_e15_etcut_Zee_L12EM3 ID#2760947942 with 1 elements
DEBUG HLTNav_EgammaPrecisionElectronHypoMT , 1
```
Addin @fernando , @cjmeyer , @tamartin , @fpastore would like to have their comments and then will remove the WIPhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/28218WIP: Add InDetRawDataContainer_p3 and TRT_LoLumRawDataContainerCnv_p32020-09-25T10:17:43+02:00John Derek ChapmanWIP: Add InDetRawDataContainer_p3 and TRT_LoLumRawDataContainerCnv_p3Adding new TP Converter classes initially a copy of `InDetRawDataContainer_p2`
and `TRT_LoLumRawDataContainerCnv_p2`, to allow TRT sub-system experts
to develop a new more compressed persistent format. Currently
these new classes are unu...Adding new TP Converter classes initially a copy of `InDetRawDataContainer_p2`
and `TRT_LoLumRawDataContainerCnv_p2`, to allow TRT sub-system experts
to develop a new more compressed persistent format. Currently
these new classes are unused by default.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36685Python3 fix in TriggerAlgorithmsTest_jobOptions.py2020-09-24T16:56:10+02:00Tim MartinPython3 fix in TriggerAlgorithmsTest_jobOptions.pySpotted in nightlies: http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/ci/CIWebArea/nicos_web_areaMRCIbuilds64BC7G8AnalysisBaseOpt/NICOS_TestLog_MR-36566-2020-09-24-07-43/ReleaseTests___unit-tests__unit-tests__m.htmlSpotted in nightlies: http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/ci/CIWebArea/nicos_web_areaMRCIbuilds64BC7G8AnalysisBaseOpt/NICOS_TestLog_MR-36566-2020-09-24-07-43/ReleaseTests___unit-tests__unit-tests__m.htmlhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36663PyJobTransforms: Fix for ATLINFR-3411 (manual cherry-pick from master)2020-09-23T21:14:39+02:00Alaettin Serhan MetePyJobTransforms: Fix for ATLINFR-3411 (manual cherry-pick from master)I need to backport this fix so that I can access `AMI` tag information (in 21.9 jobs) on the SPOT test machine, which doesn't have outside access.
See merge request atlas/athena!30782
cc: @nstyles @asalzburI need to backport this fix so that I can access `AMI` tag information (in 21.9 jobs) on the SPOT test machine, which doesn't have outside access.
See merge request atlas/athena!30782
cc: @nstyles @asalzbur