From a1b6fa9b115896f468a45e0532e7b3fdb7a5d0c6 Mon Sep 17 00:00:00 2001
From: "www@jspc55" <www@jspc55>
Date: Wed, 18 Dec 2013 20:33:36 +0100
Subject: [PATCH] added new system configuration files for running multiple
 setups in parallel

---
 config/sensor11.xml           |  2 +-
 setup/ELab_CB13_C0.xml        |  8 +++++---
 setup/boris_doublesensors.xml |  2 +-
 setup/testsetup_sensor11.xml  |  3 +++
 system/ELab.xml               | 15 ++++-----------
 system/Vacuum.xml             | 14 ++++++++++++++
 6 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 system/Vacuum.xml

diff --git a/config/sensor11.xml b/config/sensor11.xml
index 587c4ab..95bc86e 100644
--- 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="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="nice_thresh.xml"><register name="DAC_BIAS"><field name="IVTST2" value="0x64"/><field name="IVDREF1A" value="190"/><field name="IVDREF1B" value="140"/><field name="IVDREF1C" value="231"/><field name="IVDREF1D" value="205"/><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/setup/ELab_CB13_C0.xml b/setup/ELab_CB13_C0.xml
index f594e70..9aeefb6 100644
--- a/setup/ELab_CB13_C0.xml
+++ b/setup/ELab_CB13_C0.xml
@@ -4,7 +4,9 @@
                name="Prototype"
                >
   <description>The main MVD prototype system setup file</description>
-  <daqopserver>jspc55:88</daqopserver>
+
+  <readoutsystem name="ELab" />
+
   <controller id="0" address="d882" name="board01">
     <chain id="0" name="chain0">
       <sensor id="0000" 
@@ -22,8 +24,8 @@
                 phi="0"
                 />
       </sensor>
-      <config>delay1</config>
-      <config>set_timing_10mhz</config>
+      <config>delay0</config>
+      <config>set_timing_1mhz</config>
       <config>set_inout</config>
       <config>maps_reset_before_off</config>
       <config>maps_reset_after_on</config>
diff --git a/setup/boris_doublesensors.xml b/setup/boris_doublesensors.xml
index 3109267..f2d4012 100644
--- a/setup/boris_doublesensors.xml
+++ b/setup/boris_doublesensors.xml
@@ -4,7 +4,7 @@
                name="Prototype"
                >
   <description>The test MVD system setup file</description>
-  <daqopserver>jspc55:7</daqopserver>
+  <readoutsystem name="Vacuum" />
   <controller id="0" address="d000" name="board01">
     <chain id="0" name="chain0">
       <sensor id="0000" 
diff --git a/setup/testsetup_sensor11.xml b/setup/testsetup_sensor11.xml
index c4d7dc2..65b1181 100644
--- a/setup/testsetup_sensor11.xml
+++ b/setup/testsetup_sensor11.xml
@@ -4,6 +4,9 @@
                name="Prototype"
                >
   <description>The main MVD prototype system setup file</description>
+
+  <readoutsystem file="ELab_CB13_C0.xml" />
+
   <controller id="0" address="f30d" name="board01">
     <chain id="0" name="chain0">
       <sensor id="0001" 
diff --git a/system/ELab.xml b/system/ELab.xml
index 3245f74..30746ce 100644
--- a/system/ELab.xml
+++ b/system/ELab.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0"  encoding="utf-8" ?>
 <DaqSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
-               name="Prototype"
+               name="Elab"
                >
-  <description>The main MVD prototype system setup file</description>
+  <description>The Elab maps system setup file</description>
 
   <daqopserver>jspc55:88</daqopserver>
-
   <ccu address="8880" />
-
-  <gbelink address="8880" name="central link">
-    <port>50088</port>
-  </gbelink>
-
-  <setup>
-    <file>ELab_CB13_C0.xml</file>
-  </setup>
+  <roc address="d882" name="roc1" />
+  <gbe address="8880" port="50088" name="central link" />
   
 </DaqSetup>
 
diff --git a/system/Vacuum.xml b/system/Vacuum.xml
new file mode 100644
index 0000000..be7f85b
--- /dev/null
+++ b/system/Vacuum.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"  encoding="utf-8" ?>
+<DaqSetup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
+               name="Vacuum"
+               >
+  <description>The Vacuum system setup file</description>
+
+  <daqopserver>jspc55:7</daqopserver>
+  <ccu address="8000" />
+  <roc address="d002" name="roc1" />
+  <gbe address="8000" port="50000" name="central link" />
+  
+</DaqSetup>
+
-- 
2.43.0