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.

Sign up for GitHub

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

Jump to bottom

PWGMM: dndeta-hi.cxx update for hyperloop #1539

Merged
merged 5 commits into from
Dec 8, 2022
Merged

PWGMM: dndeta-hi.cxx update for hyperloop #1539

merged 5 commits into from
Dec 8, 2022

Conversation

hyungjun-lee
Copy link
Contributor

Add dN/dEta distribution code for heavy-ion based on dndeta.cxx code
If you have some asking for me, please contact.

@aalkin
Copy link
Member

aalkin commented Dec 6, 2022

Please rename the PR to something more descriptive, as this is not an addition of a task but a modification of it. Other than that it seems fine.

aalkin
aalkin previously approved these changes Dec 6, 2022
View reviewed changes
@aalkin
Copy link
Member

aalkin commented Dec 6, 2022

Please note that since #1590 modifies the same file, you will probably get merge conflicts in one of the PRs as soon as one of them is merged. I would recommend synchronizing changes, you can always open PRs to each other forks of O2Physics and then open a combined PR to the main repository, to avoid issues with conflict resolution.

@hyungjun-lee
Merge branch 'master' of https://github.com/AliceO2Group/O2Physics
3721925
@hyungjun-lee
modified by H.J.Lee
fb6b3cc 
	PWGMM :

	* processCounting modified
	* EventClassAxis of hrecdndeta & hreczvtx is modified : Double_t(kINEL) -> Double_t(kDATA)
@hyungjun-lee hyungjun-lee changed the title Add dNdEta distribution code for heavy ion based on dndeta.cxx code PWGMM: dndeta-hi.cxx update for hyperloop Dec 7, 2022
@hyungjun-lee
Copy link
Contributor Author

Please note that since #1590 modifies the same file, you will probably get merge conflicts in one of the PRs as soon as one of them is merged. I would recommend synchronizing changes, you can always open PRs to each other forks of O2Physics and then open a combined PR to the main repository, to avoid issues with conflict resolution.

thanks your reply, aalkin.
But I don't know how to open PRs to each others forks of O2physics and combine them. Can you inform any link or documentation for solving this problem?

@aalkin
Copy link
Member

aalkin commented Dec 7, 2022

@hyungjun-lee PRs to any repository are done exactly in the same way - you just need to chose the different target. Instead of the main O2Physics repository you would use a certain branch in some user's fork of it that is found at https://github.com/<username>/O2Physics with appropriate user name. The owner of the fork can accept and merge the PR and then create a new PR to the main repository, that will have both yours and user's commits in it. Or the other user can make PRs to your fork, this is completely symmetric.

@hyungjun-lee
Copy link
Contributor Author

@hyungjun-lee PRs to any repository are done exactly in the same way - you just need to chose the different target. Instead of the main O2Physics repository you would use a certain branch in some user's fork of it that is found at https://github.com/<username>/O2Physics with appropriate user name. The owner of the fork can accept and merge the PR and then create a new PR to the main repository, that will have both yours and user's commits in it. Or the other user can make PRs to your fork, this is completely symmetric.

I went to hyebin-P repository and clicked the "New pull request"
I saw that the notice about "able to merge : These branches can be automatically merged."
Is it merged? I'm sorry for not fully understand your explanation.
and thanks your reply!

@aalkin
Copy link
Member

aalkin commented Dec 7, 2022

"Able to merge" only indicates that there are no conflicts and the merge can be done without editing anything. If you have clicked "create pull request", now the owner of the repository needs to accept and merge it.

@hyungjun-lee
Copy link
Contributor Author

hyungjun-lee commented Dec 7, 2022 •
edited
Loading

"Able to merge" only indicates that there are no conflicts and the merge can be done without editing anything. If you have clicked "create pull request", now the owner of the repository needs to accept and merge it.

aalkin, I think I cannot solve this problem easily. I uploaded this code a week ago, and I can't delay my work more.
It is not good solution but I asked for closing the other "dndeta-hi.cxx" PR to my group people.
Can you tag it?

@aalkin aalkin enabled auto-merge (squash) December 7, 2022 18:38
@aalkin aalkin merged commit 641836e into AliceO2Group:master Dec 8, 2022
MrWhatZitToYaa pushed a commit to MrWhatZitToYaa/O2Physics that referenced this pull request Dec 20, 2022
@hyungjun-lee @MrWhatZitToYaa
PWGMM: dndeta-hi.cxx update for hyperloop (AliceO2Group#1539)
b0fdeb7 
* PWGMM: mdofied dndeta-hi.cxx
	* processCounting modified
	* EventClassAxis of hrecdndeta & hreczvtx is modified : Double_t(kINEL) -> Double_t(kDATA)
ercolessi pushed a commit to ercolessi/O2Physics that referenced this pull request Jan 9, 2023
@hyungjun-lee @ercolessi
PWGMM: dndeta-hi.cxx update for hyperloop (AliceO2Group#1539)
e4c0871 
* PWGMM: mdofied dndeta-hi.cxx
	* processCounting modified
	* EventClassAxis of hrecdndeta & hreczvtx is modified : Double_t(kINEL) -> Double_t(kDATA)
GijsvWeelden pushed a commit to GijsvWeelden/O2Physics that referenced this pull request Jan 13, 2023
@hyungjun-lee @GijsvWeelden
PWGMM: dndeta-hi.cxx update for hyperloop (AliceO2Group#1539)
92e0081 
* PWGMM: mdofied dndeta-hi.cxx
	* processCounting modified
	* EventClassAxis of hrecdndeta & hreczvtx is modified : Double_t(kINEL) -> Double_t(kDATA)
cimordas pushed a commit to cimordas/O2Physics that referenced this pull request Jan 20, 2023
@hyungjun-lee @cimordas
PWGMM: dndeta-hi.cxx update for hyperloop (AliceO2Group#1539)
945b2ba 
* PWGMM: mdofied dndeta-hi.cxx
	* processCounting modified
	* EventClassAxis of hrecdndeta & hreczvtx is modified : Double_t(kINEL) -> Double_t(kDATA)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aalkin aalkin aalkin approved these changes

@alibuild alibuild Awaiting requested review from alibuild alibuild is a code owner

@aortizve aortizve Awaiting requested review from aortizve aortizve is a code owner

@ddobrigk ddobrigk Awaiting requested review from ddobrigk ddobrigk is a code owner

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hyungjun-lee @aalkin