update MVD registers and MVD CTS module config

diff --git a/web/CtsPlugins/CtsMod63.pm b/web/CtsPlugins/CtsMod63.pm
index 38a766fe0cb7371a98008da5289a07a4824b6931..6b129b54bd27da3f195689aae0e635e8082a70ce 100644 (file)
--- a/web/CtsPlugins/CtsMod63.pm
+++ b/web/CtsPlugins/CtsMod63.pm
@@ -8,20 +8,10 @@ package CtsMod63;
 use warnings;
 use strict;
 
-sub moduleName {"Mimosa26"}
+sub moduleName {"M26 MVD ETM"}
 
 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'}{0x63}->read();
-   
+return;
    $regs->{'trg_m26_status'} = new TrbRegister($address + 1, $trb, {
          'value' => {'lower' =>  0, 'len' => 32, 'type' => 'hex'},
       }, {
@@ -41,4 +31,4 @@ sub init {
    $self->{'_cts'}->getProperties->{'itc_assignments'}[$header->{'itc_base'}] = "External Trigger - Mimosa26";
 }
 
-1;
\ No newline at end of file
+1;

diff --git a/xml-db/database/Mvd.xml b/xml-db/database/Mvd.xml
index 2ca106f305badff83ff1ced89c15f410509bcbd4..b0011ad7f96fc1ae5004637edfe6224866d743a1 100644 (file)
--- a/xml-db/database/Mvd.xml
+++ b/xml-db/database/Mvd.xml
@@ -192,13 +192,12 @@
       <field name="FrameBufferStatus" start="16" bits="4" format="enum" >
         <enumItem value="1">Idle</enumItem>
         <enumItem value="2">GetInfo</enumItem>
-        <enumItem value="3">CheckTime</enumItem>
-        <enumItem value="4">BigTime</enumItem>
-        <enumItem value="5">SmallTime</enumItem>
-        <enumItem value="6">Delete</enumItem>
-        <enumItem value="7">Readout</enumItem>
-        <enumItem value="8">Wait4</enumItem>
-        <enumItem value="9">Finish</enumItem>
+        <enumItem value="3">WaitRead</enumItem>
+        <enumItem value="4">CheckTime</enumItem>
+        <enumItem value="5">Delete</enumItem>
+        <enumItem value="6">Readout</enumItem>
+        <enumItem value="7">Wait4</enumItem>
+        <enumItem value="8">Finish</enumItem>
       </field>      
       <field name="LengthLevel" start="20" bits="4" format="unsigned" noflag="true" >
         <description>Number of data words stored in the frame info buffer</description>