athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-04-15T12:41:06+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/22681Ftk clustering update2019-04-15T12:41:06+02:00Stamatios GkaitatzisFtk clustering updateThe merge request aims to improve the clustering functionality of TrigFTKSim. The following modifications have been made:
1. atlClustering is replaced by the FTKClusteringEngine class.
2. FTKClusteringPrintout is tasked with handling p...The merge request aims to improve the clustering functionality of TrigFTKSim. The following modifications have been made:
1. atlClustering is replaced by the FTKClusteringEngine class.
2. FTKClusteringPrintout is tasked with handling printing functions which were previously part of the main clustering code.
Apart from the clustering improvements, this merge aims to clean a part of legacy code that is not needed anymore. These modifications include the removal of the parameters x, y and z from FTKRawHit and the removal of SCTtrk which is also not going to be needed in the future.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22695Master salva id perf mon2019-04-15T22:12:31+02:00Salvador Marti I Garciasalvador.marti@cern.chMaster salva id perf monhttps://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/22675Clean-up public Tile Conditions Tools in Digitization jobs2019-04-17T11:14:58+02:00John Derek ChapmanClean-up public Tile Conditions Tools in Digitization jobsPublic verions of `TileCondToolPulseShape`, `TileCondToolNoiseSample`,
`TileCondToolEmscale`, `TileCondToolTiming` and `TileCondToolOfcCool`
are not used in digitization jobs, so protecting against them being
created. Only doing this for...Public verions of `TileCondToolPulseShape`, `TileCondToolNoiseSample`,
`TileCondToolEmscale`, `TileCondToolTiming` and `TileCondToolOfcCool`
are not used in digitization jobs, so protecting against them being
created. Only doing this for digitization jobs, in case there are
other clients in reconstruction.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21857WIP: Externals Update, 21.2 branch (2019.03.12.)2019-04-16T16:50:47+02:00Attila KrasznahorkayWIP: Externals Update, 21.2 branch (2019.03.12.)Updated all projects to [atlasexternals-1.0.49](https://gitlab.cern.ch/atlas/atlasexternals/tags/1.0.49). The full list of changes (https://gitlab.cern.ch/atlas/atlasexternals/compare/1.0.48...1.0.49) is:
- Added `FindHJets.cmake` for...Updated all projects to [atlasexternals-1.0.49](https://gitlab.cern.ch/atlas/atlasexternals/tags/1.0.49). The full list of changes (https://gitlab.cern.ch/atlas/atlasexternals/compare/1.0.48...1.0.49) is:
- Added `FindHJets.cmake` for finding the HJets generator (meant for the 21.6 branch, should not affect this one);
- Fixed the generation of `.d` files for Ninja, to make dictionary generation behave correctly with this build tool (thanks to @fwinkl);
- Added some extra python find-modules to AtlasLCG;
- Stopped setting up the `Cairo` and `Pango` packages when using `graphviz`.
The last one is meant to get [emacs](https://www.gnu.org/software/emacs/) to work once again in the AthAnalysis/AthDerivation runtime environment. Note that this should make it unnecessary to rely on the alias set up by asetup. Though keeping that alias around will not hurt.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22396Edit so MuonGeometryConfig works2019-04-17T10:48:48+02:00Daniel Louis NoelEdit so MuonGeometryConfig worksAGDD2Geo.Builders takes a vector of strings, so use muonAGDDTool.name()
to add to this list instead of adding the tool itself which caused
errors. Should the c++ code in https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/DetectorDe...AGDD2Geo.Builders takes a vector of strings, so use muonAGDDTool.name()
to add to this list instead of adding the tool itself which caused
errors. Should the c++ code in https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/DetectorDescription/AGDD/AGDD2GeoSvc/src/AGDD2GeoSvc.cxx be changed to make m_builders a tool handle array?https://gitlab.cern.ch/atlas/athena/-/merge_requests/22685Ftk clustering update2019-04-18T18:08:12+02:00Stamatios GkaitatzisFtk clustering updateThe merge request aims to improve the clustering functionality of TrigFTKSim. The following modifications have been made:
1. atlClustering is replaced by the FTKClusteringEngine class.
2. FTKClusteringPrintout is tasked with handling pr...The merge request aims to improve the clustering functionality of TrigFTKSim. The following modifications have been made:
1. atlClustering is replaced by the FTKClusteringEngine class.
2. FTKClusteringPrintout is tasked with handling printing functions which were previously part of the main clustering code.
3. Fix memory leak issues.
Apart from the clustering improvements, this merge aims to clean a part of legacy code that is not needed anymore. These modifications include the removal of the parameters x, y and z from FTKRawHit and the removal of SCTtrk which is also not going to be needed in the future.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22134Sweeping !22083 from 21.3 to 21.9.
Manual sweep of !22078 from 21.0 to 21.3 ...2019-04-18T16:03:38+02:00Atlas NightlybuildSweeping !22083 from 21.3 to 21.9.
Manual sweep of !22078 from 21.0 to 21.3 Add MC16 Simulation ART jobsManual sweep of !22078 from 21.0 to 21.3 Add MC16 Simulation ART jobs
See merge request atlas/athena!22083Manual sweep of !22078 from 21.0 to 21.3 Add MC16 Simulation ART jobs
See merge request atlas/athena!22083https://gitlab.cern.ch/atlas/athena/-/merge_requests/22803create egammaMVACalibConfig.py2019-04-18T20:16:46+02:00Tulay Cuhadar Donszelmanncreate egammaMVACalibConfig.pyConverting egammaMVACalibFactories.py to new configuration as egammaMVACalibConfig.pyConverting egammaMVACalibFactories.py to new configuration as egammaMVACalibConfig.pyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22750WIP: 21.3 test2019-04-19T08:55:49+02:00Joerg StelzerWIP: 21.3 testhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22772WIP:OBSOLETE athenaMT migration of T0 trigger monitoring code2019-04-23T01:20:18+02:00Elin Bergeaas KuutmannWIP:OBSOLETE athenaMT migration of T0 trigger monitoring codeDO not merge this yet! Very much WIP.
I have taken the files from the tutorial,<br>
Control/AthenaMonitoring/AthenaMonitoring/ExampleMonitorAlgorithm.h<br>
Control/AthenaMonitoring/python/ExampleMonitorAlgorithm.py<br>
Control/Athe...DO not merge this yet! Very much WIP.
I have taken the files from the tutorial,<br>
Control/AthenaMonitoring/AthenaMonitoring/ExampleMonitorAlgorithm.h<br>
Control/AthenaMonitoring/python/ExampleMonitorAlgorithm.py<br>
Control/AthenaMonitoring/share/ExampleMonitorAlgorithm_jobOptions.py<br>
Control/AthenaMonitoring/src/ExampleMonitorAlgorithm.cxx
and moved them to the trigger package:<br>
Trigger/TrigMonitoring/TrigEgammaMonitoring/TrigEgammaMonitoring/TrigEgammaMonitorAlgorithm.h<br>
Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitorAlgorithm.py<br>
Trigger/TrigMonitoring/TrigEgammaMonitoring/share/TrigEgammaMonitorAlgorithm_jobOptions.py<br>
Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAlgorithm.cxx
where I just have made some minimal name changes to try to run it. The code compiles, but it seg faults when running (it creates an output root file, but does not fill it and the last line in the log file says "0 events processed".
Commands to run the code:
```
cd work/area/
setupATLAS
lsetup git
git atlas init-workdir https://:@gitlab.cern.ch:8443/atlas/athena.git #first time only
cd athena
git atlas addpkg TrigMonitoring # first time only
git atlas addpkg AthenaMonitoring # first time only
git fetch upstream
git checkout -b master-my-branch-name upstream/master --no-track #first time only
cd ..
asetup master,latest,Athena
mkdir build
mkdir run
cd build
cmake -DATLAS_PACKAGE_FILTER_FILE=../package_filters.txt ../athena/Projects/WorkDir
make -j8
source x*/setup.sh
Running trigger code:
cd../run
cp ../athena/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitorAlgorithm.py .
python TrigEgammaMonitorAlgorithm.py > mylog.txt &
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/21793Update the Ringer Fex to MT framework2019-04-23T21:32:47+02:00Joao Victor Da Fonseca PintoUpdate the Ringer Fex to MT frameworkThis MR include the ringer hypo code to the MT framework thinking in all necessary features for run 3.
Tagging @fernando , @thrynova and @wsfreundThis MR include the ringer hypo code to the MT framework thinking in all necessary features for run 3.
Tagging @fernando , @thrynova and @wsfreundJoao Victor Da Fonseca PintoJoao Victor Da Fonseca Pintohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22770Adding chains to Physics_pp_v7_primaries: master release2019-04-24T17:35:46+02:00Mario CampanelliAdding chains to Physics_pp_v7_primaries: master releaseThe chains indicated by ATR-19617 have been added to the master releaseThe chains indicated by ATR-19617 have been added to the master releasehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22952STgc clusterization in master and updating the NSW PrepRawData classes2019-04-26T15:29:06+02:00Stefano RosatiSTgc clusterization in master and updating the NSW PrepRawData classesSweeping the STGC PRD fixes and the clusterization alg to master.
From 21.3 MR !21085
Also, updates to the NSW PrepRawData classes.Sweeping the STGC PRD fixes and the clusterization alg to master.
From 21.3 MR !21085
Also, updates to the NSW PrepRawData classes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22935TrigInDetAnalysis+TrigInDetAnalysisExample+TrigInDetAnalysisUser: Comply with...2019-04-27T09:46:20+02:00Scott SnyderTrigInDetAnalysis+TrigInDetAnalysisExample+TrigInDetAnalysisUser: Comply with ATLAS naming conventions.TrackAnalysis::mname changed to m_name for consistency with ATLAS conventions.
We agreed that these fixes could go in after Run 2 finished.
I'd like to finally get some of these patches i've been maintaining off my list.TrackAnalysis::mname changed to m_name for consistency with ATLAS conventions.
We agreed that these fixes could go in after Run 2 finished.
I'd like to finally get some of these patches i've been maintaining off my list.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22852Adding photon, jet, b-jets to TMMT2019-04-27T19:30:47+02:00Catrin BerniusAdding photon, jet, b-jets to TMMT**Description in short:**
MR to move jet, photon and b-jet code to TMMT (ATR-19689, ATR-19690, ATR-19688).
Tagging @fpastore and @tbold for info.
**More details:**
* Renamed the following files:
* TUT/python/photonMenuDefs.py -...**Description in short:**
MR to move jet, photon and b-jet code to TMMT (ATR-19689, ATR-19690, ATR-19688).
Tagging @fpastore and @tbold for info.
**More details:**
* Renamed the following files:
* TUT/python/photonMenuDefs.py -> TMMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
* TUT/python/jetDefs.py -> TMMT/python/HLTMenuConfig/Jet/JetSequenceDefs.py
* TUT/python/jetMenuDefs.py -> TMMT/python/HLTMenuConfig/Jet/JetSequenceSetup.py
* TUT/python/bjetMenuDefs.py -> TMMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
* Added photon chain to LS2_v1
* Comments/questions to jet chains:
* L1_4J15 seeded chain can’t work as in the definition given in full menu test: HLT_5j70_0eta240_L14J15', l1SeedItem = ['L1_J20'], => need to redefine/make work with multi L1 seed I assume?
* Comments/questions to Egamma:
* In TUT/python there is still precisionCaloRec.py =>could this be combined with precisionCaloSequenceSetup.py that is already in TMMT/CommonSequences?
* Renaming of a few other files (generate*ChainDefs.py -> Generate*ChainDefs.py) to follow file naming convention
**Problems encountered and fixed**:
When adding jet chains to the menu, runMenuTest doesn’t run due to the following ERRORS:
```
Py:Configurable ERROR attempt to add a duplicate (TopoClusterRecoSequence.HLTCaloCellMaker) ... dupe ignored
Py:Configurable ERROR attempt to add a duplicate (TopoClusterRecoSequence.TrigCaloClusterMakerMT_topo) ... dupe ignored
Py:Configurable ERROR attempt to add a duplicate (AthAlgSeq.MuonCacheCreator) ... dupe ignored
Py:Configurable ERROR attempt to add a duplicate (AthAlgSeq.InDetCacheCreatorTrig) ... dupe ignored
Py:Configurable ERROR attempt to add a duplicate (AthAlgSeq.MuonCacheCreator) ... dupe ignored
Py:Configurable ERROR attempt to add a duplicate (AthAlgSeq.InDetCacheCreatorTrig) ... dupe ignored
```
Both problems (Calo algo and the CacheCreators) were fixed and are described here: ATR-19703
In addition @tbold also created !22944 to address the problem with the CacheCreators.
Missing import in ItemDef.py causing the build of the Lvl1 menu to fail, this had been removed in !22888.
https://gitlab.cern.ch/atlas/athena/-/merge_requests/22455WIP: Sweeping !22392 from 21.3 to 21.9.Manual sweep to 21.32019-04-29T10:52:19+02:00Atlas NightlybuildWIP: Sweeping !22392 from 21.3 to 21.9.Manual sweep to 21.3Manual sweep to 21.3
See merge request atlas/athena!22392Manual sweep to 21.3
See merge request atlas/athena!22392https://gitlab.cern.ch/atlas/athena/-/merge_requests/22775Sweeping !22680 from 21.3 to 21.9.
Add chains to Physics_pp_v7_primaries in R...2019-04-29T11:05:18+02:00Atlas NightlybuildSweeping !22680 from 21.3 to 21.9.
Add chains to Physics_pp_v7_primaries in Rel21.3, ATR-19617Add chains to Physics_pp_v7_primaries in Rel21.3, ATR-19617
See merge request atlas/athena!22680Add chains to Physics_pp_v7_primaries in Rel21.3, ATR-19617
See merge request atlas/athena!22680https://gitlab.cern.ch/atlas/athena/-/merge_requests/22776Sweeping !22721 from 21.3 to 21.9.
Add new test in TrigAnalysisTest for RDO->...2019-04-29T11:06:22+02:00Atlas NightlybuildSweeping !22721 from 21.3 to 21.9.
Add new test in TrigAnalysisTest for RDO->RDO_FTK (ATR-19672)Add new test in TrigAnalysisTest for RDO->RDO_FTK (ATR-19672)
See merge request atlas/athena!22721Add new test in TrigAnalysisTest for RDO->RDO_FTK (ATR-19672)
See merge request atlas/athena!22721https://gitlab.cern.ch/atlas/athena/-/merge_requests/22825Sweeping !22791 from 21.3 to 21.9.
Change default menu for TriggerTest slice ...2019-04-29T11:11:58+02:00Atlas NightlybuildSweeping !22791 from 21.3 to 21.9.
Change default menu for TriggerTest slice tests to MC_pp_v8Change default menu for TriggerTest slice tests to MC_pp_v8
See merge request atlas/athena!22791Change default menu for TriggerTest slice tests to MC_pp_v8
See merge request atlas/athena!22791