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

QC-479: merging supports vectors of TObject #12541

Merged
merged 8 commits into from
Jan 29, 2024

Conversation

justonedev1
Copy link
Collaborator

@justonedev1 justonedev1 commented Jan 17, 2024

the first version of requested task, just to check whether I am doing correct thing before adding tests

@justonedev1 justonedev1 changed the title merging supports vectors of TObject; no tests [WIP] merging supports vectors of TObject; no tests Jan 17, 2024
@justonedev1 justonedev1 changed the title [WIP] merging supports vectors of TObject; no tests [WIP] QC-479: merging supports vectors of TObject; no tests Jan 17, 2024
@justonedev1 justonedev1 force-pushed the QC-479 branch 4 times, most recently from 3a6149c to 6cc2484 Compare January 25, 2024 18:33
added support for std::vector<TObject*> into linkDef.h
std::vector<std::shared_ptr<TObject>> was added to the objectStorage
Interactive and FullHistory mergers were updated to support vectors
added vector example to mergersTopologyExample
small refactoring
@justonedev1 justonedev1 changed the title [WIP] QC-479: merging supports vectors of TObject; no tests QC-479: merging supports vectors of TObject Jan 26, 2024
Copy link
Collaborator

@knopers8 knopers8 left a comment

Choose a reason for hiding this comment

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

Thank you for this PR, I think it is very good. I have quite a lot of suggestions, some only pedantic, but I do not see anything fundamentally wrong.

Utilities/Mergers/include/Mergers/ObjectStore.h Outdated Show resolved Hide resolved
Utilities/Mergers/include/Mergers/ObjectStore.h Outdated Show resolved Hide resolved
Utilities/Mergers/src/ObjectStore.cxx Outdated Show resolved Hide resolved
Utilities/Mergers/include/Mergers/ObjectStore.h Outdated Show resolved Hide resolved
Utilities/Mergers/include/Mergers/ObjectStore.h Outdated Show resolved Hide resolved
Utilities/Mergers/test/test_ObjectStore.cxx Outdated Show resolved Hide resolved
Utilities/Mergers/test/test_ObjectStore.cxx Show resolved Hide resolved
Utilities/Mergers/test/test_ObjectStore.cxx Show resolved Hide resolved
Utilities/Mergers/include/Mergers/LinkDef.h Show resolved Hide resolved
@knopers8 knopers8 enabled auto-merge (squash) January 29, 2024 13:03
@knopers8
Copy link
Collaborator

Thank you!

@knopers8 knopers8 merged commit 6765575 into AliceO2Group:dev Jan 29, 2024
12 checks passed
andreasmolander pushed a commit to andreasmolander/AliceO2 that referenced this pull request Apr 12, 2024
* merging supports vectors of TObject; no tests

* added vector support to extractObjectFrom function

* deleter crash

* merged vector is composed from shared_ptrs

* tests for merging; working passing vector in example

* vectors are supported in Mergers

added support for std::vector<TObject*> into linkDef.h
std::vector<std::shared_ptr<TObject>> was added to the objectStorage
Interactive and FullHistory mergers were updated to support vectors
added vector example to mergersTopologyExample
small refactoring

* fixup! vectors are supported in Mergers

* fixup! fixup! vectors are supported in Mergers

---------

Co-authored-by: Michal Tichák <[email protected]>
andreasmolander pushed a commit to andreasmolander/AliceO2 that referenced this pull request Apr 12, 2024
* merging supports vectors of TObject; no tests

* added vector support to extractObjectFrom function

* deleter crash

* merged vector is composed from shared_ptrs

* tests for merging; working passing vector in example

* vectors are supported in Mergers

added support for std::vector<TObject*> into linkDef.h
std::vector<std::shared_ptr<TObject>> was added to the objectStorage
Interactive and FullHistory mergers were updated to support vectors
added vector example to mergersTopologyExample
small refactoring

* fixup! vectors are supported in Mergers

* fixup! fixup! vectors are supported in Mergers

---------

Co-authored-by: Michal Tichák <[email protected]>
mwinn2 pushed a commit to mwinn2/AliceO2 that referenced this pull request Apr 25, 2024
* merging supports vectors of TObject; no tests

* added vector support to extractObjectFrom function

* deleter crash

* merged vector is composed from shared_ptrs

* tests for merging; working passing vector in example

* vectors are supported in Mergers

added support for std::vector<TObject*> into linkDef.h
std::vector<std::shared_ptr<TObject>> was added to the objectStorage
Interactive and FullHistory mergers were updated to support vectors
added vector example to mergersTopologyExample
small refactoring

* fixup! vectors are supported in Mergers

* fixup! fixup! vectors are supported in Mergers

---------

Co-authored-by: Michal Tichák <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants