athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-08-24T03:05:27+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/243011rdo/1execute + disable the ntups properly2019-08-24T03:05:27+02:00Serhat Istin1rdo/1execute + disable the ntups properlyfollow up of the ticket ATR-19347
* guarantee 1 trg rdo container / execute
* disable / fix ntuples properlyfollow up of the ticket ATR-19347
* guarantee 1 trg rdo container / execute
* disable / fix ntuples properlyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/215772018PbPb overlay config update2019-04-04T09:56:29+02:00Tatyana Kharlamova2018PbPb overlay config updateUpdate configuration files for 2018 PbPb data overlay
1) Run number 313000
2) MC tag for overrides OFLCOND-MC16-SDR-26
3) Updated TRT RT and T0, Pixel DCS folders override
4) BlockFolders for OverlayBS and ESDtoAOD steps are updated...Update configuration files for 2018 PbPb data overlay
1) Run number 313000
2) MC tag for overrides OFLCOND-MC16-SDR-26
3) Updated TRT RT and T0, Pixel DCS folders override
4) BlockFolders for OverlayBS and ESDtoAOD steps are updated to exclude new unused folders
5) Improvement in reducing condition load with retrieving folders with run 265681 (DQ reference run)
JIRA ticket: https://its.cern.ch/jira/browse/ATLHI-261
//cc @olszewskhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/3906121.0 add tfcs energy interpolation histogram2021-01-15T14:42:50+01:00Benedict Tobias Winter21.0 add tfcs energy interpolation histogramAdd functionality to determine the total energy to be deposited for a particle in FastCaloSim based on histograms that serve as lookup tables. Planned use case is for low energy hadrons.Add functionality to determine the total energy to be deposited for a particle in FastCaloSim based on histograms that serve as lookup tables. Planned use case is for low energy hadrons.https://gitlab.cern.ch/atlas/athena/-/merge_requests/2188721.0-FastCaloSim: Adding function LoadFCalGeometryFromFiles to CaloGeometryFr...2019-04-04T09:56:28+02:00Petr Jacka21.0-FastCaloSim: Adding function LoadFCalGeometryFromFiles to CaloGeometryFromFileLoadFCalGeometryFromFiles function was removed from CaloGeometry class in atlas/athena!21722. However, this function is still needed in tools/CaloGeometryFromFile.cxx. I assumed by mistake that the function is also in this function. I am...LoadFCalGeometryFromFiles function was removed from CaloGeometry class in atlas/athena!21722. However, this function is still needed in tools/CaloGeometryFromFile.cxx. I assumed by mistake that the function is also in this function. I am adding this missing function in there.
tools/CaloGeometryFromFile class is not used by any athena classes and it is not even compiled in athena. It is just required in local runs outside athena. It will be removed from athena repository soon but we still need to have it working for some time.https://gitlab.cern.ch/atlas/athena/-/merge_requests/2172221.0-FastCaloSim: Removing LoadFCalGeometryFromFiles function2019-04-04T09:56:29+02:00Petr Jacka21.0-FastCaloSim: Removing LoadFCalGeometryFromFiles functionLoadFCalGeometryFromFiles function is removed from CaloGeometry class since it is no longer needed to run FastCaloSim in athena.LoadFCalGeometryFromFiles function is removed from CaloGeometry class since it is no longer needed to run FastCaloSim in athena.https://gitlab.cern.ch/atlas/athena/-/merge_requests/2231521.0 fcs debugging histograms2019-05-04T03:03:12+02:00Miha Muskinjamiha.muskinja@cern.ch21.0 fcs debugging histogramsChanges the G4Debugging algorithm to also make separate histograms for pions (before they were in `other`). Also adds 2D stepping histograms weighted with energy deposit and slightly changed the resolution of 2D plots.Changes the G4Debugging algorithm to also make separate histograms for pions (before they were in `other`). Also adds 2D stepping histograms weighted with energy deposit and slightly changed the resolution of 2D plots.https://gitlab.cern.ch/atlas/athena/-/merge_requests/2047921.0 first version of DNNCaloSimSvc2019-03-15T15:49:31+01:00David Rousseau21.0 first version of DNNCaloSimSvcFirst version of DNNCaloSimSvc to be run in lieu of FastCaloSimSvcV2.
Standard running of FastCaloSimSvcV2 is unchanged.
How to run DNNCaloSim (tested on 21.0.92, replace full path to input simulated data and input json file):
Ho...First version of DNNCaloSimSvc to be run in lieu of FastCaloSimSvcV2.
Standard running of FastCaloSimSvcV2 is unchanged.
How to run DNNCaloSim (tested on 21.0.92, replace full path to input simulated data and input json file):
How to run DNNCaloSim (tested on 21.0.92, replace full path to input simulated data and input json file):
similar to FCS:
```Sim_tf.py --simulator 'G4FastCaloDNN' --conditionsTag 'default:OFLCOND-MC16-SDR-14' --physicsList 'FTFP_BERT_ATL' --truthStrategy 'MC15aPlus' --postInclude 'default:RecJobTransforms/UseFrontier.py,G4AtlasTests/postInclude.DCubeTest.py' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' --DataRunNumber '284500' --geometryVersion 'default:ATLAS-R2-2016-01-00-01_VALIDATION' --inputEVNTFile /exp/atlas/rousseau/fcsdata/mc15_13TeV.431004.ParticleGun_pid22_E65536_disj_eta_m25_m20_20_25_zv_0.EVNT.pool.root --outputHITSFile photons.G4FastCalo.HITs.pool.root --maxEvents 5 '```
minimal to run only DNN, to save initialization time (runs in 90s wall clock time instead of 200s):
```Sim_tf.py --simulator 'DNNOnly' --geometryVersion 'default:ATLAS-R2-2016-01-00-01_VALIDATION' --inputEVNTFile /exp/atlas/rousseau/fcsdata/mc15_13TeV.431004.ParticleGun_pid22_E65536_disj_eta_m25_m20_20_25_zv_0.EVNT.pool.root --outputHITSFile photons.G4FastCalo_light.HITs.pool.root --maxEvents 5 --preExec 'from ISF_FastCaloSimServices.ISF_FastCaloSimJobProperties import ISF_FastCaloSimFlags;ISF_FastCaloSimFlags.ParamsInputFilename="DNNCaloSim/DNNCaloSim_GAN_nn_v0.json";from AthenaCommon.DetFlags import DetFlags;DetFlags.all_setOn();DetFlags.Muon_setOff();DetFlags.LVL1_setOff();DetFlags.Forward_setOff()'```
Aishik GhoshAishik Ghoshhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/2060721.0 fix nightly test22019-05-22T18:44:46+02:00Joerg Stelzer21.0 fix nightly test2Fix the configuration of the files to be saved by ART to include the athena log reference filesFix the configuration of the files to be saved by ART to include the athena log reference fileshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/2116321.0-ISF_FastCaloSim: Adding TFCSCenterPositionCalculation to the simulation ...2019-04-04T09:56:30+02:00Petr Jacka21.0-ISF_FastCaloSim: Adding TFCSCenterPositionCalculation to the simulation chainTFCSCenterPositionCalculation is added to the FastCaloSim simulation chain. This class was already prepared in previous MR.
It improves simulation of variables sensitive to z-vertex position.
See ATLASSIM-4067.TFCSCenterPositionCalculation is added to the FastCaloSim simulation chain. This class was already prepared in previous MR.
It improves simulation of variables sensitive to z-vertex position.
See ATLASSIM-4067.https://gitlab.cern.ch/atlas/athena/-/merge_requests/2324621.0 PixelPrdAssoication improvements2019-06-29T03:02:25+02:00Matthew Gignac21.0 PixelPrdAssoication improvementsHi,
This merge request implements improvements for the PixelPrdAssoication configuration:
1) Extends the minimum number of hits to 3 to improve reconstruction efficiency for shorter tracklets
2) Enables an SCT hit filter to improve reco...Hi,
This merge request implements improvements for the PixelPrdAssoication configuration:
1) Extends the minimum number of hits to 3 to improve reconstruction efficiency for shorter tracklets
2) Enables an SCT hit filter to improve reconstruction efficiency, SCT hit veto efficiency, and purity of selected tracklets
3) Fixes a bug in SiTools_xk (in regards to the SCT hit filter)
4) Uses PixelPrdAssoication configuration for vertexing code which previously relied on the PixelThreeLayer configuration.
Since (1)-(2) these changes would violate the frozen T0 policy, they were protected under a flag (default false) so that the original configuration in 21.0 remains, as recommended from the reconstruction SW experts. These changes will be included in a RPVLL reprocessing of 2018 data.
Cheers,
Matthew
Tagging @mhodgkin, @goetz , @mdanning , @npettershttps://gitlab.cern.ch/atlas/athena/-/merge_requests/2832821.0 RPVLL filters for displaced Taus added2020-01-01T03:02:29+01:00Guillermo Nicolas Hamity21.0 RPVLL filters for displaced Taus addedRPVLL processing filter for displaced Tau searches added.
New Tau Filters targeting hadronically decaying tau leptons from long-lived decays.
Minimal implementation: single/di-tau and tau+MET triggers targeting late 2018 data.
Only RNN...RPVLL processing filter for displaced Tau searches added.
New Tau Filters targeting hadronically decaying tau leptons from long-lived decays.
Minimal implementation: single/di-tau and tau+MET triggers targeting late 2018 data.
Only RNN triggers to be used for end-of-2019 reprocessing.
Implementation follows what is done for other RPVLL filters.Guillermo Nicolas HamityGuillermo Nicolas Hamityhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/2158721.0 SimulationJobOptions: Fix in postInclude.HijingPars.py to get output str...2019-04-04T09:56:29+02:00Andrzej Olszewski21.0 SimulationJobOptions: Fix in postInclude.HijingPars.py to get output streams from correct locationsFix in postInclude.HijingPars.py job option used only if explicitely requested in transform command
Fix to get output streams from correct locations:
StreamHITS from AlgSequence("Streams")
StreamRDO,EDS,AOD from topSequenceFix in postInclude.HijingPars.py job option used only if explicitely requested in transform command
Fix to get output streams from correct locations:
StreamHITS from AlgSequence("Streams")
StreamRDO,EDS,AOD from topSequencehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/4387421.0 trt ht middlebit option2021-06-17T10:07:40+02:00Christian Grefe21.0 trt ht middlebit optionAdds an option to enable bit masking for TRT raw data consistent with the suppression in data and with the treatment in r22.
Usage: `--preExec "all:from InDetRecExample.InDetJobProperties import InDetFlags; InDetFlags.maskTRToutOfTimeBi...Adds an option to enable bit masking for TRT raw data consistent with the suppression in data and with the treatment in r22.
Usage: `--preExec "all:from InDetRecExample.InDetJobProperties import InDetFlags; InDetFlags.maskTRToutOfTimeBits.set_Value_and_Lock(True)"`https://gitlab.cern.ch/atlas/athena/-/merge_requests/2419221.0-Z-counting2019-07-30T13:22:31+02:00Michael William O'Keefe21.0-Z-countingUpdated muon channel ID track T&P methodUpdated muon channel ID track T&P methodhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/3061721.2 Add resolution categories2020-02-28T11:15:59+01:00Magnar Kopangen Bugge21.2 Add resolution categoriesThis merge request adds a function to the MuonSelectorTool that allows categorization of muons according to their resolution as observed in MC samples with realistic detector misalignments. This will be used in an update of the MuonCalib...This merge request adds a function to the MuonSelectorTool that allows categorization of muons according to their resolution as observed in MC samples with realistic detector misalignments. This will be used in an update of the MuonCalibrationAndSmearingTool to allow more realistic smearing to be applied to muons that fail the high-pT working point and also to the 2-station muons currently accepted in the high-pT working point.https://gitlab.cern.ch/atlas/athena/-/merge_requests/4003821.2-AnalysisTop: Fixing bug in b-tagging per track jet scale factors2021-01-29T18:10:57+01:00Petr Jacka21.2-AnalysisTop: Fixing bug in b-tagging per track jet scale factorsTypo in the code caused that per track jet scale factor variations were not stored properly. Variatons for calo jets were stored instead.
Link to ticket: ANALYSISTO-1054Typo in the code caused that per track jet scale factor variations were not stored properly. Variatons for calo jets were stored instead.
Link to ticket: ANALYSISTO-1054https://gitlab.cern.ch/atlas/athena/-/merge_requests/3897221.2-AnalysisTop: Updating to consolidated boosted jet tagging recommendations2021-03-18T12:26:49+01:00Petr Jacka21.2-AnalysisTop: Updating to consolidated boosted jet tagging recommendationsAdding a support for systematic uncertainties related with boosted jets tagging.
Scale factors variations are stored in the nominal tree only if they are independent of 4-momentum variations. Other variations are performed coherently wi...Adding a support for systematic uncertainties related with boosted jets tagging.
Scale factors variations are stored in the nominal tree only if they are independent of 4-momentum variations. Other variations are performed coherently with 4-momentum variations in systematic trees.https://gitlab.cern.ch/atlas/athena/-/merge_requests/3300621.2 eigenvectorrecompositiontool2020-07-03T09:05:49+02:00Yan Ke21.2 eigenvectorrecompositiontoolThis MR introduces the btagging eigen vector recomposition tool. For more details see [link](https://indico.cern.ch/event/920893/contributions/3869073/attachments/2040988/3418815/20200519.pdf)
@cvarni @sanmay @cpollard @filthaut @iluise ...This MR introduces the btagging eigen vector recomposition tool. For more details see [link](https://indico.cern.ch/event/920893/contributions/3869073/attachments/2040988/3418815/20200519.pdf)
@cvarni @sanmay @cpollard @filthaut @iluise @giacinto @qbuathttps://gitlab.cern.ch/atlas/athena/-/merge_requests/2537921.2 - Fix logic in precision layer counting for forward muons2020-04-20T12:02:39+02:00Magnar Kopangen Bugge21.2 - Fix logic in precision layer counting for forward muons@jojungge and @nkoehler noticed that the current logic in the counting of precision layers for forward muons might allow double counting of the middle and outer layers in particular circumstances with overlap between small and large sect...@jojungge and @nkoehler noticed that the current logic in the counting of precision layers for forward muons might allow double counting of the middle and outer layers in particular circumstances with overlap between small and large sectors. This is now fixed.
The fix has a very small impact and only affects stand-alone and silicon-associated forward muons in the region |eta| > 2.5 entering the Loose and Medium working points.
It was useful to extend the MuonSelectorToolsTester slightly to keep track of changes in different eta regions, so this is also included in the merge request.
Tagging @szambito and @fsforzahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/3834121.2 MC truth classifier in MuonSelectorToolsTester2020-11-19T09:00:25+01:00Magnar Kopangen Bugge21.2 MC truth classifier in MuonSelectorToolsTesterThis MR adds truth classification based on MCTruthClassifier to the output of MuonSelectorToolsTester. This can be useful for spotting problems related to prompt-muon efficiencies or "fake-muon" misidentification rates.This MR adds truth classification based on MCTruthClassifier to the output of MuonSelectorToolsTester. This can be useful for spotting problems related to prompt-muon efficiencies or "fake-muon" misidentification rates.