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

[12.2.X] Refactoring gen weight storage in EDM + Nano integration #38699

Closed

Commits on Jul 11, 2022

  1. Configuration menu
    Copy the full SHA
    4e90d7e View commit details
    Browse the repository at this point in the history
  2. Working on parsing integration with scale/pdf weights

    overhaul of code: now works with tinyxml2 instead of regex
    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    a019e8a View commit details
    Browse the repository at this point in the history
  3. New WeightGroups, improved parsing with helper class

    Dylan's improvements of weight parsing
    
    changed LHEsource so it compiles, running tests now
    
    added scientific notation for numbers so values are correct
    
    added a few more test statements. Need to think of future needs
    
    Add testing suite (will remove/squash commits right before merge)
    
    Change pdfSetsInfo to be read in from LHAPDF path
    Still lingering question of how to decide pdf type
    This can be resolved in the new function "setupPdfSetsInfo"
    
    Add check if orphan weight is pdf and fix xml tag swap (needs review)
    
    Allow reading '>' as '>' and fix bug with first weight w/o group
    As for the first weight error: if the first weight doesn't have a
    weight group, the code would not add it to the list of weights because
    of currentGroupName and the first weight both having a trivial "" as
    their name. Thats the reason for the currentGroupName being set to
    "None" for initialization
    
    Fix space issue in regex and moved unchaning variables outside for
    
    Add pdfgroup splitting. To do this, needed LHAPDF requirements
    
    clang format
    
    Fix parsing issue with pdfweights in certain files
    those files being "DrellYan_LO_MGMLMv233_2016_weightInfo.txt" and "DrellYan_NLO_MGFXFXv242_2017_weightInfo.txt",
    
    Remove PdfSetInfo in favor of LHAPDF library
    
    Refactor pdfweight so pdfweights are always split
    May put flags needed for the splitting. Only impliemented in LHEWeightHelper
    
    Simplify ScaleWeight structure in anticipation of dyn weight changes
    
    Add dynWeights to scaleWeightInfo. Can improve code (basic refactor)
    
    Add orphaned pdf weight into scale weight missing central index
    not my finest work. Definitely could have improvements, but
    technically works
    
    Add Pdf info to pdfWeights (size, type) & check of size consistency
    
    More testing scripts, better error handling
    
    Fix orphaned central scale problem. was resizing to 1 (not great)
    
    Simplify logic of adding to make less opaque
    
    Move weight building logic to WeightHelper so GEN can use it
    
    Add basic GenLevel parsing. Works on ZGTo2NuG test file
    
    Add PartonShower parsing for GenWeights
    
    Change PartonShower filename to match h file
    
    More error handling, parsing improvements
    
    Add option for raising expection if XML is not valid
    
    Fix parsing of PartonShower name in GenWeights
    
    Add basic MEParam weight functionality
    
    Allow for general adding of params to vector
    Also fixed formating with clang
    
    Simplifications for PS and ME weight groups
    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    daaf3ce View commit details
    Browse the repository at this point in the history
  4. updates to allow saving weight sums from all weight categories

    adding option to save preferred PS weights
    
    Support unassociated LHE weights, simplify PS weights
    
    Refactor ScaleWeightGroup to simplify codebase
    
    Remove/change lines in WeightHelper to clean
    
    Fix naming problems in ScaleWeight
    
    Refactor LHWeightHelper (moved to helper functions)
    
    Fix errors in ScaleWeight and add print statements for debug
    sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    20d886f View commit details
    Browse the repository at this point in the history
  5. Add more error handling

    Fix off-by-one error in pdf weight splitting
    
    Templatize product adder in WeightHelper
    
    Expand emission functionality to PSWeight
    needs to add more to make sure works correctly
    clang-format the partonshowerWeightGroupInfo.cc file as well
    
    Fix central weight and error from mg26xNew
    
    Fix PSWeights in LumiHeader to work w diff pythia format
    Dylan Teague authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    f71ab49 View commit details
    Browse the repository at this point in the history
  6. adding altset index table

    sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    b13136f View commit details
    Browse the repository at this point in the history
  7. Use cms::Exception, configure debugging, code formatting

    Further cleanup, nano improvements
    
    change way PS weights handled
    
    Allow for finding missing weights
    
    Fix error with gap fixing code
    
    Change around logic to have bool to decide if use guess for PS
    
    Amend wellformed logic for scaleweight
    
    Cleanup code
    
    Nano back to GenWeightsTableProducer file
    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    156617a View commit details
    Browse the repository at this point in the history
  8. attempt to delete extra kets after the last </weightgroup>

    fix runtime error
    
    failIfInvalidXML_ cleanup
    
    failIfInvalidXML_ cleanup (2)
    
    scram b code-format
    SanghyunKo authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    37e4dad View commit details
    Browse the repository at this point in the history
  9. Step forward to newer cmssw version

    Fix problem of confounding issues in xmlParsing
    
    code fails to parse correctly when swapped weigthgroup tags and escaped
    &lt;/&gt; characters in header.
    
    Also clean up the xmlError parsing and add some debug statements
    associated with tose errors
    
    falling back to vector of flattables
    
    Add "fillEmptyIfWeightFails" option and fix an err
    
    Error is related to the product size not being updated when an unknown
    weight is found
    
    Add more error states to LHEWEightHelper to handle empty xml
    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    0438535 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    d27b812 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    bc7f352 View commit details
    Browse the repository at this point in the history
  12. Convert OwnVector to unique_ptr

    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    543c4ba View commit details
    Browse the repository at this point in the history
  13. Simplify nano producer and weight parsing

    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    56c6a7e View commit details
    Browse the repository at this point in the history
  14. Make producers edm::Global

    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    78aaa8b View commit details
    Browse the repository at this point in the history
  15. Code format, don't fail for missing LHEEventProduct

    Remove redundant files (renamed or dropped)
    
    revert unneeded change
    
    Produce new LHEEventProduct with weights zeroed
    
    Can also be done for GenEventInfoProduct, but here the number of floats
    duplicated is way less severe, and the amount of downstream code
    accessing it is way larger
    
    Code format
    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    c95bdba View commit details
    Browse the repository at this point in the history
  16. Update nano and nanogen configs

    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    871b024 View commit details
    Browse the repository at this point in the history
  17. Fix scale weights in case of < 9 entries

    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    15b0b4e View commit details
    Browse the repository at this point in the history
  18. Code format

    Code format
    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    8689e3b View commit details
    Browse the repository at this point in the history
  19. Hopefully fixing test errors

    Fix case where weight lumi product doesn't exist but event weight does
    
    Remove allowUnassociated for LHE, Code format
    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    c8a9816 View commit details
    Browse the repository at this point in the history
  20. Attempt to fit cosmics workflow error

    Treat unassociated weights properly
    
    Code checks
    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    cd7c306 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    5eed38e View commit details
    Browse the repository at this point in the history
  22. macro to permit catch statement with LHAPDF

    code format
    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    9e8ec88 View commit details
    Browse the repository at this point in the history
  23. Fix event content for gen weights in AOD

    kdlong authored and sroychow committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    a118207 View commit details
    Browse the repository at this point in the history