Query is nothing else than a std::optional but just came earlier

• Turn query into an std::optional. For now let's keep the extra methods but should be phased out on a longer term
• Add the volumeId as attribute of the getChildrenWithTrf return structs
• Add sorter struct to classify two materials as equivalent.

requested review from @tsulaia

changed the description

Hi @jojungge, I think we should eventually drop the Query and instead use std::optional directly. For the time being it is fine to subclass the Query from std::optional.

I have one suggestion about the organization of commits on you MR (sorry for asking for extra work). Could you group your changes into 3 commits as follows:

• Commit #1. Contains the changes in Query.h plus the new testQuery.cxx (the latter should obviously be dropped together with Query.h once we are ready to do that)
• Commit #2 (closed). Contains the changes in GeoModelHelpers
• Commit #3 (closed). Contains the rest of the changes from this MR. I.e., the "tidy up" changes.

Once this has been done and the MR has been updated/recreated, we need to make sure these commits will not get squashed at merging.

Thanks.

marked this merge request as draft

added 5 commits

• f6aa8bbb - Turn Query into a std::optional & add unit test
• 14782434 - Introduce GeoMaterial sorter helper struct
• 930ed375 - GeoModelKernel - Tidy the GeoAccessVolumeAction & minor tidy in the GeoMaterial & GeoVolumeCursor
• ae4944be - Add volumeId to the GeoChildNodeWithTrf
• 79d85ed6 - Minor tidy in variantHelpers / defineWorld

Compare with previous version

Done

marked this merge request as ready

merged

mentioned in merge request !415 (merged)