edit the #include to "xy/yx.h" from <xy/yx.h>
Update hwmatch.F



This code is provided to use FxFx-Merging with Herwig6 inside CMSSW.

Josh Bendavid created the first version of this code, which was loosely based on the old FxFx-Merging algorithm of the aMC@NLO authors and specially adopted to Higgs processes.
This adaption caused problems when used with other processes like ttbar. For that reason I ported it back to a newer version of the algorithm, see also http://amcatnlo.web.cern.ch/amcatnlo/mcatnlo_hwan_MLM.f
The same commit is also made in CMSSW 7_1_X
Thread safe initialization of dummy PSet static in HLTConfigData

Modified the code to safely initialize the registration of the dummy
PSet static used in HLTConfigData. Also avoid having the registration
call make each time the function was called.
This was spotted by the static analyzer.
Use initializer list to safely initialize a static in ELseverityLevel

The function loadMap is callable from multiple threads and therefore the initialization of the map must be done in a safe manner. Using an initializer list will guarantee that the compiler will make the initialization of the map thread-safe.
This was found by the static analyzer.
Merge pull request #4409 from AureliusB/patch-1

edit the #include to "xy/yx.h" from <xy/yx.h>
Merge pull request #4423 from Dr15Jones/safeInitOfStaticHLTConfigData

Thread safe initialization of dummy PSet static in HLTConfigData
Merge pull request #4426 from Dr15Jones/threadSafeInitOfStaticELseverityLevel

Use initializer list to safely initialize a static in ELseverityLevel
Merge pull request #4419 from mharrend/patch-1

Update hwmatch.F
Merge remote branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X