status, mt

diff --git a/base/serials_dirich.db b/base/serials_dirich.db
index 8114bad2db40be43ee03c68ef9587189a9463f5c..83929de5e9af0fa181d133bd3525da7d4d851e1a 100644 (file)
--- a/base/serials_dirich.db
+++ b/base/serials_dirich.db
@@ -261,6 +261,7 @@
 3351   0x3800000a49380728 # dirich3  untested
 3361   0xe300000a4938b328 # dirich3  untested
 3381   0xf200000a4938ae28 # dirich3  untested
+3391   0xba00000a48bbef28 # dirich3  tested
 3691   0x4d00000a496aea28 # dirich3  untested
 3701   0x6100000a49790b28 # dirich3  untested
 3711   0x0c00000a49a58028 # dirich3  untested
@@ -269,6 +270,7 @@
 3741   0x9400000a49ec3728 # dirich3  untested
 3751   0xfb00000a49aaf028 # dirich3  untested
 3761   0xd200000a49ec5028 # dirich3  untested
+3771   0xe300000a48ae1828 # dirich3  tested
 3791   0x6400000a48ae0c28 # dirich3  untested
 3801   0xa900000a488f0728 # dirich3  untested
 3811   0x8b00000a48e5da28 # dirich3  untested

diff --git a/tools/determine_noiseband_dirich.pl b/tools/determine_noiseband_dirich.pl
index 4d360c8dc007330955f9f052c5bf27b15a0c2abd..d17e20b7eb5e0a2c6622464136a0aab28581fed7 100755 (executable)
--- a/tools/determine_noiseband_dirich.pl
+++ b/tools/determine_noiseband_dirich.pl
@@ -8,7 +8,7 @@ use Data::Dumper;
 use lib "/home/hadaq/trbsoft/daqtools/dmon/code";
 use Dmon;
 
-my $dirich = 0x1229;
+my $dirich = 0x1234;
 
 $dirich = $ARGV[0];
 
@@ -26,7 +26,7 @@ my $monitor = 0xc001;
 my $first_channel = 0;
 my $last_channel = 31;
 
-my $default_threshold = 0x3000;
+my $default_threshold = 0x6000;
 
 #my $absolute_max_threshold = 0x8000;
 my $absolute_min_threshold = 0x1000;
@@ -49,16 +49,24 @@ my $channel_shift = 24;
 my $command;
 my $chain=0;
 
+my $READ  = 0x0<<20; # bits to set for a read command
+my $WRITE = 0x8<<20; # bits to set for a write command
+my $REGNR = 24; # number of bits to shift for the register number
 
 
 for my $channel (0 .. 31) {
   $chain = ($channel <16) ? 0 : 1;
-  $command = $fixed_bits | ($channel << $channel_shift) | ($default_threshold << $shift_bits);
+  #($channel<<$REGNR | $WRITE | ($data&0xffff));
+  # sendcmd($channel<<$REGNR | $WRITE | ($data&0xffff));
+  #$command = $fixed_bits | ((0x10| ($channel&0xf)) << $channel_shift) | (($default_threshold+$channel) << $shift_bits);
+  $command = ($channel&0xf)<<$REGNR | $WRITE | ($default_threshold&0xffff);
+  #print "$command\n";
   Dmon::PadiwaSendCmd($command,$dirich, $chain);
+  usleep(10E3);
   #trb_register_write($dirich, $throffset + $channel , $default_threshold);
   #$rh_res = trb_register_read($dirich, $throffset + $channel);
 }
-
+#exit;
 usleep (1E5);
 
 my $boundaries = {};
@@ -68,14 +76,16 @@ for my $channel ($first_channel .. $last_channel) {
 
     my $hit_zero_diff_flag = 0;
 
-    my $lower_threshold = 0x6a80;
-    my $upper_threshold = 0xd000;
-    my $reasonable_upper_threshold = 0x8000;
+    my $lower_threshold = 0x6f80;
+    my $upper_threshold = 0x9000;
+    my $reasonable_upper_threshold = 0x7800;
     my $thresh_increment = 0x8;
 
   THRESH_LOOP:    for (my $thresh = $lower_threshold ; $thresh <= $upper_threshold; $thresh += $thresh_increment) {
       $chain = ($channel <16) ? 0 : 1;
-      $command = $fixed_bits | ($channel << $channel_shift) | ($thresh << $shift_bits);
+      #$command = $fixed_bits | ( (0x10|($channel&0xf)) << $channel_shift) | ($thresh << $shift_bits);
+      $command = ($channel & 0xf)<<$REGNR | $WRITE | ($thresh&0xffff);
+      #print "chain: $chain\n";
       Dmon::PadiwaSendCmd($command,$dirich, $chain);
       ##trb_register_write($dirich, $throffset + $channel , $thresh);
       undef $rh_res;
@@ -92,7 +102,7 @@ for my $channel ($first_channel .. $last_channel) {
         }
 
       my $diff = $hits[1] - $hits[0];
-      #printf "cur thresh: %.4x diff: $diff\n",$thresh ;
+      #printf "channel: $channel: cur thresh: %.4x diff: $diff\n",$thresh ;
       #sleep 0.2;
       $hit_zero_diff_flag = 1 if($diff == 0);
 
@@ -129,7 +139,7 @@ for my $channel ($first_channel .. $last_channel) {
          last THRESH_LOOP;
       }
 
-    }
+    } # THRESH_LOOP
 
     if ( ! exists $boundaries->{$channel}->{'upper'}) {
       $boundaries->{$channel}->{'upper'} = $upper_threshold;
@@ -137,7 +147,8 @@ for my $channel ($first_channel .. $last_channel) {
     }
 
     $chain = ($channel <16) ? 0 : 1;
-    $command = $fixed_bits | ($channel << $channel_shift) | ($default_threshold << $shift_bits);
+    #$command = $fixed_bits | ( (0x10|($channel&0xf)) << $channel_shift) | ($default_threshold << $shift_bits);
+    $command = ($channel & 0xf)<<$REGNR | $WRITE | ($default_threshold&0xffff);
     Dmon::PadiwaSendCmd($command,$dirich, $chain);
     #trb_register_write($dirich, $throffset + $channel , $default_threshold);
 }

diff --git a/users/gsi_ee_trb84/TdcEventBuilder.xml b/users/gsi_ee_trb84/TdcEventBuilder.xml
index 004e19d0ad1e71e71db58b930fc7850f5fbd5ba9..cb66d2ed8f7581da30f401c7c9ee8ccc25f554f1 100644 (file)
--- a/users/gsi_ee_trb84/TdcEventBuilder.xml
+++ b/users/gsi_ee_trb84/TdcEventBuilder.xml
@@ -95,7 +95,7 @@ When starting analysis from the go4 gui, one should specify stream server with p
 
     <Module name="Combiner" class="hadaq::CombinerModule">    
         <!-- these parameters will force to create inputs/outputs of module -->
-       <NumInputs value="4"/>
+       <NumInputs value="3"/>
        <NumOutputs value="2"/>
 
        <InputPort name="Input0" url="hadaq://host:50084" urlopt1="" thread="inp2thrd"/>

diff --git a/users/gsi_ee_trb84/db/addresses_dirich.db b/users/gsi_ee_trb84/db/addresses_dirich.db
index 85260154744a2227c0bb13747a1ae5f6c84c26e9..7b1bbb3377c4ee77f9e00f8f318b2fbe399d2495 100644 (file)
--- a/users/gsi_ee_trb84/db/addresses_dirich.db
+++ b/users/gsi_ee_trb84/db/addresses_dirich.db
@@ -45,3 +45,1154 @@
 0x1239      039     1
 0x1240      040     1
 0x1241      041     1
+
+0x1232      50     1
+0x1233      51     1
+0x1234      52     1
+0x1235      53     1
+0x1236      54     1
+0x1237      55     1
+0x1238      56     1
+0x1239      57     1
+0x123a      58     1
+0x123b      59     1
+0x123c      60     1
+0x123d      61     1
+0x123e      62     1
+0x123f      63     1
+0x1240      64     1
+0x1241      65     1
+0x1242      66     1
+0x1243      67     1
+0x1244      68     1
+0x1245      69     1
+0x1246      70     1
+0x1247      71     1
+0x1248      72     1
+0x1249      73     1
+0x124a      74     1
+0x124b      75     1
+0x124c      76     1
+0x124d      77     1
+0x124e      78     1
+0x124f      79     1
+0x1250      80     1
+0x1251      81     1
+0x1252      82     1
+0x1253      83     1
+0x1254      84     1
+0x1255      85     1
+0x1256      86     1
+0x1257      87     1
+0x1258      88     1
+0x1259      89     1
+0x125a      90     1
+0x125b      91     1
+0x125c      92     1
+0x125d      93     1
+0x125e      94     1
+0x125f      95     1
+0x1260      96     1
+0x1261      97     1
+0x1262      98     1
+0x1263      99     1
+0x1264      100     1
+0x1265      101     1
+0x1266      102     1
+0x1267      103     1
+0x1268      104     1
+0x1269      105     1
+0x126a      106     1
+0x126b      107     1
+0x126c      108     1
+0x126d      109     1
+0x126e      110     1
+0x126f      111     1
+0x1270      112     1
+0x1271      113     1
+0x1272      114     1
+0x1273      115     1
+0x1274      116     1
+0x1275      117     1
+0x1276      118     1
+0x1277      119     1
+0x1278      120     1
+0x1279      121     1
+0x127a      122     1
+0x127b      123     1
+0x127c      124     1
+0x127d      125     1
+0x127e      126     1
+0x127f      127     1
+0x1280      128     1
+0x1281      129     1
+0x1282      130     1
+0x1283      131     1
+0x1284      132     1
+0x1285      133     1
+0x1286      134     1
+0x1287      135     1
+0x1288      136     1
+0x1289      137     1
+0x128a      138     1
+0x128b      139     1
+0x128c      140     1
+0x128d      141     1
+0x128e      142     1
+0x128f      143     1
+0x1290      144     1
+0x1291      145     1
+0x1292      146     1
+0x1293      147     1
+0x1294      148     1
+0x1295      149     1
+0x1296      150     1
+0x1297      151     1
+0x1298      152     1
+0x1299      153     1
+0x129a      154     1
+0x129b      155     1
+0x129c      156     1
+0x129d      157     1
+0x129e      158     1
+0x129f      159     1
+0x12a0      160     1
+0x12a1      161     1
+0x12a2      162     1
+0x12a3      163     1
+0x12a4      164     1
+0x12a5      165     1
+0x12a6      166     1
+0x12a7      167     1
+0x12a8      168     1
+0x12a9      169     1
+0x12aa      170     1
+0x12ab      171     1
+0x12ac      172     1
+0x12ad      173     1
+0x12ae      174     1
+0x12af      175     1
+0x12b0      176     1
+0x12b1      177     1
+0x12b2      178     1
+0x12b3      179     1
+0x12b4      180     1
+0x12b5      181     1
+0x12b6      182     1
+0x12b7      183     1
+0x12b8      184     1
+0x12b9      185     1
+0x12ba      186     1
+0x12bb      187     1
+0x12bc      188     1
+0x12bd      189     1
+0x12be      190     1
+0x12bf      191     1
+0x12c0      192     1
+0x12c1      193     1
+0x12c2      194     1
+0x12c3      195     1
+0x12c4      196     1
+0x12c5      197     1
+0x12c6      198     1
+0x12c7      199     1
+0x12c8      200     1
+0x12c9      201     1
+0x12ca      202     1
+0x12cb      203     1
+0x12cc      204     1
+0x12cd      205     1
+0x12ce      206     1
+0x12cf      207     1
+0x12d0      208     1
+0x12d1      209     1
+0x12d2      210     1
+0x12d3      211     1
+0x12d4      212     1
+0x12d5      213     1
+0x12d6      214     1
+0x12d7      215     1
+0x12d8      216     1
+0x12d9      217     1
+0x12da      218     1
+0x12db      219     1
+0x12dc      220     1
+0x12dd      221     1
+0x12de      222     1
+0x12df      223     1
+0x12e0      224     1
+0x12e1      225     1
+0x12e2      226     1
+0x12e3      227     1
+0x12e4      228     1
+0x12e5      229     1
+0x12e6      230     1
+0x12e7      231     1
+0x12e8      232     1
+0x12e9      233     1
+0x12ea      234     1
+0x12eb      235     1
+0x12ec      236     1
+0x12ed      237     1
+0x12ee      238     1
+0x12ef      239     1
+0x12f0      240     1
+0x12f1      241     1
+0x12f2      242     1
+0x12f3      243     1
+0x12f4      244     1
+0x12f5      245     1
+0x12f6      246     1
+0x12f7      247     1
+0x12f8      248     1
+0x12f9      249     1
+0x12fa      250     1
+0x12fb      251     1
+0x12fc      252     1
+0x12fd      253     1
+0x12fe      254     1
+0x12ff      255     1
+0x1300      256     1
+0x1301      257     1
+0x1302      258     1
+0x1303      259     1
+0x1304      260     1
+0x1305      261     1
+0x1306      262     1
+0x1307      263     1
+0x1308      264     1
+0x1309      265     1
+0x130a      266     1
+0x130b      267     1
+0x130c      268     1
+0x130d      269     1
+0x130e      270     1
+0x130f      271     1
+0x1310      272     1
+0x1311      273     1
+0x1312      274     1
+0x1313      275     1
+0x1314      276     1
+0x1315      277     1
+0x1316      278     1
+0x1317      279     1
+0x1318      280     1
+0x1319      281     1
+0x131a      282     1
+0x131b      283     1
+0x131c      284     1
+0x131d      285     1
+0x131e      286     1
+0x131f      287     1
+0x1320      288     1
+0x1321      289     1
+0x1322      290     1
+0x1323      291     1
+0x1324      292     1
+0x1325      293     1
+0x1326      294     1
+0x1327      295     1
+0x1328      296     1
+0x1329      297     1
+0x132a      298     1
+0x132b      299     1
+0x132c      300     1
+0x132d      301     1
+0x132e      302     1
+0x132f      303     1
+0x1330      304     1
+0x1331      305     1
+0x1332      306     1
+0x1333      307     1
+0x1334      308     1
+0x1335      309     1
+0x1336      310     1
+0x1337      311     1
+0x1338      312     1
+0x1339      313     1
+0x133a      314     1
+0x133b      315     1
+0x133c      316     1
+0x133d      317     1
+0x133e      318     1
+0x133f      319     1
+0x1340      320     1
+0x1341      321     1
+0x1342      322     1
+0x1343      323     1
+0x1344      324     1
+0x1345      325     1
+0x1346      326     1
+0x1347      327     1
+0x1348      328     1
+0x1349      329     1
+0x134a      330     1
+0x134b      331     1
+0x134c      332     1
+0x134d      333     1
+0x134e      334     1
+0x134f      335     1
+0x1350      336     1
+0x1351      337     1
+0x1352      338     1
+0x1353      339     1
+0x1354      340     1
+0x1355      341     1
+0x1356      342     1
+0x1357      343     1
+0x1358      344     1
+0x1359      345     1
+0x135a      346     1
+0x135b      347     1
+0x135c      348     1
+0x135d      349     1
+0x135e      350     1
+0x135f      351     1
+0x1360      352     1
+0x1361      353     1
+0x1362      354     1
+0x1363      355     1
+0x1364      356     1
+0x1365      357     1
+0x1366      358     1
+0x1367      359     1
+0x1368      360     1
+0x1369      361     1
+0x136a      362     1
+0x136b      363     1
+0x136c      364     1
+0x136d      365     1
+0x136e      366     1
+0x136f      367     1
+0x1370      368     1
+0x1371      369     1
+0x1372      370     1
+0x1373      371     1
+0x1374      372     1
+0x1375      373     1
+0x1376      374     1
+0x1377      375     1
+0x1378      376     1
+0x1379      377     1
+0x137a      378     1
+0x137b      379     1
+0x137c      380     1
+0x137d      381     1
+0x137e      382     1
+0x137f      383     1
+0x1380      384     1
+0x1381      385     1
+0x1382      386     1
+0x1383      387     1
+0x1384      388     1
+0x1385      389     1
+0x1386      390     1
+0x1387      391     1
+0x1388      392     1
+0x1389      393     1
+0x138a      394     1
+0x138b      395     1
+0x138c      396     1
+0x138d      397     1
+0x138e      398     1
+0x138f      399     1
+0x1390      400     1
+0x1391      401     1
+0x1392      402     1
+0x1393      403     1
+0x1394      404     1
+0x1395      405     1
+0x1396      406     1
+0x1397      407     1
+0x1398      408     1
+0x1399      409     1
+0x139a      410     1
+0x139b      411     1
+0x139c      412     1
+0x139d      413     1
+0x139e      414     1
+0x139f      415     1
+0x13a0      416     1
+0x13a1      417     1
+0x13a2      418     1
+0x13a3      419     1
+0x13a4      420     1
+0x13a5      421     1
+0x13a6      422     1
+0x13a7      423     1
+0x13a8      424     1
+0x13a9      425     1
+0x13aa      426     1
+0x13ab      427     1
+0x13ac      428     1
+0x13ad      429     1
+0x13ae      430     1
+0x13af      431     1
+0x13b0      432     1
+0x13b1      433     1
+0x13b2      434     1
+0x13b3      435     1
+0x13b4      436     1
+0x13b5      437     1
+0x13b6      438     1
+0x13b7      439     1
+0x13b8      440     1
+0x13b9      441     1
+0x13ba      442     1
+0x13bb      443     1
+0x13bc      444     1
+0x13bd      445     1
+0x13be      446     1
+0x13bf      447     1
+0x13c0      448     1
+0x13c1      449     1
+0x13c2      450     1
+0x13c3      451     1
+0x13c4      452     1
+0x13c5      453     1
+0x13c6      454     1
+0x13c7      455     1
+0x13c8      456     1
+0x13c9      457     1
+0x13ca      458     1
+0x13cb      459     1
+0x13cc      460     1
+0x13cd      461     1
+0x13ce      462     1
+0x13cf      463     1
+0x13d0      464     1
+0x13d1      465     1
+0x13d2      466     1
+0x13d3      467     1
+0x13d4      468     1
+0x13d5      469     1
+0x13d6      470     1
+0x13d7      471     1
+0x13d8      472     1
+0x13d9      473     1
+0x13da      474     1
+0x13db      475     1
+0x13dc      476     1
+0x13dd      477     1
+0x13de      478     1
+0x13df      479     1
+0x13e0      480     1
+0x13e1      481     1
+0x13e2      482     1
+0x13e3      483     1
+0x13e4      484     1
+0x13e5      485     1
+0x13e6      486     1
+0x13e7      487     1
+0x13e8      488     1
+0x13e9      489     1
+0x13ea      490     1
+0x13eb      491     1
+0x13ec      492     1
+0x13ed      493     1
+0x13ee      494     1
+0x13ef      495     1
+0x13f0      496     1
+0x13f1      497     1
+0x13f2      498     1
+0x13f3      499     1
+0x13f4      500     1
+0x13f5      501     1
+0x13f6      502     1
+0x13f7      503     1
+0x13f8      504     1
+0x13f9      505     1
+0x13fa      506     1
+0x13fb      507     1
+0x13fc      508     1
+0x13fd      509     1
+0x13fe      510     1
+0x13ff      511     1
+0x1400      512     1
+0x1401      513     1
+0x1402      514     1
+0x1403      515     1
+0x1404      516     1
+0x1405      517     1
+0x1406      518     1
+0x1407      519     1
+0x1408      520     1
+0x1409      521     1
+0x140a      522     1
+0x140b      523     1
+0x140c      524     1
+0x140d      525     1
+0x140e      526     1
+0x140f      527     1
+0x1410      528     1
+0x1411      529     1
+0x1412      530     1
+0x1413      531     1
+0x1414      532     1
+0x1415      533     1
+0x1416      534     1
+0x1417      535     1
+0x1418      536     1
+0x1419      537     1
+0x141a      538     1
+0x141b      539     1
+0x141c      540     1
+0x141d      541     1
+0x141e      542     1
+0x141f      543     1
+0x1420      544     1
+0x1421      545     1
+0x1422      546     1
+0x1423      547     1
+0x1424      548     1
+0x1425      549     1
+0x1426      550     1
+0x1427      551     1
+0x1428      552     1
+0x1429      553     1
+0x142a      554     1
+0x142b      555     1
+0x142c      556     1
+0x142d      557     1
+0x142e      558     1
+0x142f      559     1
+0x1430      560     1
+0x1431      561     1
+0x1432      562     1
+0x1433      563     1
+0x1434      564     1
+0x1435      565     1
+0x1436      566     1
+0x1437      567     1
+0x1438      568     1
+0x1439      569     1
+0x143a      570     1
+0x143b      571     1
+0x143c      572     1
+0x143d      573     1
+0x143e      574     1
+0x143f      575     1
+0x1440      576     1
+0x1441      577     1
+0x1442      578     1
+0x1443      579     1
+0x1444      580     1
+0x1445      581     1
+0x1446      582     1
+0x1447      583     1
+0x1448      584     1
+0x1449      585     1
+0x144a      586     1
+0x144b      587     1
+0x144c      588     1
+0x144d      589     1
+0x144e      590     1
+0x144f      591     1
+0x1450      592     1
+0x1451      593     1
+0x1452      594     1
+0x1453      595     1
+0x1454      596     1
+0x1455      597     1
+0x1456      598     1
+0x1457      599     1
+0x1458      600     1
+0x1459      601     1
+0x145a      602     1
+0x145b      603     1
+0x145c      604     1
+0x145d      605     1
+0x145e      606     1
+0x145f      607     1
+0x1460      608     1
+0x1461      609     1
+0x1462      610     1
+0x1463      611     1
+0x1464      612     1
+0x1465      613     1
+0x1466      614     1
+0x1467      615     1
+0x1468      616     1
+0x1469      617     1
+0x146a      618     1
+0x146b      619     1
+0x146c      620     1
+0x146d      621     1
+0x146e      622     1
+0x146f      623     1
+0x1470      624     1
+0x1471      625     1
+0x1472      626     1
+0x1473      627     1
+0x1474      628     1
+0x1475      629     1
+0x1476      630     1
+0x1477      631     1
+0x1478      632     1
+0x1479      633     1
+0x147a      634     1
+0x147b      635     1
+0x147c      636     1
+0x147d      637     1
+0x147e      638     1
+0x147f      639     1
+0x1480      640     1
+0x1481      641     1
+0x1482      642     1
+0x1483      643     1
+0x1484      644     1
+0x1485      645     1
+0x1486      646     1
+0x1487      647     1
+0x1488      648     1
+0x1489      649     1
+0x148a      650     1
+0x148b      651     1
+0x148c      652     1
+0x148d      653     1
+0x148e      654     1
+0x148f      655     1
+0x1490      656     1
+0x1491      657     1
+0x1492      658     1
+0x1493      659     1
+0x1494      660     1
+0x1495      661     1
+0x1496      662     1
+0x1497      663     1
+0x1498      664     1
+0x1499      665     1
+0x149a      666     1
+0x149b      667     1
+0x149c      668     1
+0x149d      669     1
+0x149e      670     1
+0x149f      671     1
+0x14a0      672     1
+0x14a1      673     1
+0x14a2      674     1
+0x14a3      675     1
+0x14a4      676     1
+0x14a5      677     1
+0x14a6      678     1
+0x14a7      679     1
+0x14a8      680     1
+0x14a9      681     1
+0x14aa      682     1
+0x14ab      683     1
+0x14ac      684     1
+0x14ad      685     1
+0x14ae      686     1
+0x14af      687     1
+0x14b0      688     1
+0x14b1      689     1
+0x14b2      690     1
+0x14b3      691     1
+0x14b4      692     1
+0x14b5      693     1
+0x14b6      694     1
+0x14b7      695     1
+0x14b8      696     1
+0x14b9      697     1
+0x14ba      698     1
+0x14bb      699     1
+0x14bc      700     1
+0x14bd      701     1
+0x14be      702     1
+0x14bf      703     1
+0x14c0      704     1
+0x14c1      705     1
+0x14c2      706     1
+0x14c3      707     1
+0x14c4      708     1
+0x14c5      709     1
+0x14c6      710     1
+0x14c7      711     1
+0x14c8      712     1
+0x14c9      713     1
+0x14ca      714     1
+0x14cb      715     1
+0x14cc      716     1
+0x14cd      717     1
+0x14ce      718     1
+0x14cf      719     1
+0x14d0      720     1
+0x14d1      721     1
+0x14d2      722     1
+0x14d3      723     1
+0x14d4      724     1
+0x14d5      725     1
+0x14d6      726     1
+0x14d7      727     1
+0x14d8      728     1
+0x14d9      729     1
+0x14da      730     1
+0x14db      731     1
+0x14dc      732     1
+0x14dd      733     1
+0x14de      734     1
+0x14df      735     1
+0x14e0      736     1
+0x14e1      737     1
+0x14e2      738     1
+0x14e3      739     1
+0x14e4      740     1
+0x14e5      741     1
+0x14e6      742     1
+0x14e7      743     1
+0x14e8      744     1
+0x14e9      745     1
+0x14ea      746     1
+0x14eb      747     1
+0x14ec      748     1
+0x14ed      749     1
+0x14ee      750     1
+0x14ef      751     1
+0x14f0      752     1
+0x14f1      753     1
+0x14f2      754     1
+0x14f3      755     1
+0x14f4      756     1
+0x14f5      757     1
+0x14f6      758     1
+0x14f7      759     1
+0x14f8      760     1
+0x14f9      761     1
+0x14fa      762     1
+0x14fb      763     1
+0x14fc      764     1
+0x14fd      765     1
+0x14fe      766     1
+0x14ff      767     1
+0x1500      768     1
+0x1501      769     1
+0x1502      770     1
+0x1503      771     1
+0x1504      772     1
+0x1505      773     1
+0x1506      774     1
+0x1507      775     1
+0x1508      776     1
+0x1509      777     1
+0x150a      778     1
+0x150b      779     1
+0x150c      780     1
+0x150d      781     1
+0x150e      782     1
+0x150f      783     1
+0x1510      784     1
+0x1511      785     1
+0x1512      786     1
+0x1513      787     1
+0x1514      788     1
+0x1515      789     1
+0x1516      790     1
+0x1517      791     1
+0x1518      792     1
+0x1519      793     1
+0x151a      794     1
+0x151b      795     1
+0x151c      796     1
+0x151d      797     1
+0x151e      798     1
+0x151f      799     1
+0x1520      800     1
+0x1521      801     1
+0x1522      802     1
+0x1523      803     1
+0x1524      804     1
+0x1525      805     1
+0x1526      806     1
+0x1527      807     1
+0x1528      808     1
+0x1529      809     1
+0x152a      810     1
+0x152b      811     1
+0x152c      812     1
+0x152d      813     1
+0x152e      814     1
+0x152f      815     1
+0x1530      816     1
+0x1531      817     1
+0x1532      818     1
+0x1533      819     1
+0x1534      820     1
+0x1535      821     1
+0x1536      822     1
+0x1537      823     1
+0x1538      824     1
+0x1539      825     1
+0x153a      826     1
+0x153b      827     1
+0x153c      828     1
+0x153d      829     1
+0x153e      830     1
+0x153f      831     1
+0x1540      832     1
+0x1541      833     1
+0x1542      834     1
+0x1543      835     1
+0x1544      836     1
+0x1545      837     1
+0x1546      838     1
+0x1547      839     1
+0x1548      840     1
+0x1549      841     1
+0x154a      842     1
+0x154b      843     1
+0x154c      844     1
+0x154d      845     1
+0x154e      846     1
+0x154f      847     1
+0x1550      848     1
+0x1551      849     1
+0x1552      850     1
+0x1553      851     1
+0x1554      852     1
+0x1555      853     1
+0x1556      854     1
+0x1557      855     1
+0x1558      856     1
+0x1559      857     1
+0x155a      858     1
+0x155b      859     1
+0x155c      860     1
+0x155d      861     1
+0x155e      862     1
+0x155f      863     1
+0x1560      864     1
+0x1561      865     1
+0x1562      866     1
+0x1563      867     1
+0x1564      868     1
+0x1565      869     1
+0x1566      870     1
+0x1567      871     1
+0x1568      872     1
+0x1569      873     1
+0x156a      874     1
+0x156b      875     1
+0x156c      876     1
+0x156d      877     1
+0x156e      878     1
+0x156f      879     1
+0x1570      880     1
+0x1571      881     1
+0x1572      882     1
+0x1573      883     1
+0x1574      884     1
+0x1575      885     1
+0x1576      886     1
+0x1577      887     1
+0x1578      888     1
+0x1579      889     1
+0x157a      890     1
+0x157b      891     1
+0x157c      892     1
+0x157d      893     1
+0x157e      894     1
+0x157f      895     1
+0x1580      896     1
+0x1581      897     1
+0x1582      898     1
+0x1583      899     1
+0x1584      900     1
+0x1585      901     1
+0x1586      902     1
+0x1587      903     1
+0x1588      904     1
+0x1589      905     1
+0x158a      906     1
+0x158b      907     1
+0x158c      908     1
+0x158d      909     1
+0x158e      910     1
+0x158f      911     1
+0x1590      912     1
+0x1591      913     1
+0x1592      914     1
+0x1593      915     1
+0x1594      916     1
+0x1595      917     1
+0x1596      918     1
+0x1597      919     1
+0x1598      920     1
+0x1599      921     1
+0x159a      922     1
+0x159b      923     1
+0x159c      924     1
+0x159d      925     1
+0x159e      926     1
+0x159f      927     1
+0x15a0      928     1
+0x15a1      929     1
+0x15a2      930     1
+0x15a3      931     1
+0x15a4      932     1
+0x15a5      933     1
+0x15a6      934     1
+0x15a7      935     1
+0x15a8      936     1
+0x15a9      937     1
+0x15aa      938     1
+0x15ab      939     1
+0x15ac      940     1
+0x15ad      941     1
+0x15ae      942     1
+0x15af      943     1
+0x15b0      944     1
+0x15b1      945     1
+0x15b2      946     1
+0x15b3      947     1
+0x15b4      948     1
+0x15b5      949     1
+0x15b6      950     1
+0x15b7      951     1
+0x15b8      952     1
+0x15b9      953     1
+0x15ba      954     1
+0x15bb      955     1
+0x15bc      956     1
+0x15bd      957     1
+0x15be      958     1
+0x15bf      959     1
+0x15c0      960     1
+0x15c1      961     1
+0x15c2      962     1
+0x15c3      963     1
+0x15c4      964     1
+0x15c5      965     1
+0x15c6      966     1
+0x15c7      967     1
+0x15c8      968     1
+0x15c9      969     1
+0x15ca      970     1
+0x15cb      971     1
+0x15cc      972     1
+0x15cd      973     1
+0x15ce      974     1
+0x15cf      975     1
+0x15d0      976     1
+0x15d1      977     1
+0x15d2      978     1
+0x15d3      979     1
+0x15d4      980     1
+0x15d5      981     1
+0x15d6      982     1
+0x15d7      983     1
+0x15d8      984     1
+0x15d9      985     1
+0x15da      986     1
+0x15db      987     1
+0x15dc      988     1
+0x15dd      989     1
+0x15de      990     1
+0x15df      991     1
+0x15e0      992     1
+0x15e1      993     1
+0x15e2      994     1
+0x15e3      995     1
+0x15e4      996     1
+0x15e5      997     1
+0x15e6      998     1
+0x15e7      999     1
+0x15e8      1000     1
+0x15e9      1001     1
+0x15ea      1002     1
+0x15eb      1003     1
+0x15ec      1004     1
+0x15ed      1005     1
+0x15ee      1006     1
+0x15ef      1007     1
+0x15f0      1008     1
+0x15f1      1009     1
+0x15f2      1010     1
+0x15f3      1011     1
+0x15f4      1012     1
+0x15f5      1013     1
+0x15f6      1014     1
+0x15f7      1015     1
+0x15f8      1016     1
+0x15f9      1017     1
+0x15fa      1018     1
+0x15fb      1019     1
+0x15fc      1020     1
+0x15fd      1021     1
+0x15fe      1022     1
+0x15ff      1023     1
+0x1600      1024     1
+0x1601      1025     1
+0x1602      1026     1
+0x1603      1027     1
+0x1604      1028     1
+0x1605      1029     1
+0x1606      1030     1
+0x1607      1031     1
+0x1608      1032     1
+0x1609      1033     1
+0x160a      1034     1
+0x160b      1035     1
+0x160c      1036     1
+0x160d      1037     1
+0x160e      1038     1
+0x160f      1039     1
+0x1610      1040     1
+0x1611      1041     1
+0x1612      1042     1
+0x1613      1043     1
+0x1614      1044     1
+0x1615      1045     1
+0x1616      1046     1
+0x1617      1047     1
+0x1618      1048     1
+0x1619      1049     1
+0x161a      1050     1
+0x161b      1051     1
+0x161c      1052     1
+0x161d      1053     1
+0x161e      1054     1
+0x161f      1055     1
+0x1620      1056     1
+0x1621      1057     1
+0x1622      1058     1
+0x1623      1059     1
+0x1624      1060     1
+0x1625      1061     1
+0x1626      1062     1
+0x1627      1063     1
+0x1628      1064     1
+0x1629      1065     1
+0x162a      1066     1
+0x162b      1067     1
+0x162c      1068     1
+0x162d      1069     1
+0x162e      1070     1
+0x162f      1071     1
+0x1630      1072     1
+0x1631      1073     1
+0x1632      1074     1
+0x1633      1075     1
+0x1634      1076     1
+0x1635      1077     1
+0x1636      1078     1
+0x1637      1079     1
+0x1638      1080     1
+0x1639      1081     1
+0x163a      1082     1
+0x163b      1083     1
+0x163c      1084     1
+0x163d      1085     1
+0x163e      1086     1
+0x163f      1087     1
+0x1640      1088     1
+0x1641      1089     1
+0x1642      1090     1
+0x1643      1091     1
+0x1644      1092     1
+0x1645      1093     1
+0x1646      1094     1
+0x1647      1095     1
+0x1648      1096     1
+0x1649      1097     1
+0x164a      1098     1
+0x164b      1099     1
+0x164c      1100     1
+0x164d      1101     1
+0x164e      1102     1
+0x164f      1103     1
+0x1650      1104     1
+0x1651      1105     1
+0x1652      1106     1
+0x1653      1107     1
+0x1654      1108     1
+0x1655      1109     1
+0x1656      1110     1
+0x1657      1111     1
+0x1658      1112     1
+0x1659      1113     1
+0x165a      1114     1
+0x165b      1115     1
+0x165c      1116     1
+0x165d      1117     1
+0x165e      1118     1
+0x165f      1119     1
+0x1660      1120     1
+0x1661      1121     1
+0x1662      1122     1
+0x1663      1123     1
+0x1664      1124     1
+0x1665      1125     1
+0x1666      1126     1
+0x1667      1127     1
+0x1668      1128     1
+0x1669      1129     1
+0x166a      1130     1
+0x166b      1131     1
+0x166c      1132     1
+0x166d      1133     1
+0x166e      1134     1
+0x166f      1135     1
+0x1670      1136     1
+0x1671      1137     1
+0x1672      1138     1
+0x1673      1139     1
+0x1674      1140     1
+0x1675      1141     1
+0x1676      1142     1
+0x1677      1143     1
+0x1678      1144     1
+0x1679      1145     1
+0x167a      1146     1
+0x167b      1147     1
+0x167c      1148     1
+0x167d      1149     1
+0x167e      1150     1
+0x167f      1151     1
+0x1680      1152     1
+0x1681      1153     1
+0x1682      1154     1
+0x1683      1155     1
+0x1684      1156     1
+0x1685      1157     1
+0x1686      1158     1
+0x1687      1159     1
+0x1688      1160     1
+0x1689      1161     1
+0x168a      1162     1
+0x168b      1163     1
+0x168c      1164     1
+0x168d      1165     1
+0x168e      1166     1
+0x168f      1167     1
+0x1690      1168     1
+0x1691      1169     1
+0x1692      1170     1
+0x1693      1171     1
+0x1694      1172     1
+0x1695      1173     1
+0x1696      1174     1
+0x1697      1175     1
+0x1698      1176     1
+0x1699      1177     1
+0x169a      1178     1
+0x169b      1179     1
+0x169c      1180     1
+0x169d      1181     1
+0x169e      1182     1
+0x169f      1183     1
+0x16a0      1184     1
+0x16a1      1185     1
+0x16a2      1186     1
+0x16a3      1187     1
+0x16a4      1188     1
+0x16a5      1189     1
+0x16a6      1190     1
+0x16a7      1191     1
+0x16a8      1192     1
+0x16a9      1193     1
+0x16aa      1194     1
+0x16ab      1195     1
+0x16ac      1196     1
+0x16ad      1197     1
+0x16ae      1198     1
+0x16af      1199     1

diff --git a/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db b/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db
index 99915cd399fa915452e2dc82c6343ea664adac24..10d8eec6230038a9f53699890ddfbcaac70216c5 100644 (file)
--- a/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db
+++ b/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db
@@ -2,3 +2,5 @@
 # concentrator/combiner
 0x8300    001   0
 0x8300    002   0
+0x8300    101   0
+0x8300    103   0

diff --git a/users/gsi_ee_trb84/startup.sh b/users/gsi_ee_trb84/startup.sh
index 1154d13c916608dece843081f4205aafa423af26..99b6ab6cc5feba4e49df31b0581df7e2f5235aa8 100755 (executable)
--- a/users/gsi_ee_trb84/startup.sh
+++ b/users/gsi_ee_trb84/startup.sh
@@ -24,8 +24,9 @@ fi
 
 
 echo "reset"
-./trbreset_loop.pl
-sleep 1;
+trbcmd reset
+#./trbreset_loop.pl
+#sleep 1;
 
 ##################################################
 ## Set addresses