Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Large Refactoring of FastSim propagator #26061

Merged
merged 18 commits into from Mar 14, 2019
Merged

Large Refactoring of FastSim propagator #26061

merged 18 commits into from Mar 14, 2019

Conversation

Dr15Jones
Copy link
Contributor

  • Made FastSimulation/BaseParticlePropagator the lowest level of the dependency hierarchy with no dependency on HepPDT. This reduced dependencies for RECO packages using this package.
  • Removed poor use of inheritance
  • Removed the need for the ParticleTable singleton. Needed information is propagated via FSimEvent (which was already present) and ParticlePropagator (which needs the info itself).

This refactoring is the first step to proper code sharing between FastSim and RECO.

@Dr15Jones
BaseParticlePropagator no longer inherits from RawParticle
da1668b 
The propagator operates on a RawParticle but is not itself a
RawParticle.
@Dr15Jones
Allow full initialization of RawParticle at construction time
5c74498 
Can now fully initialize a RawParticle at construction time.
Added helper makeMuon method to allow more meaningful mechanism
to create a particular particle type. This will be used in the future
to decouple reconstruction from Geant.
@Dr15Jones
Allow non-const access to particle in BaseParticlePropagator
fbe998c
@Dr15Jones
Propagate change of BaseParticlePropagator to dependent code
26946a5
@Dr15Jones
Switched to fixed sized std::array instead of std::vector
f89c5d4 
The container size is known at compile time. Using a std::array
avoids a heap allocation.
@Dr15Jones
PDG info explicitly comes from ParticleTable
cf22335 
The RawParticle no longer indirectly holds information about PDG
quantities. These now must come explicitly from ParticleTable.

This avoids dependency on Geant code from RawParticle and no longer
requires access to a singleton each time a RawParticle is constructed.
@Dr15Jones
Explicitly use ParticleTable to create RawParticle with PDG id
dfbcb5d 
The RawParticle has previously behind the scenes used ParticleTable
to lookup the particle info for a given PDG id. Now one must
explicitly call a function of ParticleTable.
This will allow RawParticle to not be coupled to Geant.
@Dr15Jones
RawParticle no longer inherits from XYZTLorentzVector
e114498 
RawParticle contains a XYZTLorentzVector for the momentum, it is
not itself a 4 vector.
@Dr15Jones
Made makeParticle a standalone function
ae4cc00 
Now ParticleTable and RawParticle no longer have any coupling.
Also moved makeMuon to its own header and source file.
@Dr15Jones
makeMuon is independent of ParticleTable
3c27a32 
makeMuon now has hard-coded value of the muon mass.
NOTE: testing revealed that the value of energy returned from
RawParticle has never been constrained by the mass value.
@Dr15Jones
Removed the use of RawParticle::init
ebfab80 
Use modern member data initialization mechanisms instead.
@Dr15Jones
Reduce direct use of ParticleTable
84f7fbd 
-Moved pdg related functions to own header and only make dependent
 on HepPDT::ParticleDataTable
-Prefer using already held HepPDT::ParticleDataTable over the
 ParticleTable singleton.
@Dr15Jones
Removed ParticleTable singleton
072981c 
The HepPDT::ParticleDataTable object is now transported to where
it is needed either directly or via FSimEvent or ParticlePropagator.
@Dr15Jones
Moved RawParticle and makeMuon to BaseParticlePropagator
ac60e89 
Particle package depends upon HepPDT while BaseParticlePropagator
does not. Neither RawParticle nor makeMuon need HepPDT.
@Dr15Jones
Made test name consistent
d3e1171
@Dr15Jones
Copy link
Contributor Author

I ran both the scram b runtests and runTheMatrix.py -t 4 -l limited on this change.

@cmsbuild cmsbuild added this to the CMSSW_10_6_X milestone Mar 5, 2019
@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2019

The code-checks are being triggered in jenkins.

@Dr15Jones
Copy link
Contributor Author

@makortel @wddgit could you both review this code?

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2019

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-26061/8617

  • This PR adds an extra 316KB to repository

  • Found files with invalid states:

    • FastSimulation/Particle/interface/makeMuon.h:
    • FastSimulation/Particle/test/makeMuon_catch2.cc:
    • FastSimulation/Particle/test/BuildFile.xml:
    • FastSimulation/Particle/src/makeMuon.cc:

@cmsbuild
Copy link
Contributor

+1
Tested at: 81e6e35
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-26061/33552/summary.html

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
1562da2
defc586
c19a5d8
7bbacb1
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-26061/33552/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-26061/33552/git-merge-result

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-26061/33552/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 7 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3114829
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3114631
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 133 log files, 14 edm output root files, 32 DQM output files

@fabiocos
Copy link
Contributor

I will consider all previous signatures as valid, given the very minor and localized change. Nevertheless please sign it in case for future reference

@ssekmen
Copy link
Contributor

ssekmen commented Mar 13, 2019

+1

@kpedro88
Copy link
Contributor

+upgrade

@alberto-sanchez
Copy link
Member

+1

@perrotta
Copy link
Contributor

+1

@fabiocos
Copy link
Contributor

+1

@fabiocos
Copy link
Contributor

merge

L1 acknowledged the PR #26061 (comment) , @rekovic please sign it for reference or comment further in case

@cmsbuild cmsbuild merged commit 1efe7cf into cms-sw:master Mar 14, 2019
@Dr15Jones Dr15Jones deleted the refactorBaseParticlePropagator branch March 15, 2019 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabiocos fabiocos fabiocos left review comments

@wddgit wddgit wddgit left review comments

Assignees
No one assigned
Labels
code-checks-approved comparison-available fastsim-approved generators-approved l1-pending orp-approved pending-signatures reconstruction-approved tests-approved upgrade-approved
Projects
None yet
Milestone
CMSSW_10_6_X
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@Dr15Jones @cmsbuild @makortel @kpedro88 @alberto-sanchez @ssekmen @perrotta @rekovic @fabiocos @wddgit