From 563b953692e9ea8946b97295edcbfdf1fdac8ee6 Mon Sep 17 00:00:00 2001
From: Maps <maps@ikf>
Date: Wed, 5 Jul 2017 11:02:39 +0200
Subject: [PATCH] PK: mostly sensor/system/setup config updates from last two
 months

---
 config/sensorE0scurve2.xml     |  2 +-
 config/sensorK0.xml            |  2 ++
 config/sensorP0.xml            |  2 +-
 config/sensorP1.xml            |  2 +-
 config/sensorQ0.xml            |  2 +-
 config/sensorQ1.xml            |  2 +-
 config/sensorR1.xml            |  2 ++
 config/sensorS1.xml            |  2 ++
 config/sensor_ProbeStation.xml |  2 +-
 setup/ELwindow_readout.xml     | 53 ++++++++++++++++++++++++++++------
 system/ELwindow.xml            |  1 +
 system/ProbeStation_scurve.xml | 11 +++++--
 12 files changed, 65 insertions(+), 18 deletions(-)
 create mode 100644 config/sensorK0.xml
 create mode 100644 config/sensorR1.xml
 create mode 100644 config/sensorS1.xml

diff --git a/config/sensorE0scurve2.xml b/config/sensorE0scurve2.xml
index 63ea2d7..1ed7051 100644
--- a/config/sensorE0scurve2.xml
+++ b/config/sensorE0scurve2.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="sensorProbecard.xml"><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"/><field name="En_auto_scan_discri" value="1"/><field name="En_scan" value="1"/><field name="entestdatadisc" value="1"/></register><register name="SEQUENCER_PIX_REG"><field name="DataPwrOn" value="0x7FFFFFFF"/><field name="DataRdPix" value="0x7FFF"/></register><register name="DAC_BIAS"><field name="IVDREF2" value="100"/><field name="IVDREF1A" value="255"/><field name="IVDREF1B" value="255"/><field name="IVDREF1C" value="255"/><field name="IVDREF1D" value="250"/></register></MAPS>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="sensorProbecard.xml"><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"/><field name="En_auto_scan_discri" value="1"/><field name="En_scan" value="1"/><field name="entestdatadisc" value="1"/></register><register name="SEQUENCER_PIX_REG"><field name="DataPwrOn" value="0x7FFFFFFF"/><field name="DataRdPix" value="0x7FFF"/></register><register name="DAC_BIAS"><field name="IVDREF1A" value="255"/><field name="IVDREF1B" value="255"/><field name="IVDREF1C" value="255"/><field name="IVDREF1D" value="255"/></register></MAPS>
diff --git a/config/sensorK0.xml b/config/sensorK0.xml
new file mode 100644
index 0000000..009733e
--- /dev/null
+++ b/config/sensorK0.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="IVDREF1A" value="200"/><field name="IVDREF1B" value="200"/><field name="IVDREF1D" value="200"/><field name="IVDREF1C" value="200"/><field name="IVDREF2" value="90"/></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><register name="DIS_DISCRI"><field name="DisDiscri" value="0"/></register></MAPS>
diff --git a/config/sensorP0.xml b/config/sensorP0.xml
index 8e1a14d..e5dafbd 100644
--- a/config/sensorP0.xml
+++ b/config/sensorP0.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="160"/><field name="IVDREF1B" value="200"/><field name="IVDREF1D" value="180"/><field name="IVDREF1C" value="160"/><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="178"/><field name="IVDREF1B" value="201"/><field name="IVDREF1D" value="200"/><field name="IVDREF1C" value="178"/><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/sensorP1.xml b/config/sensorP1.xml
index 8e1a14d..42dfaac 100644
--- a/config/sensorP1.xml
+++ b/config/sensorP1.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="160"/><field name="IVDREF1B" value="200"/><field name="IVDREF1D" value="180"/><field name="IVDREF1C" value="160"/><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="150"/><field name="IVDREF1B" value="140"/><field name="IVDREF1D" value="55"/><field name="IVDREF1C" value="150"/><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/sensorQ0.xml b/config/sensorQ0.xml
index 68a5927..25ee900 100644
--- a/config/sensorQ0.xml
+++ b/config/sensorQ0.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="165"/><field name="IVDREF1B" value="175"/><field name="IVDREF1D" value="135"/><field name="IVDREF1C" value="141"/><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="201"/><field name="IVDREF1B" value="210"/><field name="IVDREF1D" value="182"/><field name="IVDREF1C" value="182"/><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><register name="DIS_DISCRI"><field name="DisDiscri" value="0"/></register></MAPS>
diff --git a/config/sensorQ1.xml b/config/sensorQ1.xml
index 9c58922..c718e84 100644
--- a/config/sensorQ1.xml
+++ b/config/sensorQ1.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="IVDREF1D" value="255"/><field name="IVDREF1C" value="255"/><field name="IVDREF1B" value="255"/><field name="IVDREF1A" value="220"/></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="90"/><field name="IVDREF1D" value="255"/><field name="IVDREF1C" value="220"/><field name="IVDREF1B" value="220"/><field name="IVDREF1A" value="220"/></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/sensorR1.xml b/config/sensorR1.xml
new file mode 100644
index 0000000..8cb81bd
--- /dev/null
+++ b/config/sensorR1.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="IVDREF1A" value="168"/><field name="IVDREF1B" value="190"/><field name="IVDREF1D" value="185"/><field name="IVDREF1C" value="165"/><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/sensorS1.xml b/config/sensorS1.xml
new file mode 100644
index 0000000..d5c5d2f
--- /dev/null
+++ b/config/sensorS1.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="IVDREF1A" value="215"/><field name="IVDREF1B" value="225"/><field name="IVDREF1D" value="210"/><field name="IVDREF1C" value="255"/><field name="IVDREF2" value="59"/></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/sensor_ProbeStation.xml b/config/sensor_ProbeStation.xml
index 7bc7c1a..c803713 100644
--- a/config/sensor_ProbeStation.xml
+++ b/config/sensor_ProbeStation.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="M26default.xml"><register name="RO_MODE0"><field name="EnVDiscriTestDigital" value="0"/></register><register name="LINEPAT1_REG"><field name="LinePatL1Reg" value="0xFF0000000000FF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"/></register><register name="LINEPAT0_REG"><field name="LinePatL0Reg" value="0xFF0000000000FF000000000000000"/></register></MAPS>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="M26default.xml"><register name="RO_MODE0"><field name="EnVDiscriTestDigital" value="0"/></register><register name="LINEPAT1_REG"><field name="LinePatL1Reg" value="0xFF0000000000FF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"/></register><register name="LINEPAT0_REG"><field name="LinePatL0Reg" value="0xFF0000000000FF000000000000000"/></register><register name="DAC_BIAS"><field name="IVDREF1D" value="156"/><field name="IVDREF1C" value="227"/><field name="IVDREF1B" value="200"/><field name="IVDREF1A" value="235"/></register></MAPS>
diff --git a/setup/ELwindow_readout.xml b/setup/ELwindow_readout.xml
index 918fc2e..0cfb079 100644
--- a/setup/ELwindow_readout.xml
+++ b/setup/ELwindow_readout.xml
@@ -9,10 +9,10 @@
 
   <controller id="0" address="d823" name="board01">
     <chain id="0" name="chain0">
-      <sensor id="0000" 
+      <!-- <sensor id="0000" 
               serial="0"
-              name="sensorP0"
-              config="sensorP0.xml"
+              name="sensorS1"
+              config="sensorS1.xml"
               enabled="true">
         <description>blah</description>
         <position
@@ -31,11 +31,11 @@
 	  SensorEn="1"
 	  JtagEn="1"
 	/> 
-      </sensor>
+      </sensor>-->
       <sensor id="0001" 
               serial="1"
-              name="sensorP1"
-              config="sensorP1.xml"
+              name="sensorR1"
+              config="sensorR1.xml"
               enabled="true">
         <description>blah</description>
         <position
@@ -55,7 +55,6 @@
 	  JtagEn="1"
 	/> 
       </sensor>
-
       <JtagConf>delay0</JtagConf>
       <JtagConf>set_timing_10mhz</JtagConf>
       <JtagConf>set_inout</JtagConf>
@@ -67,7 +66,7 @@
     <JtagConf>trigger_init_sequence</JtagConf>
   </controller>
 
- <controller id="0" address="d030" name="board02">
+  <controller id="0" address="d030" name="board02">
     <chain id="0" name="chain0">
       <sensor id="0000" 
               serial="0"
@@ -92,6 +91,7 @@
 	  JtagEn="1"
 	/> 
       </sensor>
+      <!--
       <sensor id="0001" 
               serial="1"
               name="sensorQ1"
@@ -115,7 +115,7 @@
 	  JtagEn="1"
 	/> 
       </sensor>
-
+      -->
       <JtagConf>delay0</JtagConf>
       <JtagConf>set_timing_10mhz</JtagConf>
       <JtagConf>set_inout</JtagConf>
@@ -126,6 +126,41 @@
     <JtagConf>waitbeforestart_6us</JtagConf>
     <JtagConf>trigger_init_sequence</JtagConf>
   </controller>
+  <!-- <controller id="0" address="d031" name="board03">
+    <chain id="0" name="chain0">
+      <sensor id="0000" 
+              serial="0"
+              name="sensorQ1"
+              config="sensorQ1.xml"
+              enabled="true">
+        <description>blah</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/system/ELwindow.xml b/system/ELwindow.xml
index 6ca7d45..fb91910 100644
--- a/system/ELwindow.xml
+++ b/system/ELwindow.xml
@@ -17,6 +17,7 @@
   </hub>
   <hub address="c030">
     <roc address="d030" name="roc2" />
+    <!-- <roc address="d031" name="roc3" /> -->
   </hub>
   
 </system>
diff --git a/system/ProbeStation_scurve.xml b/system/ProbeStation_scurve.xml
index 799ade5..6ae04c1 100644
--- a/system/ProbeStation_scurve.xml
+++ b/system/ProbeStation_scurve.xml
@@ -3,15 +3,20 @@
                xsi:noNamespaceSchemaLocation="../schema/detectorsetup.xsd"
                name="ProbeStation_readout"
                >
-  <description>The ProbeStation system config file for normal read-out</description>
+  <description>The ProbeStation system config file for s-cures</description>
 
   <daqopserver>jspc55:7</daqopserver>
-  <ccu address="c070" />
-  <hub address="c070" />
+  <cts address="c070" />
+  <hub address="c070" >
 <!--   <roc address="d070" name="roc0" /> -->
 <!--   <roc address="d071" name="roc1" /> -->
+
   <roc address="d072" name="roc2" />
+
 <!-- <roc address="d073" name="roc3" /> -->
+
+  </hub>
+
   <gbe address="c070" port="50070" name="central link" />
   
 </system>
-- 
2.43.0