athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-04-14T15:42:29+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/62086Bug fix in VrtSecFuzzy seed cluster merging2023-04-14T15:42:29+02:00Risa UshiodaBug fix in VrtSecFuzzy seed cluster mergingThe bug in the 2-trk seed merging step in VrtSecFuzzy (https://gitlab.cern.ch/atlas/athena/-/merge_requests/49656) was fixed.
Previously the seed cluster merging was done only once.
I have modified algorithm so that the seed cluster mer...The bug in the 2-trk seed merging step in VrtSecFuzzy (https://gitlab.cern.ch/atlas/athena/-/merge_requests/49656) was fixed.
Previously the seed cluster merging was done only once.
I have modified algorithm so that the seed cluster merging is repeated until all seed clusters become independent (i.e. They don't have any common seeds.).https://gitlab.cern.ch/atlas/athena/-/merge_requests/62076SUSYTools - Update OR debug2023-04-07T15:42:40+02:00Marco RimoldiSUSYTools - Update OR debugPrevious debug:
```
SUSYObjDef_xAOD.ORTool...DEBUG Initializing SUSYObjDef_xAOD.ORTool.MuPFJetORT
SUSYObjDef_xAOD.ORTool...DEBUG Base config options: InputLabel selected OutputLabel passOR OutputPassValue 1 UserPrio 0
SUSYObjDef_xAO...Previous debug:
```
SUSYObjDef_xAOD.ORTool...DEBUG Initializing SUSYObjDef_xAOD.ORTool.MuPFJetORT
SUSYObjDef_xAOD.ORTool...DEBUG Base config options: InputLabel selected OutputLabel passOR OutputPassValue 1 UserPrio 0
SUSYObjDef_xAOD.ORTool...DEBUG Configuring mu-pflow-jet cone size 0.4
SUSYObjDef_xAOD.ORTool...DEBUG PFlow jet removal which are identified as muons config: NumJetTrk 4 MuPFJet_lowNtrk_x1 0.7 MuPFJet_lowNtrk_x2 0.85 MuPFJet_lowNtrk_y0 15000 MuPFJet_lowNtrk_y1 15000 MuPFJet_lowNtrk_y2 30000 MuPFJet_highNtrk_x1 0.6 MuPFJet_highNtrk_x2 0.9 MuPFJet_highNtrk_y0 5000 MuPFJet_highNtrk_y1 5000 MuPFJet_highNtrk_y2 30000
SUSYObjDef_xAOD.ORTool DEBUG Initializing master tool SUSYObjDef_xAOD.ORTool
```
Current debug:
```
SUSYObjDef_xAOD.ORTool...DEBUG Initializing SUSYObjDef_xAOD.ORTool.MuPFJetORT
SUSYObjDef_xAOD.ORTool...DEBUG Base config options: InputLabel selected OutputLabel passOR OutputPassValue 1 UserPrio 0
SUSYObjDef_xAOD.ORTool...DEBUG Configuring mu-pflow-jet cone size 0.4
SUSYObjDef_xAOD.ORTool...DEBUG PFlow jet removal which are identified as muons config: NumJetTrk 4 MuPFJet_lowNtrk_x1 0.7 MuPFJet_lowNtrk_x2 0.85 MuPFJet_lowNtrk_y0 15000 MuPFJet_lowNtrk_y1 15000 MuPFJet_lowNtrk_y2 30000 MuPFJet_highNtrk_x1 0.6 MuPFJet_highNtrk_x2 0.9 MuPFJet_highNtrk_y0 5000 MuPFJet_highNtrk_y1 5000 MuPFJet_highNtrk_y2 30000
SUSYObjDef_xAOD.ORTool...DEBUG Initializing SUSYObjDef_xAOD.ORTool.EleMuORT
SUSYObjDef_xAOD.ORTool...DEBUG Base config options: InputLabel selected OutputLabel passOR OutputPassValue 1 UserPrio 0
SUSYObjDef_xAOD.ORTool...DEBUG Configuring removal of overlapping calo muons
SUSYObjDef_xAOD.ORTool...DEBUG Initializing SUSYObjDef_xAOD.ORTool.EleJetORT
SUSYObjDef_xAOD.ORTool...DEBUG Base config options: InputLabel selected OutputLabel passOR OutputPassValue 1 UserPrio 1
SUSYObjDef_xAOD.ORTool...DEBUG Configuring ele-jet inner cone size 0.2
SUSYObjDef_xAOD.ORTool...DEBUG Configuring sliding outer cone for ele-jet OR with constants C1 = 0.04, C2 = 10000, MaxCone = 0.4
SUSYObjDef_xAOD.ORTool...DEBUG Initializing SUSYObjDef_xAOD.ORTool.MuJetORT
SUSYObjDef_xAOD.ORTool...DEBUG Base config options: InputLabel selected OutputLabel passOR OutputPassValue 1 UserPrio 1
SUSYObjDef_xAOD.ORTool...DEBUG Configuring ghost association + dR matching for jet-mu OR with inner cone size 0.2
SUSYObjDef_xAOD.ORTool...DEBUG Configuring sliding outer cone for mu-jet OR with constants C1 = 0.04, C2 = 10000, MaxCone = 0.4
SUSYObjDef_xAOD.ORTool...DEBUG Mu-jet matching config: NumJetTrk 3 ApplyRelPt 0 MuJetPtRatio 0.5 MuJetTrkPtRatio 0.7
SUSYObjDef_xAOD.ORTool DEBUG Initializing master tool SUSYObjDef_xAOD.ORTool
```
Follow up of: https://its.cern.ch/jira/browse/ATLSUSYBGF-658 and https://its.cern.ch/jira/browse/ATLSUSYBGF-562Marco RimoldiMarco Rimoldihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62003Better error catch in egammaLayerRecalib2023-04-05T21:42:36+02:00Jean-Baptiste De Vivie De RegieBetter error catch in egammaLayerRecalibThis MR change an assert statement to a throw runtime_error. assert might have no effect (depending on compilation options) and this can be very confusing. This is only a better protection and should have no impact for official jobs.
(wi...This MR change an assert statement to a throw runtime_error. assert might have no effect (depending on compilation options) and this can be very confusing. This is only a better protection and should have no impact for official jobs.
(will be ported to rel23/master later)https://gitlab.cern.ch/atlas/athena/-/merge_requests/61972Externals Update, 21.2 branch (2023.03.30.)2023-04-20T15:38:40+02:00Attila KrasznahorkayExternals Update, 21.2 branch (2023.03.30.)This MR is a sibling of !61968 in a way...
Updated all projects to [atlasexternals-1.0.81](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/1.0.81). The changes wrt. [atlasexternals-1.0.79](https://gitlab.cern.ch/atlas/atlasexternals/...This MR is a sibling of !61968 in a way...
Updated all projects to [atlasexternals-1.0.81](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/1.0.81). The changes wrt. [atlasexternals-1.0.79](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/1.0.79) are (https://gitlab.cern.ch/atlas/atlasexternals/-/compare/1.0.79...1.0.81):
- Introduced `Findscipy.cmake` for setting up the runtime environment of [scipy](https://scipy.org/);
- Made it possible to **not** use the `cpack_install.sh` script during [CPack](https://cmake.org/cmake/help/latest/module/CPack.html) packaging.
It's the latter that's relevant for the analysis releases at the moment. Since just like in !61968 for ~master, this MR sets `ATLAS_USE_CUSTOM_CPACK_INSTALL_SCRIPT` to `FALSE` for all of the analysis releases. (Even for [AnalysisTop](https://gitlab.cern.ch/atlas/athena/-/tree/21.2/Projects/AnalysisTop), just to cover all bases.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/61888Fix compilation warning in xAODBTaggingEfficiency2023-03-29T09:42:43+02:00Thomas StreblerFix compilation warning in xAODBTaggingEfficiencyFix
```
WARNING duplicated property name 'JetAuthor', see https://its.cern.ch/jira/browse/GAUDI-1023
```
Already fixed in ~masterFix
```
WARNING duplicated property name 'JetAuthor', see https://its.cern.ch/jira/browse/GAUDI-1023
```
Already fixed in ~masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61887Fix compilation warning in MuonCondCool2023-03-29T21:42:39+02:00Thomas StreblerFix compilation warning in MuonCondCoolFix
```
WARNING duplicated property name 'WFile', see https://its.cern.ch/jira/browse/GAUDI-1023
```
Not present in ~masterFix
```
WARNING duplicated property name 'WFile', see https://its.cern.ch/jira/browse/GAUDI-1023
```
Not present in ~masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61885Fix compilation warning in JetSimTools2023-03-29T21:42:37+02:00Thomas StreblerFix compilation warning in JetSimToolsFix
```
WARNING duplicated property name 'useChargedParticlesOnly', see https://its.cern.ch/jira/browse/GAUDI-1023
```
Already fixed in ~masterFix
```
WARNING duplicated property name 'useChargedParticlesOnly', see https://its.cern.ch/jira/browse/GAUDI-1023
```
Already fixed in ~masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61871Additional updates to E/gamma R21 precision recommendations2023-03-29T21:42:40+02:00Ahmed TarekAdditional updates to E/gamma R21 precision recommendationsAdditional updates to R21 precision recommendations for e/gamma calibration
- Splitting Wtots uncertainty to 2 bins (additional NP)
- Splitting L2gain systematics to L2Mediumgain and L2Lowgain
- Use interpolation for conversion fake rat...Additional updates to R21 precision recommendations for e/gamma calibration
- Splitting Wtots uncertainty to 2 bins (additional NP)
- Splitting L2gain systematics to L2Mediumgain and L2Lowgain
- Use interpolation for conversion fake rate and reco eff. sys. uncertainties
tagging @smanzoni @ludovica @turra @fnechanshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61857JETM8: include track probabilities from InDetTrackParticles container2023-03-29T09:42:41+02:00Kevin Thomas GreifJETM8: include track probabilities from InDetTrackParticles containerThis MR adds the `truthMatchProbability` information for tracks matched to charged PFOs to JETM8. This value is needed to run track systematic tools on charged PFOs, as part of studying the effect of track systematics on constituent base...This MR adds the `truthMatchProbability` information for tracks matched to charged PFOs to JETM8. This value is needed to run track systematic tools on charged PFOs, as part of studying the effect of track systematics on constituent based top tagger performance.
This is a small change to JETM8. The file size of JETM8 containing 200 events increased from 27,250 to 27,437 kB after the change. This is a 0.6% increase in size.Kevin Thomas GreifKevin Thomas Greifhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61742AnalysisTop: Fixing the propagation of 'ApplyTightSFsInLooseTree' config opti...2023-03-29T21:42:42+02:00Merve SahinsoyAnalysisTop: Fixing the propagation of 'ApplyTightSFsInLooseTree' config option in global lepton trigger scale factorsEnable the config option 'ApplyTightSFsInLooseTree' for global lepton trigger SFs.Enable the config option 'ApplyTightSFsInLooseTree' for global lepton trigger SFs.Merve SahinsoyMerve Sahinsoyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61600Adding BPHY24 ART tests2023-03-16T21:44:25+01:00Wolfgang WalkowiakAdding BPHY24 ART testsThis merge request adds ART tests for BPHY24.
@abartonThis merge request adds ART tests for BPHY24.
@abartonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61524Fix maxPVrefit2023-04-11T15:42:37+02:00Hao PangFix maxPVrefitFix maxPVrefit to 10 to reduce backgoundsFix maxPVrefit to 10 to reduce backgoundsHao PangHao Panghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61523Fix MaxPVrefit2023-03-15T02:51:48+01:00Hao PangFix MaxPVrefitFix MaxPVrefit to 10 to reduce backgroundsFix MaxPVrefit to 10 to reduce backgroundsHao PangHao Panghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61521fix maxPVrefit2023-03-15T02:49:23+01:00Hao Pangfix maxPVrefitfix the maxPVrefit option to 10 to reduce the backgroundsfix the maxPVrefit option to 10 to reduce the backgroundshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61513Read the correct electron efficiency map2023-03-15T15:44:50+01:00Baptiste Ravinabaptiste.ravina@cern.chRead the correct electron efficiency mapBugfix for !61202, where the electron SF map was wrongly written down as `map4.txt.txt`. This escaped the CI because it wasn't actually run for AnalysisBase in that MR, but it's now causing issues in other MRs (marking as urgent).
@omaj...Bugfix for !61202, where the electron SF map was wrongly written down as `map4.txt.txt`. This escaped the CI because it wasn't actually run for AnalysisBase in that MR, but it's now causing issues in other MRs (marking as urgent).
@omajersk @niabicht
ANALYSISTO-1292https://gitlab.cern.ch/atlas/athena/-/merge_requests/61468Fix ApplyPsi1MassConstraint in BPHY232023-03-15T15:44:48+01:00Xin ChenFix ApplyPsi1MassConstraint in BPHY23Fixed three places with wrong configurations related to ApplyPsi1MassConstraint in BPHY23.pyFixed three places with wrong configurations related to ApplyPsi1MassConstraint in BPHY23.pyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61222PCBT klfitter fro ttbb analysis2023-10-13T21:43:20+02:00Margherita SpallaPCBT klfitter fro ttbb analysisImplementation of KLFitter for all-had ttbb analysis.
An existing version of our iterative KLFitter implementation had been already merged into 21.2.
After the merge, we had to adjust our implementation further so that the pseudo-contin...Implementation of KLFitter for all-had ttbb analysis.
An existing version of our iterative KLFitter implementation had been already merged into 21.2.
After the merge, we had to adjust our implementation further so that the pseudo-continuous b-tagging is used for ordering jets prior to the KLFitter run. In the previous version, the b-tagging weight was used for jet ordering, which was not supported by the flavour tagging group.
The ordering using pseudo-continuous b-tagging is added as an additional option. The ordering using the weight has been kept, but a WARNING added explaining that this method is not supported by flavour tagging.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61202Update TopTriggerCPTools.cxx, changing from electron trigger SF map3.txt to m...2023-03-18T09:00:41+01:00Nils Julius AbichtUpdate TopTriggerCPTools.cxx, changing from electron trigger SF map3.txt to map4.txt changing to latest electron trigger SF map changing to latest electron trigger SF maphttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61201electron trigger SF map update2023-03-02T20:17:18+01:00Nils Julius Abichtelectron trigger SF map updateMerge request to include latest electron trigger SF mapMerge request to include latest electron trigger SF maphttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60975Fix setup for HION9 ART tests2023-02-24T09:44:33+01:00Klaudia MajFix setup for HION9 ART testsThe 21.2 HION9 ART tests for data and MC are broken because of missing R=0.3 and R=0.5 HI jet collections. This is fixed by adjusting the ART preExecs to include these collections.The 21.2 HION9 ART tests for data and MC are broken because of missing R=0.3 and R=0.5 HI jet collections. This is fixed by adjusting the ART preExecs to include these collections.