athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-05-13T21:44:12+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/53149Remove MM SimHits with 0 kinetic energy2022-05-13T21:44:12+02:00Alexandre LaurierRemove MM SimHits with 0 kinetic energyThe Micromegas digitization was updated in !53113 to ignore HITS with 0 kinetic energy. In !52947 discussing some critical MM issues, @jchapman suggested we modify the MM G4 simulation to simply not save SimHits with 0 kinetic energy to ...The Micromegas digitization was updated in !53113 to ignore HITS with 0 kinetic energy. In !52947 discussing some critical MM issues, @jchapman suggested we modify the MM G4 simulation to simply not save SimHits with 0 kinetic energy to save resources. this MR changes the MM G4 simulation to not save the SimHits with 0 kinetic energy.
Keeping @pscholer @chchau in the loop.https://gitlab.cern.ch/atlas/athena/-/merge_requests/53073Unify naming of NSW simulation outputs and metadata with the rest of the muon...2022-05-10T15:42:10+02:00Tadej Novaktadej.novak@cern.chUnify naming of NSW simulation outputs and metadata with the rest of the muon subdetectorsI hope that this one will not be too intrusive, but it needs to be done before MC21 production starts. It fixes two items of the NSW naming:
- NSW HIT container names (`sTGC/MMSensitiveDetector` to `sTGC/MM_Hits` like for the other muon...I hope that this one will not be too intrusive, but it needs to be done before MC21 production starts. It fixes two items of the NSW naming:
- NSW HIT container names (`sTGC/MMSensitiveDetector` to `sTGC/MM_Hits` like for the other muon components)
- MM flag names as this is used for metadata generation (all other flags are acronyms)
While doing it I also added support to the `ISF_CollectionMerger`.
Note that this MR only keeps digi compatibility, everything else is renamed!
Keeping Draft for now to allow a bit more testing. Running ~"full-integration-tests" and ~"full-unit-tests" already (at least some references will have to be updated).
/cc @chchau @jojungge @rosati @pscholer @jchapman @stavrop @alaurier @tlarihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/52993skip compiling the ISF_FastClaoGpu if no cuda found2022-05-09T09:44:02+02:00Ke Liskip compiling the ISF_FastClaoGpu if no cuda foundAs shown in https://its.cern.ch/jira/browse/ATLINFR-4536
The package of ISF_FastCaloGpu can not be compiled in the machine with no cuda, now the CmakeKist.txt is revised to check the cuda library first.
Ping @akraszna and @elmsheusAs shown in https://its.cern.ch/jira/browse/ATLINFR-4536
The package of ISF_FastCaloGpu can not be compiled in the machine with no cuda, now the CmakeKist.txt is revised to check the cuda library first.
Ping @akraszna and @elmsheushttps://gitlab.cern.ch/atlas/athena/-/merge_requests/52929Do not load muon cabling in RDO merge2022-05-05T21:42:23+02:00Tadej Novaktadej.novak@cern.chDo not load muon cabling in RDO mergeTo make RDO merge a bit faster (and also fix issues) do not load muon cabling in RDO merge.
Fixes ATLASSIM-5813.
/cc @rbielski @jchapman @jojunggeTo make RDO merge a bit faster (and also fix issues) do not load muon cabling in RDO merge.
Fixes ATLASSIM-5813.
/cc @rbielski @jchapman @jojunggehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/52509Define variable beamspot pile-up digi for MC21a2022-04-26T15:42:45+02:00Tadej Novaktadej.novak@cern.chDefine variable beamspot pile-up digi for MC21aDefine variable beamspot pile-up digitisation for MC21a:
- define proper fractions as in ATLASDP-52
- fix typo in pile-up profiles
- disable rounding of job size when running with multiple steps
- add/update ART tests
/cc @jchapman ...Define variable beamspot pile-up digitisation for MC21a:
- define proper fractions as in ATLASDP-52
- fix typo in pile-up profiles
- disable rounding of job size when running with multiple steps
- add/update ART tests
/cc @jchapman @tlarihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/52309TileGeoG4CalibSD: removed double-delete of the EscapedEnergyProcessing2022-04-16T21:42:02+02:00Vakhtang TsulaiaTileGeoG4CalibSD: removed double-delete of the EscapedEnergyProcessing`EscapedEnergyProcessing` objects are adopted by the Registry. So the Tile SD
should not attempt to delete them too`EscapedEnergyProcessing` objects are adopted by the Registry. So the Tile SD
should not attempt to delete them toohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/52302Update obsolete syntax after !49938 (ATLASSIM-5780)2022-04-16T03:51:42+02:00John Derek ChapmanUpdate obsolete syntax after !49938 (ATLASSIM-5780)After !49938 the `G4AtlasTests` library no longer exists, so it is safer to use CfgMgr to access `G4TestAlg` in the configuration.
FYI @bwynne, @bmorgan, @eramakotAfter !49938 the `G4AtlasTests` library no longer exists, so it is safer to use CfgMgr to access `G4TestAlg` in the configuration.
FYI @bwynne, @bmorgan, @eramakothttps://gitlab.cern.ch/atlas/athena/-/merge_requests/52295Configuration for Variable Beamspot Simulation2022-05-05T15:42:54+02:00John Derek ChapmanConfiguration for Variable Beamspot SimulationIn MC21a (corresponding to 2002 data) we will simulate multiple (four) beamspot sizes to
take into account the effect of luminosity levelling.
The "beamspot vs mu" profile which will be used in the pile-up presampling step is compressed ...In MC21a (corresponding to 2002 data) we will simulate multiple (four) beamspot sizes to
take into account the effect of luminosity levelling.
The "beamspot vs mu" profile which will be used in the pile-up presampling step is compressed down to a single entry per "step". (Each step corresponds to a single beamspot size (and lumiblock).)
This compressed profile is then scaled to the job size (with the MC21a profile the minimum
supported simulation job size is 50 events).
Steps are not used to trigger separate jobs in simulation.
Tested in Athena and AthSimulation. Matching output for old and new-style configuration.
NB Samples produced using this configuration should be merged using HITSMerge_tf.py with the `PyJobTransforms/postInclude.SortInput.py` postInclude before being used as input to MC Overlay or pile-up Digitization. This postInclude ensures that all events in the output merged HITS file are sorted by lumiblock.
Should go in after !52509, !52603 and !52604.https://gitlab.cern.ch/atlas/athena/-/merge_requests/52161ATLASSIM-5768 HepMC3 compilation fixes2022-04-12T21:43:54+02:00Christos Anastopouloschristos.anastopoulos@cern.chATLASSIM-5768 HepMC3 compilation fixesCloses ATLASSIM-5768Closes ATLASSIM-5768https://gitlab.cern.ch/atlas/athena/-/merge_requests/51879FCS shape tuning to data bug fix2022-04-06T11:20:53+02:00Joshua Falco Beirerjoshua.beirer@cern.chFCS shape tuning to data bug fixThis MR:
- fixes a bug where `phiScaleFactor` would get overwritten with the `etaScaleFactor` in the 2D phi_s - eta_s scaling model
- fixes an issue where we would get a crash in the FCS standalone param file merging, when the class is ...This MR:
- fixes a bug where `phiScaleFactor` would get overwritten with the `etaScaleFactor` in the 2D phi_s - eta_s scaling model
- fixes an issue where we would get a crash in the FCS standalone param file merging, when the class is called using its default constructor, but no model parameter file path is defined
- improves debug level verbosity
- removes arguments from constructor and implements separate method to initialise data tuninghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/51743Update overlay inputs to be all from OverlayTests folder2022-04-01T15:42:28+02:00Tadej Novaktadej.novak@cern.chUpdate overlay inputs to be all from OverlayTests folderUpdate all overlay test and ART inputs to use `OverlayTests` ART folder.
Also make sure data overlay always uses G4 10.6 Tile sampling fractions (cc @harkusha) as it needs to be synced with the inputs. Fixes ATLASSIM-5720.
/cc @jchapma...Update all overlay test and ART inputs to use `OverlayTests` ART folder.
Also make sure data overlay always uses G4 10.6 Tile sampling fractions (cc @harkusha) as it needs to be synced with the inputs. Fixes ATLASSIM-5720.
/cc @jchapman @emoyse @pagacovahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/51732FCS shower shape tuning out of eta range handling2022-04-04T14:27:50+02:00Joshua Falco Beirerjoshua.beirer@cern.chFCS shower shape tuning out of eta range handlingThis MR handles cases pseudorapidity ranges where we do not have any tuning to data. In this case, the simulation is not altered.This MR handles cases pseudorapidity ranges where we do not have any tuning to data. In this case, the simulation is not altered.https://gitlab.cern.ch/atlas/athena/-/merge_requests/51716Reverted changes to high granularity hit merging2022-03-30T21:43:24+02:00Michele Faucci GiannelliReverted changes to high granularity hit mergingThese changes allow producing the first set of input samples for the AF3 parameterization in Run3These changes allow producing the first set of input samples for the AF3 parameterization in Run3https://gitlab.cern.ch/atlas/athena/-/merge_requests/51714Fix Digitization_test_MC16a_Digi_tf_configuration_ctest after LAr pile-up too...2022-03-30T15:42:03+02:00Tadej Novaktadej.novak@cern.chFix Digitization_test_MC16a_Digi_tf_configuration_ctest after LAr pile-up tool cleanupFix `Digitization_test_MC16a_Digi_tf_configuration_ctest` after LAr pile-up tool cleanup.
Fixes ATLASSIM-5719.
/cc @jchapman @emoyseFix `Digitization_test_MC16a_Digi_tf_configuration_ctest` after LAr pile-up tool cleanup.
Fixes ATLASSIM-5719.
/cc @jchapman @emoysehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/51501Switch from shared to conventional interpolation class pointers2022-03-30T14:41:25+02:00Joshua Falco Beirerjoshua.beirer@cern.chSwitch from shared to conventional interpolation class pointersThis MR switches from a map of shared pointers holding the interpolation objects to conventional pointers to avoid problems in the FastCaloSimV2 param file creation.This MR switches from a map of shared pointers holding the interpolation objects to conventional pointers to avoid problems in the FastCaloSimV2 param file creation.https://gitlab.cern.ch/atlas/athena/-/merge_requests/51451Relocation Fixes, master branch (2022.03.21.)2022-03-22T15:42:32+01:00Attila KrasznahorkayRelocation Fixes, master branch (2022.03.21.)Unfortunately a number of issues sneaked into the configuration in the last few years which made `/cvmfs/...` paths appear in the exported CMake configuration of the [Athena](Projects/Athena) project, as reported in ATLINFR-4465. This co...Unfortunately a number of issues sneaked into the configuration in the last few years which made `/cvmfs/...` paths appear in the exported CMake configuration of the [Athena](Projects/Athena) project, as reported in ATLINFR-4465. This commit is meant to fix all of them.
- A number of `<FOO>_INCLUDE_DIR` -> `<FOO>_INCLUDE_DIRS` replacements are made, as only the latter are set up to be relocatable in our configuration.
- [FindHDF5](https://cmake.org/cmake/help/latest/module/FindHDF5.html)'s C\+\+ specific variables are replaced with the more generic ones in [HDF5Utils](PhysicsAnalysis/AnalysisCommon/HDF5Utils), as only the generic variables are set up to be relocatable. And we only use the C\+\+ interface of [HDF5](https://www.hdfgroup.org/solutions/hdf5/) in that package anyway.
- The "find order" of [LAPACK](http://www.netlib.org/lapack/) and [BLAS](http://www.netlib.org/blas/) is switched in [VrtSecInclusive](Reconstruction/VKalVrt/VrtSecInclusive). [FindLAPACK](https://cmake.org/cmake/help/latest/module/FindLAPACK.html) actually calls on [FindBLAS](https://cmake.org/cmake/help/latest/module/FindBLAS.html) itself internally. And the way we make paths relocatable in the [ATLAS specific FindBLAS module](https://gitlab.cern.ch/atlas/atlasexternals/-/blob/master/Build/AtlasLCG/modules/FindBLAS.cmake) is negated when [FindLAPACK](https://gitlab.cern.ch/atlas/atlasexternals/-/blob/master/Build/AtlasLCG/modules/FindLAPACK.cmake) triggers a second call to that module.
Pinging @fwinkl and @tvarol.https://gitlab.cern.ch/atlas/athena/-/merge_requests/50775Add simple evaluate method to piecewise interpolation2022-03-01T22:27:45+01:00Joshua Falco Beirerjoshua.beirer@cern.chAdd simple evaluate method to piecewise interpolationFor some strange reason, [!50562](https://gitlab.cern.ch/atlas/athena/-/merge_requests/50562) seems to have reverted the changes from [!50611](https://gitlab.cern.ch/atlas/athena/-/merge_requests/50611). This MR re-introduces the require...For some strange reason, [!50562](https://gitlab.cern.ch/atlas/athena/-/merge_requests/50562) seems to have reverted the changes from [!50611](https://gitlab.cern.ch/atlas/athena/-/merge_requests/50611). This MR re-introduces the required interpolation changes. Should fix ATLASSIM-5671https://gitlab.cern.ch/atlas/athena/-/merge_requests/50445Fixing Digitization test2022-02-21T11:43:28+01:00Pavol StrizenecFixing Digitization testThis should fix the ATLASRECTS-6821, reference was update for new object.This should fix the ATLASRECTS-6821, reference was update for new object.https://gitlab.cern.ch/atlas/athena/-/merge_requests/50288Migrate Beam.Type to be an enum2022-02-09T15:43:39+01:00Tadej Novaktadej.novak@cern.chMigrate Beam.Type to be an enumMigrate `Beam.Type` to be an enum.Migrate `Beam.Type` to be an enum.https://gitlab.cern.ch/atlas/athena/-/merge_requests/50270Migrate GeoModel.Run to be an enum2022-02-08T15:42:54+01:00Tadej Novaktadej.novak@cern.chMigrate GeoModel.Run to be an enumMigrate `GeoModel.Run` to be an enum.Migrate `GeoModel.Run` to be an enum.