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.

Sign up for GitHub

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

Jump to bottom

JCF: perform renames as described in DUNE-DAQ/daq-release#373 #61

Merged
merged 1 commit into from
Jun 6, 2024
Merged

JCF: perform renames as described in DUNE-DAQ/daq-release#373 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions python/integrationtest/config/df-segment-1df-tpw.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
<info name="" type="" num-of-items="17" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>

<include>
<file path="schema/coredal/dunedaq.schema.xml"/>
<file path="schema/appdal/application.schema.xml"/>
<file path="config/appdal/connections.data.xml"/>
<file path="config/appdal/moduleconfs.data.xml"/>
<file path="config/appdal/fsm.data.xml"/>
<file path="schema/confmodel/dunedaq.schema.xml"/>
<file path="schema/appmodel/application.schema.xml"/>
<file path="config/appmodel/connections.data.xml"/>
<file path="config/appmodel/moduleconfs.data.xml"/>
<file path="config/appmodel/fsm.data.xml"/>
</include>

<comments>
Expand Down
10 changes: 5 additions & 5 deletions python/integrationtest/config/df-segment-1df.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
<info name="" type="" num-of-items="17" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>

<include>
<file path="schema/coredal/dunedaq.schema.xml"/>
<file path="schema/appdal/application.schema.xml"/>
<file path="config/appdal/connections.data.xml"/>
<file path="config/appdal/moduleconfs.data.xml"/>
<file path="config/appdal/fsm.data.xml"/>
<file path="schema/confmodel/dunedaq.schema.xml"/>
<file path="schema/appmodel/application.schema.xml"/>
<file path="config/appmodel/connections.data.xml"/>
<file path="config/appmodel/moduleconfs.data.xml"/>
<file path="config/appmodel/fsm.data.xml"/>
</include>

<comments>
Expand Down
10 changes: 5 additions & 5 deletions python/integrationtest/config/df-segment-3df-tpw.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
<info name="" type="" num-of-items="17" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>

<include>
<file path="schema/coredal/dunedaq.schema.xml"/>
<file path="schema/appdal/application.schema.xml"/>
<file path="config/appdal/connections.data.xml"/>
<file path="config/appdal/moduleconfs.data.xml"/>
<file path="config/appdal/fsm.data.xml"/>
<file path="schema/confmodel/dunedaq.schema.xml"/>
<file path="schema/appmodel/application.schema.xml"/>
<file path="config/appmodel/connections.data.xml"/>
<file path="config/appmodel/moduleconfs.data.xml"/>
<file path="config/appmodel/fsm.data.xml"/>
</include>

<comments>
Expand Down
10 changes: 5 additions & 5 deletions python/integrationtest/config/df-segment-3df.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
<info name="" type="" num-of-items="17" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>

<include>
<file path="schema/coredal/dunedaq.schema.xml"/>
<file path="schema/appdal/application.schema.xml"/>
<file path="config/appdal/connections.data.xml"/>
<file path="config/appdal/moduleconfs.data.xml"/>
<file path="config/appdal/fsm.data.xml"/>
<file path="schema/confmodel/dunedaq.schema.xml"/>
<file path="schema/appmodel/application.schema.xml"/>
<file path="config/appmodel/connections.data.xml"/>
<file path="config/appmodel/moduleconfs.data.xml"/>
<file path="config/appmodel/fsm.data.xml"/>
</include>

<comments>
Expand Down
12 changes: 6 additions & 6 deletions python/integrationtest/config/hsi-segment.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
<info name="" type="" num-of-items="9" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>

<include>
<file path="schema/coredal/dunedaq.schema.xml"/>
<file path="schema/appdal/application.schema.xml"/>
<file path="schema/appdal/trigger.schema.xml"/>
<file path="config/appdal/connections.data.xml"/>
<file path="config/appdal/moduleconfs.data.xml"/>
<file path="config/appdal/fsm.data.xml"/>
<file path="schema/confmodel/dunedaq.schema.xml"/>
<file path="schema/appmodel/application.schema.xml"/>
<file path="schema/appmodel/trigger.schema.xml"/>
<file path="config/appmodel/connections.data.xml"/>
<file path="config/appmodel/moduleconfs.data.xml"/>
<file path="config/appmodel/fsm.data.xml"/>
</include>

<comments>
Expand Down
12 changes: 6 additions & 6 deletions python/integrationtest/config/trigger-segment-fakehsi.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
<info name="" type="" num-of-items="22" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240403T115733"/>

<include>
<file path="schema/coredal/dunedaq.schema.xml"/>
<file path="schema/appdal/application.schema.xml"/>
<file path="schema/appdal/trigger.schema.xml"/>
<file path="config/appdal/connections.data.xml"/>
<file path="config/appdal/moduleconfs.data.xml"/>
<file path="config/appdal/fsm.data.xml"/>
<file path="schema/confmodel/dunedaq.schema.xml"/>
<file path="schema/appmodel/application.schema.xml"/>
<file path="schema/appmodel/trigger.schema.xml"/>
<file path="config/appmodel/connections.data.xml"/>
<file path="config/appmodel/moduleconfs.data.xml"/>
<file path="config/appmodel/fsm.data.xml"/>
</include>

<comments>
Expand Down
12 changes: 6 additions & 6 deletions python/integrationtest/config/trigger-segment-notpg.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
<info name="" type="" num-of-items="22" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240403T115733"/>

<include>
<file path="schema/coredal/dunedaq.schema.xml"/>
<file path="schema/appdal/application.schema.xml"/>
<file path="schema/appdal/trigger.schema.xml"/>
<file path="config/appdal/connections.data.xml"/>
<file path="config/appdal/moduleconfs.data.xml"/>
<file path="config/appdal/fsm.data.xml"/>
<file path="schema/confmodel/dunedaq.schema.xml"/>
<file path="schema/appmodel/application.schema.xml"/>
<file path="schema/appmodel/trigger.schema.xml"/>
<file path="config/appmodel/connections.data.xml"/>
<file path="config/appmodel/moduleconfs.data.xml"/>
<file path="config/appmodel/fsm.data.xml"/>
</include>

<comments>
Expand Down
12 changes: 6 additions & 6 deletions python/integrationtest/config/trigger-segment.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
<info name="" type="" num-of-items="22" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240403T115733"/>

<include>
<file path="schema/coredal/dunedaq.schema.xml"/>
<file path="schema/appdal/application.schema.xml"/>
<file path="schema/appdal/trigger.schema.xml"/>
<file path="config/appdal/connections.data.xml"/>
<file path="config/appdal/moduleconfs.data.xml"/>
<file path="config/appdal/fsm.data.xml"/>
<file path="schema/confmodel/dunedaq.schema.xml"/>
<file path="schema/appmodel/application.schema.xml"/>
<file path="schema/appmodel/trigger.schema.xml"/>
<file path="config/appmodel/connections.data.xml"/>
<file path="config/appmodel/moduleconfs.data.xml"/>
<file path="config/appmodel/fsm.data.xml"/>
</include>

<comments>
Expand Down
4 changes: 2 additions & 2 deletions python/integrationtest/integrationtest_drunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class CreateConfigResult:
generate_readout(
str(dro_map_file),
str(readout_db),
["appdal/fsm", "appdal/connections", "appdal/moduleconfs"],
["appmodel/fsm", "appmodel/connections", "appmodel/moduleconfs"],
True,
False,
emulated_file_name="asset://?checksum=e96fd6efd3f98a9a3bfaba32975b476e",
Expand Down Expand Up @@ -192,7 +192,7 @@ class CreateConfigResult:
str(trigger_db),
)

dal = conffwk.dal.module("generated", "schema/appdal/fdmodules.schema.xml")
dal = conffwk.dal.module("generated", "schema/appmodel/fdmodules.schema.xml")
db = conffwk.Configuration("oksconflibs:" + str(config_db))

fsm = db.get_dal(class_name="FSMconfiguration", uid="fsmConf-1")
Expand Down