Encode Geometry Tag w/in DB macros #422
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…en the
geoemtry tag (defined by the BFC chain options and/or timestamp)
and the code which instantiates the geometry model. The macro
is loaded / executed by St_db_Maker whenever GetDataBase("VmcGeometry")
is called.
This PR encodes the geometry tag inside of each database macro, rather than
using the ROOT interpreter's introspection capabilities to read
the tag from the filename of the currently executing macro.
This works well under ROOT 5 / CINT. But I think the way that we
load macros in St_db_Maker confuses ROOT 6 / CINT.
The simplest solution is to encode the geometry tag within each
database macro.
|
diff stat: +178 −2,759 ❤️ Perfect refactoring assuming the functionality is not affected. I think the next step is just to converge to a single macro accepting one parameter "tag" |
Each of these files is considered to be a "database table". In this case it is a trivial table whose title just corresponds to the geometry tag. But it is being exercised through the general DB macro API, which expects there to be one table specified per file. |
plexoos
approved these changes
Oct 26, 2022
genevb
approved these changes
Oct 27, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Geometry.{tag}.C "database" macros establish the connection between the geometry tag (defined by the BFC chain options and/or timestamp) and the code which instantiates the geometry model. The macro is loaded / executed by St_db_Maker whenever GetDataBase("VmcGeometry") is called.
This PR encodes the geometry tag inside of each database macro, rather than using the ROOT interpreter's introspection capabilities to read the tag from the filename of the currently executing macro. This works well under ROOT 5 / CINT. But I think the way that we load macros in St_db_Maker confuses ROOT 6 / CINT.
The simplest solution is to encode the geometry tag within each database macro.