Gen weight refactor manual merge #51
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
overhaul of code: now works with tinyxml2 instead of regex
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
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
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
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
fix runtime error failIfInvalidXML_ cleanup failIfInvalidXML_ cleanup (2) scram b code-format
Fix problem of confounding issues in xmlParsing code fails to parse correctly when swapped weigthgroup tags and escaped </> 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
revert unneeded change
kdlong
force-pushed
the
GenWeightRefactor_manualMerge
branch
from
2c24d87 to
d3d2af5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR description:
PR validation:
if this PR is a backport please specify the original PR and why you need to backport that PR:
Before submitting your pull requests, make sure you followed this checklist: