athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-11-30T21:57:36+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/67340Correcting for a factor in the outputs of the DIPZ regression in Athena2023-11-30T21:57:36+01:00Mohammed Aboelelamo.abdellrazekk@cern.chCorrecting for a factor in the outputs of the DIPZ regression in AthenaThe original current DIPZ output from Athena has a factor of "50" in the outputs that we want to get rid of. Thus we derived another neural network with an extral layer that does such change and validated it. We defined the output of the...The original current DIPZ output from Athena has a factor of "50" in the outputs that we want to get rid of. Thus we derived another neural network with an extral layer that does such change and validated it. We defined the output of the network with a new timestamp. Here, we modified the files that use DIPZ with the new timestamped variable name, and also pointed athena to the location of the new json file.
These changes passed the `test_trigAna_RDOtoAOD_v1Dev_build.py` tests and the new timestamped output variables were inspected in the output AOD from the test.Dan GuestInes OchoaChris PollardKatharine LeneyMohammed Aboelelamo.abdellrazekk@cern.chDan Guesthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66360Draft: add DiTau BDT score to TauCP list of variables available for derivations2023-11-27T13:16:14+01:00Antonio De MariaDraft: add DiTau BDT score to TauCP list of variables available for derivationsTagging @martindlTagging @martindlhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63500Draft: Add alternative tagger hypo to fast GN12023-11-27T09:49:13+01:00Thandikire MadulaDraft: Add alternative tagger hypo to fast GN1WIP MR to add hypo for FastGN1_PVWIP MR to add hypo for FastGN1_PVhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67127test chains for DPJ trigger ATR-284122023-11-15T15:15:50+01:00Zhongyukun Xuzhongyukun.xu@cern.chtest chains for DPJ trigger ATR-28412New trigger into Dev chains
test VBF inclusive low threshold
test VBF+msonly
test VBF+nscanNew trigger into Dev chains
test VBF inclusive low threshold
test VBF+msonly
test VBF+nscanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67003Working with 422 clusters2023-11-09T19:26:36+01:00Dylan Sheldon RankinWorking with 422 clustershttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66896Yinmiao23.02023-11-03T10:52:48+01:00Yinmiao WangYinmiao23.0Add a flip strategy SIMPLE_FLIP, which flip the sign of detector signed IPs (d0, z0SinTheta) and lifetime-signed IPs(IP3D_signed_d0_significance, IP3D_signed_z0_significance).Add a flip strategy SIMPLE_FLIP, which flip the sign of detector signed IPs (d0, z0SinTheta) and lifetime-signed IPs(IP3D_signed_d0_significance, IP3D_signed_z0_significance).https://gitlab.cern.ch/atlas/athena/-/merge_requests/66624Draft: Updated setting of originalName in JetAnalysisConfig for PHYSLITE2023-10-20T17:10:14+02:00Thomas StreblerDraft: Updated setting of originalName in JetAnalysisConfig for PHYSLITEWhile running on PHYSLITE inputs, the `self.jetCollection` property is actually assumed to be set to `AnalysisJets` or `AnalysisLargeRJets`, as illustrated in https://gitlab.cern.ch/atlas/athena/-/blob/main/PhysicsAnalysis/Algorithms/Jet...While running on PHYSLITE inputs, the `self.jetCollection` property is actually assumed to be set to `AnalysisJets` or `AnalysisLargeRJets`, as illustrated in https://gitlab.cern.ch/atlas/athena/-/blob/main/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisConfig.py#L110
```
jetCollectionName=self.jetCollection
if(self.jetCollection=="AnalysisJets") :
jetCollectionName="AntiKt4EMPFlowJets"
if(self.jetCollection=="AnalysisLargeRJets") :
jetCollectionName="AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets"
```
This MR updates the setting of the `originalName` property to reflect this.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64539Draft: Replace boost with STL, please do not review, will not be merged in th...2023-10-10T13:25:31+02:00Andrii VerbytskyiDraft: Replace boost with STL, please do not review, will not be merged in the present state.Replace boost with STLReplace boost with STLhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/663102023-10-06: merge of 23.0 into main2023-10-09T14:32:02+02:00Adam Edward Barton2023-10-06: merge of 23.0 into main@wlampl please check merge resolutions
```
Conflicts:
Calorimeter/CaloRec/python/CaloConfigFlags.py
Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py
```
This sweep contains the following MRs:
...@wlampl please check merge resolutions
```
Conflicts:
Calorimeter/CaloRec/python/CaloConfigFlags.py
Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py
```
This sweep contains the following MRs:
* !66288 Fixes to address ZDC non-reproducibility ~ForwardDetectors
* !66085 Auto-config various HI-Rec modes (HI, HIP, UPC) ~Calorimeter, ~Core, ~DQ, ~Egamma, ~JetEtmiss, ~Reconstruction, ~Tools, ~Tracking
* !66291 [TriggerMenu] Added L1_gLJ80p0ETA25 and L1_gXEJWOJ100 to the HI menu CTP monitoring ~Trigger, ~TriggerMenuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66115Draft: Added EMPFlow jets to HI configs2023-09-28T21:12:53+02:00Lee SawyerDraft: Added EMPFlow jets to HI configsAdded EMPFlow jets to the web display configuration files for heavy ions. For some stream HIJets will be monitored; for others, EMPFlow jets will be monitored.Added EMPFlow jets to the web display configuration files for heavy ions. For some stream HIJets will be monitored; for others, EMPFlow jets will be monitored.Lee SawyerATLAS RobotLee Sawyerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64960Draft: Adding back in EtaPtFilterTool for truth filtering with fix for missin...2023-09-28T19:43:16+02:00R D SchafferDraft: Adding back in EtaPtFilterTool for truth filtering with fix for missing lepton linksThis is a continuation of [!64793](https://gitlab.cern.ch/atlas/athena/-/merge_requests/64793#note_7000903).
This implements the missing truth filtering via EtaPtFilter. This is done only for the CA Hits to AOD production, i.e. it remai...This is a continuation of [!64793](https://gitlab.cern.ch/atlas/athena/-/merge_requests/64793#note_7000903).
This implements the missing truth filtering via EtaPtFilter. This is done only for the CA Hits to AOD production, i.e. it remains commented out in jobOpts. This uses the TruthParticleBuilder which was used in the past to go from GenEvent to TruthEvent - which is not xAOD formatted one. It also performed as a first step the filtering of the truth in a GenEvent to GenEvent step. Only the filtering is not done. This reduces the AOD by a few percent due to truth reduction. This MR also fixes a problem in the filtering where the parent child links can be lost for leptons with eta > 5.5. Note that dumpTruth.py was slighting changed to be more coherent in way one passes the CA arguments.
Pinging @zmarshal, @jchapman, @jcatmoreR D SchafferR D Schafferhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/659442023-09-20: merge of 23.0 into main2023-09-24T22:05:09+02:00Vakhtang Tsulaia2023-09-20: merge of 23.0 into mainConflicts:
* `DataQuality/dqm_algorithms/src/TRTWeightedAverage.cxx`
Kept the ~main version
* `Reconstruction/Jet/JetMonitoring/python/JetMonitoringStandard.py`
Kept the ~"23.0" version. CC @cdelitzs (!65911)
* `Trigger/TriggerCommon/Tri...Conflicts:
* `DataQuality/dqm_algorithms/src/TRTWeightedAverage.cxx`
Kept the ~main version
* `Reconstruction/Jet/JetMonitoring/python/JetMonitoringStandard.py`
Kept the ~"23.0" version. CC @cdelitzs (!65911)
* `Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py`
Manual merge. Combined lambda with the help message for the `Trigger.Jet.pflowCalibKey` flag. CC @cantel (!65831)
This sweep contains the following MRs:
* !65938 TRT config updates are merged from 'main' into '23.0' (resubmission of 65926) ~DQ
* !65931 ZDC: implement EventInfo flags in case of LUCROD decoding failure, and update to ZdcRecConfig ~ForwardDetectors
* !63562 Adding cross compatability between onnx and lwtnn as a library for NNs ~Simulation
* !65752 Updates to RPD/Centroid Analysis and ZdcNtuple for Heavy Ions ~ForwardDetectors
* !65925 merging new Algo for TRT (and few changes on config) from 'main' into '23.0' ~DQ
* !65911 Configure correct jet collections for monitoring in HI and UPC mode ~Core, ~DQ, ~JetEtmiss, ~Reconstruction, ~Tile
* !65831 Trigger Jet: Add HI UPC pflow calibration configs (ATR-22067) ~JetEtmiss, ~Reconstruction, ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !65881 Heavy Ion : Disable out-of-time pileup topo cluster cut ~Reconstructionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65585Remove legacy code2023-09-06T10:27:58+02:00Jon BurrRemove legacy codeWe no longer need to support the legacy code that we had in place. This required a manual dependency mechanism for our inputs. Now we can do all of this with ComponentAccumulators.
Hopefully this should greatly simplify the code.
I did...We no longer need to support the legacy code that we had in place. This required a manual dependency mechanism for our inputs. Now we can do all of this with ComponentAccumulators.
Hopefully this should greatly simplify the code.
I did add a new `StepOutput` class to ensure that we a) keep the reco split by step and b) carry along aliased names of the various outputs we produce.
FAO @jwuerzin, @sidoti and @chenbhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64732Add hypo for time-significance based selection of HLT jets2023-08-18T20:42:24+02:00Christian OhmAdd hypo for time-significance based selection of HLT jetsThis MR adds the `TimeSignificanceCondition` class to select jets at the HLT based on the significance of their delay. To be developed further before being put into production, but once marked ready the additions in this should be possib...This MR adds the `TimeSignificanceCondition` class to select jets at the HLT based on the significance of their delay. To be developed further before being put into production, but once marked ready the additions in this should be possible to merge in without causing any problems.
Longer-term improvements most importantly would include picking parameters for pT-dependent time resolution from a db or similar (instead of hardcoded). Tagging @mapatzwa who did the implementation for [his MSc thesis](http://cds.cern.ch/record/2865684), and @xingguo and @miochoa as jet trigger signature coordinators (and @cantel who previously held this role).
Also tagging @sfyrla and @jmontejo for info, as they've done work on similar things recently.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64947Draft: Fix EtaPtFilter to avoid some missing parent links for leptons2023-08-11T10:18:04+02:00R D SchafferDraft: Fix EtaPtFilter to avoid some missing parent links for leptonsThis is a continuation of [!64793](https://gitlab.cern.ch/atlas/athena/-/merge_requests/64793#note_7000903).
This implements the missing truth filtering via EtaPtFilter. This is done only for the CA Hits to AOD production, i.e. it remai...This is a continuation of [!64793](https://gitlab.cern.ch/atlas/athena/-/merge_requests/64793#note_7000903).
This implements the missing truth filtering via EtaPtFilter. This is done only for the CA Hits to AOD production, i.e. it remains commented out in jobOpts. This uses the TruthParticleBuilder which was used in the past to go from GenEvent to TruthEvent - which is not xAOD formatted one. It also performed as a first step the filtering of the truth in a GenEvent to GenEvent step. Only the filtering is not done. This reduces the AOD by a few percent due to truth reduction. This MR also fixes a problem in the filtering where the parent child links can be lost for leptons with eta > 5.5. Note that dumpTruth.py was slighting changed to be more coherent in way one passes the CA arguments.
Pinging @zmarshal, @jchapman, @jcatmoreR D SchafferR D Schafferhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64569Draft: The first attempt to use status() instead of barcode() in Simulation2023-08-07T10:57:56+02:00Andrii VerbytskyiDraft: The first attempt to use status() instead of barcode() in SimulationThe first attempt to use status instead of barcode for the simulation.
The end goals are:
- 1) to be able to identify the origin of the particles and vertices from their status and not barcodes
- 2) to be able to use the `HepMC3::GenP...The first attempt to use status instead of barcode for the simulation.
The end goals are:
- 1) to be able to identify the origin of the particles and vertices from their status and not barcodes
- 2) to be able to use the `HepMC3::GenParticle::id()` and `HepMC3::GenVertex::id()` as unique identifiers of the particles, e.g. in `HepMCParticleLink`. In this way the usage of `barcode()` `property` of `GenParticle`a and `GenVertex` will be almost eliminated.
The 2) was already implemented by @jchapman as an option. See https://indico.cern.ch/event/1298224/contributions/5458615/attachments/2669897/4627904/Migration%20away%20from%20barcodes.pdf
The 1) requires a bit more changes and those are collected in this MR with the idea to split it later into small pieces.
Namely:
- a) Switching from the bare comparison of `status` property of particles to the classificators in `TruthUtils` ( e.g. `isStable`) See https://gitlab.cern.ch/atlas/athena/-/merge_requests/64579, https://gitlab.cern.ch/atlas/athena/-/merge_requests/64552 and similar. This is an ongoing work that touches a lot of code, but the changes are trivial.
- b) Switching from the classificators that use the `barcode()` directly as `int` to functions that use the underlying objects. See https://gitlab.cern.ch/atlas/athena/-/merge_requests/64571
This MR will also require the removal of the specification of templates `HepMC::is_simulation_particle()` for `int`.
- c) Change the definition of `isStable()`, `isPhysical()`,`isDecayed()`, i.e. ( status=1,2 particles) to take into account that particles produced in the simulation will have status `original_status + constant x times_particle_interacted`. Implemented in this MR.
- d) Drop the `Barcode` service from the `TruthSvc` and instead of increasing the barcode of each particle in the simulation increase the status of particle. Implemented in this MR.
- e) Change the references where it is needed. To be done.
@jchapman
The very beginninghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64696Revert "Merge branch 'miochoa-23.0-HIjets' into '23.0'"2023-07-30T14:52:01+02:00Tomasz BoldRevert "Merge branch 'miochoa-23.0-HIjets' into '23.0'"This reverts merge request !64528
@miochoa - since we plan to buuld nghtly tomorrow we need a fix, either reverting your changes or !64693
Obviously the prefernce is for the later.This reverts merge request !64528
@miochoa - since we plan to buuld nghtly tomorrow we need a fix, either reverting your changes or !64693
Obviously the prefernce is for the later.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62956Draft: Try to remove the barcodeservices2023-07-22T22:05:16+02:00Andrii VerbytskyiDraft: Try to remove the barcodeservicesDrfat: Try to remove the barcodeservices
@jchapmanDrfat: Try to remove the barcodeservices
@jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62222Draft: Replace outdated code with STL2023-07-22T20:31:09+02:00Andrii VerbytskyiDraft: Replace outdated code with STLReplace outdated code with STL. Not to be merged!Replace outdated code with STL. Not to be merged!https://gitlab.cern.ch/atlas/athena/-/merge_requests/64320Draft: Unification truthutils2023-07-20T14:29:26+02:00Andrii VerbytskyiDraft: Unification truthutilsUnification truthutilsUnification truthutils