star-bnl / star-sw

Core software for STAR experiment
26 stars 63 forks source link

[JevpProduction] Add online TOT histograms for MTD #230

Closed marrbnl closed 2 years ago

veprbl commented 2 years ago

@marrbnl Did you mean to submit this against the "JevpProduction" branch?

marrbnl commented 2 years ago

It looks like it is submitted against the main branch. Should I submit to "JevpProduction" branch? If so, how can I do that? Thanks.

veprbl commented 2 years ago

@marrbnl You can click "Edit" button to the right of your PR's title, then change the value of the "base:" dropdown menu. You might need to do git rebase -i JevpProduction to remove unrelated commits and git push -f after that.

veprbl commented 2 years ago

Sorry for the noise, guys.

@marrbnl You didn't do anything wrong. It's a known GitHub bug with CODEOWNERS and base change. It just needs a rebase and force push (I guess in this case you should first do that).

marrbnl commented 2 years ago

Here is what I did: git rebase JevpProduction git push -f origin rma-online-mtd

I changed the base from main to JevpProduction for this PR, but now it says my PR requests 40 commits, which seems wrong

veprbl commented 2 years ago

git rebase -i JevpProduction, then remove all lines except the one with your commit, save, exit, then git push -f

marrbnl commented 2 years ago

When I do "git rebase -i JevpProduction", only an empty scratch pops up. I do not see any commits

veprbl commented 2 years ago

You almost made it. Judging from git log be0c68b85e --format=full you've closed the file without removing the extra commit history from "main". I've fixed it by basically doing a rebase again: https://asciinema.org/a/ydvQfiB2yzsTqpan6gpGXIhxo

marrbnl commented 2 years ago

Thanks very much.

fgeurts commented 2 years ago

Code changes look fine.

fgeurts commented 2 years ago

Thanks for reopening. I mixed up my review/approval buttons.

starsdong commented 2 years ago

Do we understand the failure in CI Build with ROOT5? Can we fix it and move the request forward? Thanks

veprbl commented 2 years ago

The failure on the "JevpProduction" branch is a known issue and needs to be addressed separately from this PR.

starsdong commented 2 years ago

Closing this old PR. Jevp is update-to-date with a recent PR by Jeff. https://github.com/star-bnl/star-sw/pull/292