athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-03-13T20:25:54+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/21892DerivationFrameworkHiggs: fix HTXS pT/m decorations, add HGam DSIDs to config...2019-03-13T20:25:54+01:00Chris Meyerchris.meyer@cern.chDerivationFrameworkHiggs: fix HTXS pT/m decorations, add HGam DSIDs to configurationWhen converting the HTXS pT and m variables from the Rivet default
of GeV, they were divided by 1000 instead of multiplied by 1000.
This resulted in the DAOD values showing up in TeV instead of the
expected MeV.
HTXS pT and m decoration...When converting the HTXS pT and m variables from the Rivet default
of GeV, they were divided by 1000 instead of multiplied by 1000.
This resulted in the DAOD values showing up in TeV instead of the
expected MeV.
HTXS pT and m decorations will now show up in units of MeV.
In addition, some HGam DAODs don't contain HTXS information
since their DSIDs are missing from the configuration file.
They have now been added.
Closes HGAMSW-525, closes HGAMSW-581 and closes HGAMSW-606.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21894DerivationFrameworkHiggs: fix HTXS pT/m decorations, add HGam DSIDs to config...2019-03-13T20:34:02+01:00Chris Meyerchris.meyer@cern.chDerivationFrameworkHiggs: fix HTXS pT/m decorations, add HGam DSIDs to configurationWhen converting the HTXS pT and m variables from the Rivet default
of GeV, they were divided by 1000 instead of multiplied by 1000.
This resulted in the DAOD values showing up in TeV instead of the
expected MeV.
HTXS pT and m decoration...When converting the HTXS pT and m variables from the Rivet default
of GeV, they were divided by 1000 instead of multiplied by 1000.
This resulted in the DAOD values showing up in TeV instead of the
expected MeV.
HTXS pT and m decorations will now show up in units of MeV.
In addition, some HGam DAODs don't contain HTXS information
since their DSIDs are missing from the configuration file.
They have now been added.
Closes HGAMSW-525, closes HGAMSW-581 and closes HGAMSW-606.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21898WIP: 21.0 trig htt bank gen branch2019-03-14T14:13:11+01:00Jahred Adelmanjahreda@gmail.comWIP: 21.0 trig htt bank gen branchhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20707Migrating CTPSimulation to DataHandles2019-03-14T18:39:29+01:00Vasilis KonstantinidesMigrating CTPSimulation to DataHandlesReplacing evtStore()->retrieve() statements to DataHandles in CTPSimulation and renaming some HandleKeys to contain "_" instead of "/" so they can also be updated to DataHandles.Replacing evtStore()->retrieve() statements to DataHandles in CTPSimulation and renaming some HandleKeys to contain "_" instead of "/" so they can also be updated to DataHandles.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21543fix bug for missing jets in ttH mode2019-03-15T11:02:16+01:00R D Schafferfix bug for missing jets in ttH modeIn H4l, we were comparing the STXS truth jets vs AntiKt4TruthWZJets and noticed that for ttH that the jets coming from some of the W's were missing. This is because the ttH W's collected were not the last one in the parent/child hierarch...In H4l, we were comparing the STXS truth jets vs AntiKt4TruthWZJets and noticed that for ttH that the jets coming from some of the W's were missing. This is because the ttH W's collected were not the last one in the parent/child hierarchy and so they failed the test that the W's must have quark as children.
I know that @nberger and @okiverny are working on a new version, so this fix should be incorporated there as well. Also I see that @zmarshal put in this version...
This is used in the derivation release.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21855Set up ConditionStore in core athena2019-03-15T11:04:52+01:00Stewart Martin-HaughSet up ConditionStore in core athenaThis MR sets up the ConditionStore in basic serial jobs. It was already there in `AtlasThreadedJob`, but not in `AtlasUnixStandardJob`, instead appearing in a conddb import. This is also added back to the CA version, where I removed it (...This MR sets up the ConditionStore in basic serial jobs. It was already there in `AtlasThreadedJob`, but not in `AtlasUnixStandardJob`, instead appearing in a conddb import. This is also added back to the CA version, where I removed it (in error) for consistency.
tagging @jchapman and @tsulaia
Cheers,
Stewarthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21340WIP: ComponentAccumulator configuration for SCT and Pixel digitization2019-03-15T11:57:27+01:00Rupert TombsWIP: ComponentAccumulator configuration for SCT and Pixel digitizationDefine new style replacements for SCT_DigitizationConfig.py and PixelDigitizationConfig.py
With ConfigFlags definitions utilities and dependencies, including *ToolSetup replacements
Also makes minor updates to BCM_Digitization.
...Define new style replacements for SCT_DigitizationConfig.py and PixelDigitizationConfig.py
With ConfigFlags definitions utilities and dependencies, including *ToolSetup replacements
Also makes minor updates to BCM_Digitization.
Questions:
SCT_ReadCalibChipDataConfig.py lines 22-25: ComponentAccumulator folder tools do not have the tag features previously used here. Are these okay to neglect?
SCT_DigitizationConfig.py lines 75-83: To avoid migrating the ExperimentalDigi flag, doDetailedSurfChargesGen has not been migrated here. Is this still needed?
PixelCablingConfigNew.py line 60: Is this DBM logic correct?
OverlayConfigFlags.py line 15: `Overlay.EventStore` flag is questionable.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21004WIP: muon segment finding private tools migration2019-03-15T17:39:54+01:00Edward MoyseWIP: muon segment finding private tools migrationStill trying to get the MR originally done by @dabbott in.
I found some more configuration issues - it seems like the MuonAmbiProcessor was two different instances of two different types of tool, and the configuration in MuGirlStau was...Still trying to get the MR originally done by @dabbott in.
I found some more configuration issues - it seems like the MuonAmbiProcessor was two different instances of two different types of tool, and the configuration in MuGirlStau was by fluke rather than design.
Not completely sure I have everything fixed yet, but I would like to run some CI here, hence the WIP.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21906Revert "Merge branch 'master-CaloTopoClusterCfg-v2' into 'master'"2019-03-18T10:57:35+01:00Tim MartinRevert "Merge branch 'master-CaloTopoClusterCfg-v2' into 'master'"This reverts merge request !21428
This is an *explorative* revert MR to test a hypothesis about test failure.
I will touch the `TrigUpgradeTest` package to make sure we run all the CI tests from there tooThis reverts merge request !21428
This is an *explorative* revert MR to test a hypothesis about test failure.
I will touch the `TrigUpgradeTest` package to make sure we run all the CI tests from there toohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21985WIP Revert "Merge branch 'caloIdManager.LArRecUtils-20190311' into 'master'"2019-03-19T10:38:09+01:00Tim MartinWIP Revert "Merge branch 'caloIdManager.LArRecUtils-20190311' into 'master'"Speculative merge to check if !21835 caused symptoms in ATR-19550
Will WIP once pipeline is going
This reverts merge request !21835Speculative merge to check if !21835 caused symptoms in ATR-19550
Will WIP once pipeline is going
This reverts merge request !21835https://gitlab.cern.ch/atlas/athena/-/merge_requests/21953Sweeping !21625 from 21.3 to 21.9.
L1 v8 menu cleanup (ATR-19477)2019-03-19T11:58:35+01:00Atlas NightlybuildSweeping !21625 from 21.3 to 21.9.
L1 v8 menu cleanup (ATR-19477)L1 v8 menu cleanup (ATR-19477)
See merge request atlas/athena!21625L1 v8 menu cleanup (ATR-19477)
See merge request atlas/athena!21625https://gitlab.cern.ch/atlas/athena/-/merge_requests/21880TrigFTKSim: Updating FastTracker AUX Hitwarrior to fix duplicate removal2019-03-19T16:18:17+01:00Michael Donald HankTrigFTKSim: Updating FastTracker AUX Hitwarrior to fix duplicate removalThis edit should only affect FTKSim. Specifically, the AUX hitwarrior duplicate removal has been changed to match what is happening in firmware. This includes:
Not double counting pixel hits
Not removing tracks until after comparisons a...This edit should only affect FTKSim. Specifically, the AUX hitwarrior duplicate removal has been changed to match what is happening in firmware. This includes:
Not double counting pixel hits
Not removing tracks until after comparisons are doneMichael Donald HankMichael Donald Hankhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21809WIP: ComponentAccumulator designating 'Primary Component'2019-03-20T07:56:41+01:00Walter LamplWIP: ComponentAccumulator designating 'Primary Component'Instead of returning a tuple (ComponentAccumulator,PrimaryComponent) from configuration methods, designate a primary component inside the ComponentAccumulator.Instead of returning a tuple (ComponentAccumulator,PrimaryComponent) from configuration methods, designate a primary component inside the ComponentAccumulator.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22038TrigTauRec: Fix compilation warnings.2019-03-20T09:21:41+01:00Scott SnyderTrigTauRec: Fix compilation warnings.Local static variables should also be const.Local static variables should also be const.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21086Sweeping !20683 from 21.1 to 21.0-TrigMC.
Merge branch '21.3-fix_nightly_test...2019-03-20T13:29:37+01:00Atlas NightlybuildSweeping !20683 from 21.1 to 21.0-TrigMC.
Merge branch '21.3-fix_nightly_test_file' into '21.3'Merge branch '21.3-fix_nightly_test_file' into '21.3'
See merge request atlas/athena!20683Merge branch '21.3-fix_nightly_test_file' into '21.3'
See merge request atlas/athena!20683https://gitlab.cern.ch/atlas/athena/-/merge_requests/21919Adding noOnlineMon flag to chain definitions to replace clean monitoring (ATR...2019-03-20T13:37:49+01:00Catrin BerniusAdding noOnlineMon flag to chain definitions to replace clean monitoring (ATR-19536)To replace the "clean monitoring" (see ATR-19432, ATR-19536) in the menu for egamma & jets, a new string 'noOnlineMon' has been introduced to not write histograms online. This can be obtained via the chainDictionary that is passed to the...To replace the "clean monitoring" (see ATR-19432, ATR-19536) in the menu for egamma & jets, a new string 'noOnlineMon' has been introduced to not write histograms online. This can be obtained via the chainDictionary that is passed to the HypoTools. An example of the usage is shown in TrigL2ElectronHypoTool.py
This MR also removes to MEOW print statements pointed out by Frank in !21882.
It is based on the branch in the MR !21882 as this was adding fixes for the newly introduced pyflake test.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22101Follow up !21787 - ATLAS naming convention updates in TrigEgammaIsolationSele...2019-03-22T20:13:30+01:00Tim MartinFollow up !21787 - ATLAS naming convention updates in TrigEgammaIsolationSelectorTool```
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx: In member function 'virtual bool Trig::TrigEgammaIsolationSelectorTool::emulation(const xAOD::I...```
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx: In member function 'virtual bool Trig::TrigEgammaIsolationSelectorTool::emulation(const xAOD::IParticle*, bool&, const Trig::Info&)':
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:152:52: warning: ATLAS coding standards require that variable name '_m_PtCone' not start with '_'.
std::vector<float> EtCone, PtCone_xAOD, PtCone, _m_PtCone, _m_PtVarCone, PtCone_recalculated; //, PtCone_recalculated_fixed;
^~~~~~~~~
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:152:52: note: See <https://twiki.cern.ch/twiki/bin/view/AtlasComputing/CheckerGccPlugins#naming_plugin>.
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:152:63: warning: ATLAS coding standards require that variable name '_m_PtVarCone' not start with '_'.
std::vector<float> EtCone, PtCone_xAOD, PtCone, _m_PtCone, _m_PtVarCone, PtCone_recalculated; //, PtCone_recalculated_fixed;
^~~~~~~~~~~~
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:152:63: note: See <https://twiki.cern.ch/twiki/bin/view/AtlasComputing/CheckerGccPlugins#naming_plugin>.
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:208:15: warning: ATLAS coding standards require that variable name 'm_trk_container' not start with 'm_'.
std::string m_trk_container = el->trackParticleLink().dataID();
^~~~~~~~~~~~~~~
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/master/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaIsolationSelectorTool.cxx:208:15: note: See <https://twiki.cern.ch/twiki/bin/view/AtlasComputing/CheckerGccPlugins#naming_plugin>.
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/22118Remove cabling information for new thresholds2019-03-23T21:42:46+01:00Joerg StelzerRemove cabling information for new thresholdshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22107Remove DataHeader t/p converters from the dictionary2019-03-25T14:02:44+01:00Marcin NowakRemove DataHeader t/p converters from the dictionaryT/P converters should not need dictionaries... so attempting to clean that upT/P converters should not need dictionaries... so attempting to clean that uphttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22124Changes related to ticket 195792019-03-25T17:50:34+01:00Kalliopi IordanidouChanges related to ticket 19579Addressed points 1-3 in the ticket 19579. In summary:
- Included the following in MC_pp_v8
HLT_mu14_L12MU11
HLT_mu14_L1MU11_2MU10
HLT_mu26_ivarmedium_j110_gsc150_boffperf_split_j35_boffperf_split_L1MU20_J50
- Moved the following from...Addressed points 1-3 in the ticket 19579. In summary:
- Included the following in MC_pp_v8
HLT_mu14_L12MU11
HLT_mu14_L1MU11_2MU10
HLT_mu26_ivarmedium_j110_gsc150_boffperf_split_j35_boffperf_split_L1MU20_J50
- Moved the following from Physics_pp_v8 to MC:
HLT_e20_lhtight_nod0_ivarloose_3j20_L1EM18VHI_3J20
HLT_mu14_ivarloose_3j20_L1MU10_3J20
HLT_e60_etcut_trkcut_L1EM24VHIM_xs30_j15_perf_xe30_6dphi15_mt35
- Commented out all tau triggers with tight1_tracktwo and loose1_tracktwo in v8