latest file versions

diff --git a/users/cosy_test/config/nxyter/nxsetup.dat b/users/cosy_test/config/nxyter/nxsetup.dat
index 4a85babfe4aa4057418b9a6e69dc74ed91e69994..78ed9b6cdecd3064d1ead2fbe5f761b74a49250f 100644 (file)
--- a/users/cosy_test/config/nxyter/nxsetup.dat
+++ b/users/cosy_test/config/nxyter/nxsetup.dat
@@ -27,14 +27,14 @@
 0x00000089    # 23
 0x000000ff    # 24  Testpulse Strength, default 0x80
 0x00000045    # 25
-0x0000000f    # 26
+0x00000080    # 26  iDUR (26) Analog dead time (changes nxtimer CVT)
 0x00000036    # 27
 0x0000005c    # 28
 0x00000045    # 29
 0x000000be    # 30
 0x000000be    # 31
-0x00000000    # 32  TestTrigger setup etc. , default 0x00
-0x0000000c    # 33  clock input 256A, set bit #3, default 0x08 (normal mode)
+0x00000004    # 32  TestTrigger setup etc. , default 0x00
+0x00000008    # 33  clock input 256A, set bit #3, default 0x08 (normal mode)
 0x000000be    # 34
 0x000000be    # 35
 0x000000be    # 36

diff --git a/users/cosy_test/config/nxyter/setup.sh b/users/cosy_test/config/nxyter/setup.sh
index 9088ab397303d4b05a842614552e7dc36323aa05..79dc9e070e4f0b4efb690d3aaf210d48626303b5 100755 (executable)
--- a/users/cosy_test/config/nxyter/setup.sh
+++ b/users/cosy_test/config/nxyter/setup.sh
@@ -22,13 +22,6 @@ trbcmd w 0x3800 0x8241 1
 # Threshold setting
 #trb_i2c w 0x3800 0x08 18 0x80
 
-# Setup Trigger Generator
-trbcmd w 0x3800 0x8141  200    # 500 * 10ns = 5mus Period
-trbcmd w 0x3800 0x8142  1      # one Trigger per cycle
-trbcmd w 0x3800 0x8143  16     # 200ns trigger length, disable it
-trbcmd w 0x3800 0x8144  0      # reset before trigger
-
-
 # nx_ts_reset_start
 trbcmd w 0x3800 0x8102 0x01
 
@@ -37,10 +30,10 @@ echo "clear data fifo"
 trbcmd rm 0x3800 0x8600 4000 2>/dev/null
 
 # Set readout Mode
-trbcmd w 0x3800 0x8180 0x01   # was: 0: normal mode
-trbcmd w 0x3800 0x8182 100    # window width = 100 * 4ns
-trbcmd w 0x3800 0x8184 0xffe  # read-out time max
-
+trbcmd w 0x3800 0x8180 0x00   # 0: normal mode 4: no TS Window mode
+trbcmd w 0x3800 0x8181 50     # window  offset 200ns
+trbcmd w 0x3800 0x8182 200    # window width 800ns
+trbcmd w 0x3800 0x8183 100    # CTS-Delay 400ns
 
 # Decoder Settings
 trbcmd w 0x3800 0x8120 0       # reset all counters

diff --git a/users/cosy_test/nxscripts/trig_no.sh b/users/cosy_test/nxscripts/trig_no.sh
index 4e1e37c622da3bf522056f436bcc4e898ea91f77..c1d0ead272ce3ea488e6cfa819bb67f9b9c7cda9 100755 (executable)
--- a/users/cosy_test/nxscripts/trig_no.sh
+++ b/users/cosy_test/nxscripts/trig_no.sh
@@ -2,11 +2,10 @@
 
 [ -n $1 ] && addr=0x3800 || addr=$1
 
-trbcmd w $addr 0x8180 1
+trbcmd w $addr 0x8180 0
 trbcmd w $addr 0x8181 0
-trbcmd w $addr 0x8182 1000
-trbcmd w $addr 0x8183 0
-trbcmd w $addr 0x8183 1000
+trbcmd w $addr 0x8182 250
+trbcmd w $addr 0x8183 100
 
 trbcmd w $addr 0x8140 0
 #trbcmd w $addr 0x8144 1

diff --git a/users/cosy_test/nxscripts/trig_pulser.sh b/users/cosy_test/nxscripts/trig_pulser.sh
index 53d1e241407b4b0d8b05f5879167ed9eada5eee4..a595f690e2335d849859e6a6b24228779f45f152 100755 (executable)
--- a/users/cosy_test/nxscripts/trig_pulser.sh
+++ b/users/cosy_test/nxscripts/trig_pulser.sh
@@ -2,11 +2,10 @@
 
 [ -n $1 ] && addr=0x3800 || addr=$1
 
-trbcmd w $addr 0x8180 1
+trbcmd w $addr 0x8180 0
 trbcmd w $addr 0x8181 0
-trbcmd w $addr 0x8182 1000
-trbcmd w $addr 0x8183 0
-trbcmd w $addr 0x8183 1000
+trbcmd w $addr 0x8182 250
+trbcmd w $addr 0x8183 100
 
 #trbcmd w $addr 0x8140 1
 #trbcmd w $addr 0x8144 1

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 295b297e38a8e9808cff19c21fe8fdf2b06b435c..29bdee2f65bb161d5c7625014159985cb0efd392 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -102,7 +102,7 @@
         <enumItem value="7">ignore TS Status Bits</enumItem>
       </field>
     </register>    
-    
+
     <register name="TriggerWindowOffset" address="0001" purpose="config">
       <description>Delay of the trigger window</description>
       <field name="TriggerWindowOffset" start="0" bits="11" format="signed" unit="ns" scale="4"/>
@@ -153,6 +153,7 @@
       <field name="DataFifoDelay" start="0" bits="7" format="unsigned" unit="ns" scale="32"/>
     </register>
     
+
     <register name="ChannelDone" address="000b" purpose="status" mode="r" repeat="4">
       <description>Data channel read-out finished</description>
       <field name="ChannelDone" start="0" bits="32" format="bitmask"/>