Nicafemto

Newer version of Nicafemto. Removed old formats - now Analysis Tree is the default one.

added 35 commits

• 48f3f86e...ddef2952 - 11 commits from branch computing:master
• 525d2c88 - Multiple unigen files support.
• e9049762 - Inlines added.
• 94cbbdb7 - Added freezout info to the convertion tree.
• cadde5a6 - Added freezout storage to nicafemto.
• 48f04822 - Fix issue with missed configuration.
• c85ede92 - newer clang
• 294f635c - Adaptation to newer format.
• a256daf0 - Newer nicafemto.
• 22595632 - Removed "raw" formats.
• f0f83d7c - Cbm Analysisi tree is now the only supported format for analysis (except Unigen).
• ac3bfc16 - Bugfix.
• a1ddcae1 - Added description of freezouts.
• 1dc92c58 - Format fix.
• ccce61ba - Format fix part II.
• b5f89e2d - Bugfix.
• 528fd19a - Fix: missing dictionaries.
• 7815006e - Specification of tree name in Analysis Tree data.
• 7e41aa13 - fixed cmakes.
• 4f4fcd4d - Some improvements in Analysis tree.
• d12071ee - Clang fix.
• d20d8b84 - Newer version of nicafemto.
• 1eeb9055 - New flags from AnaTree added.
• 83e5a43b - Newer nicafemto.
• 122afd10 - Protection against embedded data.

Compare with previous version

@wielanek_AT_if.pw.edu.pl,

your changes break on macosx because at one point you use a gcc extension. If you want to initialize whole arrays with values in the member initializer list fKt({0, 1E+9}) does work only with gcc.

With C++11 and above you can use {} for initialization all over the place. It is even wise to do so as you see with the current problem. If you do the change shown in the diff below the code works on Linux and macosx.

diff --git a/analysis/femto/corrfit/mapgenerator_multidim/NicaCorrFitPairGeneratorYPt.cxx b/analysis/femto/corrfit/mapgenerator_multidim/NicaCorrFitPairGeneratorYPt.cxx
index 1683280..8b6c0f7 100644
--- a/analysis/femto/corrfit/mapgenerator_multidim/NicaCorrFitPairGeneratorYPt.cxx
+++ b/analysis/femto/corrfit/mapgenerator_multidim/NicaCorrFitPairGeneratorYPt.cxx
@@ -34,7 +34,7 @@ NicaCorrFitPairGeneratorYPt::NicaCorrFitPairGeneratorYPt() :
   fMax(1),
   fM1(0.),
   fM2(0.),
-  fKt({0, 1E+9}),
+  fKt{0, 1E+9},
   fRanges(nullptr),
   fFile(nullptr),
   fTree(nullptr),

added 25 commits

• 2e814dac - Multiple unigen files support.
• 776cd04a - Inlines added.
• 9e0617af - Added freezout info to the convertion tree.
• 1a0dfdb7 - Added freezout storage to nicafemto.
• 4112b573 - Fix issue with missed configuration.
• 93727964 - newer clang
• 4b21076a - Adaptation to newer format.
• 69de6202 - Newer nicafemto.
• 4e0a2ba7 - Removed "raw" formats.
• 6dbe9f80 - Cbm Analysisi tree is now the only supported format for analysis (except Unigen).
• 998254ac - Bugfix.
• cd596be7 - Added description of freezouts.
• 9f67292a - Format fix.
• 68fd307d - Format fix part II.
• 397fa0b3 - Bugfix.
• a61037b6 - Fix: missing dictionaries.
• 2dd8ceb9 - Specification of tree name in Analysis Tree data.
• 37387f46 - fixed cmakes.
• 0c2cb537 - Some improvements in Analysis tree.
• f343f76f - Clang fix.
• 3c96c56e - Newer version of nicafemto.
• dd1b3350 - New flags from AnaTree added.
• 910ee05e - Newer nicafemto.
• 48f3f86e - Protection against embedded data.
• 9810eaab - Fixed nicafemto initializer.

Compare with previous version

added 36 commits

• 9810eaab...ddef2952 - 11 commits from branch computing:master
• 6b34ed27 - Multiple unigen files support.
• b803165e - Inlines added.
• 1bc6bc3f - Added freezout info to the convertion tree.
• 0fbb49e8 - Added freezout storage to nicafemto.
• 5843a7d3 - Fix issue with missed configuration.
• da77b225 - newer clang
• 3fbec31a - Adaptation to newer format.
• fb6007b4 - Newer nicafemto.
• 09b9ceb7 - Removed "raw" formats.
• 49e5ebae - Cbm Analysisi tree is now the only supported format for analysis (except Unigen).
• 98ae216e - Bugfix.
• d9f8837d - Added description of freezouts.
• eb993f1f - Format fix.
• 7f6200a4 - Format fix part II.
• 0f85fff3 - Bugfix.
• 6f75d999 - Fix: missing dictionaries.
• d1b42834 - Specification of tree name in Analysis Tree data.
• 5d92ceab - fixed cmakes.
• 93b6b68d - Some improvements in Analysis tree.
• 340a9152 - Clang fix.
• e40aebeb - Newer version of nicafemto.
• 08fba79c - New flags from AnaTree added.
• a42688d3 - Newer nicafemto.
• b24b3e9f - Protection against embedded data.
• af9fa53b - Fixed nicafemto initializer.

Compare with previous version

added 26 commits

• 2e814dac - Multiple unigen files support.
• 776cd04a - Inlines added.
• 9e0617af - Added freezout info to the convertion tree.
• 1a0dfdb7 - Added freezout storage to nicafemto.
• 4112b573 - Fix issue with missed configuration.
• 93727964 - newer clang
• 4b21076a - Adaptation to newer format.
• 69de6202 - Newer nicafemto.
• 4e0a2ba7 - Removed "raw" formats.
• 6dbe9f80 - Cbm Analysisi tree is now the only supported format for analysis (except Unigen).
• 998254ac - Bugfix.
• cd596be7 - Added description of freezouts.
• 9f67292a - Format fix.
• 68fd307d - Format fix part II.
• 397fa0b3 - Bugfix.
• a61037b6 - Fix: missing dictionaries.
• 2dd8ceb9 - Specification of tree name in Analysis Tree data.
• 37387f46 - fixed cmakes.
• 0c2cb537 - Some improvements in Analysis tree.
• f343f76f - Clang fix.
• 3c96c56e - Newer version of nicafemto.
• dd1b3350 - New flags from AnaTree added.
• 910ee05e - Newer nicafemto.
• 48f3f86e - Protection against embedded data.
• 9810eaab - Fixed nicafemto initializer.
• 3c54df53 - Fix default value.

Compare with previous version

added 37 commits

• 3c54df53...ddef2952 - 11 commits from branch computing:master
• a96c7dc0 - Multiple unigen files support.
• 567dd199 - Inlines added.
• 0d9b4180 - Added freezout info to the convertion tree.
• 8eb769c9 - Added freezout storage to nicafemto.
• ff2a0e27 - Fix issue with missed configuration.
• 606bc76a - newer clang
• 20d33f96 - Adaptation to newer format.
• 1346a4c9 - Newer nicafemto.
• 82b01403 - Removed "raw" formats.
• 76bcfb26 - Cbm Analysisi tree is now the only supported format for analysis (except Unigen).
• ae50641a - Bugfix.
• b696ff8d - Added description of freezouts.
• 8c86e750 - Format fix.
• e6174907 - Format fix part II.
• de32ee8c - Bugfix.
• 12900903 - Fix: missing dictionaries.
• 46952c90 - Specification of tree name in Analysis Tree data.
• 41fa145a - fixed cmakes.
• ccc9529c - Some improvements in Analysis tree.
• 4d8fa0f0 - Clang fix.
• e4dec92b - Newer version of nicafemto.
• 78e8f78a - New flags from AnaTree added.
• 7e5f0cac - Newer nicafemto.
• d6ad3633 - Protection against embedded data.
• 18b8520d - Fixed nicafemto initializer.
• 1317680e - Fix default value.

Compare with previous version

Dear @d.wielanek, @i.selyuzhenkov, @f.uhlig,

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.

added CodeOwners label

added 27 commits

• 2e814dac - Multiple unigen files support.
• 776cd04a - Inlines added.
• 9e0617af - Added freezout info to the convertion tree.
• 1a0dfdb7 - Added freezout storage to nicafemto.
• 4112b573 - Fix issue with missed configuration.
• 93727964 - newer clang
• 4b21076a - Adaptation to newer format.
• 69de6202 - Newer nicafemto.
• 4e0a2ba7 - Removed "raw" formats.
• 6dbe9f80 - Cbm Analysisi tree is now the only supported format for analysis (except Unigen).
• 998254ac - Bugfix.
• cd596be7 - Added description of freezouts.
• 9f67292a - Format fix.
• 68fd307d - Format fix part II.
• 397fa0b3 - Bugfix.
• a61037b6 - Fix: missing dictionaries.
• 2dd8ceb9 - Specification of tree name in Analysis Tree data.
• 37387f46 - fixed cmakes.
• 0c2cb537 - Some improvements in Analysis tree.
• f343f76f - Clang fix.
• 3c96c56e - Newer version of nicafemto.
• dd1b3350 - New flags from AnaTree added.
• 910ee05e - Newer nicafemto.
• 48f3f86e - Protection against embedded data.
• 9810eaab - Fixed nicafemto initializer.
• 3c54df53 - Fix default value.
• 839e1b29 - Format fix.

Compare with previous version

added 38 commits

• 839e1b29...ddef2952 - 11 commits from branch computing:master
• dfbf8d32 - Multiple unigen files support.
• 373afeaf - Inlines added.
• cee087ba - Added freezout info to the convertion tree.
• 1b32719a - Added freezout storage to nicafemto.
• ade0c37e - Fix issue with missed configuration.
• 5ff6b595 - newer clang
• 4f5aa3b2 - Adaptation to newer format.
• fc1b0dc6 - Newer nicafemto.
• 1da98b70 - Removed "raw" formats.
• 2637fcce - Cbm Analysisi tree is now the only supported format for analysis (except Unigen).
• 76e0e7f7 - Bugfix.
• 0f62edad - Added description of freezouts.
• 4e541bf5 - Format fix.
• 73b67167 - Format fix part II.
• 0d2c7feb - Bugfix.
• 9aeb1da1 - Fix: missing dictionaries.
• 5b1461f7 - Specification of tree name in Analysis Tree data.
• 4c97ba7d - fixed cmakes.
• 5f26a348 - Some improvements in Analysis tree.
• 933475a2 - Clang fix.
• 9ae208a2 - Newer version of nicafemto.
• 33253154 - New flags from AnaTree added.
• 62378e5b - Newer nicafemto.
• 0e8b4dfa - Protection against embedded data.
• 15886e19 - Fixed nicafemto initializer.
• 1c4e1ff2 - Fix default value.
• 81c5dca4 - Format fix.

Compare with previous version

added 49 commits

• 81c5dca4...d08c3ba4 - 22 commits from branch computing:master
• d7da3991 - Multiple unigen files support.
• c29f7aea - Inlines added.
• 842436d4 - Added freezout info to the convertion tree.
• 5e632189 - Added freezout storage to nicafemto.
• 17e9d874 - Fix issue with missed configuration.
• d25a1eb5 - newer clang
• 28791292 - Adaptation to newer format.
• b26151e7 - Newer nicafemto.
• f752525a - Removed "raw" formats.
• a1480e20 - Cbm Analysisi tree is now the only supported format for analysis (except Unigen).
• a9a2e3ce - Bugfix.
• ec117a95 - Added description of freezouts.
• c5af5e15 - Format fix.
• eb0f94e0 - Format fix part II.
• 0edd0053 - Bugfix.
• 878fb677 - Fix: missing dictionaries.
• d5543e7b - Specification of tree name in Analysis Tree data.
• 905a2631 - fixed cmakes.
• 7c005cc1 - Some improvements in Analysis tree.
• 3f2361a4 - Clang fix.
• d88de1e9 - Newer version of nicafemto.
• 164797d8 - New flags from AnaTree added.
• 42f3f637 - Newer nicafemto.
• c0720827 - Protection against embedded data.
• b0b8e747 - Fixed nicafemto initializer.
• 801cdab7 - Fix default value.
• 1f8678d2 - Format fix.

Compare with previous version

Please don't update the branch currently. One of our test machines is offline such that the pipeline will break. I will restart it pipelines when the machine is back online.

added 69 commits

• 1f8678d2...4bc48ae7 - 42 commits from branch computing:master
• 2eab58ea - Multiple unigen files support.
• 80e1e3f4 - Inlines added.
• 74c31e68 - Added freezout info to the convertion tree.
• ee336013 - Added freezout storage to nicafemto.
• 60d72abf - Fix issue with missed configuration.
• d4fa6212 - newer clang
• 8a29ce24 - Adaptation to newer format.
• 8299b955 - Newer nicafemto.
• 0c66c8d0 - Removed "raw" formats.
• 86a7447c - Cbm Analysisi tree is now the only supported format for analysis (except Unigen).
• f6e9f087 - Bugfix.
• 41e9c20d - Added description of freezouts.
• bd02951b - Format fix.
• f027c4bf - Format fix part II.
• 6dd0bd64 - Bugfix.
• 32a20442 - Fix: missing dictionaries.
• 4a25c297 - Specification of tree name in Analysis Tree data.
• 401b8244 - fixed cmakes.
• c17c356d - Some improvements in Analysis tree.
• 08a0d4bd - Clang fix.
• 34e7ac5b - Newer version of nicafemto.
• 09965b2f - New flags from AnaTree added.
• ef422ee9 - Newer nicafemto.
• 04dca91c - Protection against embedded data.
• fabbf808 - Fixed nicafemto initializer.
• c5826eb4 - Fix default value.
• cddd69cb - Format fix.

Compare with previous version

@i.selyuzhenkov,

could you please check this MR.

@wielanek_AT_if.pw.edu.pl,

am I allowed to rebase myself? If I do the rebase you have to be aware that this changes the branch of your fork.

@wielanek_AT_if.pw.edu.pl,

I think you have to rebase locally and push the commits to your branch. This is at least what I see on the web page. If you want to have the changes included in the release please do the rebase before tomorrow.

@i.selyuzhenkov could you please approve the changes.

I am not an expert on Nica-femto package so I rely on Daniel's experience with this MR. In that respect it is fine from my side to proceed.

@i.selyuzhenkov,

thanks for you approval. If you are not an expert it is completely fine to forward the approval to another developer. It would be good for the future if you find another developer which checks the code additionally to Daniel.

I am waiting for Daniel to rebase the MR and then I will proceed.

The problem is that Daniel is the main developer of this specialized package. I am not sure who else from PWGs can be better that Daniel himself in checking this part of the code.

Daniel, maybe you have some suggestions? What about Hanna?

There must not be a better person but there should be also another person which has a look at the code. Another developer checks the code with another focus.