cleaned up network config, changed to different addresses for setups, added new setup...

diff --git a/config/sensorE0.xml b/config/sensorE0.xml
index e0b9745c9d00498b04d204ce408473aaded32674..45e8ca0a63c1f02759c6773f41a8a251f32b37df 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="225"/><field name="IVDREF1B" value="200"/><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="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>

diff --git a/config/sensorE1.xml b/config/sensorE1.xml
index 04eaabec257e2b4d1c21bd1f5a0303539ba48608..f5c8fd89d674eca95420ceddc9eb369f6d9d5a42 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="200"/><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="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>

diff --git a/network/addresses_trb3.db b/network/addresses_trb3.db
index 4d4ed4a7f2b24f851cb72aea2dda1be763ff732b..26a8837cc17694ec72b163073ee419e0f55f3753 100644 (file)
--- a/network/addresses_trb3.db
+++ b/network/addresses_trb3.db
@@ -1,10 +1,10 @@
 #Address  #   S/N   #   FPGA  #
 ###############################
- 0xD000       88        0     
- 0xD001       88        1     
- 0xD002       88        2     
- 0xD003       88        3     
- 0x8000       88        5     
+ 0xD880       88        0     
+ 0xD881       88        1     
+ 0xD882       88        2     
+ 0xD883       88        3     
+ 0x8880       88        5     
  
  0xD000       7        0     
  0xD001       7        1     
@@ -12,4 +12,4 @@
  0xD003       7        3     
  0x8000       7        5     
  
- 
\ No newline at end of file
+ 

diff --git a/network/addresses_arbiter.db b/network/old/addresses_arbiter.db
similarity index 100%
rename from network/addresses_arbiter.db
rename to network/old/addresses_arbiter.db

diff --git a/network/addresses_hub.db b/network/old/addresses_hub.db
similarity index 100%
rename from network/addresses_hub.db
rename to network/old/addresses_hub.db

diff --git a/network/addresses_mapsaddon.db b/network/old/addresses_mapsaddon.db
similarity index 100%
rename from network/addresses_mapsaddon.db
rename to network/old/addresses_mapsaddon.db

diff --git a/network/serials_arbiter.db b/network/old/serials_arbiter.db
similarity index 100%
rename from network/serials_arbiter.db
rename to network/old/serials_arbiter.db

diff --git a/network/serials_hub.db b/network/old/serials_hub.db
similarity index 100%
rename from network/serials_hub.db
rename to network/old/serials_hub.db

diff --git a/network/serials_mapsaddon.db b/network/old/serials_mapsaddon.db
similarity index 100%
rename from network/serials_mapsaddon.db
rename to network/old/serials_mapsaddon.db

diff --git a/network/register_configgbe_ip_mvd.db b/network/register_configgbe_ip_mvd.db
index 84b54353747ea189c389c40132b0ff2ed44318f6..b17e1e38016603d4a982f83ffb326dcb3a513b0f 100755 (executable)
--- a/network/register_configgbe_ip_mvd.db
+++ b/network/register_configgbe_ip_mvd.db
@@ -32,3 +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

diff --git a/network/register_configgbe_mvd.db b/network/register_configgbe_mvd.db
index 0e69dc66a2c35af8876bdbd4edca899c3038011f..dbc2aa1582d4b7398607633fd2bd59845a1ad188 100755 (executable)
--- a/network/register_configgbe_mvd.db
+++ b/network/register_configgbe_mvd.db
@@ -9,5 +9,4 @@
 # Hub    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4     #     C5     #     C6     #     C7     #    C8     #    C9     #
 ###################################################################################################################################################
   0x8000      0       0x8000     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7  
- 
-
+  0x8880      0       0x8000     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7  

diff --git a/setup/ELab_CB13_C0.xml b/setup/ELab_CB13_C0.xml
new file mode 100644 (file)
index 0000000..eb36b74
--- /dev/null
+++ b/setup/ELab_CB13_C0.xml
@@ -0,0 +1,37 @@
+<?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:88</daqopserver>
+  <gbelink>
+   <port>50088</port>
+  </gbelink>
+  <controller id="0" address="d882" name="board01">
+    <chain id="0" name="chain0">
+      <sensor id="0000" 
+              serial="20"
+              name="sensor11"
+              config="sensor11.xml"
+              enabled="true">
+        <description>Sensor 11 on CB13 no 2</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>