added some files for Krakow

diff --git a/config/neu.xml b/config/neu.xml
index df4774bc31d3b1867f84a6e1870706f03e764e32..a46ab758dc77b7b0f02ffe01415904c1c3c90618 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="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>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml"><register name="DAC_BIAS"><field name="IKIMO" value="100"/><field name="IPIX" value="50"/><field name="IDIS1" value="32"/><field name="IVDREF2" value="118"/><field name="IVDREF1A" value="3"/><field name="IVDREF1B" value="124"/><field name="IVDREF1C" value="128"/><field name="IVDREF1D" value="128"/><field name="IVTST2" value="118"/><field name="IVTST1" value="128"/><field name="ILVDSTX" value="40"/><field name="IPwrSWBias" value="10"/><field name="ICLPDISC" value="2"/></register></MAPS>

diff --git a/config/sensor11.xml b/config/sensor11.xml
index 7bc42295786966826ad7062a14665a39112e28da..f1f099f4a5dca6fcf127b4ec5ecf2556fb8e34bb 100644 (file)
--- a/config/sensor11.xml
+++ b/config/sensor11.xml
@@ -1,2 +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="IVDREF1A" value="0xBF"/><field name="IVDREF1B" value="0x8C"/><field name="IVDREF1C" value="0xE7"/><field name="IVDREF1D" value="0xCD"/><field name="IVDREF2" value="100"/></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>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="M26default.xml"><register name="DAC_BIAS"><field name="IVDREF1A" value="255"/><field name="IVDREF1B" value="200"/><field name="IVDREF1C" value="255"/><field name="IVDREF1D" value="255"/></register></MAPS>

diff --git a/config/sensorE0.xml b/config/sensorE0.xml
index 45e8ca0a63c1f02759c6773f41a8a251f32b37df..6557458cb95e80ab080df020809724e945d5a0de 100644 (file)
--- a/config/sensorE0.xml
+++ b/config/sensorE0.xml
@@ -1,2 +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="255"/><field name="IVDREF1B" value="255"/><field name="IVDREF1D" value="255"/><field name="IVDREF1C" value="0"/></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>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="nice_thresh.xml"><register name="DAC_BIAS"><field name="IVTST2" value="0x64"/><field name="IVDREF1A" value="255"/><field name="IVDREF1B" value="210"/><field name="IVDREF2" value="100"/><field name="IVDREF1C" value="115"/><field name="IVDREF1D" value="160"/></register><register name="RO_MODE0"><field name="En_ExtStart" value="0x1"/></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><register name="SEQUENCER_PIX_REG"><field name="DataPwrOn" value="0x7FFFFFFF"/><field name="DataRdPix" value="0x7FFF"/></register><register name="DIS_DISCRI"><field name="DisDiscri" value="0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"/></register></MAPS>

diff --git a/config/sensorE1.xml b/config/sensorE1.xml
index f5c8fd89d674eca95420ceddc9eb369f6d9d5a42..46948f6c216db1c094e552fd24b0ecdef665b829 100644 (file)
--- a/config/sensorE1.xml
+++ b/config/sensorE1.xml
@@ -1,2 +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="0"/><field name="IVDREF1B" value="200"/><field name="IVDREF1D" value="255"/><field name="IVDREF1C" value="215"/></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>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="nice_thresh.xml"><register name="DAC_BIAS"><field name="IVTST2" value="0x64"/><field name="IVDREF1A" value="195"/><field name="IVDREF1B" value="238"/><field name="IVDREF1D" value="230"/><field name="IVDREF1C" value="180"/><field name="IVDREF2" value="100"/></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/config/sensorG03.xml b/config/sensorG03.xml
index eb88b9c7b96d75911d02a909a448e88afa52b2f8..25bec60d80e6ad262d92092b6a6ba35490b22daa 100644 (file)
--- a/config/sensorG03.xml
+++ b/config/sensorG03.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="230"/><field name="IVDREF1B" value="205"/><field name="IVDREF1C" value="227"/><field name="IVDREF1D" value="175"/></register></MAPS>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="M26default.xml"><register name="DAC_BIAS"><field name="IVDREF1B" value="210"/><field name="IVDREF1C" value="230"/><field name="IVDREF1D" value="180"/><field name="IVDREF1A" value="240"/></register></MAPS>

diff --git a/config/sensorNA61a.xml b/config/sensorNA61a.xml
new file mode 100644 (file)
index 0000000..9d19da2
--- /dev/null
+++ b/config/sensorNA61a.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="M26default.xml"><register name="DAC_BIAS"><field name="IVDREF1C" value="222"/><field name="IVDREF1D" value="210"/><field name="IVDREF1A" value="220"/><field name="IVDREF1B" value="235"/><field name="IVDREF2" value="100"/></register></MAPS>

diff --git a/config/sensorNA61b.xml b/config/sensorNA61b.xml
new file mode 100644 (file)
index 0000000..d392619
--- /dev/null
+++ b/config/sensorNA61b.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="M26default.xml"><register name="DAC_BIAS"><field name="IVDREF2" value="85"/><field name="IVDREF1A" value="255"/><field name="IVDREF1C" value="187"/><field name="IVDREF1D" value="125"/><field name="IVDREF1B" value="180"/></register></MAPS>

diff --git a/config/sensorProbecard.xml b/config/sensorProbecard.xml
index c311c347dff81325ff3c1e73aaa1ce2a3e3560f2..97d3c3149a4944cdfce2677a6019b60926da0562 100644 (file)
--- a/config/sensorProbecard.xml
+++ b/config/sensorProbecard.xml
@@ -1,2 +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="215"/><field name="IVDREF1B" value="242"/><field name="IVDREF1D" value="255"/><field name="IVDREF1C" value="200"/></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>
+<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="215"/><field name="IVDREF1D" value="255"/><field name="IVDREF1C" value="200"/><field name="IVDREF1B" value="242"/></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 b17e1e38016603d4a982f83ffb326dcb3a513b0f..5239cc3c277e79f5090987808c23573969b82282 100755 (executable)
--- a/network/register_configgbe_ip_mvd.db
+++ b/network/register_configgbe_ip_mvd.db
@@ -32,4 +32,4 @@
 ########################################################################################################################################
 #jspc55 with 192.168.10.254 IP
 0x8000      0      0x00C9D870     0xC860     0xc0a800FE     0xc350     0xdead8000     0x0230     0xc0a80080     0xc350       0x0578
-0x8880      0      0x00C9D870     0xC860     0xc0a800FE     0xc3a8     0xdead8880     0x0230     0xc0a80088     0xc3a8       0x0578
+0x8880      0      0x00C9D870     0xC860     0xc0a800FE     0xc6c8     0xdead8880     0x0230     0xc0a80088     0xc3a8       0x0578

diff --git a/setup/ELab_CB13_4sensors.xml b/setup/ELab_CB13_4sensors.xml
new file mode 100644 (file)
index 0000000..f5c5865
--- /dev/null
+++ b/setup/ELab_CB13_4sensors.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0"  encoding="utf-8" ?>
+<setup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
+               name="Prototype"
+               >
+  <description>Setup file for roc1 in the ELab system.</description>
+
+  <system name="ELab" />
+
+  <controller id="0" address="d882" name="board01">
+    <chain id="0" name="chain0">
+      <sensor id="0000" 
+              serial="20"
+              name="sensorG03"
+              config="sensorG03.xml"
+              enabled="true">
+        <description>Sensor G03 on CB13 no 2</description>
+        <position
+                x="0"
+                y="0"
+                z="0"
+                flippedx="false"
+                flippedy="false"
+                phi="0"
+                />
+       <CbConf
+         EnaA="1"
+         EnaD="1"
+         DisA="0"
+         DisD="0"
+         SensorEn="1"
+         JtagEn="1"
+       />
+      </sensor>
+      <sensor id="0001" 
+              serial="11"
+              name="sensorFPC10b"
+              config="sensorFPC10b.xml"
+              enabled="true">
+        <description>Sensor FPC10b in reference plane</description>
+        <position
+                x="0"
+                y="0"
+                z="0"
+                flippedx="false"
+                flippedy="false"
+                phi="0"
+                />
+       <CbConf
+         EnaA="1"
+         EnaD="1"
+         DisA="0"
+         DisD="0"
+         SensorEn="1"
+         JtagEn="1"
+       />
+      </sensor>
+      <JtagConf>delay0</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
+      <CbConf CycleRef="1" />
+    </chain>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
+  </controller>
+
+  <controller id="1" address="d883" name="board02">
+    <chain id="0" name="chain0">
+      <sensor id="0000" 
+              serial="61"
+              name="sensorNA61a"
+              config="sensorNA61a.xml"
+              enabled="true">
+        <description>Sensor NA61 on CB13 a</description>
+        <position
+                x="0"
+                y="0"
+                z="0"
+                flippedx="false"
+                flippedy="false"
+                phi="0"
+                />
+       <CbConf
+         EnaA="1"
+         EnaD="1"
+         DisA="0"
+         DisD="0"
+         SensorEn="1"
+         JtagEn="1"
+       />
+      </sensor>
+      <sensor id="0001" 
+              serial="61"
+              name="sensorNA61b"
+              config="sensorNA61b.xml"
+              enabled="true">
+        <description>Sensor NA61 on CB13 b</description>
+        <position
+                x="0"
+                y="0"
+                z="0"
+                flippedx="false"
+                flippedy="false"
+                phi="0"
+                />
+       <CbConf
+         EnaA="1"
+         EnaD="1"
+         DisA="0"
+         DisD="0"
+         SensorEn="1"
+         JtagEn="1"
+       />
+      </sensor>
+      <JtagConf>delay0</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
+    </chain>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
+  </controller>
+  
+  
+</setup>

diff --git a/setup/ELab_CB13_C0.xml b/setup/ELab_CB13_C0.xml
index a2e654c788613a6413f6e251724c6d04a028e1e6..989f7e02119a489f950eda81652ccc244d9db8d0 100644 (file)
--- a/setup/ELab_CB13_C0.xml
+++ b/setup/ELab_CB13_C0.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<DetectorSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<setup 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>
 
-  <readoutsystem name="ELab" />
+  <system name="ELab" />
 
   <controller id="0" address="d882" name="board01">
     <chain id="0" name="chain0">
@@ -24,13 +24,13 @@
                 phi="0"
                 />
       </sensor>
-      <config>delay0</config>
-      <config>set_timing_10mhz</config>
-      <config>set_inout</config>
-      <config>maps_reset_before_off</config>
-      <config>maps_reset_after_on</config>
+      <JtagConf>delay0</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
     </chain>
-    <config>waitbeforestart_6us</config>
-    <config>trigger_init_sequence</config>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
   </controller>
-</DetectorSetup>
+</setup>

diff --git a/setup/boris_doublesensors.xml b/setup/boris_doublesensors.xml
index f2d4012656adfa91df85760b0c1cfe11a1b033ca..69b8eed38ecb65a8a8b7193294a8c2a4ac319d64 100644 (file)
--- a/setup/boris_doublesensors.xml
+++ b/setup/boris_doublesensors.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<DetectorSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<setup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
                name="Prototype"
                >
   <description>The test MVD system setup file</description>
-  <readoutsystem name="Vacuum" />
+  <system name="Vacuum" />
   <controller id="0" address="d000" name="board01">
     <chain id="0" name="chain0">
       <sensor id="0000" 
@@ -37,13 +37,13 @@
                 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>
+      <JtagConf>delay1</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
     </chain>
-    <config>waitbeforestart_6us</config>
-    <config>trigger_init_sequence</config>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
   </controller>
-</DetectorSetup>
+</setup>

diff --git a/setup/testsetup.xml b/setup/testsetup.xml
deleted file mode 120000 (symlink)
index a22a1bba38e21ac73927a9ad444e8a481d0f19ff..0000000000000000000000000000000000000000
--- a/setup/testsetup.xml
+++ /dev/null
@@ -1 +0,0 @@
-testsetup_sensor11.xml
\ No newline at end of file

diff --git a/setup/testsetup.xml b/setup/testsetup.xml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..c12ab7d2cb5e0dc64c2f09ef89660c82ef7acfb3
--- /dev/null
+++ b/setup/testsetup.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"  encoding="utf-8" ?>
+<setup 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>
+
+  <system file="ELab_CB13_C0.xml" />
+
+  <controller id="0" address="f30d" name="board01">
+    <chain id="0" name="chain0">
+      <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"
+              enabled="true">
+        <description>Dat einzige Ding dat mir habbe</description>
+        <position
+                x="0"
+                y="0"
+                z="0"
+                flippedx="false"
+                flippedy="false"
+                phi="0"
+                />
+      </sensor>
+      <JtagConf>delay1</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
+    </chain>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
+  </controller>
+</setup>

diff --git a/setup/testsetup_FPC11.xml b/setup/testsetup_FPC11.xml
index a5e9e08f8afda5ebde06cdc5884725a6b61606d8..37c901ddc80db3539f29499552d39c16d2d00191 100644 (file)
--- a/setup/testsetup_FPC11.xml
+++ b/setup/testsetup_FPC11.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<DetectorSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<setup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
                name="Prototype"
                >
@@ -36,13 +36,13 @@
                 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>
+      <JtagConf>delay1</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
     </chain>
-    <config>waitbeforestart_6us</config>
-    <config>trigger_init_sequence</config>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
   </controller>
-</DetectorSetup>
+</setup>

diff --git a/setup/testsetup_g3_g4.xml b/setup/testsetup_g3_g4.xml
index f53f3fd22ff2c420f91e35ac32f75b41a916c1c8..6bd13bdf4d0007849405f23a479a2b0f9b20579a 100644 (file)
--- a/setup/testsetup_g3_g4.xml
+++ b/setup/testsetup_g3_g4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<DetectorSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<setup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
                name="Prototype"
                >
@@ -37,13 +37,13 @@
                 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>
+      <JtagConf>delay1</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
     </chain>
-    <config>waitbeforestart_6us</config>
-    <config>trigger_init_sequence</config>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
   </controller>
-</DetectorSetup>
+</setup>

diff --git a/setup/testsetup_g4.xml b/setup/testsetup_g4.xml
index 7b9a774f7da2794ba9b7f7e578799ca5027203d3..732f7f07f54e3728cb8ce843b6caf04a7d8ceb82 100644 (file)
--- a/setup/testsetup_g4.xml
+++ b/setup/testsetup_g4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<DetectorSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<setup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
                name="Prototype"
                >
@@ -21,13 +21,13 @@
                 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>
+      <JtagConf>delay1</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
     </chain>
-    <config>waitbeforestart_6us</config>
-    <config>trigger_init_sequence</config>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
   </controller>
-</DetectorSetup>
+</setup>

diff --git a/setup/testsetup_probecard.xml b/setup/testsetup_probecard.xml
index 0b7993dd6f04fd6e3caf39736d044d77f87ef7c6..75c5bb2f738fc79ed38a0a16901e4c1939b75462 100644 (file)
--- a/setup/testsetup_probecard.xml
+++ b/setup/testsetup_probecard.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<DetectorSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<setup 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>
 
-  <readoutsystem name="Vacuum" />
+  <system name="Vacuum" />
 
   <controller id="0" address="d000" name="board01">
     <chain id="0" name="chain0">
@@ -24,13 +24,13 @@
                 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>
+      <JtagConf>delay1</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
     </chain>
-    <config>waitbeforestart_6us</config>
-    <config>trigger_init_sequence</config>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
   </controller>
-</DetectorSetup>
+</setup>

diff --git a/setup/testsetup_sensor11.xml b/setup/testsetup_sensor11.xml
index 65b11818cc90df736e83f17f43de18d9a7fdf7c5..c12ab7d2cb5e0dc64c2f09ef89660c82ef7acfb3 100644 (file)
--- a/setup/testsetup_sensor11.xml
+++ b/setup/testsetup_sensor11.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<DetectorSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<setup 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>
 
-  <readoutsystem file="ELab_CB13_C0.xml" />
+  <system file="ELab_CB13_C0.xml" />
 
   <controller id="0" address="f30d" name="board01">
     <chain id="0" name="chain0">
@@ -39,13 +39,13 @@
                 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>
+      <JtagConf>delay1</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
     </chain>
-    <config>waitbeforestart_6us</config>
-    <config>trigger_init_sequence</config>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
   </controller>
-</DetectorSetup>
+</setup>

diff --git a/system/ELab.xml b/system/ELab.xml
index 1d8d9025ae7c37a83ed55a908b8e1ef417575e54..f9683cb381acc4426989bc0905ef4f80cc5efe4b 100644 (file)
--- a/system/ELab.xml
+++ b/system/ELab.xml
@@ -1,15 +1,26 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<DaqSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<system xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
-               name="Elab"
+               name="ELab"
                >
-  <description>The Elab maps system setup file</description>
+  <description>The ELab maps system setup file</description>
 
   <daqopserver>jspc55:88</daqopserver>
   <ccu address="8880" />
   <hub address="8880" />
+  <roc address="d880" name="roc0" />
   <roc address="d882" name="roc1" />
-  <gbe address="8880" port="50088" name="central link" />
+  <roc address="d883" name="roc2" />
+  <gbe address="8880" port="50888" name="central link" />
   
-</DaqSetup>
+</system>
+
+
+
+
+
+
+
+
+
 

diff --git a/system/Vacuum.xml b/system/Vacuum.xml
index be7f85b8d0165ccc0b7a6575aa52d244bfad99d0..2a9f5569df9eb7779fb54837f7539af316035e5b 100644 (file)
--- a/system/Vacuum.xml
+++ b/system/Vacuum.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<DaqSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<system xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
                name="Vacuum"
                >
@@ -7,8 +7,8 @@
 
   <daqopserver>jspc55:7</daqopserver>
   <ccu address="8000" />
-  <roc address="d002" name="roc1" />
+  <roc address="d000" name="roc1" />
   <gbe address="8000" port="50000" name="central link" />
   
-</DaqSetup>
+</system>