Skip to content

Commit 8aedc87

Browse files
fmaugerfmauger
committed
Merge recent work on other feature branch
2 parents a26816b + defdcb9 commit 8aedc87

File tree

4 files changed

+72
-22
lines changed

4 files changed

+72
-22
lines changed

‎resources/_resources.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set(Falaise_RESOURCES
22
${PROJECT_SOURCE_DIR}/resources/README.rst
3+
${PROJECT_SOURCE_DIR}/resources/urn/README.rst
34
${PROJECT_SOURCE_DIR}/resources/urn/db/README.rst
45
${PROJECT_SOURCE_DIR}/resources/urn/db/snemo_reconstruction_setup_infos.defs
56
${PROJECT_SOURCE_DIR}/resources/urn/db/experimental_setup_infos.defs

‎resources/config/snemo/demonstrator/simulation/geant4_control/2.2/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ for the SuperNEMO demonstrator simulation.
1717

1818
* Version is : ``2.2``
1919

20-
This setup reuses a large part of the ``2.1`` setup depends on:
20+
This setup reuses a large part of the ``2.1`` setup and depends on:
2121

2222
* the SuperNEMO demonstrator's geometry layout (``4.0``) and its variants.
2323
* the SuperNEMO vertex generation (``4.1``) and its variants.

‎resources/urn/README.rst

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
=======================================================
2+
URN management resource directory for Falaise
3+
=======================================================
4+
5+
6+
This directory hosts two types of files in two subdirectories:
7+
8+
* ``db/`` : contains files for the registration of configuration tags
9+
and the description of their dependency scheme. The main
10+
configuration file for the ``datatools::urn_db_service`` service
11+
embedded in the Bayeux kernel is : ``urn/db/snemo_setup_db.conf``.
12+
It uses the ``datatools::properties`` text format. A set of files
13+
(``urn/db/*.defs``) are stored here to describe each configuration
14+
tag and the list of tags they depend on. Such files uses the
15+
``datatools::multi\_properties`` text format.
16+
* ``resolvers/`` : contains files for the localization of resource files
17+
associated to configuration tags. The main
18+
configuration file for the ``datatools::urn_to_path_resolver_service`` service
19+
embedded in the Bayeux kernel is : ``resolvers/snemo_resource_path_resolver.conf``.
20+
It uses the ``datatools::properties`` text format. A set of files
21+
(``urn/resolvers/*_resource_map.conf``) are stored here to describe configuration
22+
resource files (location, MIME type...). Such files uses the
23+
``datatools::multi\_properties`` text format.

‎resources/urn/db/snemo_simulation_setup_infos.defs

+47-21
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
#@meta_label "category"
66

77

8+
##############
9+
# VERTEXES #
10+
##############
11+
12+
############
13+
# TAG 4.1 #
14+
############
15+
816
###############################################################################
917
[urn="urn:snemo:demonstrator:simulation:vertexes:4.1" category="configuration"]
1018

@@ -17,6 +25,16 @@ topics : string[1] = "geometry"
1725
topic.geometry.component : string = "urn:snemo:demonstrator:geometry:4.0"
1826

1927

28+
29+
############
30+
# DECAYS #
31+
############
32+
33+
############
34+
# TAG 1.2 #
35+
############
36+
37+
2038
#############################################################################
2139
[urn="urn:snemo:demonstrator:simulation:decays:1.2" category="configuration"]
2240

@@ -25,17 +43,33 @@ topic.geometry.component : string = "urn:snemo:demonstrator:geometry:4.0"
2543
description : string = "Decay generation setup (tag 1.2) for SuperNEMO demonstrator simulation"
2644

2745

28-
#############
29-
# TAG 2.1 #
30-
#############
46+
############
47+
# TAG 1.3 #
48+
############
49+
50+
#############################################################################
51+
[urn="urn:snemo:demonstrator:simulation:decays:1.3" category="configuration"]
52+
53+
#@config URN registration of decay generation setup (tag 1.3) for SuperNEMO demonstrator simulation
54+
55+
description : string = "Decay generation setup (tag 1.3) for SuperNEMO demonstrator simulation"
56+
57+
58+
################
59+
# SIMULATION #
60+
################
61+
62+
############
63+
# TAG 2.1 #
64+
############
3165

3266

3367
#########################################################################
3468
[urn="urn:snemo:demonstrator:simulation:2.1:variants" category="variant"]
3569

3670
#@config URN registration of variants setup for the SuperNEMO demonstrator simulation setup (tag 2.1)
3771

38-
description : string = "Variants setup for the SuperNEMO demonstrator simulation setup (tag 2.1)"
72+
description : string = "Variants setup for the SuperNEMO demonstrator simulation setup (tag 2.1)"
3973

4074

4175
#############################################################################################
@@ -76,18 +110,10 @@ topic.vertexes.component : string = "urn:snemo:demonstrator:simulation:vertexe
76110
topic.decays.component : string = "urn:snemo:demonstrator:simulation:decays:1.2"
77111
topic.services.component : string = "urn:snemo:demonstrator:simulation:2.1:services"
78112

79-
#############
80-
# TAG 2.2 #
81-
#############
82-
83-
84-
#############################################################################
85-
[urn="urn:snemo:demonstrator:simulation:decays:1.3" category="configuration"]
86-
87-
#@config URN registration of decay generation setup (tag 1.3) for SuperNEMO demonstrator simulation
88-
89-
description : string = "Decay generation setup (tag 1.3) for SuperNEMO demonstrator simulation"
90113

114+
############
115+
# TAG 2.2 #
116+
############
91117

92118
#########################################################################
93119
[urn="urn:snemo:demonstrator:simulation:2.2:variants" category="variant"]
@@ -97,7 +123,6 @@ description : string = "Decay generation setup (tag 1.3) for SuperNEMO demonstra
97123
description : string = "Variants setup for the SuperNEMO demonstrator simulation setup (tag 2.2)"
98124

99125

100-
101126
#############################################################################################
102127
[urn="urn:snemo:demonstrator:simulation:2.2:variants:profiles:default" category="varprofile"]
103128

@@ -118,12 +143,13 @@ description : string = "SuperNEMO demonstrator simulation setup (tag 2.2)"
118143

119144
topics : string[6] = "variants" "defvarprofile" "expsetup" "vertexes" "decays" "services"
120145

121-
topic.variants.component : string = "urn:snemo:demonstrator:simulation:2.2:variants"
146+
topic.variants.component : string = "urn:snemo:demonstrator:simulation:2.2:variants"
122147
topic.defvarprofile.component : string = "urn:snemo:demonstrator:simulation:2.2:variants:profiles:default"
123-
topic.expsetup.component : string = "urn:snemo:demonstrator:setup:1.0"
124-
topic.vertexes.component : string = "urn:snemo:demonstrator:simulation:vertexes:4.1"
125-
topic.decays.component : string = "urn:snemo:demonstrator:simulation:decays:1.3"
126-
topic.services.component : string = "urn:snemo:demonstrator:simulation:2.1:services"
148+
topic.expsetup.component : string = "urn:snemo:demonstrator:setup:1.0"
149+
topic.vertexes.component : string = "urn:snemo:demonstrator:simulation:vertexes:4.1"
150+
topic.decays.component : string = "urn:snemo:demonstrator:simulation:decays:1.3"
151+
topic.services.component : string = "urn:snemo:demonstrator:simulation:2.1:services"
152+
127153

128154

129155
# end

0 commit comments

Comments
 (0)