From: HADES DAQ Date: Thu, 29 Jan 2015 10:06:11 +0000 (+0100) Subject: new boards, mt X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=1ac69776a205391d9b0aae51f070c26bfa72fe71;p=daqtools.git new boards, mt --- diff --git a/base/addresses_trb3.db b/base/addresses_trb3.db index 965cacf..d00ba49 100644 --- a/base/addresses_trb3.db +++ b/base/addresses_trb3.db @@ -4,6 +4,12 @@ # Address # S/N # FPGA # 0x1234 14 0 +0xc000 06 0 +0xc001 06 1 +0xc002 06 2 +0xc003 06 3 +0x8000 06 5 + 0xc000 13 0 0xc001 13 1 0xc002 13 2 @@ -508,12 +514,11 @@ 0xc003 93 3 0x8000 93 5 -#MCP TOF front -0x2010 94 0 -0x2011 94 1 -0x2012 94 2 -0x2013 94 3 -0x8020 94 5 +0xc010 94 0 +0xc011 94 1 +0xc012 94 2 +0xc013 94 3 +0x8001 94 5 0xc000 95 0 0xc001 95 1 @@ -521,11 +526,11 @@ 0xc003 95 3 0x8000 95 5 -0x1610 96 0 -0x1611 96 1 -0x1612 96 2 -0x1613 96 3 -0x8016 96 5 +0xc000 96 0 +0xc001 96 1 +0xc002 96 2 +0xc003 96 3 +0x8000 96 5 #MCP 14 0x1410 97 0 @@ -593,11 +598,11 @@ 0xc003 106 3 0x8000 106 5 -0xc000 107 0 -0xc001 107 1 -0xc002 107 2 -0xc003 107 3 -0x8000 107 5 +0xc010 107 0 +0xc011 107 1 +0xc012 107 2 +0xc013 107 3 +0x8001 107 5 0x2110 108 0 0x2111 108 1 @@ -618,5 +623,125 @@ 0xc003 110 3 0x8000 110 5 +0xc000 111 0 +0xc001 111 1 +0xc002 111 2 +0xc003 111 3 +0x8000 111 5 + +0xc000 112 0 +0xc001 112 1 +0xc002 112 2 +0xc003 112 3 +0x8000 112 5 + +0xc000 113 0 +0xc001 113 1 +0xc002 113 2 +0xc003 113 3 +0x8000 113 5 + +0xc000 114 0 +0xc001 114 1 +0xc002 114 2 +0xc003 114 3 +0x8000 114 5 + +0xc000 115 0 +0xc001 115 1 +0xc002 115 2 +0xc003 115 3 +0x8000 115 5 + +0xc000 116 0 +0xc001 116 1 +0xc002 116 2 +0xc003 116 3 +0x8000 116 5 + +0xc000 117 0 +0xc001 117 1 +0xc002 117 2 +0xc003 117 3 +0x8000 117 5 + +0xc000 118 0 +0xc001 118 1 +0xc002 118 2 +0xc003 118 3 +0x8000 118 5 + +0xc000 119 0 +0xc001 119 1 +0xc002 119 2 +0xc003 119 3 +0x8000 119 5 + +0xc000 120 0 +0xc001 120 1 +0xc002 120 2 +0xc003 120 3 +0x8000 120 5 + +0xc000 121 0 +0xc001 121 1 +0xc002 121 2 +0xc003 121 3 +0x8000 121 5 + +0xc000 122 0 +0xc001 122 1 +0xc002 122 2 +0xc003 122 3 +0x8000 122 5 + +0xc000 123 0 +0xc001 123 1 +0xc002 123 2 +0xc003 123 3 +0x8000 123 5 + +0xc000 124 0 +0xc001 124 1 +0xc002 124 2 +0xc003 124 3 +0x8000 124 5 + +0xc000 125 0 +0xc001 125 1 +0xc002 125 2 +0xc003 125 3 +0x8000 125 5 + +0xc000 126 0 +0xc001 126 1 +0xc002 126 2 +0xc003 126 3 +0x8000 126 5 + +0xc000 127 0 +0xc001 127 1 +0xc002 127 2 +0xc003 127 3 +0x8000 127 5 + +0xc000 128 0 +0xc001 128 1 +0xc002 128 2 +0xc003 128 3 +0x8000 128 5 + +0xc000 129 0 +0xc001 129 1 +0xc002 129 2 +0xc003 129 3 +0x8000 129 5 + +0xc000 130 0 +0xc001 130 1 +0xc002 130 2 +0xc003 130 3 +0x8000 130 5 + diff --git a/base/serials_trb3.db b/base/serials_trb3.db index 96e4838..30b2cfe 100644 --- a/base/serials_trb3.db +++ b/base/serials_trb3.db @@ -27,15 +27,18 @@ 0052 0xf2000002e312d328 0053 0xd3000002e30d7128 + 0065 0xc4000003481ef228 + 0060 0xb5000003482d3d28 + 0061 0xd5000003481eef28 + 0062 0xec00000348284328 + 0063 0x34000003482d1c28 + 0075 0x9500000347f24328 0070 0x4300000348258728 0071 #no communication to FPGA 0072 0x98000003482ab428 0073 0x0e00000348180d28 - - - 0085 0x0f0000034822f028 0080 0xeb000003480eae28 #flash programming? 0081 0x91000003481be628 @@ -663,3 +666,124 @@ 1102 0x08000004fa23ec28 1103 0xd7000004f9f23c28 1105 0xe0000004fa12e428 + + 1110 0x31000005ed1afc28 + 1111 0x95000005ed31bf28 + 1112 0xb0000005ed3c8028 + 1113 0xcc000005ed3c0928 + 1115 0xdc000005ed4a5328 + + 1120 0x88000005ed1d6f28 + 1121 0xa3000005ed720628 + 1122 0xed000005ed1e9c28 + 1123 0x23000005ed35fb28 + 1125 0x9e000005ed324e28 + + 1130 0x0d000005ed1d6828 + 1131 0x8e000005ed272228 + 1132 0x66000005ed2b1d28 + 1133 0xb9000005ed217528 + 1135 0xae000005ed215d28 + + 1140 0xbe000005ed389d28 + 1141 0xff000005ed28c328 + 1142 0x2b000005ed590628 + 1143 0xf0000005ed2d4228 + 1145 0xc6000005ed548328 + + 1150 0x03000005ed5e2c28 + 1151 0x32000005ed53ad28 + 1152 0x4a000005ed730928 + 1153 0xc1000005ed6f5228 + 1155 0xfa000005ed2a5228 + + 1160 0x96000005ed555028 + 1161 0x74000005ed392d28 + 1162 0x54000005ed578728 + 1163 0x1c000005ed590728 + 1165 0xde000005ed58fb28 + + 1170 0x12000005ed31ab28 + 1171 0xfd000005ed88f728 + 1172 0x77000005ed891528 + 1173 0x81000005ed84d228 + 1175 0x17000005ed333a28 + + 1180 0x95000005ed3c0a28 + 1181 0x73000005ed388428 + 1182 0xef000005ed1aeb28 + 1183 0x06000005ed1afd28 + 1185 0xe7000005ed389e28 + + 1190 0x34000005ed17ea28 + 1191 0x82000005ed35f328 + 1192 0x19000005ed1b8028 + 1193 0x8a000005ed34a628 + 1195 0x6b000005ed185b28 + + 1200 0x03000005ed213f28 + 1201 0x91000005ed622d28 + 1202 0xf4000005ed60c728 + 1203 0x0f000005ed443528 + 1205 0x81000005ed42be28 + + 1210 0x59000005ed25ce28 + 1211 0xe5000005ed25b128 + 1212 0x99000005ed689b28 + 1213 0x2b000005ed689d28 + 1215 0xc1000005ed6b3628 + + 1220 0x08000005ed4c4d28 + 1221 0x42000005ed6b0428 + 1222 0xe0000005ed1c4128 + 1223 0x29000005ed4bae28 + 1225 0xf9000005ed797028 + + 1230 0xf4000005ed6f4028 + 1231 0xf0000005ed39af28 + 1232 0xbb000005ed617028 + 1233 0x6d000005ed846728 + 1235 0xb5000005ed475428 + + 1240 0xfd000005ed2f9f28 + 1241 0x02000005ed302a28 + 1242 0xb9000005ed836028 + 1243 0x44000005ed6e4c28 + 1245 0xe4000005ed2baa28 + + 1250 0x27000005ed8af428 + 1251 0x92000005ed912828 + 1252 0x35000005ed86d328 + 1253 0x08000005ed905228 + 1255 0xe7000005ed7ede28 + + 1260 0x30000005ed223328 + 1261 0xff000005ed401628 + 1262 0x62000005ed189228 + 1263 0x09000005ed425628 + 1265 0x6a000005ed619b28 + + 1270 0xe1000005ed6c5028 + 1271 0x39000005ed278728 + 1272 0xc2000005ed2fd228 + 1273 0x9f000005ed2ff728 + 1275 0x9c000005ed716028 + + 1280 0x3e000005ed826d28 + 1281 0x0d000005ed670628 + 1282 0xa0000005ed7a5828 + 1283 0x56000005ed660f28 + 1285 0xbc000005ed925328 + + 1290 0xab000005ed6c5d28 + 1291 0xc1000005ed6d6028 + 1292 0x46000005ed6e5f28 + 1293 0x84000005ed6fa328 + 1295 0x68000005ed6b7228 + + 1300 0xe6000005ed5b2d28 + 1301 0x09000005ed6cc328 + 1302 0x1b000005ed648028 + 1303 0x1a000005ed56b528 + 1305 0x0c000005ed5bad28 + diff --git a/tools/generate_serial_table.pl b/tools/generate_serial_table.pl index ae6fbc8..a58dc44 100755 --- a/tools/generate_serial_table.pl +++ b/tools/generate_serial_table.pl @@ -30,7 +30,7 @@ foreach my $cur_line (@r) { my $c="trbcmd s $s[1] $s[2] 0x$o"; #print $c . "\n"; print qx($c); - $e{hex($s[2])} = " 0" . $sernr . hex($s[2]) . " $s[1]\n"; + $e{hex($s[2])} = " " . $sernr . hex($s[2]) . " $s[1]\n"; } diff --git a/users/gsi_ee_lab_kp1pc105/start_readout.pl b/users/gsi_ee_lab_kp1pc105/start_readout.pl index beb17d5..531994b 100755 --- a/users/gsi_ee_lab_kp1pc105/start_readout.pl +++ b/users/gsi_ee_lab_kp1pc105/start_readout.pl @@ -15,5 +15,5 @@ qx($c); $c=q|xterm -geometry 122x14-0+0 -e bash -c 'daq_evtbuild -m 1 -d file -o /tmp'|; system("$c &"); sleep 1; -$c="xterm -geometry 82x10-0+210 -e bash -c 'daq_netmem -m 1 -i UDP:127.0.0.1:50002'"; +$c="xterm -geometry 82x10-0+210 -e bash -c 'daq_netmem -m 1 -i UDP:127.0.0.1:50001'"; system("$c &"); diff --git a/web/htdocs/tools/pwr/pwr.conf b/web/htdocs/tools/pwr/pwr.conf index 61e7917..f139388 100644 --- a/web/htdocs/tools/pwr/pwr.conf +++ b/web/htdocs/tools/pwr/pwr.conf @@ -1,7 +1,5 @@ Content-type: text/html -Content-type: text/html - //PWRSPLY:/path/to/device:speed:Name:Type:Channels //type can be HMP, PSP, PST