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

pat::Muon best track embedding fix (7.0.X) #4359

Merged

Conversation

gpetruc
Copy link
Contributor

@gpetruc gpetruc commented Jun 23, 2014

  1. properly initialize embeddedTunePMuonBestTrack_ and embeddedTunePMuonBestTrack_
  2. make the getter work also on existing 7_0_6 files (the bool was wrong, but the vector size was correct)
    note: it doesn't need recompilation of any dependency, but it would be good to have this in a 7.0.X patch

@arizzi

…BestTrack_, but also make the getter work on existing 7_0_6 files
@cmsbuild
Copy link
Contributor

A new Pull Request was created by @gpetruc (Giovanni Petrucciani) for CMSSW_7_0_X.

pat::Muon best track embedding fix (7.0.X)

It involves the following packages:

DataFormats/PatCandidates

@nclopezo, @vadler, @cmsbuild, @Degano, @monttj 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.
@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.

@ghost
Copy link

ghost commented Jun 25, 2014

Hi, this PR cannot be merged. Can you please rebase?

@gpetruc
Copy link
Contributor Author

gpetruc commented Jun 25, 2014

Hi @Degano,

This PR is a single commit on top of the CMSSW_7_0_6 tag ( 572426e ) which as of now seems to be identical to the CMSSW_7_0_X branch, so I can't understand how it can fail merging, nor on top of what I should rebase it.

Giovanni

@monttj
Copy link
Contributor

monttj commented Jun 25, 2014

I am having this message when I tried to merge to CMSSW_7_0_X_2014-06-25-1400.

fatal: Couldn't find remote ref refs/pull/4359/head
Unexpected end of command stream

@arizzi
Copy link
Contributor

arizzi commented Jun 25, 2014

perhaps you can try to cherry-pick the single commit?

On Thu, Jun 26, 2014 at 12:13 AM, Tae Jeong Kim notifications@github.com
wrote:

I am having this message when I tried to merge to
CMSSW_7_0_X_2014-06-25-1400.

fatal: Couldn't find remote ref refs/pull/4359/head
Unexpected end of command stream


Reply to this email directly or view it on GitHub
#4359 (comment).

@monttj
Copy link
Contributor

monttj commented Jun 25, 2014

It's strange. It does not work unless I misused "cherry-pick". I have no idea what that (below) means.

CMSSW_7_0_X_2014-06-25-1400/src > git cherry-pick c352c9a
fatal: bad revision 'c352c9a'

@arizzi
Copy link
Contributor

arizzi commented Jun 25, 2014

can you try to merge from giovanni's github directly instead of the PR
number?

@monttj
Copy link
Contributor

monttj commented Jun 25, 2014

+1
It is mergeable from his github. Compiles OK. But how do we go with this technical conflicts?

@cmsbuild
Copy link
Contributor

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

@Dr15Jones
Copy link
Contributor

The problem using the pull request directly has happened to other pull requests. The problem being worked on by the github team.

@arizzi
Copy link
Contributor

arizzi commented Jun 30, 2014

@Degano @ktf can you guys meanwhile merge it from the original branch of giovanni? This is a needed bug-fix for miniAOD

@nclopezo
Copy link
Contributor

Hi all,

I did a PR here:
#4446
let me know if this one is ok.

@arizzi
Copy link
Contributor

arizzi commented Jun 30, 2014

seems ok

@davidlange6 davidlange6 merged commit c352c9a into cms-sw:CMSSW_7_0_X Jul 1, 2014
davidlange6 added a commit that referenced this pull request Jul 1, 2014
pat::Muon best track embedding fix (7.0.X) Copied from #4359
gpetruc added a commit to gpetruc/cmssw that referenced this pull request Nov 23, 2014
@gpetruc gpetruc deleted the PatMuonBestTrackFix-fromCMSSW_7_0_6 branch September 30, 2015 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants