GSI Forum
GSI Helmholtzzentrum für Schwerionenforschung
Home » R3BRoot » General Discussions » R3BRoot with ROOT6
R3BRoot with ROOT6 [message #18437] Fri, 28 August 2015 12:47 Go to next message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es
Dear all:

I have prepared a version of R3BRoot to be used also with ROOT6. It runs fine and backwards compatibility with ROOT5 was checked, but only in my Ubuntu 14.04. So, volunteers who want to check also in other platforms (like Mac) before submissions, please let me know.

On the other hand, I have seen that the new ROOT6 interpreter doesn't like the r3bsim.C-r3ball.C style for configuration and running macros (function calls, loading libraries, TMap...). So, I wrote a new single macro to run the simulation (here attached), but I don't know whether or not it is worthy to keep the current style... Please, let me know your feeling too.

Greetings,

Pablo
  • Attachment: runsim.C
    (Size: 10.59KB, Downloaded 500 times)

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18438 is a reply to message #18437] Fri, 28 August 2015 13:06 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *gsi.de
Dear Pablo,

I volunteer to check your code on OS X. For that, please push it to a new branch of your forked repository on GitHub. Here is once more the link to documentation: https://github.com/AnarManafov/GitWorkflow/blob/master/GitWorkflow.markd own

Concerning the r3bsim.C - please do the same. Then I will be able to checkout your branch and to test it.

Best regards,
Dima

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18441 is a reply to message #18438] Mon, 31 August 2015 11:14 Go to previous messageGo to next message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es
Hi,

Please get the code from the git branch https://github.com/PabloCabanelas/R3BRoot/tree/R3BRoot_ROOT6_dev

New running macro runsim.C is under macros/r3b/califa

Cheers

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18443 is a reply to message #18441] Mon, 31 August 2015 13:40 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *gsi.de
Hi Pablo,

It looks like your branch is completely diverged from dev branch of main repository. GitHub shows that all files have been changed. It will be impossible to make a merge later.
Have you performed the steps "Create a feature branch" and "Sync your feature branch" which are described in the workflow documentation?

This point is essential:

...
git checkout -b featureXXX mainrepo/dev
...

Feature branch is created from current dev of the main repository. Then you can add modified files and commit them.

Cheers,
Dima

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18444 is a reply to message #18443] Mon, 31 August 2015 14:20 Go to previous messageGo to next message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es
Hi,

I got the point. I tried the steps you meant with another branch, but push that branch from scratch. I will let you know once the thing is ready.

Thanks

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18449 is a reply to message #18443] Tue, 01 September 2015 13:17 Go to previous messageGo to next message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es
Hi,

I guess it should be better now with this new feature branch:

https://github.com/PabloCabanelas/R3BRoot/tree/root6_test

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18450 is a reply to message #18449] Tue, 01 September 2015 13:30 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *gsi.de
Hi Pablo,

looks much better. I have only noticed two files in "neuland" which are reverting this commit from Jan Mayer: https://github.com/R3BRootGroup/R3BRoot/commit/42f919cf44974842ac8af4b7b 4ff62d4ff06b0b3
Please have a look and possibly commit original versions.

I will now test your branch with both ROOT 6 and 5 and let you know.

Cheers,
Dima

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18451 is a reply to message #18450] Tue, 01 September 2015 14:19 Go to previous messageGo to next message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es

Done!

Cheers

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18452 is a reply to message #18451] Wed, 02 September 2015 11:56 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *gsi.de
Hi Pablo,

The compilation on Mac OS X 10.10.5 with clang is successful. I will test now simulation and analysis.

Again the same issue with reverted commits. Now it is main CMakeLists.txt, in first I have added directory tcal, in second: adjustment of LIBDIR when compiling with Xcode.

https://github.com/R3BRootGroup/R3BRoot/commit/4c00a380f4a9e4a705bb6ede2 180255f1565c58f
https://github.com/R3BRootGroup/R3BRoot/commit/90b0848b0b94a7e6319a691b3 ad95023146d42f2

Please apply them also.

Cheers,
Dima

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18453 is a reply to message #18452] Wed, 02 September 2015 13:06 Go to previous messageGo to next message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es
Hi Dima,

Sorry for the mistake; I thought I've done already but obviously I missed something... Now it is.

Please let me know if you can run the simulation with r3bsim.C-r3ball.C style without major problems.

Thanks again!

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18459 is a reply to message #18453] Wed, 02 September 2015 14:31 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *gsi.de
I have modified the r3ball.C and r3bsim.C in order that the scheme works for both ROOT 5 and 6. Changes are merged. Please rebase your feature branch from dev branch of main repository and push your branch to the origin.
If you volunteer, you could apply the changes for the rest of r3bsim.C files.
The only drawback, that the path to r3ball.C macro is relative. So, for example in case you work with macros/r3b/califa/r3bsim.C, you need to use #include "../r3ball.C"

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18461 is a reply to message #18459] Thu, 03 September 2015 09:33 Go to previous messageGo to next message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es
Ok, thanks. I can do it.

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18462 is a reply to message #18461] Thu, 03 September 2015 10:45 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *gsi.de
Analysis works fine, besides some minor changes I had to do with literal constants. Please let me know when you are ready, and we will merge your branch with dev of main repository.

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18480 is a reply to message #18462] Tue, 08 September 2015 15:33 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *gsi.de
Hi Pablo,

are you ready to merge your branch with main dev?

Cheers,
Dima

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18481 is a reply to message #18480] Wed, 09 September 2015 08:10 Go to previous messageGo to next message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es
Hi Dima,

I can push it today. There were too many obsolete macros in califa subdir... Sad

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18482 is a reply to message #18481] Wed, 09 September 2015 10:31 Go to previous messageGo to next message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es
Hi again,

I am done with subdir macros/r3b/califa. I have prepared and checked all macros there in root6. Changes are already push to my branch (root6_test)

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18483 is a reply to message #18482] Wed, 09 September 2015 15:56 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *dyn.telefonica.de
Hi Pablo,
Please proceed as described in the section "Request to pull" of the workflow documentation. Squashing of your commits and pull request on GitHub are the last things you need to do before merge.
Thanks,
Dima

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18485 is a reply to message #18482] Thu, 10 September 2015 09:57 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *gsi.de
1. Please, squash your commits into 1, using

git fetch mainrepo
git rebase -i mainrepo/dev
(pick for the first commit, for all the following - squash option)
git push -f origin

2. When creating pull request, chose the R3BRootGroup/R3BRoot:dev branch as the base.

Best regards,
Dima

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18486 is a reply to message #18485] Thu, 10 September 2015 10:30 Go to previous messageGo to next message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es
I didn't chose the right base branch before, sorry; I guess I did it properly now

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18487 is a reply to message #18485] Thu, 10 September 2015 10:35 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *gsi.de
In this graph you can see that your commits are not squashed (not meldet into one single commit).
https://github.com/R3BRootGroup/R3BRoot/network
Here is how to do it:

Dmytro Kresan wrote on Thu, 10 September 2015 09:57
1. Please, squash your commits into 1, using

git fetch mainrepo
git rebase -i mainrepo/dev
(pick for the first commit, for all the following - squash option)
git push -f origin

2. When creating pull request, chose the R3BRootGroup/R3BRoot:dev branch as the base.

Best regards,
Dima

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18488 is a reply to message #18486] Thu, 10 September 2015 13:18 Go to previous messageGo to next message
Dmytro Kresan is currently offline  Dmytro Kresan
Messages: 166
Registered: June 2004
first-grade participant
 From: *gsi.de
Now it has worked. Thanks! I have merged your branch into R3BRoot:dev

To finish with this github story, please have a look at the network graph: https://github.com/R3BRootGroup/R3BRoot/network

you have some branches detached. I recommend you to delete your repository completely, then to fork mainrepo again and to proceed with sections "Prepare the environment" and for the future developments: "Create a feature branch" and so on...

Best regards,
Dima

Report message to a moderator

Re: R3BRoot with ROOT6 [message #18489 is a reply to message #18488] Thu, 10 September 2015 13:36 Go to previous message
Pablo Cabanelas
Messages: 13
Registered: June 2006
occasional visitor
 From: *usc.es
Ok, I got it! I will do that.

Thanks to you!

Cheers!

Report message to a moderator

Previous Topic: New version of the external packages "apr 13"
Next Topic: Reading the TTree cbmsim with R3B member functions
Goto Forum:
  

[ Syndicate this forum (XML) ] [ RSS ] [ PDF ]

Current Time: Sun Dec 01 01:52:23 CET 2024

Total time taken to generate the page: 0.00823 seconds
.:: Contact :: Home :: Legal Notice :: Data Protection Policy ::.

Powered by: FUDforum 3.1.3.
Copyright ©2001-2023 FUDforum Bulletin Board Software