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

JPT_TrackJetsSeeds_Reco_and_PATrereco #30160

Closed
wants to merge 31 commits into from
Closed

Conversation

kodolova
Copy link
Contributor

@kodolova kodolova commented Jun 9, 2020

PR description:

Presented at Reconstruction meeting
https://indico.cern.ch/event/923095/

PR validation:

Tests are performed according:https://cms-sw.github.io/PRWorkflow.html
Result of runTheMatrix test is in:
/afs/cern.ch/work/k/kodolova/public/HMUMUBB/CMSSW_11_1_X_2020-06-08-1100/src

if this PR is a backport please specify the original PR and why you need to backport that PR:

Before submitting your pull requests, make sure you followed this checklist:

Sunanda and others added 29 commits May 23, 2020 16:22
…tHLT_29333

[11.1.X] Applied gain calibration scheme update at HLT as well
Run3-ft25 Fix overlap for run3 geometry - backport cms-sw#29953
…date111X

HLT customisation update (111X)
[11.1.X]  Fix several bugs introduced in the Pixel PI
…oducerIn11

Fixes in PSetBlobProducer functionality for use in HLT (11_1_X)
Fix DetectorDescription Parser unit test -- backport of cms-sw#29947
…_deadECAL

Restructured code of againstElectronDeadECAL tauID (11_1_X)
…pre8for111X

Migration of HLT menus to 11_1_0_pre8 template plus updates (11_1_X)
Davix unit test fix: use google instead of cern.ch
…onst_on_return

Do not apply the "const" modifier to the return type (11.1.x)
[11.1.X] Add CDC Tracks to TkAlCosmics0T ALCARECO
…_TauIdToolFix

bug fix to runTauIdMVA.py tool (11_1_X)
…dFix

Fix bug affecting boosted tau isolation (11_1_X)
…eTags_11_1_X

11.1.X  [Tracker Alignment] All-in-one tool support of multiple tags in user-inputed sqlite file
@cmsbuild cmsbuild added this to the CMSSW_11_2_X milestone Jun 9, 2020
@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30160/15991

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @kodolova (kodolova) for master.

It involves the following packages:

Alignment/CommonAlignmentProducer
Alignment/OfflineValidation
CondCore/SiPixelPlugins
CondFormats/EcalObjects
Configuration/StandardSequences
DQMOffline/Alignment
DetectorDescription/Parser
EventFilter/Utilities
Geometry/CMSCommonData
HLTrigger/Configuration
IOPool/Streamer
L1Trigger/TrackFindingTracklet
PhysicsTools/PatAlgos
RecoJets/JetPlusTracks
RecoJets/JetProducers
RecoTauTag/Configuration
RecoTauTag/RecoTau
Utilities/DavixAdaptor

@andrius-k, @emeschi, @schneiml, @ianna, @kpedro88, @Martin-Grunewald, @rekovic, @fioriNTU, @tlampen, @pohsun, @santocch, @perrotta, @civanch, @makortel, @cmsbuild, @fwyzard, @davidlange6, @smuzaffar, @Dr15Jones, @cvuosalo, @mdhildreth, @jfernan2, @tocheng, @slava77, @ggovi, @fabiocos, @benkrikler, @kmaeshima, @christopheralanwest, @silviodonato, @franzoni, @mommsen can you please review it and eventually sign? Thanks.
@rappoccio, @gouskos, @yslai, @felicepantaleo, @hatakeyamak, @emilbols, @argiro, @Martin-Grunewald, @tlampen, @ahinzmann, @peruzzim, @seemasharmafnal, @pakhotin, @mmarionncern, @makortel, @smoortga, @dgulhan, @jdolen, @slomeo, @ferencek, @rociovilar, @GiacomoSguazzoni, @rovere, @VinInn, @jdamgov, @nhanvtran, @gkasieczka, @tocheng, @schoef, @mschrode, @mmusich, @fabiocos, @clelange, @adewit, @rchatter, @riga, @wddgit, @JyothsnaKomaragiri, @mverzett, @dkotlins, @lecriste, @gpetruc, @mariadalfonso, @andrzejnovak this is something you requested to watch as well.
@silviodonato, @dpiparo you are the release manager for this.

cms-bot commands are listed here

@jfernan2
Copy link
Contributor

-1
Changes for DQM not expected

@kodolova
Copy link
Contributor Author

Dear All, I ran code over patch as it was proposed, made add, commit push. But I am sorry, could you advice how to rebase and how to change the name of PR as Slava requested?

@slava77
Copy link
Contributor

slava77 commented Jun 10, 2020

how to change the name of PR as Slava requested?

There is an "Edit" button at the top of the page, to the right from the PR title

@slava77
Copy link
Contributor

slava77 commented Jun 10, 2020

could you advice how to rebase

did you try http://cms-sw.github.io/tutorial-resolve-conflicts.html
(suggested yesterday in #30160 (comment))
?

@kodolova kodolova changed the title Jpt 11 1 x JPT_TrackJetsSeeds_Reco_and_PATrereco Jun 10, 2020
@kodolova
Copy link
Contributor Author

Slava, I did code-format with patch. I looked into http://cms-sw.github.io/tutorial-resolve-conflicts.html but I do not understand what exact command I need to perform:
git cms-rebase-topic XXXX <--- what I should put here instead of XXXX?
I am currently staying in CMSSW_11_1_X_2020-06-08-1100 project.

@slava77
Copy link
Contributor

slava77 commented Jun 10, 2020

Slava, I did code-format with patch. I looked into http://cms-sw.github.io/tutorial-resolve-conflicts.html but I do not understand what exact command I need to perform:
git cms-rebase-topic XXXX <--- what I should put here instead of XXXX?
I am currently staying in CMSSW_11_1_X_2020-06-08-1100 project.

code made in 11_1_X can not be directly made as a PR to 11_2_X (master branch) as it is done here.

cmsrel [NEW_RELEASE]
cd [NEW_RELEASE]/src
cmsenv
git cms-rebase-topic [user]:[my-branch]

the new release would be one of the CMSSW_11_2_X IBs

@kodolova
Copy link
Contributor Author

Done. Thank you!

@slava77
Copy link
Contributor

slava77 commented Jun 10, 2020

Done. Thank you!

was it pushed as well?
I still see the same list of merge commits that do not belong to JPT developments https://github.com/cms-sw/cmssw/pull/30160/commits

@kodolova
Copy link
Contributor Author

No, I thought that it is done automatically.
I tried it now and immediately get:
[kodolova@lxplus778 src]$ git push my-cmssw JPT_11_1_X
Enter passphrase for key '/afs/cern.ch/user/k/kodolova/.ssh/id_rsa':
To github.com:kodolova/cmssw.git
! [rejected] JPT_11_1_X -> JPT_11_1_X (non-fast-forward)
error: failed to push some refs to 'git@github.com:kodolova/cmssw.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I am sorry but there is not good instruction step by step how to work with git.
Could you advice?

@perrotta
Copy link
Contributor

perrotta commented Jun 11, 2020

Dear Olga, I followed line by line the instructions posted above by Slava and I ended up with a github branch in 11_2_X which only contains your commits:

cmsrel CMSSW_11_2_X_2020-06-10-2300
cd CMSSW_11_2_X_2020-06-10-2300/src
cmsenv
git cms-rebase-topic kodolova:JPT_11_1_X

At this point you can simply try to push in your current branch

git push my-cmssw JPT_11_1_X

or, if it fails for any reason, just open a new branch and submit a new PR with it (and close this one), as I could have done with

git checkout -b jptFromKodolova
git push my-cmssw jptFromKodolova

for which you can check my perrotta:jptFromKodolova branch.

@kodolova
Copy link
Contributor Author

Thank you! I repeated in new project area and got the same error. I think that I do need to open the new branch and new PR. Something is broken with this one.

@kodolova
Copy link
Contributor Author

I have created the new PULL request.
JPT_TrackJets seed reco and PAT rereco 11_2_x based

How to kill #30160?

@kodolova
Copy link
Contributor Author

Sorry again... When I try: https://github.com/kodolova/cmssw
I see : Pull requests 0
Are there any problems with my git account?

@perrotta
Copy link
Contributor

Please stay in THIS pull request
You should have a button here below, close to the green "Comment" one.

@perrotta
Copy link
Contributor

-1
(just to take this out of our list until it gets closed)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment