athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-06-14T21:59:33+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/33705Fix a crash in the finalisation of the histograms2020-06-14T21:59:33+02:00Mark SuttonFix a crash in the finalisation of the histogramsFor some reason, in master now, root crashes in TH1::Fit(). The histogram
is fine, the fit is fine, but root crashes. Probably some memory issue
behind the scenes when tryoing to use the root Gaussian function, so get
round this by ju...For some reason, in master now, root crashes in TH1::Fit(). The histogram
is fine, the fit is fine, but root crashes. Probably some memory issue
behind the scenes when tryoing to use the root Gaussian function, so get
round this by just using the mean and rms and avoid calling TH1::Fit() at all.
https://gitlab.cern.ch/atlas/athena/-/merge_requests/32919xAODCore Dictionary Updates, master branch (2020.05.15.)2020-05-22T17:28:45+02:00Attila KrasznahorkayxAODCore Dictionary Updates, master branch (2020.05.15.)Similar to !32914, this MR continues sampling updates from !32081 into digestible chunks.
In order to organise the dictionary generation of the xAOD packages a little better, this MR introduces some new functionality in [xAODCore](Event...Similar to !32914, this MR continues sampling updates from !32081 into digestible chunks.
In order to organise the dictionary generation of the xAOD packages a little better, this MR introduces some new functionality in [xAODCore](Event/xAOD/xAODCore).
- A new header, `xAODCore/tools/DictHelpers.h`, which provides some convenience macros for instantiating (smart pointer) types that we typically want to generate dictionaries for;
- A new CMake module, `xAODUtilitiesConfig.cmake`, which provides the `atlas_add_xaod_smart_pointer_dicts(...)` helper function for generating the XML lines corresponding to the types that the helper functions from `xAODCore/tools/DictHelpers.h` instantiated.
The idea here was to avoid the mindless repetitions of lines in the `<Foo>Dict.h` headers and `selection.xml` files across the packages. With the help of these macros and the CMake function the xAOD packages can express in a much more compact way which types they want to generate smart pointer dictionaries for.
The concept for this is not new at all. The [atlas_add_dictionary(...)](https://twiki.cern.ch/twiki/bin/view/AtlasComputing/SoftwareDevelopmentWorkBookCMakeInAtlas#atlas_add_dictionary) function can actually auto-generate type declarations for the dictionary that it wants to generate, through its many optional arguments, already. I was at first considering extending that function inside [atlas/atlasexternals](https://gitlab.cern.ch/atlas/atlasexternals) for this functionality at first, but then decided that it would be more elegant to have this implemented in [xAODCore](Event/xAOD/xAODCore). A bit similar to how [AthenaPoolUtilitiesTestConfig.cmake](Database/AthenaPOOL/AthenaPoolUtilities/cmake/AthenaPoolUtilitiesTestConfig.cmake) is used. (Just like for [AthenaPoolUtilitiesTestConfig.cmake](Database/AthenaPOOL/AthenaPoolUtilities/cmake/AthenaPoolUtilitiesTestConfig.cmake), I had to teach the project configurations how to find this module.)
With this functionality in place I also updated a number of "simpler" packages as part of this MR, to make use of this code. These are all packages that didn't declare any STL-only dictionaries, or any other dictionary that in !32081 I decided to migrate somewhere else. The list doesn't even include all the "simple" packages like that, as I wanted to keep this MR small enough to be reviewable. Once this MR is merged, I'll open separate MRs with the remaining updates that I developed in !32081.
Pinging @ssnyder, @fwinkl and @krumnack for information purpuses.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32900Set jet TVA WP back to original Loose2020-07-08T20:59:22+02:00William Keaton BalunasSet jet TVA WP back to original LooseThe track-vertex association working points were recently changed (!32362). These haven't been studied by Jet/Etmiss yet, so we'd like to keep the previous WP for the purposes of the ongoing physics validation such that all changes can b...The track-vertex association working points were recently changed (!32362). These haven't been studied by Jet/Etmiss yet, so we'd like to keep the previous WP for the purposes of the ongoing physics validation such that all changes can be fully understood. This MR does exactly that (adding the prefix `Old_` to the WP name gives this). We'll update to one of the new WPs after we've had a chance to study the performance implications.
Tagging @sawyer, @sschramm, @cdelitzs for their awareness.https://gitlab.cern.ch/atlas/athena/-/merge_requests/31561Test classes TileGeoG4SD and TileGeoG4CalibSD2020-06-30T02:30:34+02:00Liangliang HanTest classes TileGeoG4SD and TileGeoG4CalibSDIn the branch, I will test the classes `TileGeoG4SD` and `TileGeoG4CalibSD`. Here is how I did about my testing strategy.
1. I put my test codes in the `test` folder. And the nomenclature is like `CLASSNAME_gtest.cxx` for testing the ...In the branch, I will test the classes `TileGeoG4SD` and `TileGeoG4CalibSD`. Here is how I did about my testing strategy.
1. I put my test codes in the `test` folder. And the nomenclature is like `CLASSNAME_gtest.cxx` for testing the class `CLASSNAME`.
2. I created the jobOption file `optionForTest.txt`, which is placed in the `share` folder.
3. In oder to add my test classes as friends of the tested classes, I add several lines for that in the file `CLASSNAME_gtest.h`.
4. Of course, I add some lines in the `CMakeLists.txt` for compiling my test code, using google test frame work, and so on.
5. I create 3 files and put them into the folder `Simulation/G4Atlas/G4AtlasTools/G4AtlasTools`. The 1st file is `DerivedG4SensitiveDetectorTestSetting.h`, where I define a function for setting G4-objects to G4Step object. The 2nd file is `G4MyPhysicalVolume.h`, where I define a class called `G4MyPhysicalVolume` that is derived from `G4VPhysicalVolume`. The 3rd file is `G4MyProcess.h`, where I define a class called `G4MyProcess` that is derived from `G4VProcess`.
6. Also, I created a file called `DerivedG4SensitiveDetector.h` in the folder `Simulation/G4Atlas/G4AtlasTools/G4AtlasTools`, which is intended to define a class inheriting from a abstract class `G4VSensitiveDetector`. Then I can use the derived class in my test codes.
7. In addition, I created files called `DerivedISvcLocator.h` and `DerivedITileCalculator.h` where two classes are defined with inheriting respectively class `SvcLocator` and class `ITileCalculator`.
8. It is worth mentioning that I use different TEST_F to test different member functions of the tested class.https://gitlab.cern.ch/atlas/athena/-/merge_requests/29142PixelAthMonitoringBase : fix issue in recent CI2019-12-21T19:56:47+01:00Christos Anastopouloschristos.anastopoulos@cern.chPixelAthMonitoringBase : fix issue in recent CIIn a few recent CI one can see
```
raceback (most recent call last):
File "/build2/ci-builds/master/Athena/build/Athena/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeFiles/PixelAthMonitoringBasepycGen.py", line 1, in <module>
...In a few recent CI one can see
```
raceback (most recent call last):
File "/build2/ci-builds/master/Athena/build/Athena/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeFiles/PixelAthMonitoringBasepycGen.py", line 1, in <module>
import py_compile; py_compile.compile( '/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py', cfile = '/build2/ci-builds/master/Athena/build/Athena/x86_64-centos7-gcc8-opt/python/PixelMonitoring/PixelAthMonitoringBase.pyc', doraise = True )
File "/cvmfs/sft.cern.ch/lcg/releases/LCG_96/Python/2.7.16/x86_64-centos7-gcc8-opt/lib/python2.7/py_compile.py", line 117, in compile
raise py_exc
py_compile.PyCompileError: File "/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py", line 11
if “ServiceMgr†in dir():
```
This should fix it
i.e fixes
this issue
```
InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py:11:4: E999 SyntaxError: invalid syntax
```
Mentiong @ponyisi @fwinkl @ssnyder @wlamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/29094Organizing sequences and adding placeholder for lhloose, lhmedium and lhtight...2019-12-19T19:59:27+01:00Fernando MonticelliOrganizing sequences and adding placeholder for lhloose, lhmedium and lhtight chains with precision stepsThis MR is a redo of !28775 to organize how sequences are setup for electron chains. I updated names and organized the preparation of the sequences as we did for photon chains. Now it is ready for adding lhloose, lhmedium and lhtight typ...This MR is a redo of !28775 to organize how sequences are setup for electron chains. I updated names and organized the preparation of the sequences as we did for photon chains. Now it is ready for adding lhloose, lhmedium and lhtight type of chains that are comming soon.
Precision sequences are here running on lhloose, lhmedium and lhtight chains.
Added in the menu the following development chains:
* HLT_e5_lhloose_L1EM3
* HLT_e5_lhmedium_L1EM3
* HLT_e5_lhtight_L1EM3
And the following primary electron chains:
* HLT_e26_lhtight_L1EM24VHI
* HLT_e60_lhmedium_L1EM24VHI
* HLT_e140_lhloose_L1EM24VHI
* HLT_e300_etcut_L1EM24VHI
* HLT_2e17_lhvloose_L12EM3
Note that none of these chains are implementing the likelihood yet. Just precision tracking and electron reconstruction using topoEgamaBuilder and applying a pT cut at the end as a final hypo.
Implementation of likelihood via ElectronPhotonSelectorTools is being developed by @dbakshig and myself on another MR
This is following the task discussed in ATR-18927 and tasks within.https://gitlab.cern.ch/atlas/athena/-/merge_requests/26486Fixing newly introduced warning in FastCaloSim2019-09-11T14:46:51+02:00Pavol StrizenecFixing newly introduced warning in FastCaloSimThis should fix the flake8 warning introduced by mistake in the recent MR !26383This should fix the flake8 warning introduced by mistake in the recent MR !26383https://gitlab.cern.ch/atlas/athena/-/merge_requests/23735Switch triggerAPI to v7_primaries menu2019-06-03T17:06:21+02:00Javier Montejo BerlingenSwitch triggerAPI to v7_primaries menuFixes a problem introduced in !23622
Tagging @fwinklFixes a problem introduced in !23622
Tagging @fwinklhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/23501Fix in TrigT1/TrigT1RPChardware/Matrix.cxx relative to ATR-194272019-05-22T22:09:41+02:00Antonio PolicicchioFix in TrigT1/TrigT1RPChardware/Matrix.cxx relative to ATR-19427Fix in TrigT1/TrigT1RPChardware/Matrix.cxx relative to ATR-19427: use &&, not &, for booleans at line 1247.
Closes ATR-19427Fix in TrigT1/TrigT1RPChardware/Matrix.cxx relative to ATR-19427: use &&, not &, for booleans at line 1247.
Closes ATR-19427https://gitlab.cern.ch/atlas/athena/-/merge_requests/22370Use imf in all tests2019-04-04T15:40:58+02:00Tomasz BoldUse imf in all testsThis MR should fix the irreproducibility in TUT tests.
Should fix !22347 and similar.This MR should fix the irreproducibility in TUT tests.
Should fix !22347 and similar.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/21650Follow up !21424 - fixes to upgrade test reference and GenerateMenuMT.py2019-03-06T10:41:12+01:00Tim MartinFollow up !21424 - fixes to upgrade test reference and GenerateMenuMT.pyUpdate RunMenuTest.ref with new naming convention including L1 item. Fix python typo in GenerateMenuMT.py
Issue was missed due to !21424 not touching `TrigUpgradeTest` (and hence not triggering unit test CI)
Marking urgent as blocks tr...Update RunMenuTest.ref with new naming convention including L1 item. Fix python typo in GenerateMenuMT.py
Issue was missed due to !21424 not touching `TrigUpgradeTest` (and hence not triggering unit test CI)
Marking urgent as blocks trigger devhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64083Config delta X and Y cuts2023-07-04T10:54:14+02:00Luisa CarvalhoConfig delta X and Y cutsConfigure cuts in delta X and Y for AFP+dijet algorithm. Job options change only. Y and absolute distance cuts very wide since we know that with current parameterization and lack of global alignment Y matching probably won't work.Configure cuts in delta X and Y for AFP+dijet algorithm. Job options change only. Y and absolute distance cuts very wide since we know that with current parameterization and lack of global alignment Y matching probably won't work.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64065Set FRONTIER as default database server instead of ORACLE in all TileCal pyth...2023-06-30T23:44:35+02:00Sanya SolodkovSet FRONTIER as default database server instead of ORACLE in all TileCal python scriptsUpdating all python scripts which works with COOL DB - set FRONTIER as default database serverUpdating all python scripts which works with COOL DB - set FRONTIER as default database serverhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63927Update NSWPRDValAlg output filenames2023-06-26T14:48:32+02:00Marten Zefanja BarelUpdate NSWPRDValAlg output filenamesSmall update the the names of the output files generated by the NSWPRDValAlg python scripts to match the name of the script generating the fileSmall update the the names of the output files generated by the NSWPRDValAlg python scripts to match the name of the script generating the filehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/6382423.0-coverity-FPGATrackSimMaps2023-06-20T13:13:48+02:00Shaun Roe23.0-coverity-FPGATrackSimMapsFix various coverity defects: uninitialised member variables, use of uninitialised variable, memory leak. One identified bug (arguments reversed) will have JIRA ticket opened, not part of this MR.Fix various coverity defects: uninitialised member variables, use of uninitialised variable, memory leak. One identified bug (arguments reversed) will have JIRA ticket opened, not part of this MR.https://gitlab.cern.ch/atlas/athena/-/merge_requests/63778Improvements and fixes to PhysLite, primarily as seen from the H4l analysis...2023-06-18T18:59:36+02:00R D SchafferImprovements and fixes to PhysLite, primarily as seen from the H4l analysis...Improvements and fixes to PhysLite (and Phys), primarily as seen from the H4l analysis perspective.
The changes include:
- Implementation of the isolationCloseBy tool in the running of Phys and PhysLite. This allows closeBy to be availa...Improvements and fixes to PhysLite (and Phys), primarily as seen from the H4l analysis perspective.
The changes include:
- Implementation of the isolationCloseBy tool in the running of Phys and PhysLite. This allows closeBy to be available for all analyses, and avoids extra information to be added to either so that one could do it when reading Phys/PhysLite and included LLP1. Corrected iso variables are <iso_value>_OR. For the moment, the 'extra' closeBy information is left in Phys and LLP1 to allow cross check. But this can be removed, eventually. - [ATLASG-2520](https://its.cern.ch/jira/browse/ATLASG-2520)
- Added in config to PhysLite for H4l vertex calculation [ATLASG-2518](https://its.cern.ch/jira/browse/ATLASG-2518)
- Added in STXS information to PhysLite for Higgs analyses, fixing units [ATLASG-2515](https://its.cern.ch/jira/browse/ATLASG-2515)
- Reducing the electron id requirement from LH Loose to SiHits for PhysLite [ATLASG-2537](https://its.cern.ch/jira/browse/ATLASG-2537)R D SchafferR D Schafferhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63718modify tau smear tool according to R22 rec2023-06-15T12:30:39+02:00Mingming Xiamodify tau smear tool according to R22 recadd "Campaign" property for tau smear tool for AnalysisTopadd "Campaign" property for tau smear tool for AnalysisTophttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63504SUSYTools - Fix art AthAnalysis2023-06-06T16:40:53+02:00Marco RimoldiSUSYTools - Fix art AthAnalysisMarco RimoldiMarco Rimoldihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63474Fix typo in Muon Tester Tree branch2023-06-05T12:34:09+02:00Davide CieriFix typo in Muon Tester Tree branchLittle MR to fix a typo in the mcChannelNumber branch of the muon tester treeLittle MR to fix a typo in the mcChannelNumber branch of the muon tester treeJohannes Junggeburthjohannes.josef.junggeburth@cern.chJohannes Junggeburthjohannes.josef.junggeburth@cern.ch