athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-01-09T03:02:36+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/39525Use RpcCablingCondData instead of service in RpcPadContainerCnv2021-01-09T03:02:36+01:00Nicolas KoehlerUse RpcCablingCondData instead of service in RpcPadContainerCnvHi,
this MR moves to using RpcCablingCondData instead of service in RpcPadContainerCnv.
Best, NicoHi,
this MR moves to using RpcCablingCondData instead of service in RpcPadContainerCnv.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39523MCTruthClassifier : Pass the EventContext down the call chain2021-01-08T03:03:51+01:00Christos Anastopouloschristos.anastopoulos@cern.chMCTruthClassifier : Pass the EventContext down the call chainMCTruthClassifier : Pass the EventContext down the call chainMCTruthClassifier : Pass the EventContext down the call chainhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39522Sweeping !39493 from master to 21.6.
Fix compiler warning from qualifier in s...2021-01-08T03:04:53+01:00Atlas NightlybuildSweeping !39493 from master to 21.6.
Fix compiler warning from qualifier in static_castFix compiler warning from qualifier in static_cast
See merge request atlas/athena!39493Fix compiler warning from qualifier in static_cast
See merge request atlas/athena!39493https://gitlab.cern.ch/atlas/athena/-/merge_requests/39520Documentation on HLT jet configuration python - v22021-01-08T03:02:34+01:00Teng Jian KhooDocumentation on HLT jet configuration python - v2README and markdown docs for high-level description of HLT jet configuration. No executable code.
@jbossios, @valentem
(Second version of this MR, as a failed rebase messed up the first one)README and markdown docs for high-level description of HLT jet configuration. No executable code.
@jbossios, @valentem
(Second version of this MR, as a failed rebase messed up the first one)https://gitlab.cern.ch/atlas/athena/-/merge_requests/39518Hepmc3 nightly fixes 06012021 part 12021-01-09T03:03:41+01:00Andrii VerbytskyiHepmc3 nightly fixes 06012021 part 1In this MR:
- Try to have const correctness for HepMC2 and HepMC3 in
InnerDetector/InDetValidation/InDetRecStatistics
- Fix some formating and removed some stray commentsIn this MR:
- Try to have const correctness for HepMC2 and HepMC3 in
InnerDetector/InDetValidation/InDetRecStatistics
- Fix some formating and removed some stray commentshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39516TrigInDetAnalysisUser: Fix clang warnings.2021-01-08T03:03:26+01:00Scott SnyderTrigInDetAnalysisUser: Fix clang warnings.Pass large objects by const reference, not by value.
Implicit declaration of assignment is deprecated if there's an explicit
copy ctor. Make the copy ctor default instead.Pass large objects by const reference, not by value.
Implicit declaration of assignment is deprecated if there's an explicit
copy ctor. Make the copy ctor default instead.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39515TrigHLTJetHypo, TrigT1MuctpiPhase1: Fix clang warnings.2021-01-08T03:04:16+01:00Scott SnyderTrigHLTJetHypo, TrigT1MuctpiPhase1: Fix clang warnings.Unused private data member.
Do not use std::move with a non-lvalue.
class/struct mismatch.Unused private data member.
Do not use std::move with a non-lvalue.
class/struct mismatch.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39514TrigConfIO, TrigCostAnalysis: Fix clang warnings.2021-01-08T03:02:42+01:00Scott SnyderTrigConfIO, TrigCostAnalysis: Fix clang warnings.Avoid spurious copies in range-for.Avoid spurious copies in range-for.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39512Fix 2D local to global methods for ITk Strips2021-01-08T19:53:36+01:00Nicholas StylesFix 2D local to global methods for ITk StripsWhen porting some code to ~master I noticed something strange when I was comparing back to ~"21.9" using ```ReadSiDetectorElements``` - some local-to-global tests were giving sensible results in ~master but in ~"21.9" they looked incorre...When porting some code to ~master I noticed something strange when I was comparing back to ~"21.9" using ```ReadSiDetectorElements``` - some local-to-global tests were giving sensible results in ~master but in ~"21.9" they looked incorrect, as was discussed in an meeting with @asalzbur @tadej @ncalace and @tstreble
I found why, and this is because in ~"21.9" some inline methods were using the ```origin``` instead of the ```centre``` for the reference point of the local coordinates. For pixel and strip-barrel modules (and all Run 2) these are the same, but for ITk strip endcaps they differ due to the annulus shape always having a frame with an origin on the beamline.
The results in ~"21.9" are definitively wrong as a result, but I don't know for sure if perhaps this was accounted for somehow "downstream" or we just never use these particular versions anywhere important. Since these are very generically named and also inlined, its tricky to tell where they could be being used (and also tricky to test the impact locally).
I think this is something to be fixed, and hopefully CI test (and worst case ART) will show if there are any unexpected effects because this was "fixed" downstream somewhere.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39511InDetTrigRecExample: enable flake82021-01-08T03:03:23+01:00Frank WinklmeierInDetTrigRecExample: enable flake8Enable flake8 and make code compliant. Most of this code is legacy and
where the fixes would have been too numerous/intrusive mark the entire
file with `noqa`. Also delete unused `EFIDUtils.py`.Enable flake8 and make code compliant. Most of this code is legacy and
where the fixes would have been too numerous/intrusive mark the entire
file with `noqa`. Also delete unused `EFIDUtils.py`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39510Jet Hypo Rename and clean-up of VBENF chains2021-01-11T20:51:16+01:00Peter SherwoodJet Hypo Rename and clean-up of VBENF chainsThe VBENF chains have been renamed to fbdjnoshared to match other chains names that are now possible.
Handling of the hypo parameters, which appear in the chain name, has been improved.
@jbossios @valentem @khoo @Peter
ATR-22572The VBENF chains have been renamed to fbdjnoshared to match other chains names that are now possible.
Handling of the hypo parameters, which appear in the chain name, has been improved.
@jbossios @valentem @khoo @Peter
ATR-22572Peter SherwoodPeter Sherwoodhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39508AthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attribu...2021-01-13T10:48:40+01:00Johannes ElmsheuserAthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attributes for the output file - cherry-pick from 21.0AthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attributes for the output file
See merge request atlas/athena!39254
(cherry picked from commit 11eb73dd2917531b6c69ea3c234905f9a11fec0b)
fa23b384 RootStorageSvc: Up...AthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attributes for the output file
See merge request atlas/athena!39254
(cherry picked from commit 11eb73dd2917531b6c69ea3c234905f9a11fec0b)
fa23b384 RootStorageSvc: Update the default split-level from 99 to 0 for RootDomain,...
4031f139 Revert "RootStorageSvc: Update the default split-level from 99 to 0 for...
dad763a0 AthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attributes
b16b7176 Delete debugging message
Tagging @amete and @emoysehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39507AthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attribu...2021-01-11T11:14:30+01:00Johannes ElmsheuserAthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attributes for the output file - cherry-pick from 21.0AthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attributes for the output file
See merge request atlas/athena!39254
(cherry picked from commit 11eb73dd2917531b6c69ea3c234905f9a11fec0b)
fa23b384 RootStorageSvc: Up...AthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attributes for the output file
See merge request atlas/athena!39254
(cherry picked from commit 11eb73dd2917531b6c69ea3c234905f9a11fec0b)
fa23b384 RootStorageSvc: Update the default split-level from 99 to 0 for RootDomain,...
4031f139 Revert "RootStorageSvc: Update the default split-level from 99 to 0 for...
dad763a0 AthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attributes
b16b7176 Delete debugging message
Tagging @amete and @emoysehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39506RegionSelectionTool for road definer2021-01-12T03:03:19+01:00Yohei YamaguchiRegionSelectionTool for road definerModify L2MuonSA package to fix WARNINGs reported in ATR-22477. RegionSelectionTool is passed in config files.
tagging @nakahama , @cdiez and @sshawModify L2MuonSA package to fix WARNINGs reported in ATR-22477. RegionSelectionTool is passed in config files.
tagging @nakahama , @cdiez and @sshawhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39505Update trigger newJO config to be able to run muon triggers standalone2021-01-08T03:04:17+01:00Savanna ShawUpdate trigger newJO config to be able to run muon triggers standaloneApplying some fixes to the trigger new JO config to be able to run muon triggers independently from the rest of the menu:
- Removing the configuration of region selector service from the general JO as this sets up the region selector for...Applying some fixes to the trigger new JO config to be able to run muon triggers independently from the rest of the menu:
- Removing the configuration of region selector service from the general JO as this sets up the region selector for all detectors (the service is only needed for the calo based triggers, and is already configured in the calo data access configuration, so isn't needed generally. All other detectors use the detector specific region selector tools)
- Adding the configuration of the LAr/Tile geometries to the muon trigger config (needed since we extrapolate muons through the calorimeter).
cc @tboldhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39504Migrate LArCalib_PedestalAutoCorr_jobOptions.py and...2021-01-08T03:02:36+01:00Walter LamplMigrate LArCalib_PedestalAutoCorr_jobOptions.py and...Few steps towards LAr Elec Calib processing in Rel 22:
- Migrate `LArCalib_PedestalAutoCorr_jobOptions.py` and `LArCalib_Delay_OFC_Cali_jobOptions.py` to `LArRawCalibDataReader`
- few more rel22 fixes to these files
- Incorporate code ...Few steps towards LAr Elec Calib processing in Rel 22:
- Migrate `LArCalib_PedestalAutoCorr_jobOptions.py` and `LArCalib_Delay_OFC_Cali_jobOptions.py` to `LArRawCalibDataReader`
- few more rel22 fixes to these files
- Incorporate code from `UseLArExendedSubDetGrouping` (in the LArCalib AFS area) to LArExtendedSubDetGrouping.pyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39503tauRecTools: cleanup leftover code2021-01-08T03:03:45+01:00Bertrand Martin Dit LatourtauRecTools: cleanup leftover codeHello,
This MR is dropping a few lines of code that should have been removed in !37952 when we dropped a tau eta correction.
It does not change the reconstruction output.
Cheers,
BertrandHello,
This MR is dropping a few lines of code that should have been removed in !37952 when we dropped a tau eta correction.
It does not change the reconstruction output.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39502Use MDT cabling conditions object instead of service in MdtCalibrationShiftMa...2021-01-08T03:02:54+01:00Nicolas KoehlerUse MDT cabling conditions object instead of service in MdtCalibrationShiftMapBaseHi,
in `MdtCalibrationShiftMapBase` and its derived classes, still the MDT cabling service was used. This MR moves to the conditions objects instead. However, this required changing the services to become tools.
Best, NicoHi,
in `MdtCalibrationShiftMapBase` and its derived classes, still the MDT cabling service was used. This MR moves to the conditions objects instead. However, this required changing the services to become tools.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39501Do not add MuGirl related tag_maps to MuonCreatorAlg_LRT if MuGirl off.2021-01-08T03:03:55+01:00Edward MoyseDo not add MuGirl related tag_maps to MuonCreatorAlg_LRT if MuGirl off.While trying to debug something else, I spotted the following error:
```
WARNING StoreGate/src/VarHandleBase.cxx:848 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key MuGirlMap_LRT
```
This should fi...While trying to debug something else, I spotted the following error:
```
WARNING StoreGate/src/VarHandleBase.cxx:848 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key MuGirlMap_LRT
```
This should fix it. Tagging @jojunggehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39499Coordinate fixes for ITk Strips2021-01-08T03:02:52+01:00Nicholas StylesCoordinate fixes for ITk StripsSeveral fixes to get the coordinate systems correct for ITk strips.
- update coordinate definitions for HITS in `InnerDetector/InDetG4/SCT_G4_SD/src/SctSensorGmxSD.cxx`
- Add dedicated stereo angle calculation for ITk Strip endcaps (bui...Several fixes to get the coordinate systems correct for ITk strips.
- update coordinate definitions for HITS in `InnerDetector/InDetG4/SCT_G4_SD/src/SctSensorGmxSD.cxx`
- Add dedicated stereo angle calculation for ITk Strip endcaps (built-in rotation needs different treatment) in `InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiDetectorElement.cxx`
- add radial shift to `getExtent` so that ITk Strip Endcaps are positioned correctly in `DetectorDescription/ReadoutGeometryBase/src/SolidStateDetectorElementBase.cxx` (required because Annuli have coordinate frame centred on beam line rather than sensor centre)
- fix some pre-calculations of sin(+/-stereoAngle) so that signs are correct (do cos at same time for consistency, although it doesn't affect results) in `InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/src/StripStereoAnnulusDesign.cxx`
- Updates to allow ITk strips to be validated properly in `InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx`