latest version of config files

diff --git a/config/neu.xml b/config/neu.xml
index 002b116200564043d5409263d42cb0cb1c6c636a..df4774bc31d3b1867f84a6e1870706f03e764e32 100644 (file)
--- a/config/neu.xml
+++ b/config/neu.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="nice_thresh.xml"><register name="CONTROL_PIX_REG"><field name="NU" value="4"/></register><register name="CONTROL_SUZE_REG"><field name="NU" value="0"/><field name="SelPad4" value="0"/><field name="SelPad3" value="0"/><field name="En_auto_scan_discri" value="0"/><field name="En_scan" value="0"/><field name="Test_after_mux" value="0"/><field name="entestdatadisc" value="0"/><field name="RowLastSuze" value="0x023F"/><field name="ScanLineTst" value="0"/><field name="dualchannelout" value="0"/><field name="clkrateout" value="0"/><field name="jsupinitmem" value="1"/><field name="disckgmodgate" value="0"/><field name="cfgwr" value="0"/><field name="cfgdata" value="0"/><field name="cfgcs" value="0"/><field name="cfadr" value="0"/></register><register name="DAC_BIAS"><field name="IVDREF1A" value="128"/><field name="IPIX" value="50"/><field name="IVDREF1B" value="150"/></register></MAPS>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="nice_thresh.xml"><register name="CONTROL_PIX_REG"><field name="NU" value="0x5"/></register><register name="CONTROL_SUZE_REG"><field name="NU" value="0"/><field name="SelPad4" value="0"/><field name="SelPad3" value="0"/><field name="En_auto_scan_discri" value="0"/><field name="En_scan" value="0"/><field name="Test_after_mux" value="0"/><field name="entestdatadisc" value="0"/><field name="RowLastSuze" value="0x023F"/><field name="ScanLineTst" value="0"/><field name="dualchannelout" value="0"/><field name="clkrateout" value="0"/><field name="jsupinitmem" value="1"/><field name="disckgmodgate" value="0"/><field name="cfgwr" value="0"/><field name="cfgdata" value="0"/><field name="cfgcs" value="0"/><field name="cfadr" value="0"/></register><register name="DAC_BIAS"><field name="IVDREF1A" value="128"/><field name="IPIX" value="50"/><field name="IVDREF1B" value="150"/></register></MAPS>

diff --git a/config/sensorFPC11a.xml b/config/sensorFPC11a.xml
index 76aae51ab160e098cbea4d91f46a1a07379e1f29..a0a97e6a617e918542b249f7c0be0f96310e7973 100644 (file)
--- a/config/sensorFPC11a.xml
+++ b/config/sensorFPC11a.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="sensor11.xml"><register name="DAC_BIAS"><field name="IVDREF1A" value="193"/><field name="IVDREF1B" value="180"/><field name="IVDREF1C" value="210"/><field name="IVDREF1D" value="187"/></register><register name="DIS_DISCRI"><field name="DisDiscri" value="0"/></register></MAPS>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="sensor11.xml"><register name="DAC_BIAS"><field name="IVDREF1A" value="220"/><field name="IVDREF1B" value="210"/><field name="IVDREF1C" value="210"/><field name="IVDREF1D" value="187"/></register><register name="DIS_DISCRI"><field name="DisDiscri" value="0"/></register></MAPS>

diff --git a/config/sensorG04.xml b/config/sensorG04.xml
index 370835755fffb5566e94b4880dce0bcd74cd85c2..c21cc7e68142888879a6c902eb98220eb0c4ac1d 100644 (file)
--- a/config/sensorG04.xml
+++ b/config/sensorG04.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="sensor11.xml"><register name="DAC_BIAS"><field name="IVDREF1A" value="180"/><field name="IVDREF1B" value="135"/><field name="IVDREF1D" value="200"/><field name="IVDREF1C" value="222"/></register><register name="DIS_DISCRI"><field name="DisDiscri" value="0"/></register></MAPS>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="sensor11.xml"><register name="DAC_BIAS"><field name="IVDREF1D" value="200"/><field name="IVDREF1C" value="222"/></register><register name="DIS_DISCRI"><field name="DisDiscri" value="0"/></register></MAPS>

diff --git a/network/register_configgbe_ip_mvd.db b/network/register_configgbe_ip_mvd.db
index 798cda0101a1028cd308da0ffeeb4e329519c9bc..b16e366ad5d754f74e549eb9fcecf42bba3ef8bb 100755 (executable)
--- a/network/register_configgbe_ip_mvd.db
+++ b/network/register_configgbe_ip_mvd.db
@@ -31,5 +31,5 @@
 # Hub    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4     #     C5     #     C6     #     C7     #     C8     #
 ########################################################################################################################################
 #jspc55 with 192.168.10.254 IP
-0x8c00      0      0x00C9D870     0xC860     0xc0a800FE     0xc350     0xdead8100     0x0230     0xc0a80080     0xc350       0x0578
-0xf30c      0      0x00C9D870     0xC860     0xc0a800FE     0xc351     0xdeadf30c     0x0230     0xc0a80081     0xc350       0x0578
\ No newline at end of file
+0xf30c      0      0x00C9D870     0xC860     0xc0a800FE     0xc350     0xdead8100     0x0230     0xc0a80080     0xc350       0x0578
+#0x8c00      0      0x00C9D870     0xC860     0xc0a800FE     0xc351     0xdeadf30c     0x0230     0xc0a80081     0xc350       0x0578

diff --git a/network/register_configgbe_mvd.db b/network/register_configgbe_mvd.db
index 0e91cea8c25fa047f53961d1b4e75eb0bd31bdbc..fa89a609791a16fbfdfcc4599ed0f990e3296f6c 100755 (executable)
--- a/network/register_configgbe_mvd.db
+++ b/network/register_configgbe_mvd.db
@@ -11,7 +11,7 @@
 #                    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
+#  0x8c00      0       0x8c00     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7
   0xf30c      0       0xf30c     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7
  
 

diff --git a/setup/testsetup.xml b/setup/testsetup.xml
index 9642a008b4a4e38fe379b06bd399f810f10a6a1e..a22a1bba38e21ac73927a9ad444e8a481d0f19ff 120000 (symlink)
--- a/setup/testsetup.xml
+++ b/setup/testsetup.xml
@@ -1 +1 @@
-testsetup_FPC11.xml
\ No newline at end of file
+testsetup_sensor11.xml
\ No newline at end of file

diff --git a/setup/testsetup_g4.xml b/setup/testsetup_g4.xml
new file mode 100644 (file)
index 0000000..7b9a774
--- /dev/null
+++ b/setup/testsetup_g4.xml
@@ -0,0 +1,33 @@
+<?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>
+  <controller id="0" address="f308" name="board01">
+    <chain id="0" name="chain0">
+      <sensor id="ccc1" 
+              serial="4"
+              name="sensorG04"
+              config="sensorG04.xml"
+              enabled="true">
+        <description>Dat Vakuum-Ding (links)</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>

diff --git a/setup/testsetup_sensor11.xml b/setup/testsetup_sensor11.xml
index 89b84def520ae183ecdae8039153877ba71cff96..c4d7dc2b8bb7b3a7afb28a619c73ef0aefd8db8a 100644 (file)
--- a/setup/testsetup_sensor11.xml
+++ b/setup/testsetup_sensor11.xml
@@ -4,9 +4,24 @@
                name="Prototype"
                >
   <description>The main MVD prototype system setup file</description>
-  <controller id="0" address="f308" name="board01">
+  <controller id="0" address="f30d" name="board01">
     <chain id="0" name="chain0">
-      <sensor id="ccc1" 
+      <sensor id="0001" 
+              serial="11"
+              name="sensor11"
+              config="sensor11.xml"
+              enabled="true">
+        <description>Dat einzige Ding dat mir habbe</description>
+        <position
+                x="0"
+                y="0"
+                z="0"
+                flippedx="false"
+                flippedy="false"
+                phi="0"
+                />
+      </sensor>
+      <sensor id="0000" 
               serial="11"
               name="sensor11"
               config="sensor11.xml"