From 8fcf5f3851edb508e1fe8b11ec15b54b52245c9b Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Tue, 21 Sep 2021 12:27:27 +0200 Subject: [PATCH] update CTS trigger modules --- web/CtsPlugins/CtsMod12.pm | 2 +- web/CtsPlugins/CtsMod15.pm | 6 ++--- web/CtsPlugins/CtsMod16.pm | 4 ++-- web/CtsPlugins/CtsMod17.pm | 4 ++-- web/CtsPlugins/CtsMod64.pm | 45 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 web/CtsPlugins/CtsMod64.pm diff --git a/web/CtsPlugins/CtsMod12.pm b/web/CtsPlugins/CtsMod12.pm index 3f44e47..e65e64f 100755 --- a/web/CtsPlugins/CtsMod12.pm +++ b/web/CtsPlugins/CtsMod12.pm @@ -54,4 +54,4 @@ sub init { } -1; \ No newline at end of file +1; diff --git a/web/CtsPlugins/CtsMod15.pm b/web/CtsPlugins/CtsMod15.pm index 557c6c7..c9a5211 100755 --- a/web/CtsPlugins/CtsMod15.pm +++ b/web/CtsPlugins/CtsMod15.pm @@ -8,7 +8,7 @@ use strict; use TrbRegister; use Data::Dumper; -sub moduleName {"AddOn Input Multiplexer"} +sub moduleName {"Trigger Input Multiplexer"} sub init { my $self = $_[0]; @@ -64,7 +64,7 @@ sub init { for(my $i = 0; $i < $header->{'itc_len'}; $i++) { - $self->{'_cts'}->getProperties->{'itc_assignments'}[$i + $header->{'itc_base'}] = "AddOn Multiplexer $i"; + $self->{'_cts'}->getProperties->{'itc_assignments'}[$i + $header->{'itc_base'}] = "Input Multiplexer $i"; } # properties @@ -72,4 +72,4 @@ sub init { $prop->{"trg_inp_mux_itc_base"} = $header->{'itc_base'}; } -1; \ No newline at end of file +1; diff --git a/web/CtsPlugins/CtsMod16.pm b/web/CtsPlugins/CtsMod16.pm index 7b540db..6aecf41 100644 --- a/web/CtsPlugins/CtsMod16.pm +++ b/web/CtsPlugins/CtsMod16.pm @@ -8,7 +8,7 @@ use strict; use TrbRegister; use Data::Dumper; -sub moduleName {"AddOn Input Multiplexer"} +sub moduleName {"Trigger Input Multiplexer"} sub init { my $self = $_[0]; @@ -51,7 +51,7 @@ sub init { for(my $i = 0; $i < $header->{'itc_len'}; $i++) { - $self->{'_cts'}->getProperties->{'itc_assignments'}[$i + $header->{'itc_base'}] = "AddOn Multiplexer $i"; + $self->{'_cts'}->getProperties->{'itc_assignments'}[$i + $header->{'itc_base'}] = "Trigger Multiplexer $i"; } # properties diff --git a/web/CtsPlugins/CtsMod17.pm b/web/CtsPlugins/CtsMod17.pm index ae5bf16..f2368d4 100644 --- a/web/CtsPlugins/CtsMod17.pm +++ b/web/CtsPlugins/CtsMod17.pm @@ -8,7 +8,7 @@ use strict; use TrbRegister; use Data::Dumper; -sub moduleName {"AddOn Input Multiplexer"} +sub moduleName {"Trigger Input Multiplexer"} sub init { my $self = $_[0]; @@ -57,7 +57,7 @@ sub init { for(my $i = 0; $i < $header->{'itc_len'}; $i++) { - $self->{'_cts'}->getProperties->{'itc_assignments'}[$i + $header->{'itc_base'}] = "AddOn Multiplexer $i"; + $self->{'_cts'}->getProperties->{'itc_assignments'}[$i + $header->{'itc_base'}] = "Trigger Multiplexer $i"; } # properties diff --git a/web/CtsPlugins/CtsMod64.pm b/web/CtsPlugins/CtsMod64.pm new file mode 100644 index 0000000..fca6aec --- /dev/null +++ b/web/CtsPlugins/CtsMod64.pm @@ -0,0 +1,45 @@ +# Module: R3B timestamp receiver External Trigger Module +# + +package CtsMod64; + +@ISA = (CtsBaseModule); + +use warnings; +use strict; + +sub moduleName {"R3B TS Recv"} + +sub init { + my $self = $_[0]; + my $address = $_[1]; + + my $trb = $self->{'_cts'}{'_trb'}; + + my $regs = $self->{'_registers'}; + my $expo = $self->{'_exportRegs'}; + my $prop = $self->{'_properties'}; + + my $header = $self->{'_cts'}{'_enum'}{0x64}->read(); + + + $regs->{'r3b_ts_recv_status'} = new TrbRegister($address + 1, $trb, { + 'value' => {'lower' => 0, 'len' => 32, 'type' => 'hex'}, + }, { + 'accessmode' => "ro", + 'label' => "Mimosa26 Status Register", + 'monitor' => '1' + }); + + $regs->{'r3b_ts_recv_control'} = new TrbRegister($address + 2, $trb, {}, + { + 'accessmode' => "rw", + 'label' => "Mimosa26 Control Register", + 'monitor' => '1', + 'export' => 1 + }); + + $self->{'_cts'}->getProperties->{'itc_assignments'}[$header->{'itc_base'}] = "External Module - R3B TS Recv"; +} + +1; -- 2.43.0