Skip to content

Conversation

@tongtongcao
Copy link
Collaborator

Recent DC updates have been merged into development(dc2). Those updates should also be merged into dc1.
The branch here is built based on dc1, and the commits are picked from development by git cherry-pick.

* cancel SNR and change limit of total DC hits from raw hits to hits after denoising

* remove unused codes
…skipped layer for cluster candidates from splitter (#500)
…543)

* As supplementary, take conventional tracking with remaining cluters after AI-assisted tracking

* add one more bit into track status to tell if track is from AI-asssisted tracking
* fix an issue in DCHBPostClusterAI.java to save all necessary clusters in HB cluster bank

* add clusters in tracks from AI-assisted tracking into cluster list
@c-dilks
Copy link
Member

c-dilks commented May 1, 2025

Copy file .pre-commit-config.yaml from branch development if you want pre-commit.ci -pr CI job to pass.

@c-dilks
Copy link
Member

c-dilks commented May 2, 2025

Sorry, you also need .github/make_banks_readme_precommit.sh and .github/make_banks_readme.rb.

@tongtongcao
Copy link
Collaborator Author

I copied .github/make_banks_readme_precommit.sh ahead of your comment.
Then, auto fixes were taken by CI.
File etc/bankdefs/hipo4/README.md was changed.
Before pull the change to local, I can not push the update for copying of .github/make_banks_readme.rb.
Is there a way to withdraw the auto fixes?

@c-dilks
Copy link
Member

c-dilks commented May 2, 2025

Before pull the change to local, I can not push the update for copying of .github/make_banks_readme.rb.

I committed it, and pre-commit ran okay now. Run git pull to update your local repository.

@c-dilks
Copy link
Member

c-dilks commented May 2, 2025

Hmm.. since this pre-commit stuff has caused some confusion here, I think it's better to just get rid of it. After (if) #609 is merged, you may remove the 3 pre-commit files.

@baltzell baltzell enabled auto-merge (squash) May 5, 2025 14:52
@baltzell
Copy link
Collaborator

baltzell commented May 5, 2025

Why are the commit hashes different than on the development branch?

@baltzell baltzell disabled auto-merge May 5, 2025 15:07
@tongtongcao
Copy link
Collaborator Author

Here is answer from chatgpt:
git cherry-pick changes commit hash.
Here’s why: Git commit hashes are SHA-1 hashes based on several pieces of data including:

  • The contents of the commit (tree)
  • The commit message
  • The author and committer information
  • The parent commit(s)
  • The timestamp

When you cherry-pick a commit, you're applying the changes from that commit to a new point in the Git history. Even if the changes and message are identical, the context (e.g., parent commit or timestamp) is different, so the resulting commit hash will be different.

@c-dilks
Copy link
Member

c-dilks commented May 5, 2025

@tongtongcao and I rolled this branch back a few commits (git reset --hard), to revert the now-unnecessary pre-commit fixes. Backup branch is dc1_DCUpdates_backup, in case we messed up. This confusion motivated #609.

Why are the commit hashes different than on the development branch?

Cherry-pick commit hashes will be different; use git cherry-pick -x to include the original hash in the commit message.

@baltzell
Copy link
Collaborator

baltzell commented May 5, 2025

Which is the merged dc2 PR(s)?

@raffaelladevita
Copy link
Collaborator

It's 73bd1ef

@baltzell baltzell mentioned this pull request May 6, 2025
@baltzell baltzell closed this May 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants