added probecard sensor & changed GbE config

diff --git a/config/sensorProbecard.xml b/config/sensorProbecard.xml
new file mode 100644 (file)
index 0000000..13fc39d
--- /dev/null
+++ b/config/sensorProbecard.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="nice_thresh.xml"><register name="DAC_BIAS"><field name="IVTST2" value="0x64"/><field name="IVDREF2" value="100"/><field name="IVDREF1A" value="225"/><field name="IVDREF1B" value="0"/><field name="IVDREF1C" value="217"/><field name="IVDREF1D" value="235"/></register><register name="RO_MODE0"><field name="En_ExtStart" value="0x1"/></register><register name="SEQUENCER_PIX_REG"><field name="DataRdPix" value="0x7FFF"/><field name="DataPwrOn" value="0x7FFFFFFF"/></register><register name="HEADER_REG"><field name="trailer0" value="0x8001"/><field name="trailer1" value="0x8001"/></register><register name="CONTROL_SUZE_REG"><field name="dualchannelout" value="0x1"/><field name="clkrateout" value="0x1"/></register></MAPS>

diff --git a/network/register_configgbe_ip_mvd.db b/network/register_configgbe_ip_mvd.db
index b16e366ad5d754f74e549eb9fcecf42bba3ef8bb..84b54353747ea189c389c40132b0ff2ed44318f6 100755 (executable)
--- a/network/register_configgbe_ip_mvd.db
+++ b/network/register_configgbe_ip_mvd.db
@@ -31,5 +31,4 @@
 # Hub    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4     #     C5     #     C6     #     C7     #     C8     #
 ########################################################################################################################################
 #jspc55 with 192.168.10.254 IP
-0xf30c      0      0x00C9D870     0xC860     0xc0a800FE     0xc350     0xdead8100     0x0230     0xc0a80080     0xc350       0x0578
-#0x8c00      0      0x00C9D870     0xC860     0xc0a800FE     0xc351     0xdeadf30c     0x0230     0xc0a80081     0xc350       0x0578
+0x8000      0      0x00C9D870     0xC860     0xc0a800FE     0xc350     0xdead8000     0x0230     0xc0a80080     0xc350       0x0578

diff --git a/network/register_configgbe_mvd.db b/network/register_configgbe_mvd.db
index fa89a609791a16fbfdfcc4599ed0f990e3296f6c..0e69dc66a2c35af8876bdbd4edca899c3038011f 100755 (executable)
--- a/network/register_configgbe_mvd.db
+++ b/network/register_configgbe_mvd.db
@@ -3,15 +3,11 @@
 ###################################################################################################
      0     0x8300   0x8301   0x8302   0x8303   0x8304   0x8305   0x8306   0x8307    0x8308  0x830b
 
-#old register set
-#    17     0xc100   0xc101   0xc102   0xc103   0xc104   0xc105   0xc106   0xc107   0xc108
-
 
 !Value table
 #                    SubEvtId     SubEvtDec     QueDec      PackSize     FrameSize    UseGbE       UseTrbNet   MultiQueue   Trig. Num.   MinEvtSize
 # Hub    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4     #     C5     #     C6     #     C7     #    C8     #    C9     #
 ###################################################################################################################################################
-#  0x8c00      0       0x8c00     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7
-  0xf30c      0       0xf30c     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7
+  0x8000      0       0x8000     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7  
  
 

diff --git a/setup/testsetup_probecard.xml b/setup/testsetup_probecard.xml
new file mode 100644 (file)
index 0000000..5fcc8c7
--- /dev/null
+++ b/setup/testsetup_probecard.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"  encoding="utf-8" ?>
+<DetectorSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
+               name="Prototype"
+               >
+  <description>The main MVD prototype system setup file</description>
+  <daqopserver>jspc55:7</daqopserver>
+  <controller id="0" address="d000" name="board01">
+    <chain id="0" name="chain0">
+      <sensor id="0000" 
+              serial="20"
+              name="sensorProbecard"
+              config="sensorProbecard.xml"
+              enabled="true">
+        <description>Dat Probecard-Ding</description>
+        <position
+                x="0"
+                y="0"
+                z="0"
+                flippedx="false"
+                flippedy="false"
+                phi="0"
+                />
+      </sensor>
+      <config>delay1</config>
+      <config>set_timing_10mhz</config>
+      <config>set_inout</config>
+      <config>maps_reset_before_off</config>
+      <config>maps_reset_after_on</config>
+    </chain>
+    <config>waitbeforestart_6us</config>
+    <config>trigger_init_sequence</config>
+  </controller>
+</DetectorSetup>