athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-01-24T15:57:21+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20480Adding local and global position to RDOs in NSW Val Alg2019-01-24T15:57:21+01:00Michiel Jan Veenmichiel.jan.veen@cern.chAdding local and global position to RDOs in NSW Val AlgDump the local and global positions of the NSW RDOs into the validation Ntuple. This is for both MM and sTGC
tagging @rosati @cchau @kluitDump the local and global positions of the NSW RDOs into the validation Ntuple. This is for both MM and sTGC
tagging @rosati @cchau @kluithttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20544Sweeping !20514 from master to 21.3.
Start versioning the CI reference files ...2019-01-24T03:03:26+01:00Atlas NightlybuildSweeping !20514 from master to 21.3.
Start versioning the CI reference files for the RunTier0TestsStart versioning the CI reference files for the RunTier0Tests
See merge request atlas/athena!20514Start versioning the CI reference files for the RunTier0Tests
See merge request atlas/athena!20514https://gitlab.cern.ch/atlas/athena/-/merge_requests/20290ATR-19262: Support FTK b-jet chains with the ALLTE implementation2019-01-22T12:23:34+01:00Carlo Varnicarlo.varni@cern.chATR-19262: Support FTK b-jet chains with the ALLTE implementation**Justification:** A misconfiguration of FTK b-jet chains affecting multi b-jet chains, which are configured with the so-called ALLTE implementation for b-jet chains. For them, FTK algorithms are not scheduled. Conversely, single b-jet c...**Justification:** A misconfiguration of FTK b-jet chains affecting multi b-jet chains, which are configured with the so-called ALLTE implementation for b-jet chains. For them, FTK algorithms are not scheduled. Conversely, single b-jet chains are correctly implemented, since they fo not use the ALLTE implementation. The solution is to modify the ALLTE configuration in order to schedule FTK algorithms.
This MR also adds GSC for FTK multi b-jet chains, and goes together with https://gitlab.cern.ch/atlas/athena/merge_requests/20263
**Tests:**
`trigtest.pl --test BjetSliceAthenaTrigRDO --run BjetSliceAthenaTrigRDO --conf TriggerTest.conf` produced no difference w.r.t. the nominal release.
**Jira:** ATR-19262
**Notes:** bug
Tagging @baines, @aranzazu, @jmontejo, @lidiaz and @sekulahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20287Merge release/21.0.92 into 21.3 branch2019-01-18T17:44:35+01:00John Derek ChapmanMerge release/21.0.92 into 21.3 branchThis merge request merges the changes that went into the ~"21.0" branch between the [release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91)
and [release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0....This merge request merges the changes that went into the ~"21.0" branch between the [release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91)
and [release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) tags into the ~"21.3" branch.
[release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) contains the following ~"frozen\-tier0\-violating" merge requests:
- athenaprivate1!15481
- athenaprivate1!16537
MRs in https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-01-06T2159, accepted since https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2018-12-13T2202:
- athenaprivate1!16769: FW-like Code Compatibility
- athenaprivate1!15481: Sweeping athenaprivate1!15419 from 21.2 to 21.0. Fix MET_Truth muon selections for IntOut and IntMuons terms
- athenaprivate1!16537: Merge 21.1 into 21.0
The full diff between [release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) and
[release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.91...release/21.0.92https://gitlab.cern.ch/atlas/athena/-/merge_requests/20263Support GSC for FTK b-jet chains2019-01-17T20:47:35+01:00Carlo Varnicarlo.varni@cern.chSupport GSC for FTK b-jet chainsFollowing ATR-19193, some code changes in the configuration of FTK b-jet chains are needed in order to support GSC.
This has been tested in 21.3 by adding some FTK+GSC b-jet chains in the Physics v7 menu and with the following command:
...Following ATR-19193, some code changes in the configuration of FTK b-jet chains are needed in order to support GSC.
This has been tested in 21.3 by adding some FTK+GSC b-jet chains in the Physics v7 menu and with the following command:
`trigtest.pl --cleardir --test AthenaTrigRDO_MC_pp_v7_no_prescale_toxAOD_FTK --rundir AthenaTrigRDO_MC_pp_v7_no_prescale_toxAOD_FTK --conf TriggerTest.conf`
Additional code changes have to be applied for addressing ATR-19262, but I'll open another MR for that since it is a different issue.
Tagging @jmontejo, @aranzazu and @baineshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20381Sweeping !20350 from master to 21.3.
FTK_RecTools: cmake fix2019-01-17T20:47:02+01:00Atlas NightlybuildSweeping !20350 from master to 21.3.
FTK_RecTools: cmake fixFTK_RecTools: cmake fix
See merge request atlas/athena!20350FTK_RecTools: cmake fix
See merge request atlas/athena!20350https://gitlab.cern.ch/atlas/athena/-/merge_requests/20280FastTRT_Digitization : configuration cleanup2019-01-16T03:34:42+01:00Tommaso LariFastTRT_Digitization : configuration cleanupRemoving the reference to two TRT database folders which do no longer exist (ATLASSIM-2698).
I compiled and run a fast TRT digitization job on a few events and found identical results to those before my changes (as expected, those line...Removing the reference to two TRT database folders which do no longer exist (ATLASSIM-2698).
I compiled and run a fast TRT digitization job on a few events and found identical results to those before my changes (as expected, those lines in the configuration were not supposed to be used in any way)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20187FTK changes to Trigger ART tests2019-01-10T19:39:59+01:00Julie KirkFTK changes to Trigger ART testsChange FTK data file for ART tests
Add FTK tests to TrigAnalysisTestChange FTK data file for ART tests
Add FTK tests to TrigAnalysisTesthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20228Merge 21.0.91 into 21.32019-01-10T12:56:11+01:00John Derek ChapmanMerge 21.0.91 into 21.3This merge request merges the changes that went into the ~"21.0" branch between the [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....This merge request merges the changes that went into the ~"21.0" branch between the [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.91) tags into the ~"21.3" branch.
[release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) contains the following ~"frozen\-tier0\-violating" merge requests:
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16171
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/15893
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/15117
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16009
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16049
[release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) contains one merge request which changes Geant4 simulation output:
https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16126
Full details of the individual merge requests that went into [release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) were lost in the repository clean-up, but the full diff between [release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) and
[release/21.0.90](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.90)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.90...release/21.0.91https://gitlab.cern.ch/atlas/athena/-/merge_requests/20188Update trig-art-result-parser.sh2019-01-09T14:03:43+01:00Rafal Bielskirafal.bielski@cern.chUpdate trig-art-result-parser.shAn updated version of this script was added to master in !20078 and swept to other branches. This MR brings the version from master to 21.3:
```
git checkout upstream/master -- Trigger/TrigValidation/TrigValTools/bin/trig-art-result-pars...An updated version of this script was added to master in !20078 and swept to other branches. This MR brings the version from master to 21.3:
```
git checkout upstream/master -- Trigger/TrigValidation/TrigValTools/bin/trig-art-result-parser.sh
```
The changes include adding the second command line argument for list of steps to check and adding some comments in the scripthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20024Adding MM and STGC clusterization packages for the NSW, with interfaces and e...2019-01-09T01:50:13+01:00Stefano RosatiAdding MM and STGC clusterization packages for the NSW, with interfaces and example toolsThis merge request provides a structure to be followed in the future to implement the cluster builders tools, that will have various developers.
We also have a first version of the "simple" cluster builder, right now implemented in th...This merge request provides a structure to be followed in the future to implement the cluster builders tools, that will have various developers.
We also have a first version of the "simple" cluster builder, right now implemented in the converters, this will be added as soon as this merge request is merged. But this will also imply modifying the clients, so a few more packages involved, it is neater to stage the two MR's.
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/CMakeLists.txt
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/MMClusterization/IMMClusterBuilderTool.h
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/SimpleMMClusterBuilderTool.cxx
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/SimpleMMClusterBuilderTool.h
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/components/MMClusterization_entries.cxx
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/components/MMClusterization_load.cxx
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/CMakeLists.txt
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/STgcClusterization/ISTgcClusterBuilderTool.h
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/SimpleSTgcClusterBuilderTool.cxx
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/SimpleSTgcClusterBuilderTool.h
new file: MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/components/STgcClusterization_entries.cxxhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20075Add Muon ART Tests for Standalone Setup and NSW2019-01-09T01:50:13+01:00Zhidong ZhangAdd Muon ART Tests for Standalone Setup and NSWThree ART tests are added into MuonRecRTT:
test_muonrec_sa_setup_normal.sh: normal test for standalone muon setup;
test_muonrec_sa_setup_simple.sh: simplest test for standalone muon setup;
test_nsw_singlemuon_recon.sh: muon reconst...Three ART tests are added into MuonRecRTT:
test_muonrec_sa_setup_normal.sh: normal test for standalone muon setup;
test_muonrec_sa_setup_simple.sh: simplest test for standalone muon setup;
test_nsw_singlemuon_recon.sh: muon reconstruction test for New Small Wheel.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20038code cleaning and mapping tool update2019-01-08T15:08:15+01:00Chiao-Ying Lincode cleaning and mapping tool updateThe following changes are made:
1. temporary trigger objects are handled by std::map
2. temporary trigger objects are now smart pointers to prevent potential memory leak
3. mappling format is switched from std::map to std::vecThe following changes are made:
1. temporary trigger objects are handled by std::map
2. temporary trigger objects are now smart pointers to prevent potential memory leak
3. mappling format is switched from std::map to std::vechttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20035Move trig-art-result-parser.sh to TrigValTools/bin2018-12-27T18:13:16+01:00Rafal Bielskirafal.bielski@cern.chMove trig-art-result-parser.sh to TrigValTools/binMove the script to where all other scripts are, which also makes it installed in the release.Move the script to where all other scripts are, which also makes it installed in the release.