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

Use schema suggested by Giovanna and Alessandro #39

Merged
merged 3 commits into from
Sep 3, 2024
Merged

Use schema suggested by Giovanna and Alessandro #39

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1aa2961
Use schema suggested by Giovanna and Alessandro
eflumerf Aug 29, 2024
fcbc257
Remove SmartActionPlan in favor of validation within appfwk. Add exec…
eflumerf Aug 30, 2024
4e25827
Merge remote-tracking branch 'origin/develop' into eflumerf/ActionPla…
eflumerf Aug 30, 2024
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
24 changes: 17 additions & 7 deletions schema/confmodel/dunedaq.schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,12 @@

<oks-schema>

<info name="" type="" num-of-items="46" oks-format="schema" oks-version="862f2957270" created-by="jcfree" created-on="mu2edaq13.fnal.gov" creation-time="20230123T223700" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20240326T183809"/>
<info name="" type="" num-of-items="48" oks-format="schema" oks-version="862f2957270" created-by="jcfree" created-on="mu2edaq13.fnal.gov" creation-time="20230123T223700" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20240829T165707"/>

<class name="ActionPlan" description="A set of parallel steps for an application to carry out a command">
<relationship name="fsm" class-type="FSMCommand" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
<relationship name="steps" class-type="ActionStep" low-cc="zero" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no" ordered="no"/>
</class>

<class name="ActionStep">
<attribute name="modules" type="class" is-multi-value="yes"/>
<attribute name="execution_policy" type="enum" description="How the application should execute steps of the action plan" range="modules-in-parallel,modules-in-series" init-value="modules-in-parallel"/>
<relationship name="command" class-type="FSMCommand" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
<relationship name="steps" class-type="DaqModulesGroup" low-cc="zero" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no"/>
</class>

<class name="Application" description="A software executable" is-abstract="yes">
Expand Down Expand Up @@ -141,6 +138,19 @@
<relationship name="used_resources" class-type="HostComponent" low-cc="zero" high-cc="many" is-composite="yes" is-exclusive="no" is-dependent="yes"/>
</class>

<class name="DaqModulesGroup" description="Represents a group of DAQ Modules that can run commands in parallel as one of the steps of an ActionPlan." is-abstract="yes">
</class>

<class name="DaqModulesGroupById">
<superclass name="DaqModulesGroup"/>
<relationship name="modules" class-type="DaqModule" low-cc="one" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no"/>
</class>

<class name="DaqModulesGroupByType">
<superclass name="DaqModulesGroup"/>
<attribute name="modules" type="class" is-multi-value="yes"/>
</class>

<class name="DetDataReceiver" is-abstract="yes">
<superclass name="Resource"/>
</class>
Expand Down
Loading