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

add specific post-LS1 customisations for 25ns, 50ns and heavy ions with premixing #7831

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
}
digiPremixUp2015Defaults50ns=merge([{'--conditions':'auto:run2_mc_50ns'},
{'--pileup_input' : 'das:/RelValPREMIXUP15_PU50/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[6]},
# {'--customise':'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1_50ns'}, # FIX FIX here we miss an equivalent versin of postLS1CustomsPreMixing for 50ns; keep the same custom here as in digiPremixUp2015Defaults25ns
{'--customise': 'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1_50ns'},
digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PU25']=merge([digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PU50']=merge([digiPremixUp2015Defaults50ns])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,29 @@

def customisePostLS1(process):

# apply the general 25 ns post-LS1 customisation
process = postLS1Customs.customisePostLS1(process)
# deal with CSC separately:
# deal with premixing-specific CSC changes separately
process = customise_csc_PostLS1(process)

return process


def customisePostLS1_50ns(process):

# apply the general 25 ns post-LS1 customisation
process = postLS1Customs.customisePostLS1_50ns(process)
# deal with premixing-specific CSC changes separately
process = customise_csc_PostLS1(process)

return process


def customisePostLS1_HI(process):

# apply the general 25 ns post-LS1 customisation
process = postLS1Customs.customisePostLS1_HI(process)
# deal with premixing-specific CSC changes separately
process = customise_csc_PostLS1(process)

return process
Expand Down