Bug #1799 Fixed

you have been identified as code owner of at least one file which was changed with this merge request.

Please check the changes and approve them or request changes.

Yes, It is for mCBM only. Due to progressive geometry of GEM Modules which positioned horizontally in mCBM, therefore we need translation. You are right we need to think for some scheme in which via Geometry file we should pick the Z position and then accordingly calculate the X, Y translation which can be used in CbmMuchDigitizeGem and also in CbmMuchFindHitsGem.

For time being we use this hard-coded values and include mMUCH modules for mCBM global tracking. Vikas

added mCBM label

Dear @omveer.rs_AT_amu.ac.in

As the release is taking more time than we expected, I propose that you merge your branch to the mcbm fork master instead of this main master. For this you would need to perform the following steps:

Add mcbm as a remote to your local copy of your branch

git remote add mcbm git@git.cbm.gsi.de:mcbm/cbmroot.git

or if you use https access

git remote add mcbm https://git.cbm.gsi.de/mcbm/cbmroot.git

Fetch latest version of the mcbm fork
```
git fetch mcbm
```
Rebase against the mcbm master
```
git rebase mcbm/master
```
Fix all conflicts (you will probably get some as the new format was applied to the full master recently)
Push to your branch
Make a new merge request, changing the destination to mcbm/cbmroot:master instead of computing/cbmroot:master

We may need an additional rebase depending on the merge order of the mCBM MRs, but that should be trivial as the existing ones are touching different files

added 13 commits

039f47a0...4fdffafa - 10 commits from branch computing:master
887dc6e5 - [CI/CD] Add mCBM fork settings, probably to be removed before MR to upstream!
ef753165 - Bug #1799 Fixed
56bc481b - mcbm/cbmroot added

Compare with previous version

mentioned in merge request mcbm/cbmroot!2 (closed)

assigned to @se.gorbunov

@omveer.rs_AT_amu.ac.in,

could you please rebase your branch locally and push the changes. In the moment the MR is stuck since it can't be rebased on the GitLab server.

added 14 commits

56bc481b...fcec79d4 - 11 commits from branch computing:master
dc524012 - Bug #1799 Fixed
a602c582 - [CI/CD] Add mCBM fork settings, probably to be removed before MR to upstream!
1e236b45 - Merge branch 'master' of git.cbm.gsi.de:om/cbmroot

Compare with previous version

@f.uhlig could you please check why the pipeline is failed? "Pipeline #11018 failed with stages"

@omveer.rs_AT_amu.ac.in,

thanks for the fast reaction. You can check yourself. If you click on the tab Pipelines you will see all pipelines which ran for the MR. On this page simply click on the pipeline number of the failed pipeline (in your case #11018) which will open a new page with detailed information. Here you can see that the Linear History check did fail which means that something went wrong with your updates. What is the problem I still have to check.

@omveer.rs_AT_amu.ac.in,

you can check the graph of your development on the following page

https://git.cbm.gsi.de/om/cbmroot/-/network/master

As you can easily see the history of the development isn't linear but you created some loops which are not allowed in our development scheme. The last commit of your branch is a merge which break things. Also the second to last commit should not enter the master branch since it is a change only needed for the mcbm fork.

In the following I will describe how you can fix the issue. If you do a git log you should see the following sequence of commits ( I removed the Author and date information for a better overview)

commit 1e236b4518585c0a98ab0a8a180e5c0ec9bf3230 (HEAD -> om_master, om/master)
    Merge branch 'master' of git.cbm.gsi.de:om/cbmroot

commit a602c582666e37b3d0d43fff6412155f3549213a
    [CI/CD] Add mCBM fork settings, probably to be removed before MR to upstream!

commit dc52401207899b20ffc09e3c2187826437ab90b8
    Bug #1799 Fixed

commit fcec79d42824324a2e4f070d25adb353fe34ccd2 (upstream/master)
    L1 fix bug for mCBM ToF hit indexes

If I am correct the relevant commit to fix the issue is dc52401207899b20ffc09e3c2187826437ab90b8 which means that you only need to remove the last two commits from your branch which is actually very easy.

git reset --hard dc52401207899b20ffc09e3c2187826437ab90b8

will remove the last two commits from your history which fixes the issue. To push the changes to the server you need to do a forced push since you changed the history by removing commits.

git push <name> <branch> --force

In your case the branch name is master. The name of the GitLab repository server I don't know. In my case it is fuhlig but since you can use a different name please check with

git remote -v

for the name which is connected with you GitLab repository.

Since you have changed the history you have to do a forced push to the GitLab server but I am not sure if this is enough in your case because you did the changes on your master branch which normally is protected. Please let me know if the forced push worked or not such that I can give you further instructions.

@f.uhlig getting error at the time of forced push...

om@om:/cbmroot$ git remote -v mcbm git@git.cbm.gsi.de:mcbm/cbmroot.git (fetch) mcbm git@git.cbm.gsi.de:mcbm/cbmroot.git (push) origin git@git.cbm.gsi.de:om/cbmroot.git (fetch) origin git@git.cbm.gsi.de:om/cbmroot.git (push) upstream git@git.cbm.gsi.de:computing/cbmroot.git (fetch) upstream git@git.cbm.gsi.de:computing/cbmroot.git (push) om@om:/cbmroot$ git push origin master --force Enter passphrase for key '/home/om/.ssh/id_ed25519': Total 0 (delta 0), reused 0 (delta 0) remote: GitLab: You are not allowed to force push code to a protected branch on this project.To git@git.cbm.gsi.de:om/cbmroot.git ! [remote rejected] master -> master (pre-receive hook declined) error: failed to push some refs to 'git@git.cbm.gsi.de:om/cbmroot.git'

@omveer.rs_AT_amu.ac.in,

that is what I have expected. To ease things for the next time please create a new branch for any of your developments. This has many advantages.

You can do a forced push to the branch.
You can have many branches for different developments without interference between the different branches.
The branch can be deleted after the MR was merged.
An administrator can click on the rebase button without your interaction.
Probably more.

To solve your problem now you have to unprotect your master branch, do the forced push and protect the branch again. To do so please click on Settings->Repository in the menu bar on the left side of the webpage. In the new window click on Expand in the Protected Branches section. There you should see that your master branch is protected. Please unprotect the branch and do the forced push. Afterwards you should protect the branch again using the menu you used for unprotecting the branch.

@f.uhlig I think now it works.

@omveer.rs_AT_amu.ac.in,

your master branch is still not correct. The new temp branch and such the new MR is okay. You can nicely see it at

https://git.cbm.gsi.de/om/cbmroot/-/network/master

The temp branch adds exactly one commit and does not contain any loops. The master still has loops and unnecessary commits.

@f.uhlig Now I think master branch is also correct. Thanks a lot

@omveer.rs_AT_amu.ac.in,

yes, now both branches are correct. I would prefer to merge this MR. Could you please close the other one after the pipeline has succeeded.

approved this merge request

@f.uhlig One more thing I am stuck with one commit actually I want to rename one file of my last commit in cbmroot_geometry/much/much_v21a_sis100_1m_lmvm_low_energy.root/.info with v21b. Could you please convey what can I do that?

Simply do

git mv cbmroot_geometry/much/much_v21a_sis100_1m_lmvm_low_energy.root cbmroot_geometry/much/much_v21b_sis100_1m_lmvm_low_energy.root

and the same for all other files and commit the change. If you only want to have one commit which contain both changes you can do an interactive rebase

git rebase -i upstream/master

and squash the two commits.

upstream/master could be different in your case.

resolved all threads

@se.gorbunov,

could you please merge the MR if you approve the change.

merged

Bug #1799 Fixed

Merge request reports

Activity