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

Removing CustomTCMaker, replaced by vector of RandomTCMakers #156

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Removing CustomTCMaker, replaced by vector of RandomTCMakers #156

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
104 changes: 0 additions & 104 deletions schema/appmodel/Trigger.view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,6 @@

<info name="" type="" num-of-items="233" oks-format="data" oks-version="oks-08-04-00-2-g4949f80 built &quot;Dec 6 2023&quot;" created-by="root" created-on="f1c9af75d018" creation-time="20240319T114528" last-modified-by="root" last-modified-on="f1c9af75d018" last-modification-time="20240319T114528"/>

<obj class="ALink" id="CustomTCMaker-2-CustomTCMakerConf-via-configuration">
<attr name="Name" type="string" val="configuration"/>
<rel name="From" class="Class" id="CustomTCMaker"/>
<rel name="To" class="Class" id="CustomTCMakerConf"/>
<rel name="Points">
<ref class="Point" id="1 CustomTCMaker-2-CustomTCMakerConf-via-configuration"/>
<ref class="Point" id="2 CustomTCMaker-2-CustomTCMakerConf-via-configuration"/>
<ref class="Point" id="3 CustomTCMaker-2-CustomTCMakerConf-via-configuration"/>
<ref class="Point" id="4 CustomTCMaker-2-CustomTCMakerConf-via-configuration"/>
</rel>
</obj>

<obj class="ALink" id="DataReaderConf-2-StreamEmulationParameters-via-emulation_conf">
<attr name="Name" type="string" val="emulation_conf"/>
<rel name="From" class="Class" id="DataReaderConf"/>
Expand Down Expand Up @@ -341,16 +329,6 @@
</rel>
</obj>

<obj class="Class" id="CustomTCMaker">
<attr name="x" type="s16" val="1011"/>
<attr name="y" type="s16" val="922"/>
</obj>

<obj class="Class" id="CustomTCMakerConf">
<attr name="x" type="s16" val="69"/>
<attr name="y" type="s16" val="847"/>
</obj>

<obj class="Class" id="DataProcessor">
<attr name="x" type="s16" val="1068"/>
<attr name="y" type="s16" val="334"/>
Expand Down Expand Up @@ -625,17 +603,6 @@
</rel>
</obj>

<obj class="GLink" id="StandaloneTCMakerModule-2-CustomTCMaker">
<rel name="From" class="Class" id="StandaloneTCMakerModule"/>
<rel name="To" class="Class" id="CustomTCMaker"/>
<rel name="Points">
<ref class="Point" id="1 StandaloneTCMakerModule-2-CustomTCMaker"/>
<ref class="Point" id="2 StandaloneTCMakerModule-2-CustomTCMaker"/>
<ref class="Point" id="3 StandaloneTCMakerModule-2-CustomTCMaker"/>
<ref class="Point" id="4 StandaloneTCMakerModule-2-CustomTCMaker"/>
</rel>
</obj>

<obj class="GLink" id="StandaloneTCMakerModule-2-RandomTCMakerModule">
<rel name="From" class="Class" id="StandaloneTCMakerModule"/>
<rel name="To" class="Class" id="RandomTCMakerModule"/>
Expand All @@ -647,17 +614,6 @@
</rel>
</obj>

<obj class="GLink" id="StandaloneTCMakerConf-2-CustomTCMakerConf">
<rel name="From" class="Class" id="StandaloneTCMakerConf"/>
<rel name="To" class="Class" id="CustomTCMakerConf"/>
<rel name="Points">
<ref class="Point" id="1 StandaloneTCMakerConf-2-CustomTCMakerConf"/>
<ref class="Point" id="2 StandaloneTCMakerConf-2-CustomTCMakerConf"/>
<ref class="Point" id="3 StandaloneTCMakerConf-2-CustomTCMakerConf"/>
<ref class="Point" id="4 StandaloneTCMakerConf-2-CustomTCMakerConf"/>
</rel>
</obj>

<obj class="GLink" id="StandaloneTCMakerConf-2-RandomTCMakerConf">
<rel name="From" class="Class" id="StandaloneTCMakerConf"/>
<rel name="To" class="Class" id="RandomTCMakerConf"/>
Expand Down Expand Up @@ -702,11 +658,6 @@
</rel>
</obj>

<obj class="Point" id="1 CustomTCMaker-2-CustomTCMakerConf-via-configuration">
<attr name="x" type="s16" val="136"/>
<attr name="y" type="s16" val="24"/>
</obj>

<obj class="Point" id="1 DataProcessor-2-HSIFrameProcessor">
<attr name="x" type="s16" val="116"/>
<attr name="y" type="s16" val="65"/>
Expand Down Expand Up @@ -837,21 +788,11 @@
<attr name="y" type="s16" val="38"/>
</obj>

<obj class="Point" id="1 StandaloneTCMakerModule-2-CustomTCMaker">
<attr name="x" type="s16" val="113"/>
<attr name="y" type="s16" val="24"/>
</obj>

<obj class="Point" id="1 StandaloneTCMakerModule-2-RandomTCMakerModule">
<attr name="x" type="s16" val="113"/>
<attr name="y" type="s16" val="24"/>
</obj>

<obj class="Point" id="1 StandaloneTCMakerConf-2-CustomTCMakerConf">
<attr name="x" type="s16" val="141"/>
<attr name="y" type="s16" val="51"/>
</obj>

<obj class="Point" id="1 StandaloneTCMakerConf-2-RandomTCMakerConf">
<attr name="x" type="s16" val="141"/>
<attr name="y" type="s16" val="51"/>
Expand Down Expand Up @@ -897,11 +838,6 @@
<attr name="y" type="s16" val="65"/>
</obj>

<obj class="Point" id="2 CustomTCMaker-2-CustomTCMakerConf-via-configuration">
<attr name="x" type="s16" val="136"/>
<attr name="y" type="s16" val="939"/>
</obj>

<obj class="Point" id="2 DataProcessor-2-HSIFrameProcessor">
<attr name="x" type="s16" val="116"/>
<attr name="y" type="s16" val="513"/>
Expand Down Expand Up @@ -1032,21 +968,11 @@
<attr name="y" type="s16" val="117"/>
</obj>

<obj class="Point" id="2 StandaloneTCMakerModule-2-CustomTCMaker">
<attr name="x" type="s16" val="113"/>
<attr name="y" type="s16" val="820"/>
</obj>

<obj class="Point" id="2 StandaloneTCMakerModule-2-RandomTCMakerModule">
<attr name="x" type="s16" val="113"/>
<attr name="y" type="s16" val="820"/>
</obj>

<obj class="Point" id="2 StandaloneTCMakerConf-2-CustomTCMakerConf">
<attr name="x" type="s16" val="141"/>
<attr name="y" type="s16" val="783"/>
</obj>

<obj class="Point" id="2 StandaloneTCMakerConf-2-RandomTCMakerConf">
<attr name="x" type="s16" val="141"/>
<attr name="y" type="s16" val="783"/>
Expand Down Expand Up @@ -1092,11 +1018,6 @@
<attr name="y" type="s16" val="271"/>
</obj>

<obj class="Point" id="3 CustomTCMaker-2-CustomTCMakerConf-via-configuration">
<attr name="x" type="s16" val="76"/>
<attr name="y" type="s16" val="939"/>
</obj>

<obj class="Point" id="3 DataProcessor-2-HSIFrameProcessor">
<attr name="x" type="s16" val="81"/>
<attr name="y" type="s16" val="513"/>
Expand Down Expand Up @@ -1226,21 +1147,11 @@
<attr name="y" type="s16" val="117"/>
</obj>

<obj class="Point" id="3 StandaloneTCMakerModule-2-CustomTCMaker">
<attr name="x" type="s16" val="45"/>
<attr name="y" type="s16" val="820"/>
</obj>

<obj class="Point" id="3 StandaloneTCMakerModule-2-RandomTCMakerModule">
<attr name="x" type="s16" val="44"/>
<attr name="y" type="s16" val="820"/>
</obj>

<obj class="Point" id="3 StandaloneTCMakerConf-2-CustomTCMakerConf">
<attr name="x" type="s16" val="76"/>
<attr name="y" type="s16" val="783"/>
</obj>

<obj class="Point" id="3 StandaloneTCMakerConf-2-RandomTCMakerConf">
<attr name="x" type="s16" val="124"/>
<attr name="y" type="s16" val="783"/>
Expand Down Expand Up @@ -1286,11 +1197,6 @@
<attr name="y" type="s16" val="271"/>
</obj>

<obj class="Point" id="4 CustomTCMaker-2-CustomTCMakerConf-via-configuration">
<attr name="x" type="s16" val="76"/>
<attr name="y" type="s16" val="26"/>
</obj>

<obj class="Point" id="4 DataProcessor-2-HSIFrameProcessor">
<attr name="x" type="s16" val="81"/>
<attr name="y" type="s16" val="8"/>
Expand Down Expand Up @@ -1420,21 +1326,11 @@
<attr name="y" type="s16" val="21"/>
</obj>

<obj class="Point" id="4 StandaloneTCMakerModule-2-CustomTCMaker">
<attr name="x" type="s16" val="45"/>
<attr name="y" type="s16" val="8"/>
</obj>

<obj class="Point" id="4 StandaloneTCMakerModule-2-RandomTCMakerModule">
<attr name="x" type="s16" val="44"/>
<attr name="y" type="s16" val="12"/>
</obj>

<obj class="Point" id="4 StandaloneTCMakerConf-2-CustomTCMakerConf">
<attr name="x" type="s16" val="76"/>
<attr name="y" type="s16" val="26"/>
</obj>

<obj class="Point" id="4 StandaloneTCMakerConf-2-RandomTCMakerConf">
<attr name="x" type="s16" val="124"/>
<attr name="y" type="s16" val="26"/>
Expand Down
13 changes: 0 additions & 13 deletions schema/appmodel/trigger.schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,6 @@
<attribute name="plane2" description="Threshold for plane 2." type="u16" init-value="100" is-not-null="yes"/>
</class>

<class name="CustomTCMaker">
<superclass name="StandaloneTCMakerModule"/>
<relationship name="configuration" class-type="CustomTCMakerConf" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
</class>

<class name="CustomTCMakerConf">
<superclass name="StandaloneTCMakerConf"/>
<attribute name="template_for" type="class" init-value="CustomTCMaker"/>
<attribute name="trigger_types" description="List of TC-Types (as ints) for the CTCM to produce" type="u32" is-multi-value="yes" init-value="3,7" is-not-null="yes"/>
<attribute name="trigger_intervals" description="List time intervals between consecutive TCs generated, one for each TC-type" type="u32" is-multi-value="yes" init-value="62500000,62500000" is-not-null="yes"/>
<attribute name="clock_frequency_hz" description="Detector clock frequency (in Hz)" type="u32" init-value="62500000"/>
</class>

<class name="DataSubscriberModule">
<superclass name="DaqModule"/>
<relationship name="configuration" class-type="DataReaderConf" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
Expand Down