More forward porting from CMSSW_7_2_X

[ktf]

While forward porting the following bits conflicted:

• RecoTracker/DeDx/plugins/HLTDeDxFilter.cc

<<<<<<< HEAD 
       //calculate relative trk isolation only if parameter maxRelTrkIsoDeltaRp3 is less than 0 
       if(maxRelTrkIsoDeltaRp3_ >= 0){ 
         auto ptCone = trackCollection[i].pt(); 
         for(unsigned int j=0; j<trackCollection.size(); j++){ 
         reco::TrackRef track2  = reco::TrackRef( trackCollectionHandle, j ); 
======= 
       //calculate relative trk isolation only if parameter maxRelTrkIsoDeltaRp3 is greater than 0 
       if(maxRelTrkIsoDeltaRp3_ >= 0){ 
         auto ptCone = trackCollection[i].pt(); 
         for(unsigned int j=0; j<trackCollection.size(); j++){ 
>>>>>>> cms-sw/CMSSW_7_2_X 

In this case I picked up the 72X version since the commend is actually correct there.

• Configuration/PyReleaseValidation/python/relval_steps.py:

++<<<<<<< HEAD
 +steps['RECOHI']=merge([hiDefaults,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Defaults])
 +
++=======
+ steps['RECOHI']=merge([hiDefaults,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Up2015Defaults])
+ #wmsplit['RECOHI']=5
++>>>>>>> cms-sw/CMSSW_7_2_X

I picked up again the CMSSW_7_2_X version since that's what I was asked to do also in the past.

[cmsbuild]

A new Pull Request was created by @ktf (Giulio Eulisse) for CMSSW_7_3_X.

More forward porting from CMSSW_7_2_X

It involves the following packages:

Configuration/PyReleaseValidation
EventFilter/FEDInterface
EventFilter/Utilities
HLTrigger/Configuration
RecoTracker/DeDx

@perrotta, @cmsbuild, @nclopezo, @vlimant, @fwyzard, @emeschi, @Martin-Grunewald, @franzoni, @StoyanStoynev, @slava77, @mommsen, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig, @makortel, @GiacomoSguazzoni, @rovere, @VinInn, @gpetruc, @cerati, @venturia this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@nclopezo, @ktf you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

[Martin-Grunewald]

+1

correct choices.

But please add #5752 and #5781 to this forward prot now that they are signed by L1