Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup basemq #1340

Merged
merged 7 commits into from
Feb 9, 2023
Merged

Cleanup basemq #1340

merged 7 commits into from
Feb 9, 2023

Conversation

rbx
Copy link
Member

@rbx rbx commented Feb 6, 2023

  • Make basemq/tasks/FairMQ*Task header only.

  • Remove unused files:

    • basemq/baseMQtools/baseMQtools.h
    • basemq/policies/Sampler/FairMQFileSource.h
    • basemq/policies/Sampler/FairSourceMQInterface.h
    • basemq/policies/Sampler/SimpleTreeReader.h
    • basemq/policies/Serialization/BinaryBaseClassSerializer.h
    • basemq/policies/Storage/BinaryOutFileManager.h
    • basemq/policies/Storage/BoostDataSaver.h
    • basemq/policies/Storage/TriviallyCopyableDataSaver.h

    These are not used anywhere in FairRoot nor in Alice, CBM, PANDA or R3B.

  • Rewrite MBSSink without policies.

    • This also allows removal of basemq/policies/Serialization/IOPolicy.h
  • Simplify RootOutFileManager and move it to the serialization example, where it is used.

In my opinion, these classes add unnecessary indirections, without providing much benefit. The code is much more straight-forward without them. Since they have not been used since their introduction (9 years ago), I don't see a reason to keep maintaining them.

Ideally deprecating them first would be cleaner, but I'm pretty sure they are not in use. Comment if you strongly disagree ;)

This was mainly for me to see if it can be done, and how much it simplifies.

If you think this is a bad idea - comment :)

Copy link
Member

@ChristianTackeGSI ChristianTackeGSI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First quick looks. I'll take a deeper look tomorrow.

basemq/tasks/FairMQProcessorTask.h Outdated Show resolved Hide resolved
basemq/CMakeLists.txt Show resolved Hide resolved
examples/MQ/Lmd/runMBSSink.cxx Outdated Show resolved Hide resolved
@rbx rbx force-pushed the lil-cleanup branch 4 times, most recently from c6dcc91 to 1c5180c Compare February 7, 2023 12:23
Copy link
Member

@ChristianTackeGSI ChristianTackeGSI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a bunch of more notes. I have to admit, that I haven't understood all of the stuff here. I might take another round.

basemq/CMakeLists.txt Show resolved Hide resolved
basemq/tasks/FairMQSamplerTask.h Outdated Show resolved Hide resolved
basemq/tasks/FairMQSamplerTask.h Outdated Show resolved Hide resolved
examples/MQ/serialization/data_generator/dataGenerator.cxx Outdated Show resolved Hide resolved
@rbx rbx force-pushed the lil-cleanup branch 3 times, most recently from ac92ee7 to 8525f92 Compare February 8, 2023 09:32
Copy link
Member

@ChristianTackeGSI ChristianTackeGSI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am okay with this now. Others might take a look as well?

@rbx
Copy link
Member Author

rbx commented Feb 8, 2023

Updated the format >.>

@dennisklein dennisklein merged commit b7df117 into FairRootGroup:dev Feb 9, 2023
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