Change some strings to InputTag for proper HLT ConfDB tracking

[Martin-Grunewald]

Change some strings to InputTag for proper HLT ConfDB tracking.
Package code and local py cfi files are updated.

This change is backward compatible: if an old or private py config still contains
the parameter as a string, cmsRun will issue a warning for you to update your py
config but run doing the correct(TM) thing!

[cmsbuild]

A new Pull Request was created by @Martin-Grunewald (Martin Grunewald) for CMSSW_7_0_X.

Change some strings to InputTag for proper HLT ConfDB tracking

It involves the following packages:

Calibration/HcalIsolatedTrackReco
RecoMuon/L3MuonIsolationProducer

@nclopezo, @demattia, @cmsbuild, @thspeer, @rcastello, @slava77 can you please review it and eventually sign? Thanks.
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.
@ktf you are the release manager for this.

[cmsbuild]

+1
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-1656/1567/summary.html

[thspeer]

+1
tested 9e3b567 in CMSSW_7_0_X_2013-12-03-0200-1656
No difference in reco, based on RelMon and reco script

[rcastello]

+1

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next IBs unless changes or unless it breaks tests. @ktf can you please take care of it?

[nclopezo]

@Martin-Grunewald

Hi Martin,

This pull request has become unmergeable. Could you please rebase it?

[Martin-Grunewald]

Sorry, I do not see any conflict - so what am I supposed to do?

[nclopezo]

You can resolve the conflicts, and then push again to this branch. I think this can help you:
http://cms-sw.github.io/cmssw/tutorial-forward-port.html

[Martin-Grunewald]

Sorry, it does not:

First of all I do not see any merge conflicts.
Second, what release should I rebase to?
The generic 7_0_X git tag?
I tried, again no conflicts:

gruen@ughent2:~/CMS/CMSSW_7_0_X_2013-12-06-0200/src/[118]$ git branch
CMSSW_7_0_X
cms-sw/refs/pull/1656/head

• from-CMSSW_7_0_X_2013-12-06-0200
  gruen@ughent2:/CMS/CMSSW_7_0_X_2013-12-06-0200/src/[119]$ git rebase CMSSW_7_0_X
  First, rewinding head to replay your work on top of it...
  Applying: Change some strings to InputTag for proper HLT ConfDB tracking
  gruen@ughent2:/CMS/CMSSW_7_0_X_2013-12-06-0200/src/[120]$ ls

[davidlt]

Does not merge on top of CMSSW_7_0_X:

$ git merge Martin-Grunewald/String2InputTag
Auto-merging Calibration/HcalIsolatedTrackReco/src/HITRegionalPixelSeedGenerator.h
CONFLICT (content): Merge conflict in Calibration/HcalIsolatedTrackReco/src/HITRegionalPixelSeedGenerator.h
Auto-merging RecoMuon/L3MuonIsolationProducer/src/IsolationRegionAroundL3Muon.h
CONFLICT (content): Merge conflict in RecoMuon/L3MuonIsolationProducer/src/IsolationRegionAroundL3Muon.h
Automatic merge failed; fix conflicts and then commit the result.

Between IB you use and CMSSW_7_0_X there are changes on the same files.

Regarding rebasing, you should rebase it on top of CMSSW_7_0_X.

[nclopezo]

Thanks! I was just going to write something similar.

[Martin-Grunewald]

error: failed to push some refs to 'git@github.com:Martin-Grunewald/cmssw.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

The tutorial is kind of useless for this case.

[nclopezo]

you can check that what you currently have is what you want for this pr, and then try doing git push -f to rewrite the history of this branch.

[cmsbuild]

Pull request #1656 was updated. @nclopezo, @demattia, @cmsbuild, @thspeer, @rcastello, @slava77 can you please check and sign again.

[rcastello]

+1

[Martin-Grunewald]

Can someone re-write the cited tutorial to make it actually usefull?

Ie, it seems to me it should be:

If someone tells you that your branch no longer merges, do the following:

Make a new developer area:

cmsrel CMSSW_7_0_X_2013-12-06-0200
cd CMSSW_7_0_X_2013-12-06-0200/src
cmsrel

Update to the HEAD of 7_0_X:

git cms-merge-topic CMSSW_7_0_X

Connect to your old branch which does not merge, for example:

git checkout -b String2InputTag

Run the merge try, eg:

git cms-merge-topic 1656

Look for conflicts:

git diff

Fix them:

emacs ...
emacs ...

Commit them back to the old branch:

git commit -a -m "This sucks bigtime"

Push the branch:

git push my-cmssw HEAD:String2InputTag

(beware: must add "HEAD:" in the above)

[Martin-Grunewald]

Ah, sorry, second cmsrel (without argument) in the above should rather be cmsenv.

[Martin-Grunewald]

#1702 to add the above recipe to the tutorial page.

[cmsbuild]

+1
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-1656/1618/summary.html

[ktf]

Bypassing signatures, given they were all given previously.