iLCSoft / Marlin

Modular Analysis and Reconstruction for the LINear Collider
GNU General Public License v3.0
11 stars 16 forks source link

Include feature #19

Closed rete closed 7 years ago

rete commented 7 years ago

BEGINRELEASENOTES

ENDRELEASENOTES

petricm commented 7 years ago

Your PR has more then 100 whitespace changes, please remove them.

rete commented 7 years ago

Hi all,

I added an include mechanism to the XMLParser class, allowing to load xml files into the main Marlin steering file. Note that :

To test the feature, I used the processor in examples/mymarlin. You can test it with the following xml files (sorry, rename them with .xml extension. Github doesn't allows me to upload xml files) :

Test it with :

export MARLIN_DLL=./lib/libmymarlin.so
Marlin marlin.xml
rete commented 7 years ago

Sorry with the whitespace I will fix them ...

rete commented 7 years ago

The last commit is a squash of the last modifications. No history problem normally ...

petricm commented 7 years ago

Please squash commit 37aa5b5 with d8952a6

rete commented 7 years ago

All commits are squashed now

petricm commented 7 years ago

I have added some lines from you to the release notes, but it's a bit unclear what you mean.

Nested includes will not be processed in the current version vs. Includes are processed recursively in the document inside the root element.

What I understand under nested is an include of a include, but this is a bit in contradiction to the last statement

rete commented 7 years ago

You understand correctly. All elements in the main file are processed but the elements in included files are not processed. Recursively just means that wherever you place your include element in the main file, it will be processed. I hope I'm a bit more clear ...