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.

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

Properly handle Run product merging in LHESource #21820

Merged
merged 8 commits into from Jan 12, 2018

Commits on Jan 8, 2018

  1. Fix multi-file reading

    Previously, when the first xml document was finished and the XMLDocument
    object was deleted, then xerces would be uninitialized. This lead to
    the parser being invalid so the next read of LHEReader would crash.
    Keeping the XercesPlatform alive for the lifetime of the LHEReader
    fixes that problem.
    Dr15Jones committed Jan 8, 2018
    Copy the full SHA
    708c6bf View commit details
    Browse the repository at this point in the history
  2. Modernizing of LHESource

    Moved to std::unique_ptr and std::shared_ptr for most memory handling.
    Changed member variables to match CMS conventions.
    Dr15Jones committed Jan 8, 2018
    Copy the full SHA
    374d1c7 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    b34a2ad View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Merge LHERunInfoProduct during nextEvent

    When we identify that we need to merge the LHERunInfoProduct in
    nextEvent, we immediately do the merge.
    This avoids the need for a endRun call which will allow those calls
    to be removed from the framework.
    Dr15Jones committed Jan 9, 2018
    Copy the full SHA
    910b1dc View commit details
    Browse the repository at this point in the history
  2. Properly override fileIndex

    The function fileIndex was not being overridden for base class
    ProducerSourceBase. Now we forward FromFile::fileIndex to
    ProducerSourceBase.
    Dr15Jones committed Jan 9, 2018
    Copy the full SHA
    b55141f View commit details
    Browse the repository at this point in the history
  3. Tell framework when LHESource goes to a new file

    By telling the framework that the LHESource has gone to a new file,
    the merging of RunInfoProduct can be done properly.
    Dr15Jones committed Jan 9, 2018
    Copy the full SHA
    578fd2c View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    2bbc021 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    1f2facf View commit details
    Browse the repository at this point in the history