athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-03-04T16:23:09+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/21600pseudomerge of TrigEgammaAnalysisTools packages from rel 21 to master2019-03-04T16:23:09+01:00Joao Victor Da Fonseca Pintopseudomerge of TrigEgammaAnalysisTools packages from rel 21 to masterCommand used to build the workspace:
setupATLAS
asetup Athena,master,latest
git clone https://:@gitlab.cern.ch:8443/jodafons/athena.git
cd athena
git remote add upstream https://:@gitlab.cern.ch:8443/atlas/athena.git
git-packag...Command used to build the workspace:
setupATLAS
asetup Athena,master,latest
git clone https://:@gitlab.cern.ch:8443/jodafons/athena.git
cd athena
git remote add upstream https://:@gitlab.cern.ch:8443/atlas/athena.git
git-package-pseudomerge.py \
--packages Trigger/TrigAnalysis/TrigEgammaAnalysisTools \
--source archive/21.0-TrigMC \
--target upstream/master \
--stage 1
All conflicts were solved comparing the master and TrigMC. Most part of AcceptData strategy are taken from the master branch. Used the ctest and some trigger monitoring scripts (my script) to test everything.
This MR fixed the problem related in ATR-19448
See the discussion about the pseudo merge in: ATR-19005
Tagging: @fernando and @thrynova (ringer MT task) and @wsfreundJoao Victor Da Fonseca PintoJoao Victor Da Fonseca Pintohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21639Update packages:TrigEgammaAnalysisTools from archive/21.0-TrigMC to...2019-03-06T10:29:05+01:00Joao Victor Da Fonseca PintoUpdate packages:TrigEgammaAnalysisTools from archive/21.0-TrigMC to...Command used to build the workspace:
setupATLAS
lsetup git
asetup Athena,master,latest
git clone https://:@gitlab.cern.ch:8443/jodafons/athena.git
cd athena
git remote add upstream https://:@gitlab.cern.ch:8443/atlas/athena.git
git-pack...Command used to build the workspace:
setupATLAS
lsetup git
asetup Athena,master,latest
git clone https://:@gitlab.cern.ch:8443/jodafons/athena.git
cd athena
git remote add upstream https://:@gitlab.cern.ch:8443/atlas/athena.git
git-package-pseudomerge.py
--packages Trigger/TrigAnalysis/TrigEgammaAnalysisTools
--source archive/21.0-TrigMC
--target upstream/master
--stage 1 (and 2 after fix all conflicts)
All conflicts were solved comparing the master and TrigMC. Most part of AcceptData strategy are taken from the master branch. Used the ctest and some trigger monitoring scripts (my script) to test everything.
This MR fixed the problem related in ATR-19448
See the discussion about the pseudo merge in: ATR-19005
Tagging: @fernando and @thrynova (ringer MT task) and @wsfreundhttps://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/21566Tau trigger: dR combo hypo (ATR-19359)2019-03-11T17:11:15+01:00Daniele ZanziTau trigger: dR combo hypo (ATR-19359)@jmontejo @aranzazu could you please check you are happy with these changes?
I renamed the old dR hypo (for topo selection in tau signature) to dRtt and created a new dR hypo for topo selections in combined signatures.
I reused the hy...@jmontejo @aranzazu could you please check you are happy with these changes?
I renamed the old dR hypo (for topo selection in tau signature) to dRtt and created a new dR hypo for topo selections in combined signatures.
I reused the hypo code developed in ATR-16730 (https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/4193) which was not merged to 21.1.
I had to remove the L1 seed for tau20 otherwise the name of the VBF chains get too long.
I'll check the counts later and remove WIP when you OK'ed.
Does this need to go also to master?https://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/22476Removing tau trigger dependency on TrigTauDiscriminant, and cleanup2019-04-09T10:34:32+02:00Bertrand Martin Dit LatourRemoving tau trigger dependency on TrigTauDiscriminant, and cleanupHello,
This MR removes the dependency on TrigTauDiscriminant for the evaluation of the jet BDT ID in tau triggers.
Once this MR is merged, TrigTauDiscriminant can be deleted from master (ATR-19015).
Old tau trigger configurations ha...Hello,
This MR removes the dependency on TrigTauDiscriminant for the evaluation of the jet BDT ID in tau triggers.
Once this MR is merged, TrigTauDiscriminant can be deleted from master (ATR-19015).
Old tau trigger configurations have been cleaned up.
Code has been made slightly more readable (use of lists).
Some discontinued chains have been removed from the menu (e.g. tight1, tracktwoEFmvaTES,...), and one has been added to Physics_pp_v7_primaries (tau25_mediumRNN_tracktwoMVA that we can now schedule in master!). I don't put the "changes-trigger-counts" label because the counts of existing triggers should not change (we'll just have new counts from the RNN chain).
Tagging @guindon and @carquin , and @aranzazu and @jmontejo for menu changes.
This MR should be merged after !22450 .
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22582Calo noise alg clients12019-04-12T15:34:13+02:00Walter LamplCalo noise alg clients1This MR migrates the CaloTopoClusterMaker to the new CaloNoise conditions object, removing the dependency on the thread-unsafe CaloNoiseTool.
On top of this, a number of obsolete features of the TopoClusterMaker are removed. This was d...This MR migrates the CaloTopoClusterMaker to the new CaloNoise conditions object, removing the dependency on the thread-unsafe CaloNoiseTool.
On top of this, a number of obsolete features of the TopoClusterMaker are removed. This was discussed on the calo-perf mailing list.
While testing this, I found that the implementation of the CaloNoise::getEffectiveSigma (that is used to account for the double-gaussian noise observed in the TileCal during some periods) was wrong. This MR fixes also this problem. I verified that the resulting CaloCalTopoClusters container remains identical.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22628More clients of CaloNoiseAlg2019-04-16T14:35:28+02:00Walter LamplMore clients of CaloNoiseAlgThis one contains (and superseeds) !22582.
It contains:
Migration of the CaloTopoClusterMaker, CaloClusterMomentsMaker and CaloTopoTowerAlg to the new CaloNoise conditions object, removing the dependency on the thread-unsafe CaloNoise...This one contains (and superseeds) !22582.
It contains:
Migration of the CaloTopoClusterMaker, CaloClusterMomentsMaker and CaloTopoTowerAlg to the new CaloNoise conditions object, removing the dependency on the thread-unsafe CaloNoiseTool.
On top of this, a number of obsolete features of the TopoClusterMaker are removed. This was discussed on the calo-perf mailing list.
While testing this, I found that the implementation of the CaloNoise::getEffectiveSigma (that is used to account for the double-gaussian noise observed in the TileCal during some periods) was wrong. This MR fixes also this problem. I verified that the resulting CaloCalTopoClusters container remains identical.
It contains also fixes for the CI failures observed in !22582.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22643MdtCalibrationDbSvc MT migration v32019-06-22T20:55:03+02:00Chikuma KatoMdtCalibrationDbSvc MT migration v3Callback functions and member data cache are removed from `MdtCalibrationDbSvc` using `ReadCondHandle`. For example derived data in `"RtKey"` was originally recorded by `MdtCalibDbCoolStrTool` reading raw data from `"/MDT/RTBLOB"`. And t...Callback functions and member data cache are removed from `MdtCalibrationDbSvc` using `ReadCondHandle`. For example derived data in `"RtKey"` was originally recorded by `MdtCalibDbCoolStrTool` reading raw data from `"/MDT/RTBLOB"`. And the data was provided via detector store, removing previous IoV data. But in AthenaMT, derived data must be provided by an Alg via the condition store. So a new Alg with `WriteCondhandle` (`MdtCalibDbAlg`) is added to the condition sequence.
To schedule the derived data in the AthenaMT scheduler (--threads=1), the parent Svc and DbSvc are changed in to Tool and DbTool. And the private tools and condition handles are declared as properties either using auto-declaring initializer or declareProperty(). This should fix the read error found in a trigger test [https://gitlab.cern.ch/atlas/athena/merge_requests/21313] after merging the first MR [https://gitlab.cern.ch/atlas/athena/merge_requests/21512]. Since the same trigger test (test_mu_menu.sh) was not running in master (master,x86_64,centos7,gcc8,opt,2019-04-05T2141,Athena), I used another trigger test (test_mu_run_data.sh).
The trigger test, q221 and q431 output ESD was ok [[diff-root-run09-q431.txt](/uploads/5fa4ccd6a9027c55e095d93ab5087c71/diff-root-run09-q431.txt)[diff-root-run09-mu_run_data.txt](/uploads/8c71d577c2be75333d4a2eb38078a18f/diff-root-run09-mu_run_data.txt)[diff-root-run09-q221.txt](/uploads/ca29fd418dce30d2fdbed61d00cb16d4/diff-root-run09-q221.txt)]. The tier0 test was also ok [[RunTier0Tests.log](/uploads/1077eeda6f70af55d959fc082aa93bf2/RunTier0Tests.log)]. Thanks a lot for feedback from @wleight @rosati @diehl @oda .https://gitlab.cern.ch/atlas/athena/-/merge_requests/21909WIP: Tau track sequence dev2019-06-21T15:43:24+02:00Edson Carquin LopezWIP: Tau track sequence devHello,
I'm creating this MR in order to trigger the discussion on the TrackSequence steps of the tau trigger which is ongoing in JIRA https://its.cern.ch/jira/browse/ATR-17399.
This MR should be merged after !21249.
Cheers,
Edson
Ta...Hello,
I'm creating this MR in order to trigger the discussion on the TrackSequence steps of the tau trigger which is ongoing in JIRA https://its.cern.ch/jira/browse/ATR-17399.
This MR should be merged after !21249.
Cheers,
Edson
Tagging the relevant people here: @fpastore @tbold @mvozak @zgrout @martindl @guindonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/26229Trigger Tau algorithm monitoring (Calo Only)2019-09-18T16:48:29+02:00Marcin Piotr WandasTrigger Tau algorithm monitoring (Calo Only)This MR assures that the monitored quantities enter the histograms. Related to: ATR-19978
Tagging @carquin This MR assures that the monitored quantities enter the histograms. Related to: ATR-19978
Tagging @carquin Tomasz BoldTomasz Boldhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/27375Enable tau signature in more trigger tests2019-11-01T15:26:37+01:00Stewart Martin-HaughEnable tau signature in more trigger testsEnable tau slice in full_menu test
I had to make a single small change in TrigTauRec monitoring.
cc @guindon @malconadEnable tau slice in full_menu test
I had to make a single small change in TrigTauRec monitoring.
cc @guindon @malconadhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/27736Avoiding == 0. or != 0. comparison for pFlow charge2019-12-02T17:11:13+01:00Chris Malena DelitzschAvoiding == 0. or != 0. comparison for pFlow charge@mhodgkin reported in [ATLJETMET-796](https://its.cern.ch/jira/browse/ATLJETMET-796) that the charge of the pFlow object is compared to != 0.0 instead of using FLT_MIN. This has been hopefully changed now in all instances and also the co...@mhodgkin reported in [ATLJETMET-796](https://its.cern.ch/jira/browse/ATLJETMET-796) that the charge of the pFlow object is compared to != 0.0 instead of using FLT_MIN. This has been hopefully changed now in all instances and also the comparisons to 1e-9 where changed to FLT_MIN
A similar MR will be created for release 21.2. I chose a separate MR given that some files differed between 21.0 and 21.2.
Also tagging @wbalunas, @williams and @khoo for their information.https://gitlab.cern.ch/atlas/athena/-/merge_requests/2861821.2: Redefining HggPrimaryVertices in HIGG12019-12-11T15:10:19+01:00Ioannis Nomidis21.2: Redefining HggPrimaryVertices in HIGG1Changes to HggPrimaryVertices, the vertex collection used in H->yy analyses.
Changes to it are required to allow developments in the HIGG1D1 derivations needed for PFlow: https://its.cern.ch/jira/browse/HGAMSW-716
In specific, the new co...Changes to HggPrimaryVertices, the vertex collection used in H->yy analyses.
Changes to it are required to allow developments in the HIGG1D1 derivations needed for PFlow: https://its.cern.ch/jira/browse/HGAMSW-716
In specific, the new container is now a shallow copy of PrimaryVertices with redefined vertexType so that the primary vertex is the one selected by the PhotonVertexSelection tool. Decorations are also added to maintain previous functionality.
These changes are also be backwards compatible: the name and format of the container is the same, the only practical difference is that the new container contains also pile-up vertices (because it is a shallow copy of PrimaryVertices).
Code has been tested in 21.2.84.0.https://gitlab.cern.ch/atlas/athena/-/merge_requests/30329WIP: tauRecTools: avoid obtain TrackContainer and VertexContainer via tauEven...2020-02-22T07:53:32+01:00Xiaozhong HuangWIP: tauRecTools: avoid obtain TrackContainer and VertexContainer via tauEventData in trriggerOnline tau reconstruction obtain TrackContainer and VertexContainer via ReadHandle in `TrigTauRecMergedMT`, and these containers are passed to tauRecTools via TauEventData. Now, remove the use of TauEventData by obtaining these container...Online tau reconstruction obtain TrackContainer and VertexContainer via ReadHandle in `TrigTauRecMergedMT`, and these containers are passed to tauRecTools via TauEventData. Now, remove the use of TauEventData by obtaining these containers directly in tauRecTools.https://gitlab.cern.ch/atlas/athena/-/merge_requests/29069WIP : get rid of tauEventData in offline reconstruction code2020-02-22T07:53:44+01:00Xiaozhong HuangWIP : get rid of tauEventData in offline reconstruction code- Replace access of AverageInterations from tauEventData by LumiBlocakTool.
- Replace access of inTrigger/IsCosmics flag from tauEventData by setting the property,
e.g. inTrigger/isCosmics.
- Use data handles to obtain input container...- Replace access of AverageInterations from tauEventData by LumiBlocakTool.
- Replace access of inTrigger/IsCosmics flag from tauEventData by setting the property,
e.g. inTrigger/isCosmics.
- Use data handles to obtain input containers, and update the interface
- for TauVertexVariables so that it can be used in both online and offline
tau reconstructionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/31032Record mechanism for IJetProvider -- ATLJETMET-12252020-03-11T20:33:20+01:00Teng Jian KhooRecord mechanism for IJetProvider -- ATLJETMET-1225Restructured how `IJetProvider` returns the jet container it produces and add a record method to the `IJetProvider` interface. This has two benefits:
1. Avoid memory leaks of the aux container and remove all bare pointer handling. Previo...Restructured how `IJetProvider` returns the jet container it produces and add a record method to the `IJetProvider` interface. This has two benefits:
1. Avoid memory leaks of the aux container and remove all bare pointer handling. Previously it may not have been obvious that one would need to extract the store from the returned jet container and manage its memory.
2. Because some tools (!30790) will create a different aux container type and we don't want clients to have to know anything about the implementation, we forward the `WriteHandle` to the `IJetProvider`, such that the record is handled there, and the creator can use the most derived aux container type for the record to StoreGate, avoiding any loss of information.
Since this is mostly about code transparency, I also did a little bit of interface cleanup.https://gitlab.cern.ch/atlas/athena/-/merge_requests/30725WIP: A second prototype for dealing with the jet hypos2020-03-16T11:19:19+01:00Mark Andrew OwenWIP: A second prototype for dealing with the jet hyposWhat I changed:
* JetChainConfiguration now represents the configuration of all the jet parts of the chain (e.g. j80_j60) rather than just a single leg.
* Because of this GenerateJetChainDefs no longer splits the chain defs.
* Simil...What I changed:
* JetChainConfiguration now represents the configuration of all the jet parts of the chain (e.g. j80_j60) rather than just a single leg.
* Because of this GenerateJetChainDefs no longer splits the chain defs.
* Similarly, in GenerateBjetChainDefs, the jet part of the chain is created from the unsplit chain def.
* The extractRecoDict function in JetRecoConfiguration now handles a vector of chain parts and checks the settings are consistent in the different parts.
* ChainSteps now contain the vector of chain dictionaries they represent. This allows to create the hypo tools from these dictionaries.
* Updated various hypo tools because of a change in type of dict['chainParts']https://gitlab.cern.ch/atlas/athena/-/merge_requests/27784WIP Addition of Tau Fake Factor Tool2020-03-23T18:59:48+01:00Joseph M MuseWIP Addition of Tau Fake Factor ToolTwo packages have been added to /PhysicsAnalysis/TauID: TauFakeFactorTool and TauFakeFactorToolData. These are independent packages for two independent methods of estimating fake tau backgrounds. The packages are essentially stand-alone ...Two packages have been added to /PhysicsAnalysis/TauID: TauFakeFactorTool and TauFakeFactorToolData. These are independent packages for two independent methods of estimating fake tau backgrounds. The packages are essentially stand-alone executables with ROOT dependencies.
Both packages were tested as sparse builds in runtime environments: asetup 21.2,AthAnalysis,latest and asetup 21.2,AnalysisBase,latest
In both cases, the packages compiled and were executable with expected results.https://gitlab.cern.ch/atlas/athena/-/merge_requests/31632Updates to upgrade tau reconstruction, identification and calibration2020-04-03T17:34:48+02:00Martina Laura OjedaUpdates to upgrade tau reconstruction, identification and calibrationAdded a directory on cvmfs that contains the re-tunings from R20.20 for the track selection, tauID and calibration of upgrade taus.
Updated all path and file names to access these files.
Tagging @demers @cohm @asalzbur @nstyles @martind...Added a directory on cvmfs that contains the re-tunings from R20.20 for the track selection, tauID and calibration of upgrade taus.
Updated all path and file names to access these files.
Tagging @demers @cohm @asalzbur @nstyles @martindl @cgrefe for information.