athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-06-28T20:34:42+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/34244WIP: 21.2 topq1 add rc jets 2020 06 272020-06-28T20:34:42+02:00Rafael Coelho Lopes De SaWIP: 21.2 topq1 add rc jets 2020 06 27This MR is to add the PFlow anti-kT 0.8 RC jets to TOPQ1. These jets are the base for the double-flavor tagger (DeXTer) being developed to be used in H->aa->bbXX searches. In the past, the jets themselves were not added to the derivation...This MR is to add the PFlow anti-kT 0.8 RC jets to TOPQ1. These jets are the base for the double-flavor tagger (DeXTer) being developed to be used in H->aa->bbXX searches. In the past, the jets themselves were not added to the derivation, but that created an inconsistency between training and application. Even though the inconsistency was eventually circumvented, it was really never solved. We would like to be able to add the proper jets to the derivation.
In order to ensure consistency, the code that produces the reclustered jets are now imported directly from FTAG derivation (as I think other large-R jet collections in TOPQ derivations do)
I am putting a WIP since it is important that the person training DeXTer check the code. @yuchou could you please check this MR? I put a small sample here http://rcoelhol.web.cern.ch/rcoelhol/TOPQ1_RCJet08/ . It contains the Reco_tf.py logs, and the content of the DAOD. I have also ran FTAG1 over the same AOD for direct 1-1 comparison. In particular, I am only saving the basic variables, but you should let me know if you need any extra variable (Mazin used a lot sd0 of the jets as an observable in the analysis, so this would be a natural candidate)
@spalazzo @borisov : Could you please let me know what you think about this proposal? I kept the variables we used in the 36 ifb analysis https://gitlab.cern.ch/atlas/athena/-/blob/21.2/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonExtraContent.py#L171-224 but I honestly believe no one else is using them. We won't need them anymore. We would greatly appreciate if we could include the jets that we use for flavor tagging. Please, let me know what you think and if there is some information you would need.
The plan is to also include the flavor tagging discriminants and jet mass corrections. @yuchou , in time, will add to this MR with the appropriate modifications.
For reference, this is the JIRA of the previous strategy https://its.cern.ch/jira/browse/TOPQDERIV-62 that lead to the issues mentioned above.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34182Merge new MCTruthClassifier developments into master2020-06-26T17:33:33+02:00Sukanya Sinhasukanya.sinha@cern.chMerge new MCTruthClassifier developments into masterDefined a new function which checks for hadron/tau/BSM/Geant/uncategorised origin and returns the output as a bitset. Individual digits of the bitset are decorated into branches corresponding to above-mentioned classes.
# SuperSimplif...Defined a new function which checks for hadron/tau/BSM/Geant/uncategorised origin and returns the output as a bitset. Individual digits of the bitset are decorated into branches corresponding to above-mentioned classes.
# SuperSimplifiedTruthClassifier(SSTC) classification scheme:
The following boolean flags are used:
- fromGeant: the particle originates in a nuclear interaction or not [1/0].
- uncat: HEPMC production vertex not found / found [1/0].
- isBSM: the particle itself is a BSM particle or not [1/0].
- fromBSM: there is a BSM particle in the ancestor chain or not [1/0]. Usual caveats apply.
- fromhad: there is a hadron in the ancestor chain or not [1/0].
- fromTau: there is a tau lepton in the ancestor chain or not [1/0].
- isHadTau: there is a tau lepton with a hadronic mother in the ancestor chain or not [1/0].
# Validity of the booleans
| | | | | | | | |
| --- | ------ | --------- | --- | --- | ------ | --------- | --------- |
| | fromGeant | uncat | isBSM | fromBSM | fromhad | fromtau | isHadTau |
| fromGeant | - | X | X | X | X | X | X |
| uncat | X | - | X | X | X | X | X |
| isBSM | X | X | - | Y* | Y | Y | Y |
| fromBSM | X | X | X | - | Y | Y | Y |
| fromhad | X | X | Y | Y | - | Y | Y |
| fromtau | X | X | X | Y | Y | - | Y |
| isHadTau | X | X | X | X | Y** | Y | - |
(*) If a particle is BSM and also has another BSM particle in the ancestor chain, then both isBSM & fromBSM flags are switched on.
(**) Example Chain: Hadron -> Tau -> Hadron -> final particle
# Output
Runs only on truthparticles, which are leptons or photons or BSM now. Creates the 7 branches mentioned above.
SSTC function runs in parallel with the original MCTC functions.
# Contact
Sukanya Sinha (sukanya.sinha@cern.ch)https://gitlab.cern.ch/atlas/athena/-/merge_requests/34164Use allMuons instead oc combinedOnly for BPHY152020-06-26T14:46:17+02:00Semen TurchikhinUse allMuons instead oc combinedOnly for BPHY15To increase the signal yields in Bc -> J/psi Ds channel, by using not only combined muons in JpsiFinder tool. ATLBPHYS-54.To increase the signal yields in Bc -> J/psi Ds channel, by using not only combined muons in JpsiFinder tool. ATLBPHYS-54.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34029tauRecTools+LArG4FastSimulation: cmake fixes2020-06-24T23:05:23+02:00Scott SnydertauRecTools+LArG4FastSimulation: cmake fixesLibrary dependency fixes.Library dependency fixes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34060AsgTools: cmake fixes2020-06-24T22:43:41+02:00Scott SnyderAsgTools: cmake fixesLibrary dependency fixes.Library dependency fixes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/3289121.0 salva s82020-06-24T16:26:03+02:00Salvador Marti I Garciasalvador.marti@cern.ch21.0 salva s8Small fix on TRT 3D histograms and some cleaningSmall fix on TRT 3D histograms and some cleaninghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/32688Sweeping !32627 from master to 21.9.
Add methods to get data dependencies out...2020-06-24T15:05:04+02:00Atlas NightlybuildSweeping !32627 from master to 21.9.
Add methods to get data dependencies out of DL2Add methods to get data dependencies out of DL2
See merge request atlas/athena!32627Add methods to get data dependencies out of DL2
See merge request atlas/athena!32627https://gitlab.cern.ch/atlas/athena/-/merge_requests/34070WIP:This MR is to add mb and zb trigger LS22020-06-24T13:48:32+02:00Debottam Bakshi GuptaWIP:This MR is to add mb and zb trigger LS2As discussed in ATR-21367 this MR will add
```
HLT_noalg_mb_L1RD2_EMPTY
HLT_noalg_zb L1ZB
```
to the LS2_v1 menuAs discussed in ATR-21367 this MR will add
```
HLT_noalg_mb_L1RD2_EMPTY
HLT_noalg_zb L1ZB
```
to the LS2_v1 menuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33049WIP: porting HLT InDet GPU demonstrator to AthenaMT2020-06-22T18:44:13+02:00Dmitry EmeliyanovWIP: porting HLT InDet GPU demonstrator to AthenaMTthe first version of the HLT demonstrator for AthenaMT - contains several new packages, requires CUDA for compilation of TrigInModules package. As the GPU acceleration is switched off by default no change in tests is expected.the first version of the HLT demonstrator for AthenaMT - contains several new packages, requires CUDA for compilation of TrigInModules package. As the GPU acceleration is switched off by default no change in tests is expected.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33926Addition of Low-Pt RoI tracking information to DAOD STDM7 derivation2020-06-19T00:39:11+02:00William Patrick MccormackAddition of Low-Pt RoI tracking information to DAOD STDM7 derivation@spagan @adimitri @npetters @goblirsc
This is a companion merge request for https://gitlab.cern.ch/atlas/athena/-/merge_requests/33769?resolved_conflicts=true. The exclusive WW analysis team is implementing low-pt tracking within a reg...@spagan @adimitri @npetters @goblirsc
This is a companion merge request for https://gitlab.cern.ch/atlas/athena/-/merge_requests/33769?resolved_conflicts=true. The exclusive WW analysis team is implementing low-pt tracking within a region of interest, such that low-pt tracks can be constructed within a z-region of the beamline. The analysis uses DAOD_STDM7 as their analysis derivation. They want a separate container for the low-pt tracks, such that the production DAODs can easily be used to reproduce the generic analysis and can be used to do the version of the analysis with low-pt tracks. There is also a vertex container added that keeps track of the places within a beamspot where low-pt tracking was performed.
The DAOD_STDM7 will not include these new containers unless the low-pt track and vertex containers are already in the AOD being slimmed. In this way, the content of the DAOD_STDM7 will be unchanged for all analyses that are not using low-pt RoI tracking.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33903TrigT1RPChardware+MuonG4SD: cmake fixes2020-06-18T21:13:48+02:00Scott SnyderTrigT1RPChardware+MuonG4SD: cmake fixesDon't build the same source into more than one library.
Remove useless library.Don't build the same source into more than one library.
Remove useless library.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33799Allow rejection based on pixel or sct holes individually2020-06-16T21:22:26+02:00Mark SuttonAllow rejection based on pixel or sct holes individually
Previous the standard selection would select only on combined silicon holes, and speciceal selections were implemented that also selected individually on pixel or sct holes. These changes allow both to be set also for the standard analyses
Previous the standard selection would select only on combined silicon holes, and speciceal selections were implemented that also selected individually on pixel or sct holes. These changes allow both to be set also for the standard analyseshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33615Merging recent developments in jet grooming2020-06-16T20:19:38+02:00Teng Jian KhooMerging recent developments in jet grooming@delsart, I put together the new JetTrimming class you prepared with my JetGroomer, making the former a subclass of the latter. I think this way it ends up being quite neat, as for any given grooming method, one just has to define the pe...@delsart, I put together the new JetTrimming class you prepared with my JetGroomer, making the former a subclass of the latter. I think this way it ends up being quite neat, as for any given grooming method, one just has to define the per-jet operation, and configure a filter with the appropriate setup in `initialize()`. In fact even most of the per-jet operation is the same, it's only the decorations that need to be changed -- so in principle we could even think of moving even more into the `JetGroomer` class.
In the process, I also reworked `PseudoJetTranslator` to eliminate bare pointers -- we can work with references everywhere to make the memory management a mite more robust.
A few other minor changes:
* Created a WriteHandleKey for the output pseudojets in `JetGroomer` and `JetClusterer` -- I think it is better to communicate this explicitly to the scheduler. This is autoconfigured, so `initialize` will print a warning if the user sets any value. Lastly, I changed the name of the container to be `ToolName+"FinalPJ"`, because I think this will be more unique (I think the previous setup could clash if you had 2 jet collections built from the same merged PJ container).
* Merging the various Read/WriteHandles, I thought `UngroomedJets` and `ParentPseudoJets` was a bit more explicit.
This was tested so far with `JetRecAlgTestCfg.py`, but we could stand to verify the results vs the older classes.
This MR needs to be handled after !33564 is merged.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33729WIP: Move the RingerHypoTool to EgammaHypo package.2020-06-16T16:34:57+02:00Micael Verissimo De AraujoWIP: Move the RingerHypoTool to EgammaHypo package.This MR is related to ATR-20143, especially to remove the warning messages that appear and was pointed in ATR-21548.
In this MR the changes were:
1. Move all RingerHypoTool (MT, Mult, and python file) to EgammaHypo package;
2. Ad...This MR is related to ATR-20143, especially to remove the warning messages that appear and was pointed in ATR-21548.
In this MR the changes were:
1. Move all RingerHypoTool (MT, Mult, and python file) to EgammaHypo package;
2. Add the TrigMultiVarHypoLib dependence in EgammaHypo in order to use the RingerSelector;
2. Add in the ITrigL2CaloHypoTool.h the rings creating a FastCaloInfo that will be used for CutBased tool and RingerHypo tool;
3. Change the MenuSequence build in TriggerMenuMT to use a unique HypoAlg and add the right tool for the chain (Ringer or CutBased).
This is a WIP until [this](https://its.cern.ch/jira/browse/ATR-21357?focusedCommentId=3249644&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-3249644) isn't fixed. Since this will be fix I can test.
pinning @fernando, @thrynova, @jodafons, @wsfreund and @dbakshig.
Cheers,
Micael VerĂssimo.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33661SCT_Monitoring: Use thread-safe track summary method.2020-06-15T21:44:22+02:00Scott SnyderSCT_Monitoring: Use thread-safe track summary method.The thread-safety checker wasn't properly checking virtual function calls.
When that is fixed, it flags calls to ITrackSummaryTool::createSummary,
which modifies in place the Track passed to it.
Change to using the thread-safe version s...The thread-safety checker wasn't properly checking virtual function calls.
When that is fixed, it flags calls to ITrackSummaryTool::createSummary,
which modifies in place the Track passed to it.
Change to using the thread-safe version summary(), which does not attempt
to cache a new summary.https://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/33709WIP: Migration of HI Jet Decorators to MT safe version2020-06-12T22:09:16+02:00Riccardo LongoWIP: Migration of HI Jet Decorators to MT safe versionThis MR is intended to migrate HIJet tools containing decorators to the new `IJetDecorator` interface which was introduced in !24710. The reference for this migration was taken from the MR https://gitlab.cern.ch/atlas/athena/-/merge_requ...This MR is intended to migrate HIJet tools containing decorators to the new `IJetDecorator` interface which was introduced in !24710. The reference for this migration was taken from the MR https://gitlab.cern.ch/atlas/athena/-/merge_requests/25234 done for Jet package.Riccardo LongoRiccardo Longohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33707WIP: Fixes for the updated Powheg Wt_DR process, and removal of Wt_DR_onshell...2020-06-12T21:42:48+02:00Simone AmorosoWIP: Fixes for the updated Powheg Wt_DR process, and removal of Wt_DR_onshellW and Wt_DS_onshellW processesFollowing the discussion in AGENE-1819, I am adding the new options introduced in the updated Wt_DR process with the proper W offshelness treatment, and removing the temporary onshellW versions of the Wt_DR and Wt_DS processes.
Tagging ...Following the discussion in AGENE-1819, I am adding the new options introduced in the updated Wt_DR process with the proper W offshelness treatment, and removing the temporary onshellW versions of the Wt_DR and Wt_DS processes.
Tagging also @grovellihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33688WIP: first attempt to Improve documentation of the SiSpSeededTrackFinder2020-06-12T15:25:36+02:00Maximilian Emanuel Goblirsch-KolbWIP: first attempt to Improve documentation of the SiSpSeededTrackFinderThis MR resulted from an accidental push to upstream, will open a new one using the fork.
> This MR, as part of https://its.cern.ch/jira/browse/ATLIDTRKCP-263, attempts to improve a bit the readability of the track finder top level a...This MR resulted from an accidental push to upstream, will open a new one using the fork.
> This MR, as part of https://its.cern.ch/jira/browse/ATLIDTRKCP-263, attempts to improve a bit the readability of the track finder top level algorithm.
>
> In particular, comments were added explaining what is being done, and variable names were changed to be hopefully a bit more expressive.
>
> In addition, a few C-style arrays were replaced by std containers in non-performance-critical locations.
>
> This MR should not affect the reconstruction outcome or speed.
>
> Adding @sroe, @goetz for IDSW, and @npetters for IDTR https://gitlab.cern.ch/atlas/athena/-/merge_requests/33616PyUtils: Python 3 fixes2020-06-12T10:52:25+02:00Scott SnyderPyUtils: Python 3 fixesUpdates to work with python 3.Updates to work with python 3.