athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-03-01T14:11:51+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/40547"Include ionization statististics in sTGC digitization"2021-03-01T14:11:51+01:00Sandeep Kaursandeep.hep@gmail.com"Include ionization statististics in sTGC digitization"include polya distribution function to parameterize ionization gain
@alaurier @dpizziinclude polya distribution function to parameterize ionization gain
@alaurier @dpizzihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40466Sweeping !40386 from master to 21.3.
Add warning to MuonPerformanceAlg in cas...2021-02-10T03:06:40+01:00Atlas NightlybuildSweeping !40386 from master to 21.3.
Add warning to MuonPerformanceAlg in case muon is of bad qualityAdd warning to MuonPerformanceAlg in case muon is of bad quality
See merge request atlas/athena!40386Add warning to MuonPerformanceAlg in case muon is of bad quality
See merge request atlas/athena!40386https://gitlab.cern.ch/atlas/athena/-/merge_requests/40420Replace unsafe sprintf() in NSWL1Simulation::initialize()2021-02-10T03:06:39+01:00Yuval ZachReplace unsafe sprintf() in NSWL1Simulation::initialize()In `NSWL1Simulation::initialize()`, two calls are made to `sprintf` into a stack-allocated array. The format string is unbounded, meaning a `name()` longer than 36 characters (extremely unlikely) will result in a stack buffer overflow.
...In `NSWL1Simulation::initialize()`, two calls are made to `sprintf` into a stack-allocated array. The format string is unbounded, meaning a `name()` longer than 36 characters (extremely unlikely) will result in a stack buffer overflow.
This replaces the `sprintf` and char arrays with C++ strings.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40364Sweeping !40292 from master to 21.3.
Fix muon reco ART test release2021-02-06T03:06:32+01:00Atlas NightlybuildSweeping !40292 from master to 21.3.
Fix muon reco ART test releaseFix muon reco ART test release
See merge request atlas/athena!40292Fix muon reco ART test release
See merge request atlas/athena!40292https://gitlab.cern.ch/atlas/athena/-/merge_requests/40332Manual sweep of !40325 (Fix NSW check crash)2021-02-08T09:32:30+01:00Nicolas KoehlerManual sweep of !40325 (Fix NSW check crash)Hi,
this MR is a manual sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/40325 into ~"21.3" and ~"21.9". Also closes ATLASRECTS-5987.
Best, NicoHi,
this MR is a manual sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/40325 into ~"21.3" and ~"21.9". Also closes ATLASRECTS-5987.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40275Bump q221 and q431 references2021-02-08T09:48:35+01:00Tadej Novaktadej.novak@cern.chBump q221 and q431 referencesBump `q221` and `q431` references after !40181. @jchapman is aware and setting to auto-merge.Bump `q221` and `q431` references after !40181. @jchapman is aware and setting to auto-merge.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40214Sweeping !40177 from master to 21.3.
Update rel22 muon reco ART tests2021-02-05T03:06:38+01:00Atlas NightlybuildSweeping !40177 from master to 21.3.
Update rel22 muon reco ART testsUpdate rel22 muon reco ART tests
See merge request atlas/athena!40177Update rel22 muon reco ART tests
See merge request atlas/athena!40177https://gitlab.cern.ch/atlas/athena/-/merge_requests/40189Fix sc simple maker2021-02-05T18:10:24+01:00Denis Oliveira DamazioFix sc simple makerVery interesting bad feature of CaloDDE->IdentifierHash. I wonder if this happens in other places (What do you think @pavol?? Maybe there are many places where I might have done this wrongly).
It looks like caloDDE->IdentifierHash return...Very interesting bad feature of CaloDDE->IdentifierHash. I wonder if this happens in other places (What do you think @pavol?? Maybe there are many places where I might have done this wrongly).
It looks like caloDDE->IdentifierHash returns a hash within the SubCalo, instead of doing
so within the whole calorimeter. @lbaltes (I hope I got the right one), got the point (Thanks a lot) and I propose here a fix for the specific algorithm she was talking about. This is probably the reason why we have some issues yet to be understood in the HEC and FCAL superCells.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40181Keep MuonAuxContainer_v4 default in 21.X2021-02-08T09:48:35+01:00Tadej Novaktadej.novak@cern.chKeep MuonAuxContainer_v4 default in 21.XTo allow compatibility with other branches keep `MuonAuxContainer_v4` default in `21.X` branches.
/cc @nkoehler @bcarlson @jchapmanTo allow compatibility with other branches keep `MuonAuxContainer_v4` default in `21.X` branches.
/cc @nkoehler @bcarlson @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40174Manual sweep of !40112 (More protections against non-existing Run3 MDT calibr...2021-02-05T18:17:25+01:00Nicolas KoehlerManual sweep of !40112 (More protections against non-existing Run3 MDT calibration database)Hi,
since the automatic sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/40112 into ~"21.3" and ~"21.9" failed, here the manual sweep.
Best, NicoHi,
since the automatic sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/40112 into ~"21.3" and ~"21.9" failed, here the manual sweep.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40147modify the asetup configuration from slc6 to centos7 (ATR-22677)2021-02-10T03:06:36+01:00Yasuyuki Okumuramodify the asetup configuration from slc6 to centos7 (ATR-22677)To modify obsolete settings in the following tests, addressing ATR-22677.
- `Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v8_rdotoaod_deriv_build.sh`
- `Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v8_rdotoaod_deriv...To modify obsolete settings in the following tests, addressing ATR-22677.
- `Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v8_rdotoaod_deriv_build.sh`
- `Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v8_rdotoaod_deriv_grid.sh`
Best regards,
Yasu Okumurahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39997Manual sweep of !39926 (Fix MuonTruthAssociationAlg for running without CSCs)2021-02-08T09:48:35+01:00Nicolas KoehlerManual sweep of !39926 (Fix MuonTruthAssociationAlg for running without CSCs)Hi,
since the automatic sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/39926 into ~"21.3" and ~"21.9" failed, here the manual sweep.
Best, NicoHi,
since the automatic sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/39926 into ~"21.3" and ~"21.9" failed, here the manual sweep.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39946Fix usage of mm cluster on track creator2021-02-20T12:27:04+01:00Patrick ScholerFix usage of mm cluster on track creatorThis MR introduces the use of the MMClusterOnTrackCreator to the ` MuonPRDSelectionTool` (thanks to @ztarem for identifying the problem) and in the `MuonChamberHoleRecoveryTool` (ATLASRECTS-5630) . Furthermore it adds a check to the `Muo...This MR introduces the use of the MMClusterOnTrackCreator to the ` MuonPRDSelectionTool` (thanks to @ztarem for identifying the problem) and in the `MuonChamberHoleRecoveryTool` (ATLASRECTS-5630) . Furthermore it adds a check to the `MuonClusterOnTrackCreator` to throw an error if its called with an MM cluster.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39812Fixes to pedestal correction related trigger algorithm sequence2021-02-08T09:48:35+01:00Ben CarlsonFixes to pedestal correction related trigger algorithm sequence- For MC simulation, I adjusted the sequence to run the PC from HITS to RDO, as implemented in MR37875. Here I change the names pulled from the trigger sequence to reflect the pedestal corrected containers. Note that the PC applied from ...- For MC simulation, I adjusted the sequence to run the PC from HITS to RDO, as implemented in MR37875. Here I change the names pulled from the trigger sequence to reflect the pedestal corrected containers. Note that the PC applied from HITS to RDO has been validated, and seem to perform well. See: https://indico.cern.ch/event/993730/
- For the emulation (data and MC), adjusted the sequence to use the new `SuperCellBCIDEmAlg` algorithm introduced in MR38859. This means the PC now works on emulated MC and on data. Please note that this fix does resolve some issues with the pedestal correction for the emulation tool and for data, but **the known issues with an estimate of the supercell time in data persist. To be clear, we cannot trust the emulation until we address the timing issue (that is in progress by Lisa Baltes and myself, but not related to this merge request)** ATR-22168, ATR-20845
- The MR38395 is no longer needed and has been closed, as this involves some fixes for a different angle to this problem, that we decided to not pursue.
- I have tested these changes using the MC reconstruction tag and using the trigger reprocessing command on data.
**Test to run on MC simulation**
`Reco_tf.py --AMIConfig="r12259" --maxEvents="10" \
--inputHITSFile="/eos/atlas/user/b/bcarlson/Run3Tmp/mc16_13TeV.361020.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ0W.simul.HITS.e3569_s3126/HITS.10728672._000474.pool.root.1" \
--inputHighPtMinbiasHitsFile="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/validate_sampleT/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.simu\
l.HITS.e4981_s3087_s3111/HITS.10701335._000217.pool.root.1" \
--inputLowPtMinbiasHitsFile="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/validate_sampleT/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.simul.\
HITS.e4981_s3087_s3111/HITS.10701323._005536.pool.root.1" \
--outputRDOFile="RDO.r12259.pool.root"--outputESDFile="ESD.r12259.pool.root" --outputAODFile="AOD.r12259.pool.root" --jobNumber="1" \
`
**Test to run on data**
`Trig_reco_tf.py --athena athena.py --inputBS_RDOFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.MissingTowers._lb0151\
._SFO-6._0001.1 --outputBSFile out.data --athenaopts='-c "setMenu=\"Physics_pp_v8\";rerunLVL1=False;rerunLVL1PhaseI=True;"' --maxEvents 10`https://gitlab.cern.ch/atlas/athena/-/merge_requests/39810Manual sweep of !39809 into 21.3 and 21.9 (fix in MDT calib)2021-02-08T09:48:35+01:00Nicolas KoehlerManual sweep of !39809 into 21.3 and 21.9 (fix in MDT calib)Hi,
this is a manual sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/39809: in case of BI sMDTs (added for Run3) where no MDT calibration data is available yet, currently the MDT calibration is skipped when running reconst...Hi,
this is a manual sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/39809: in case of BI sMDTs (added for Run3) where no MDT calibration data is available yet, currently the MDT calibration is skipped when running reconstruction. However, instead of continuing the for loop on the MdtTubeCalibContainer, we had a return statement that caused the algorithm to get stalled.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39803NSW efficiency correction2021-02-20T12:30:19+01:00Stefano RosatiNSW efficiency correctionIntroducing a PCB-dependent efficiency for NSW detectors, read from an input file, access to the HV values per PCB.Introducing a PCB-dependent efficiency for NSW detectors, read from an input file, access to the HV values per PCB.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39802ATR-22241 - adding MET chains with new L1Calo2021-02-08T09:48:35+01:00Lidija ZivkovicATR-22241 - adding MET chains with new L1CaloAdded 5 new chains, some L1 items also added. All tests passed.Added 5 new chains, some L1 items also added. All tests passed.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39794Update q431/q221 references to match !388322021-02-08T09:48:35+01:00Nicolas KoehlerUpdate q431/q221 references to match !38832Hi,
as we agreed in !38832, we did not update the q431/q221 references there, since running this locally with the new version of MuonAuxContainer would have required compiling several packages locally. Instead, we update the references ...Hi,
as we agreed in !38832, we did not update the q431/q221 references there, since running this locally with the new version of MuonAuxContainer would have required compiling several packages locally. Instead, we update the references here in a dedicated MR.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39727Sweeping !39665 from 21.9 to 21.3.
Fix leaks in sTGC_Digitization && MM_Digit...2021-02-08T09:48:36+01:00Atlas NightlybuildSweeping !39665 from 21.9 to 21.3.
Fix leaks in sTGC_Digitization && MM_DigitizationFix leaks in sTGC_Digitization && MM_Digitization
See merge request atlas/athena!39665Fix leaks in sTGC_Digitization && MM_Digitization
See merge request atlas/athena!39665https://gitlab.cern.ch/atlas/athena/-/merge_requests/39712Merge 21.0.120 and 21.0.121 into 21.32021-02-08T09:48:36+01:00John Derek ChapmanMerge 21.0.120 and 21.0.121 into 21.3This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.121](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.121) and the release
[release/21.0.119](https://gitlab.cern.ch/at...This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.121](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.121) and the release
[release/21.0.119](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.119).
Below is the full list of merge requests that were included between these two tags:
* !39271: Patch for running MC TriggerDB from SQLite (attempt 2)
* !39061: 21.0 add tfcs energy interpolation histogram
* !39248: Change to numerical more stable calculation of quasi stable particle lifetime
* !39176: Add gen particle sim quasi stable filter
* !39254: AthenaPoolCnvSvc: Re-initialize AthenaPoolCnvSvc and extract the Pool Attributes for the output file
* !39154: Fix quasi stable particle sim
* !39108: Update Simulation and Reconstruction references after CC7 update
* !38998: Added custom streamer to TFCSEnergyInterpolationPiecewiseLinear
* !38907: Revert "Merge branch '21.0-runFromSQLite' into '21.0'"
* !38799: Add a new G4FastCalo_QS simulator configuration
* !38741: xAODJiveXML: update jobOptions for jet collection names
* !38265: Patch for running MC TriggerDB from SQLite
* !38396: Fixes of Pixel Error Monitoring histograms from r22 validation
* !38036: Update Quasi-stable particle definition in GenParticleSimWhiteList
* !38095: New TFCSEnergyInterpolationPiecewiseLinear class for piecewise linear interpolation
* !37484: Fix for Monitoring of Pixel FE errors
* !38280: Upper limit for cell time cut application propagated back from master
* !38099: ATLASSIM-4945: fix for diff-root in 21.0
* !38126: Change default mpt eta window in ISF_FastCaloSimServices AdditionalConfig.py
* !37931: TRTRodDecoder bugFix: iterator increase
* !37828: Adjust cache lenght for SCT folders
* !37775: Fix ISF_EtaPhiFilter configuration for ForwardDetector Simulation (ATLASSIM-4925)
* !37622: More robust bin selection based on outEnergy in PunchThroughTools PDFcreator.cxx getRand()
* !37580: Minor fixes in D3PD jobOptions for Calibration hits
Link to the full diff between [release/21.0.121](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.121) and
[release/21.0.119](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.119)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.119...release/21.0.121