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

Manual merge 7_3_X into 7_3_ROOT6_X #6025

Merged
merged 84 commits into from Oct 27, 2014
Merged

Conversation

nclopezo
Copy link
Contributor

Manual merge of CMSSW_7_3_X into CMSSW_7_3_ROOT6_X.

arizzi and others added 30 commits September 17, 2014 18:33
…llow XMLGeometryBuilder to optionally use the new MF geometry record
…tograms + added possibility to validate different type of jets (for dijet HPA) and trigger information for future developments of the module
…tograms + added possibility to validate different type of jets (for dijet HPA) and trigger information for future developments of the module
…tograms + added possibility to validate different type of jets (for dijet HPA) and trigger information for future developments of the module
ktf and others added 27 commits October 24, 2014 16:31
Put back the plugin definition for RPC
Provide the ability to do a separate cache-hint for cloning.
Removed unused lines.
The static analyzer believes this module can safely be converted
to a stream module. This was also converted to make the DIGI workflow
more thread efficient.
The static analyzer believes this module can safely be converted
to a stream module. This was also converted to make the DIGI workflow
more thread efficient.
fixing bug where brem var was NaN which causes out of bound array access
Geometry and configuration of Magnetic Field from DB
…teMesurement

Single lepton HLT for fake rate mesurement
Convert PileupInformation to stream module
…Producer

Convert ESZeroSuppressionProducer to stream module
unused duplicate plugin removed
Make IVF code templated (btag fwk migration)
FastPV update and triggers for ZnnHbb, VBFHbb, X->HH->4b: CMSHLT-128
…-migration-thread-safe

Exotica dqm update and migration thread safe
include pilot blade stuff to pixel rawdigi, 2nd attempt
Conflicts:
	CondCore/Utilities/BuildFile.xml
nclopezo added a commit that referenced this pull request Oct 27, 2014
Manual merge 7_3_X into 7_3_ROOT6_X
@nclopezo nclopezo merged commit 1ff99fe into cms-sw:CMSSW_7_3_ROOT6_X Oct 27, 2014
@nclopezo
Copy link
Contributor Author

I started CMSSW_7_3_ROOT6_X_2014-10-27-1700 with these changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet