athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-03-06T16:31:51+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20378Ringer AthenaMT migration (FEX and HYPO)2019-03-06T16:31:51+01:00Joao Victor Da Fonseca PintoRinger AthenaMT migration (FEX and HYPO)The Athena MT ringer migration will affect:
TrigT2CaloCommon: Include doRinger flag in python configuration;
TrigT2CaloEgamma: Code harmonization, new Athena monitoring, New Ringer Fex follows the recomendation from AthenaMT note (co...The Athena MT ringer migration will affect:
TrigT2CaloCommon: Include doRinger flag in python configuration;
TrigT2CaloEgamma: Code harmonization, new Athena monitoring, New Ringer Fex follows the recomendation from AthenaMT note (const methods), support to bphysics chains for no hadronic chains (nohad) for future developments;
TrigMultiVarHypo: Code update, harmonization and migration to Athena MT follow the recommendations from AthenaMT note; (solver the issue in ATR-19281);
TrigUpgradeTest: Add ringer chain test (fex+hypo);
Tested using: Asetup master,r4,setup,here And Source test_ringer_chain.sh (see test file in TrigUpgradeTest)
Tagging: @fernando and @thrynova (ringer MT task) and @wsfreundJoao Victor Da Fonseca PintoJoao Victor Da Fonseca Pintohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21683Optimization of CPU time of FastCaloSimV2 (ATLASSIM-3980)2019-03-07T10:54:26+01:00Xiaozhong HuangOptimization of CPU time of FastCaloSimV2 (ATLASSIM-3980)Cherry pick to masterCherry pick to masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21724Test egamma201903062019-03-07T15:48:23+01:00Denis Oliveira DamazioTest egamma20190306New merge request to improve RoI part of the HLTCaloCellMaker algorithm, which was only dealing with one layer (was actually in a prototype mode). Also, when checking regions not supposed to be covered by a particular layer, the data pre...New merge request to improve RoI part of the HLTCaloCellMaker algorithm, which was only dealing with one layer (was actually in a prototype mode). Also, when checking regions not supposed to be covered by a particular layer, the data preparation service (TrigCaloDataAccessSvc) needed a fix to handle such cases.
Should be a simple change, but certainly should give difference in tests.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21667MET from clusters algorithm MT migration2019-03-07T16:22:24+01:00Kenji HamanoMET from clusters algorithm MT migrationMET from cluster algorithm MT migration. Details are in ATR-19491.MET from cluster algorithm MT migration. Details are in ATR-19491.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20468Update packages:TrigTauRec from upstream/21.0-TrigMC to upstream/master via p...2019-03-08T20:04:59+01:00Bertrand Martin Dit LatourUpdate packages:TrigTauRec from upstream/21.0-TrigMC to upstream/master via pseudo-mergeHello,
With this MR, we migrate developments that were made in TrigTauRec 21.1 but were never ported to master.
Other packages listed in ATR-19015 will follow.
For `TrigTauRecMerged.h` and `TrigTauRecMerged.cxx`, we were missing:
* th...Hello,
With this MR, we migrate developments that were made in TrigTauRec 21.1 but were never ported to master.
Other packages listed in ATR-19015 will follow.
For `TrigTauRecMerged.h` and `TrigTauRecMerged.cxx`, we were missing:
* the monitoring of RNN ID input variables (which is now commented out in master, because the tauRecTools RNN tools have not been migrated to master yet, they will be shortly)
* the fix to element links (relevant for data)
For `TrigTauRecMergedMT.cxx`, I only fixed the indentation, and made no other change.
Importing the RNN monitoring functionality will be done later (unless this is migrated to tauRecTools somehow?).
For `TrigTauAlgorithmsHolder.py` and `TrigTauRecConfig.py`, we were missing all 2018 developments (mediumRNN_tracktwoMVA triggers).
For `TrigTauRecMonitoring.py`, these are trivial changes.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20578WIP: Rename SiPropertiesSvc package to SiPropertiesTool package (ATLASRECTS-4...2019-03-10T14:48:39+01:00Susumu OdaWIP: Rename SiPropertiesSvc package to SiPropertiesTool package (ATLASRECTS-4048)Rename SiPropertiesSvc package to SiPropertiesTool package because SiPropertiesSvc was converted to SiPropertiesTool.
https://its.cern.ch/jira/browse/ATLASRECTS-4048
RunTier0Tests.py was fine. [RunTier0Tests.log](/uploads/3598591b5...Rename SiPropertiesSvc package to SiPropertiesTool package because SiPropertiesSvc was converted to SiPropertiesTool.
https://its.cern.ch/jira/browse/ATLASRECTS-4048
RunTier0Tests.py was fine. [RunTier0Tests.log](/uploads/3598591b5227d560ddda6313dbcd0ac9/RunTier0Tests.log)
This will conflict with
https://gitlab.cern.ch/atlas/athena/merge_requests/20394
and
https://gitlab.cern.ch/atlas/athena/merge_requests/21026
I will put WIP until the MR is merged. Move the SiProtiesTool directories back, merge upstream/master, and move the directories again. https://gitlab.cern.ch/atlas/athena/-/merge_requests/21779Remove unnecessary dependence on SCT_ConditionsData of InDetPrepRawDataFormation2019-03-11T02:36:54+01:00Susumu OdaRemove unnecessary dependence on SCT_ConditionsData of InDetPrepRawDataFormationRemove unnecessary dependence on SCT_ConditionsData of InDetPrepRawDataFormationRemove unnecessary dependence on SCT_ConditionsData of InDetPrepRawDataFormationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21457Hack for muon cache creator removed2019-03-11T09:25:34+01:00Tomasz BoldHack for muon cache creator removedWith this MR the IDC cache creator algs are moved outside of mainline reco algorithms configuration and are added to the top sequence dierctly.
Tagging @abarton @markowen @smh @kjamrogWith this MR the IDC cache creator algs are moved outside of mainline reco algorithms configuration and are added to the top sequence dierctly.
Tagging @abarton @markowen @smh @kjamroghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21634Replace Svc's with Private Tools. Move caches to CondAlg2019-03-12T10:27:48+01:00Peter HansenReplace Svc's with Private Tools. Move caches to CondAlgATLASRECTS-4840. Since MR21022 is stuck, I replace it by this.
Again the TRT event-dependent services are replaced by private tools (for now only in their most important clients) and previously cached structures are moved to a CondAlg w...ATLASRECTS-4840. Since MR21022 is stuck, I replace it by this.
Again the TRT event-dependent services are replaced by private tools (for now only in their most important clients) and previously cached structures are moved to a CondAlg whose postings are used by the clients.
Since MR21331 removes the event dependence of TRT_DriftFunctionTool, this is for now kept as a public tool.
In the testing there are problems with the HLT, but this is also the case when nothing is checked out in the current nightly.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21830Dev met from clusters v22019-03-12T15:54:42+01:00Kenji HamanoDev met from clusters v2AthenaMT migration of EFMissingETFromClusters algorithm. See details in ATR-19491.
Cheers, KenjiAthenaMT migration of EFMissingETFromClusters algorithm. See details in ATR-19491.
Cheers, Kenjihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21824MET Trigger: MET from jets2019-03-12T15:54:42+01:00Gabriel Gallardogabriel.gallardo@cern.chMET Trigger: MET from jetsFirst implementation of MET from jets algorithm (ATR-19490).
Standalone job option and ctest implemented in `TrigUpgradeTest`.
`MenuSequence` to be implemented later this week as part of trigger hackathon.First implementation of MET from jets algorithm (ATR-19490).
Standalone job option and ctest implemented in `TrigUpgradeTest`.
`MenuSequence` to be implemented later this week as part of trigger hackathon.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20707Migrating CTPSimulation to DataHandles2019-03-14T18:39:29+01:00Vasilis KonstantinidesMigrating CTPSimulation to DataHandlesReplacing evtStore()->retrieve() statements to DataHandles in CTPSimulation and renaming some HandleKeys to contain "_" instead of "/" so they can also be updated to DataHandles.Replacing evtStore()->retrieve() statements to DataHandles in CTPSimulation and renaming some HandleKeys to contain "_" instead of "/" so they can also be updated to DataHandles.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21855Set up ConditionStore in core athena2019-03-15T11:04:52+01:00Stewart Martin-HaughSet up ConditionStore in core athenaThis MR sets up the ConditionStore in basic serial jobs. It was already there in `AtlasThreadedJob`, but not in `AtlasUnixStandardJob`, instead appearing in a conddb import. This is also added back to the CA version, where I removed it (...This MR sets up the ConditionStore in basic serial jobs. It was already there in `AtlasThreadedJob`, but not in `AtlasUnixStandardJob`, instead appearing in a conddb import. This is also added back to the CA version, where I removed it (in error) for consistency.
tagging @jchapman and @tsulaia
Cheers,
Stewarthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21340WIP: ComponentAccumulator configuration for SCT and Pixel digitization2019-03-15T11:57:27+01:00Rupert TombsWIP: ComponentAccumulator configuration for SCT and Pixel digitizationDefine new style replacements for SCT_DigitizationConfig.py and PixelDigitizationConfig.py
With ConfigFlags definitions utilities and dependencies, including *ToolSetup replacements
Also makes minor updates to BCM_Digitization.
...Define new style replacements for SCT_DigitizationConfig.py and PixelDigitizationConfig.py
With ConfigFlags definitions utilities and dependencies, including *ToolSetup replacements
Also makes minor updates to BCM_Digitization.
Questions:
SCT_ReadCalibChipDataConfig.py lines 22-25: ComponentAccumulator folder tools do not have the tag features previously used here. Are these okay to neglect?
SCT_DigitizationConfig.py lines 75-83: To avoid migrating the ExperimentalDigi flag, doDetailedSurfChargesGen has not been migrated here. Is this still needed?
PixelCablingConfigNew.py line 60: Is this DBM logic correct?
OverlayConfigFlags.py line 15: `Overlay.EventStore` flag is questionable.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21004WIP: muon segment finding private tools migration2019-03-15T17:39:54+01:00Edward MoyseWIP: muon segment finding private tools migrationStill trying to get the MR originally done by @dabbott in.
I found some more configuration issues - it seems like the MuonAmbiProcessor was two different instances of two different types of tool, and the configuration in MuGirlStau was...Still trying to get the MR originally done by @dabbott in.
I found some more configuration issues - it seems like the MuonAmbiProcessor was two different instances of two different types of tool, and the configuration in MuGirlStau was by fluke rather than design.
Not completely sure I have everything fixed yet, but I would like to run some CI here, hence the WIP.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21906Revert "Merge branch 'master-CaloTopoClusterCfg-v2' into 'master'"2019-03-18T10:57:35+01:00Tim MartinRevert "Merge branch 'master-CaloTopoClusterCfg-v2' into 'master'"This reverts merge request !21428
This is an *explorative* revert MR to test a hypothesis about test failure.
I will touch the `TrigUpgradeTest` package to make sure we run all the CI tests from there tooThis reverts merge request !21428
This is an *explorative* revert MR to test a hypothesis about test failure.
I will touch the `TrigUpgradeTest` package to make sure we run all the CI tests from there toohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21985WIP Revert "Merge branch 'caloIdManager.LArRecUtils-20190311' into 'master'"2019-03-19T10:38:09+01:00Tim MartinWIP Revert "Merge branch 'caloIdManager.LArRecUtils-20190311' into 'master'"Speculative merge to check if !21835 caused symptoms in ATR-19550
Will WIP once pipeline is going
This reverts merge request !21835Speculative merge to check if !21835 caused symptoms in ATR-19550
Will WIP once pipeline is going
This reverts merge request !21835https://gitlab.cern.ch/atlas/athena/-/merge_requests/22038TrigTauRec: Fix compilation warnings.2019-03-20T09:21:41+01:00Scott SnyderTrigTauRec: Fix compilation warnings.Local static variables should also be const.Local static variables should also be const.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21919Adding noOnlineMon flag to chain definitions to replace clean monitoring (ATR...2019-03-20T13:37:49+01:00Catrin BerniusAdding noOnlineMon flag to chain definitions to replace clean monitoring (ATR-19536)To replace the "clean monitoring" (see ATR-19432, ATR-19536) in the menu for egamma & jets, a new string 'noOnlineMon' has been introduced to not write histograms online. This can be obtained via the chainDictionary that is passed to the...To replace the "clean monitoring" (see ATR-19432, ATR-19536) in the menu for egamma & jets, a new string 'noOnlineMon' has been introduced to not write histograms online. This can be obtained via the chainDictionary that is passed to the HypoTools. An example of the usage is shown in TrigL2ElectronHypoTool.py
This MR also removes to MEOW print statements pointed out by Frank in !21882.
It is based on the branch in the MR !21882 as this was adding fixes for the newly introduced pyflake test.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22101Follow up !21787 - ATLAS naming convention updates in TrigEgammaIsolationSele...2019-03-22T20:13:30+01:00Tim MartinFollow up !21787 - ATLAS naming convention updates in TrigEgammaIsolationSelectorTool```
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx: In member function 'virtual bool Trig::TrigEgammaIsolationSelectorTool::emulation(const xAOD::I...```
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx: In member function 'virtual bool Trig::TrigEgammaIsolationSelectorTool::emulation(const xAOD::IParticle*, bool&, const Trig::Info&)':
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:152:52: warning: ATLAS coding standards require that variable name '_m_PtCone' not start with '_'.
std::vector<float> EtCone, PtCone_xAOD, PtCone, _m_PtCone, _m_PtVarCone, PtCone_recalculated; //, PtCone_recalculated_fixed;
^~~~~~~~~
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:152:52: note: See <https://twiki.cern.ch/twiki/bin/view/AtlasComputing/CheckerGccPlugins#naming_plugin>.
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:152:63: warning: ATLAS coding standards require that variable name '_m_PtVarCone' not start with '_'.
std::vector<float> EtCone, PtCone_xAOD, PtCone, _m_PtCone, _m_PtVarCone, PtCone_recalculated; //, PtCone_recalculated_fixed;
^~~~~~~~~~~~
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:152:63: note: See <https://twiki.cern.ch/twiki/bin/view/AtlasComputing/CheckerGccPlugins#naming_plugin>.
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:208:15: warning: ATLAS coding standards require that variable name 'm_trk_container' not start with 'm_'.
std::string m_trk_container = el->trackParticleLink().dataID();
^~~~~~~~~~~~~~~
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:208:15: note: See <https://twiki.cern.ch/twiki/bin/view/AtlasComputing/CheckerGccPlugins#naming_plugin>.
```