Skip to content

Conversation

@rsadikin
Copy link

Dear Ernst Hellbar

Here I fixed some bugs:

  • distortion r
  • dphir correction
  • destruction on InterpolatorIrregular

Can you give me advices how to pull request my changes to the main AliTPCCommon.

I saw that AliRoot has AliTPCCommon at AliRoot/GPU, is it manually copied? or what its the mechanism?

Here is the output of AliRoot unittest
out.txt

Best Regards
Rifki Sadikin

Rifki Sadikin and others added 5 commits February 5, 2019 05:27
@ehellbar
Copy link
Owner

Dear Rifki,

the old AliTPCCommon repository is not used anymore. As you mentioned, it was moved to O2/GPU and AliRoot/GPU, respectively.

The procedure is the following:

  1. Changes, commits and pull requests have to be made to O2/GPU.
  2. After ht PR has been merged in O2/GPU, it will be synchronized to AliRoot/GPU either manually or automatically after a certain time.

Can you copy your changes to O2/GPU and make a new pull request there, please? Either to the official O2 repository dev branch https://github.com/AliceO2Group/AliceO2 or to my development branch https://github.com/ehellbar/AliceO2/tree/ehellbar-dev .

Cheers,
Ernst

@rsadikin
Copy link
Author

rsadikin commented Jul 3, 2019

Dear Ernst

My changes located also in non-GPU folder at AliRoot suchas AliTPCSpaceCharge3DDriftline.cxx at TPC/TPCbase and the folder test there.

Should I make a pull request to both?
Regards
Rifki

@ehellbar
Copy link
Owner

ehellbar commented Jul 3, 2019

Hello Rifki,

if the changes in AliTPCSpaceCharge3DDriftline.cxx do not require the changes in the GPU folder, you can make a pull request in AliRoot of only the files which are not in the GPU folder.

If the changes of non-GPU files require the changes in the GPU folder, you first have to make a pull request of the GPU files in O2 and wait until it is synched with the AliRoot GPU folder.

You cannot make a pull request for files in the GPU folder in AliRoot. This has to be done in O2.

Before you make the new pull request, we should meet because there are some changes I would propose to put into this pull request.

Cheers,
Ernst

@rsadikin
Copy link
Author

rsadikin commented Jul 3, 2019

Hello Ernst

But both need to be synchronized to be worked. I am now cloning the AliceO2 and will put the changes there, will make a pull request to AliceO2Group directly.

Regards
Rifki Sadikin

@rsadikin
Copy link
Author

rsadikin commented Jul 3, 2019

However I need to follow these rules first, let me first check

https://github.com/AliceO2Group/CodingGuidelines

@ehellbar
Copy link
Owner

ehellbar commented Jul 3, 2019

Hello Rifki,

ok. For the GPU/TPCSpaceChargeBase repository, we are not following the O2 coding guide lines too much, so as long as you stick to how it was done before, it should be fine.

Can you also look at this commit, please? I made some small changes (replacing TF1 by TF2) to the AliTPCSpaceCharge3DCalc.cxx and AliTPCSpaceCharge3DCalc.h which we need for the ROC displacement studies.
ehellbar/AliRoot@c1ebee7
Can you also put those into the pull request for O2/GPU, please?

Cheers,
Ernst

@rsadikin
Copy link
Author

rsadikin commented Jul 3, 2019

Ok, thanks for your explanation.
I will check your code and add the changes to my pull request to O2/GPU

Regards
Rifki

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.

2 participants