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

Forward port of CMSSW_7_2_X into CMSSW_7_3_X #5738

Merged
merged 58 commits into from Oct 9, 2014

Conversation

ktf
Copy link
Contributor

@ktf ktf commented Oct 8, 2014

As requested by @civanch #5643 is ignored in this forward port.

inugent and others added 30 commits September 22, 2014 12:13
The if statement would never be true.
With this fix the functionality is preserved with some more information in case of error.
The eg candidates were intially part of the PU calculation to be used for a region-calibration scheme which was abandoned. Clean up the PU code to no longer need egcands and to simplify the logic.
…-report-gen

Guard against blank lines in db.txt which cause tlf2esd.txt report to not be generated.
…ng to fix various runtests by setting the GT to run2_mc
…ies runtest. Also fixing a couple of stray AK5s from python files more than one layer deep in the package
@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 8, 2014

edm::LogError("HepMCValidationHelper") << "Tau with no daughters. This is a bug. Fix it";
continue;
abort();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This abort is annoying:

Just as a minor advice, DON'T call abort or exit, throw an exception so that the job can terminate gracefully.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the abort() in 73X was more recently merged than the continue in 72X.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment