From 1c6461f9a7e87a856df1dc0b5740f4fb4f01ded8 Mon Sep 17 00:00:00 2001 From: "hadaq@countinghouse" Date: Fri, 4 Jul 2014 17:27:16 +0200 Subject: [PATCH] Latest changes in settings for beamtime --- control/gui/daq/50_Reboot_TRB3 | 8 +- evtbuild/start_eb_gbe.pl | 97 +++- hub/register_configgbe_multiQueueOn.db | 31 +- hub/startup.script | 6 + main/data_sources_notrb3.db | 16 +- main/main_hades.script | 4 +- main/startup_briccolage.sh | 34 +- mdc/addresses_mdcaddon.db | 16 +- mdc/addresses_oep.db | 14 +- mdc/register/register_configuration.db | 2 + ...face_tdcreg0_P1sr18_P2sr13s3458_P34sr23.db | 4 + mdc/register_thresholds_current.db | 2 +- mdc/thresholds/register_thresholds_jul14.db | 432 ++++++++++++++++++ oracle/runinfo2ora.pl | 3 +- oracle/subevtids.txt | 27 +- pion/addresses_pion.db | 12 +- pion/config/nxyter/trb3_setup.sh | 110 +++-- pion/config/nxyter_wrapper.sh | 2 +- rich/peds/current | 2 +- rich/register_thresholds.db | 2 +- shower/configure_shower.script | 5 +- shower/generate.pl | 43 +- shower/showerpeds.dat | 2 +- start/ThreshNinoStart.db | 184 ++++---- start/ThreshPadiwaVeto.db | 159 +++---- start/configure_startveto.script | 2 +- start/startup.script | 8 +- 27 files changed, 860 insertions(+), 367 deletions(-) create mode 100644 mdc/thresholds/register_thresholds_jul14.db diff --git a/control/gui/daq/50_Reboot_TRB3 b/control/gui/daq/50_Reboot_TRB3 index 88d671e..5c67e75 100755 --- a/control/gui/daq/50_Reboot_TRB3 +++ b/control/gui/daq/50_Reboot_TRB3 @@ -1,10 +1,16 @@ #!/usr/bin/perl + use warnings; use HADES::TrbNet; + $ENV{'DAQOPSERVER'} = "hades31"; trb_init_ports() or die "could not reach trbnet-daemon.", trb_strerror(); + +#system("trbcmd i 0xffff"); +#exit; + system("trbcmd reload 0x8880"); system("trbcmd reload 0x8890"); system("trbcmd reload 0x8900"); system("trbcmd reload 0x8910"); - \ No newline at end of file + diff --git a/evtbuild/start_eb_gbe.pl b/evtbuild/start_eb_gbe.pl index 0d45fe8..7c8b787 100755 --- a/evtbuild/start_eb_gbe.pl +++ b/evtbuild/start_eb_gbe.pl @@ -156,8 +156,24 @@ sub init_CPU_status() #JAM adjust this to actual affinities for eth0 settings TODO # eth0 interrupts are above core 8 now - foreach my $core (0..11){ - if(($core < 2) || ($core> 8 ) ){ +# +# +# foreach my $core (0..11){ +# if(($core < 2) || ($core> 8 ) ){ +# $EB_CPU_status_href->{'192.168.100.12'}->{$core} = "res"; #reserved +# $EB_CPU_status_href->{'192.168.100.13'}->{$core} = "res"; #reserved +# $EB_CPU_status_href->{'192.168.100.14'}->{$core} = "res"; #reserved +# } +# else{ +# $EB_CPU_status_href->{'192.168.100.12'}->{$core} = "free"; +# $EB_CPU_status_href->{'192.168.100.13'}->{$core} = "free"; +# $EB_CPU_status_href->{'192.168.100.14'}->{$core} = "free"; +# } +# } +# +## after upgrade to debian 7: ethernet reserved cores are below 6 + foreach my $core (0..11){ + if(($core < 6) ){ $EB_CPU_status_href->{'192.168.100.12'}->{$core} = "res"; #reserved $EB_CPU_status_href->{'192.168.100.13'}->{$core} = "res"; #reserved $EB_CPU_status_href->{'192.168.100.14'}->{$core} = "res"; #reserved @@ -168,7 +184,7 @@ sub init_CPU_status() $EB_CPU_status_href->{'192.168.100.14'}->{$core} = "free"; } } - + # eth0 ir is set above core 11 foreach my $core (0..23){ if( ($core < 2) ||( $core > 11) ){ @@ -308,12 +324,15 @@ sub getEBArgs() my @epics_list = split(/\s+/, $epics_ctrl); - #- Logging the output of EBs + #- Logging the output of EBs my $eb_log = $temp_args_href->{'Parallel'}->{'EB_LOG'}; + my $eb_debug = $temp_args_href->{'Parallel'}->{'EB_DEBUG'}; my $nm_log = $temp_args_href->{'Parallel'}->{'NM_LOG'}; my @eblog_list = split(/\s+/, $eb_log); + my @ebdbg_list = split(/\s+/, $eb_debug); my @nmlog_list = split(/\s+/, $nm_log); + #- Write to disk my $write2disk = $temp_args_href->{'Parallel'}->{'WRITE_TO_DISK'}; my @write2disk_list = split(/\s+/, $write2disk); @@ -413,10 +432,13 @@ sub getEBArgs() $href->{$ebproc}->{'DABC'} = $dabc_list[$ebproc]; # 0|1 + $href->{$ebproc}->{'EB_DEBUG'} = $ebdbg_list[$ebproc]; # 0|1 $href->{$ebproc}->{'EB_LOG'} = $eblog_list[$ebproc]; # 0|1 $href->{$ebproc}->{'NM_LOG'} = $nmlog_list[$ebproc]; # 0|1 + + if( $write2disk_list[$ebproc] && lc($opt_disk) eq 'undef' ){ if(&isVarDefined($temp_args_href->{$procname}->{'OUTDIR'}, "OUTDIR for $procname")){ $href->{$ebproc}->{'OUTDIR'} = $temp_args_href->{$procname}->{'OUTDIR'}; @@ -524,36 +546,47 @@ sub startEvtBuilders() #- add output type - if($EB_Args_href->{$ebproc}->{'OUTDIR'} ){ - $exports = $exports . " export FILEOUTPUTS=2;"; + if($EB_Args_href->{$ebproc}->{'OUTDIR'} ){ if($EB_Args_href->{$ebproc}->{'MULTIDISK'}){ $exports = $exports . "export DAQDISK=1; export OUTDIR=/data01; "; } else{ $exports = $exports . "export DAQDISK=0; export OUTDIR=" . $EB_Args_href->{$ebproc}->{'OUTDIR'} .";"; } - } - else{ - $exports = $exports . " export FILEOUTPUTS=1;"; - # no output except for the stream server... - } - -# additional exports for RFIO + if( $EB_Args_href->{$ebproc}->{'RFIO'} ){ + + $exports = $exports . " export FILEOUTPUTS=3;"; + # additional exports for RFIO - $exports = $exports . " export RFIOPATH=". $EB_Args_href->{$ebproc}->{'RFIO_PATH'} . ";"; + $exports = $exports . " export RFIOPATH=". $EB_Args_href->{$ebproc}->{'RFIO_PATH'} . ";"; $exports = $exports . " export RFIOLUSTREPATH=". $EB_Args_href->{$ebproc}->{'RFIO_pcCopyPath'} . ";"; $exports = $exports . " export RFIOCOPYMODE=". $EB_Args_href->{$ebproc}->{'RFIO_iCopyMode'} . ";"; $exports = $exports . " export RFIOCOPYFRAC=". $EB_Args_href->{$ebproc}->{'RFIO_iCopyFrac'} . ";"; $exports = $exports . " export RFIOMAXFILE=". $EB_Args_href->{$ebproc}->{'RFIO_iMaxFile'} . ";"; $exports = $exports . " export RFIOPATHCONV=". $EB_Args_href->{$ebproc}->{'RFIO_iPathConv'} . ";"; - - -if( $EB_Args_href->{$ebproc}->{'RFIO'} ){ - $exports = $exports . " export FILEOUTPUTS=3;"; # switch on by number of outputs -} + } + else + { + # no rfio, just local file + $exports = $exports . " export FILEOUTPUTS=2;"; + } + + + + + } #outdir + else{ + $exports = $exports . " export FILEOUTPUTS=1;"; + # no output except for the stream server... + } + + + + + # my $rfio; @@ -661,6 +694,11 @@ else #- add epics controlled $cmd_eb = $cmd_eb . " --epicsctrl " if( $EB_Args_href->{$ebproc}->{'EPICS_CTRL'} ); + # switch on debug output + $cmd_eb = $cmd_eb . " --debug trignr --debug errbit --debug word " if( $EB_Args_href->{$ebproc}->{'EB_DEBUG'} ); + + + #- logging the output my $eblog_file = "/tmp/log_eb_" . $EB_Args_href->{$ebproc}->{'EBNUM'} . ".txt"; my $eb_log = "1>$eblog_file 2>$eblog_file"; @@ -820,15 +858,23 @@ sub writeIOC_stcmd() { my ($ioc_dir) = @_; + # JAM first evaluate ports for ca list + my $epicscalist = "192.168.103.255"; + foreach my $ebproc (keys %$EB_Args_href){ + $epicscalist=sprintf("%s 192.168.103.255:%d", $epicscalist, 10001 + $ebproc); + } + print "Copying st.cmd files to servers...\n" if($opt_verb); my $smallest_ebproc = &smallestEBProcNum(); - + foreach my $ebproc (keys %$EB_Args_href){ my $ebNr = 1 + $ebproc; my $ebnum = sprintf("eb%02d", $ebNr); - + my $serverport = 10001+ $ebproc; + + #- in MBytes my $maxFileSize = $EB_Args_href->{$ebproc}->{'FILESIZE'}; @@ -858,7 +904,9 @@ epicsEnvSet(EBTYPE,"$ebtype") epicsEnvSet(EBNUM,"$ebNr") epicsEnvSet(ERRBITLOG, "1") epicsEnvSet(ERRBITWAIT, "30") -epicsEnvSet(EPICS_CA_ADDR_LIST,"192.168.103.255") +epicsEnvSet(EPICS_CAS_SERVER_PORT,"$serverport") +## epicsEnvSet(EPICS_CA_ADDR_LIST,"192.168.103.255") +epicsEnvSet(EPICS_CA_ADDR_LIST,"$epicscalist") epicsEnvSet(EPICS_CA_AUTO_ADDR_LIST,"NO") epicsEnvSet(PATH,"/home/scs/base-3-14-11/bin/linux-x86_64:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:.") @@ -879,7 +927,8 @@ dbLoadRecords("db/trignr2.db","eb=$ebnum") dbLoadRecords("db/portnr1.db","eb=$ebnum") dbLoadRecords("db/portnr2.db","eb=$ebnum") dbLoadRecords("db/trigtype.db","eb=$ebnum") -dbLoadRecords("db/cpu.db","eb=$ebnum") +## JAM disable cpu module to test epicshangup issue: +## dbLoadRecords("db/cpu.db","eb=$ebnum") dbLoadRecords("db/errbitstat.db","eb=$ebnum") $comment_totalevt dbLoadRecords("db/totalevtstat.db") $comment_genrunid dbLoadRecords("db/genrunid.db","eb=$ebnum") @@ -891,7 +940,7 @@ var genrunidDebug 0 var writerunidDebug 0 var errbit1Debug 0 var errbit2Debug 0 -var trigtypeDebug 0 +var trigtypeDebug 1 var cpuDebug 0 var errbitstatDebug 0 $comment_totalevt var totalevtscompDebug 0 diff --git a/hub/register_configgbe_multiQueueOn.db b/hub/register_configgbe_multiQueueOn.db index 1506d7b..3ea8bbb 100644 --- a/hub/register_configgbe_multiQueueOn.db +++ b/hub/register_configgbe_multiQueueOn.db @@ -60,8 +60,9 @@ # Hub # Type # C1 # C2 # C3 # C4 # C6 # C8 # C9 # C9 # ######################################################################################################################### 0xff7f 0 0x00020001 0x00030062 0xea60 0x578 0 0xffffff 0x7 0x0 - - + + + # SubEvtId UseGbE MultiQueue # Hub # Type # C0 # C5 # C7 # ########################################################## @@ -81,19 +82,19 @@ 0x8890 1 0x8890 1 1 0x8900 1 0x8900 1 1 0x8910 1 0x8910 1 1 - 0x1000 1 0x1000 1 1 - 0x1010 1 0x1010 1 1 - 0x1020 1 0x1020 1 1 - 0x1030 1 0x1030 1 1 - 0x1040 1 0x1040 1 1 - 0x1050 1 0x1050 1 1 - 0x1100 1 0x1100 1 1 - 0x1110 1 0x1110 1 1 - 0x1120 1 0x1120 1 1 - 0x1130 1 0x1130 1 1 - 0x1140 1 0x1140 1 1 - 0x1150 1 0x1150 1 1 - 0x1160 1 0x1160 1 1 + 0x1000 1 0x1000 1 0 + 0x1010 1 0x1010 1 0 + 0x1020 1 0x1020 1 0 + 0x1030 1 0x1030 1 0 + 0x1040 1 0x1040 1 0 + 0x1050 1 0x1050 1 0 + 0x1100 1 0x1100 1 0 + 0x1110 1 0x1110 1 0 + 0x1120 1 0x1120 1 0 + 0x1130 1 0x1130 1 0 + 0x1140 1 0x1140 1 0 + 0x1150 1 0x1150 1 0 + 0x1160 1 0x1160 1 0 0x3200 1 0x3200 1 0 0x3210 1 0x3210 1 0 0x3220 1 0x3220 1 0 diff --git a/hub/startup.script b/hub/startup.script index f6a98a4..3f4bc13 100644 --- a/hub/startup.script +++ b/hub/startup.script @@ -39,6 +39,12 @@ wait trbcmd w 0xfc00 0xc5 0xffff trbcmd w 0x8000 0xc5 0x5000 trbcmd w 0x8001 0xc5 0x5000 + +# Set the maximum subevents in the queue for TRB3s + trbcmd w 0x8900 0x830e 0x10 + trbcmd w 0x8910 0x830e 0x10 + trbcmd w 0x8880 0x830e 0x10 + trbcmd w 0x8890 0x830e 0x10 #Load hub level setting for time-out for each hub in the system trbcmd loadbit 0xfe11 0xc5 0xffff0000 0x80300000 #with new hub (with auto-switch-off) diff --git a/main/data_sources_notrb3.db b/main/data_sources_notrb3.db index 547ee40..2566a02 100644 --- a/main/data_sources_notrb3.db +++ b/main/data_sources_notrb3.db @@ -25,15 +25,15 @@ 0x1040 1 MDC12sec5 high 0x1050 1 MDC12sec6 high 0x1100 1 MDC34sec1 high -0x1110 0 MDC34sec2 mid +0x1110 1 MDC34sec2 mid 0x1120 1 MDC34sec3 high 0x1130 1 MDC34sec4 mid 0x1140 1 MDC34sec5 high 0x1150 1 MDC34sec6 high -0x1160 1 MDCspecial mid #off -0x3200 0 Shower1 mid -0x3210 0 Shower2 mid -0x3220 0 Shower3 mid -0x3230 0 Shower4 mid -0x3240 0 Shower5 mid -0x3250 0 Shower6 mid +0x1160 0 MDCspecial mid #off +0x3200 1 Shower1 mid +0x3210 1 Shower2 mid +0x3220 1 Shower3 mid +0x3230 1 Shower4 mid +0x3240 1 Shower5 mid +0x3250 1 Shower6 mid diff --git a/main/main_hades.script b/main/main_hades.script index ead3f23..b93f331 100644 --- a/main/main_hades.script +++ b/main/main_hades.script @@ -71,7 +71,9 @@ read_addrange_db ../main/address_range.db # Program 2nd AddOn FPGA exec_cmd{local} echo "Programming FPGA2" - exec_cmd{hub} jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga2_single_20111121.stp #experimental + + exec_cmd{hub} jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga2_single_20120221.stp # multievent test + # exec_cmd{hub} jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga2_single_20111121.stp # proper one # exec_cmd{hubcentral} jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20110523.stp # leave this hub with old exec_cmd{hubcts} jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20111121.stp #experimental # exec_cmd{cts} jam_trbv2 --addononly -aFP /home/hadaq/cts/20120321_cts_fpga2_only_etrax_a.stp diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh index 0a66809..ce51ea6 100755 --- a/main/startup_briccolage.sh +++ b/main/startup_briccolage.sh @@ -6,7 +6,7 @@ notifyall.sh "DAQ" " DAQ is going to be restarted." "STARTUP" & echo " Killing log-scripts" ssh hades33 "cd /home/hadaq/trbsoft/hadesdaq/hmon; ./stop.sh" & ssh hades33 "killall -USR1 speakdaemon.pl" & - killall mdc_calibration_masks.pl; + ssh hades33 "killall mdc_calibration_masks.pl" & #Stop Eventbuilder @@ -54,7 +54,8 @@ notifyall.sh "DAQ" " DAQ is going to be restarted." "STARTUP" & #2014-04-16 frquent reinits switchport.pl 0x1151 8 off #2257 - +#2014-06-11 link not working +# switchport.pl 0x1134 5 off #2233 #Retransmission on as early as possible trbcmd setbit 0xfffd 0x22 0x08000000 #enable retransmission on oep trbcmd setbit 0xfe11 0x22 0x08000000 #enable retransmission on mdchub @@ -62,17 +63,23 @@ switchport.pl 0x1151 8 off #2257 #Main Start-up echo " Running Startup script" -# time ./startup.pl -f main_hades.script -eb off -o file \ -# -m TOF -m RPC -m WALL -m RICH -m SHOWER \ -# -m STARTCTS -m NORESET -m CONFIGONLY -m MON_CTS \ -# -m MDC -m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv - - -#startup for MDC-tests time ./startup.pl -f main_hades.script -eb off -o file \ - -m TOF -m RPC -m WALL -m RICH -m NOSHOWER \ + -m TOF -m RPC -m WALL -m RICH -m SHOWER \ -m STARTCTS -m NORESET -m CONFIGONLY -m MON_CTS \ -m MDC -m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv +# -m NOMDC + + +#Switch off one DBO due to ringing +trbcmd w 0x222a 0xa039 0x00 +trbcmd w 0x222a 0xa03d 0x00 + + +#startup for MDC-tests +# time ./startup.pl -f main_hades.script -eb off -o file \ +# -m TOF -m RPC -m WALL -m RICH -m SHOWER \ +# -m STARTCTS -m NORESET -m CONFIGONLY -m MON_CTS \ +## -m MDC -m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv # -m NOMDC @@ -88,9 +95,10 @@ switchport.pl 0x1151 8 off #2257 trbcmd w 0x0003 0xa0f3 0xff1 # turn off multi event queue, as these garble the data from the TRB2s -stoptrigger.sh; trbcmd w 0xff7f 0x8307 0 ; starttrigger.sh +#stoptrigger.sh; trbcmd w 0xff7f 0x8307 0 ; starttrigger.sh - +#trbcmd w 0x8890 0x830d 0xea60 + #/home/hadaq/trbsoft/hadesdaq/utils/move_doublecpu_irq.sh &>/dev/null & /home/hadaq/trbsoft/hadesdaq/utils/move_doublecpu_irq.sh & @@ -105,7 +113,7 @@ scp /home/hadaq/oper/daq2ora/daq2ora_current.txt hades33:/home/hadaq/trbsoft/had echo " Restart Monitoring" # /home/hadaq/jan/crashlog.pl #Log timeouts after restart nohup ssh hades33 "cd /home/hadaq/trbsoft/hadesdaq/hmon; ./start.sh &" /dev/null & - nohup /home/hadaq/trbsoft/hadesdaq/utils/mdc_calibration_masks.pl &>/dev/null & + nohup ssh hades33 "/home/hadaq/trbsoft/daq/utils/mdc_calibration_masks.pl" &>/dev/null & nohup ssh hades33 "sleep 20; killall -USR2 speakdaemon.pl" &>/dev/null & echo " Everything done. Closing window automatically after 10 seconds." sleep 10; diff --git a/mdc/addresses_mdcaddon.db b/mdc/addresses_mdcaddon.db index 5180943..89bc32c 100644 --- a/mdc/addresses_mdcaddon.db +++ b/mdc/addresses_mdcaddon.db @@ -62,9 +62,15 @@ 0x1054 017 3 19 0 0x1050 017 5 20 0 - 0x1161 006 0 19 0 - 0x1162 006 1 19 0 - 0x1163 006 2 19 0 - 0x1164 006 3 19 0 - 0x1160 006 5 20 0 +# 0x1161 006 0 19 0 +# 0x1162 006 1 19 0 +# 0x1163 006 2 19 0 +# 0x1164 006 3 19 0 +# 0x1160 006 5 20 0 + + 0x1161 002 0 19 0 + 0x1162 002 1 19 0 + 0x1163 002 2 19 0 + 0x1164 002 3 19 0 + 0x1160 002 5 20 0 diff --git a/mdc/addresses_oep.db b/mdc/addresses_oep.db index a149629..8732507 100644 --- a/mdc/addresses_oep.db +++ b/mdc/addresses_oep.db @@ -17,6 +17,7 @@ 0x200d 463 1 12 0 #Chamber 7 + #0x2000 408 1 12 0 #0x2001 485 1 12 0 #0x2002 484 1 12 0 @@ -235,6 +236,7 @@ 0x220f 355 1 12 0 ################################################### # M2S1 until Feb 8, 2012 (moved to M2S3) +0x2210 013 1 12 0 #0x2210 394 1 12 0 #0x2211 282 1 12 0 ## exchange 1 and 8 (201010) #0x2212 288 1 12 0 @@ -306,6 +308,8 @@ ################################################### # M2S3 until Feb 8, 2012 (moved to M2S1) +#MDC test oep in rich tent oep number 013 +0x2230 013 1 12 0 #0x2230 021 1 12 0 #0x2231 089 1 12 0 #0x2232 096 1 12 0 @@ -412,8 +416,9 @@ #0x231e 466 1 12 0 #0x231f 464 1 12 0 #### M3S1 from Feb 8,2012 -0x2310 071 1 12 0 -0x2311 104 1 12 0 +#0x2310 013 1 12 0 ## for MBO Test setup 14.5.2014 CW +0x2310 071 1 12 0 ## original +0x2311 104 1 12 0 0x2312 101 1 12 0 0x2313 067 1 12 0 0x2314 140 1 12 0 @@ -426,7 +431,8 @@ 0x231b 047 1 12 0 0x231c 080 1 12 0 0x231d 076 1 12 0 -0x231e 081 1 12 0 +0x231e 081 1 12 0 ## original +#0x231e 013 1 12 0 ## for MBO Test setup 14.5.2014 CW 0x231f 065 1 12 0 ################################################### 0x2320 320 1 12 0 @@ -517,5 +523,7 @@ ################################################### +### testsystem +#0x2444 013 1 12 0 diff --git a/mdc/register/register_configuration.db b/mdc/register/register_configuration.db index 43bb04e..cabb341 100644 --- a/mdc/register/register_configuration.db +++ b/mdc/register/register_configuration.db @@ -414,3 +414,5 @@ 0x235d 1 0x00000020 0x235e 1 0x00000020 0x235f 1 0x00000010 + +0x2444 1 0x00000010 diff --git a/mdc/register/register_interface_tdcreg0_P1sr18_P2sr13s3458_P34sr23.db b/mdc/register/register_interface_tdcreg0_P1sr18_P2sr13s3458_P34sr23.db index fdf2831..5b054d2 100644 --- a/mdc/register/register_interface_tdcreg0_P1sr18_P2sr13s3458_P34sr23.db +++ b/mdc/register/register_interface_tdcreg0_P1sr18_P2sr13s3458_P34sr23.db @@ -416,3 +416,7 @@ 0x235d 2 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x235e 2 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x235f 1 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 + + +#0x2444 2 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 +0x2444 1 0x17 0x17 0x17 0x17 0x17 0x17 0x17 0x17 diff --git a/mdc/register_thresholds_current.db b/mdc/register_thresholds_current.db index 370b843..36e0177 120000 --- a/mdc/register_thresholds_current.db +++ b/mdc/register_thresholds_current.db @@ -1 +1 @@ -thresholds/register_thresholds_20120405_181232.db \ No newline at end of file +thresholds/register_thresholds_jul14.db \ No newline at end of file diff --git a/mdc/thresholds/register_thresholds_jul14.db b/mdc/thresholds/register_thresholds_jul14.db new file mode 100644 index 0000000..d8d314d --- /dev/null +++ b/mdc/thresholds/register_thresholds_jul14.db @@ -0,0 +1,432 @@ +# Standard Thresholds (8bit each) for OEP +# Unused thresholds are empty +# Type 0 boards: Write thresholds to register 0xa049 0xa04b 0xa04d 0xa04f +# Type 1 boards: Write thresholds to register 0xa0cd 0xa0cf 0xa0d1 0xa0d3 0xa0d5 0xa0d7 +# I'm using the 0x prefix to make replacing settings automatically easier + + +!Register table +# Type # C0 # C1 # C2 # C3 # C4 # C5 +################################################################ + 1 0xa049 0xa04b 0xa04d 0xa04f + 2 0xa0cd 0xa0cf 0xa0d1 0xa0d3 0xa0d5 0xa0d7 + + +!Version table +1070 + + +!Value table +#Plane 1 +#OEP # Type # T0 # T1 # T2 # T3 # T4 # T5 +######################################################################## +0x2000 1 0x50 0x50 0x50 0x50 +0x2001 2 0x50 0x50 0x50 0x50 0x5c 0x50 +0x2002 2 0x5e 0x50 0x60 0x58 0x5c 0x50 +0x2003 1 0x56 0x54 0x50 0x50 +0x2004 1 0x50 0x50 0x50 0x50 +0x2005 1 0x50 0x50 0x50 0x50 +0x2006 2 0x56 0x50 0x50 0x50 0x50 0x5a +0x2007 2 0x60 0x50 0x58 0x52 0x5a 0x50 +0x2008 1 0x50 0x50 0x50 0x50 +0x2009 1 0x50 0x50 0x54 0x50 +0x200a 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x200b 1 0x58 0x50 0x50 0x50 +0x200c 2 0x50 0x54 0x50 0x50 0x50 0x50 +0x200d 1 0x50 0x50 0x58 0x52 +######################################################################## +0x2010 1 0x50 0x50 0x50 0x50 +0x2011 2 0x50 0x50 0x50 0x50 0x50 0x52 +0x2012 2 0x5a 0x50 0x50 0x50 0x60 0x5e +0x2013 1 0x50 0x50 0x50 0x50 +0x2014 1 0x50 0x50 0x50 0x50 +0x2015 1 0x50 0x50 0x50 0x50 +0x2016 2 0x50 0x50 0x50 0x52 0x50 0x50 +0x2017 2 0x5c 0x50 0x50 0x50 0x50 0x50 +0x2018 1 0x54 0x50 0x50 0x50 +0x2019 1 0x50 0x50 0x50 0x50 +0x201a 2 0x54 0x50 0x50 0x50 0x56 0x52 +0x201b 1 0x50 0x50 0x50 0x50 +0x201c 2 0x50 0x50 0x5c 0x50 0x50 0x50 +0x201d 1 0x50 0x50 0x50 0x50 +######################################################################## +0x2020 1 0x50 0x50 0x54 0x50 +0x2021 2 0x50 0x50 0x50 0x50 0x52 0x50 +0x2022 2 0x60 0x50 0x5e 0x5e 0x5e 0x52 +0x2023 1 0x50 0x50 0x50 0x50 +0x2024 1 0x5a 0x58 0x5e 0x58 +0x2025 1 0x52 0x50 0x50 0x50 +0x2026 2 0x68 0x50 0x56 0x50 0x50 0x50 +0x2027 2 0x60 0x50 0x50 0x50 0x50 0x50 +0x2028 1 0x50 0x50 0x50 0x50 +0x2029 1 0x50 0x50 0x50 0x50 +0x202a 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x202b 1 0x50 0x50 0x50 0x50 +0x202c 2 0x50 0x38 0x60 0x54 0x50 0x50 +0x202d 1 0x5a 0x50 0x50 0x50 +######################################################################## +0x2030 1 0x54 0x50 0x52 0x50 +0x2031 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x2032 2 0x50 0x50 0x50 0x50 0x54 0x50 +0x2033 1 0x50 0x50 0x50 0x50 +0x2034 1 0x50 0x50 0x50 0x50 +0x2035 1 0x54 0x50 0x50 0x50 +0x2036 2 0x54 0x50 0x50 0x50 0x50 0x50 +0x2037 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x2038 1 0x50 0x50 0x54 0x50 +0x2039 1 0x50 0x50 0x50 0x50 +0x203a 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x203b 1 0x5e 0x5e 0x50 0x50 +0x203c 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x203d 1 0x50 0x50 0x50 0x50 +######################################################################## +0x2040 1 0x50 0x50 0x50 0x50 +0x2041 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x2042 2 0x50 0x50 0x50 0x50 0x54 0x50 +0x2043 1 0x40 0x40 0x40 0x40 +0x2044 1 0x50 0x50 0x50 0x50 +0x2045 1 0x50 0x50 0x50 0x50 +0x2046 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x2047 2 0x50 0x50 0x54 0x50 0x50 0x52 +0x2048 1 0x30 0x30 0x30 0x30 +0x2049 1 0x50 0x40 0x50 0x50 +0x204a 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x204b 1 0x50 0x50 0x50 0x50 +0x204c 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x204d 1 0x50 0x50 0x50 0x50 +######################################################################## +0x2050 1 0x50 0x50 0x50 0x50 +0x2051 2 0x50 0x50 0x54 0x50 0x50 0x50 +0x2052 2 0x50 0x50 0x54 0x54 0x52 0x50 +0x2053 1 0x50 0x50 0x40 0x50 +0x2054 1 0x40 0x50 0x40 0x50 +0x2055 1 0x50 0x5e 0x50 0x50 +0x2056 2 0x50 0x50 0x50 0x5a 0x50 0x60 +0x2057 2 0x60 0x50 0x60 0x50 0x54 0x50 +0x2058 1 0x50 0x40 0x50 0x50 +0x2059 1 0x50 0x50 0x50 0x50 +0x205a 2 0x50 0x50 0x50 0x54 0x50 0x50 +0x205b 1 0x50 0x50 0x50 0x50 +0x205c 2 0x50 0x24 0x3d 0x50 0x50 0x50 +0x205d 1 0x54 0x50 0x50 0x50 + +#Plane 2 +#OEP # Type # T0 # T1 # T2 # T3 # T4 # T5 +######################################################################## +0x2100 1 0x54 0x50 0x50 0x50 +0x2101 1 0x58 0x60 0x50 0x50 +0x2102 1 0x50 0x50 0x50 0x50 +0x2103 1 0x50 0x50 0x50 0x50 +0x2104 1 0x50 0x50 0x50 0x50 +0x2105 1 0x50 0x50 0x52 0x50 +0x2106 1 0x56 0x50 0x50 0x50 +0x2107 1 0x54 0x50 0x50 0x58 +0x2108 1 0x50 0x50 0x50 0x50 +0x2109 1 0x50 0x50 0x50 0x50 +0x210a 1 0x52 0x50 0x50 0x50 +0x210b 1 0x50 0x50 0x50 0x50 +0x210c 1 0x52 0x54 0x50 0x50 +0x210d 1 0x50 0x58 0x50 0x60 +0x210e 2 0x54 0x50 0x60 0x52 0x50 0x58 +0x210f 2 0x50 0x50 0x5a 0x60 0x56 0x5e +######################################################################## +0x2110 1 0x54 0x50 0x50 0x50 +0x2111 1 0x50 0x50 0x50 0x50 +0x2112 1 0x50 0x50 0x50 0x50 +0x2113 1 0x50 0x50 0x50 0x50 +0x2114 1 0x50 0x50 0x50 0x50 +0x2115 1 0x50 0x50 0x50 0x50 +0x2116 1 0x50 0x50 0x50 0x50 +0x2117 1 0x52 0x58 0x56 0x5a +0x2118 1 0x50 0x50 0x50 0x50 +0x2119 1 0x50 0x50 0x50 0x5a +0x211a 1 0x50 0x50 0x50 0x50 +0x211b 1 0x50 0x5c 0x50 0x50 +0x211c 1 0x60 0x50 0x50 0x50 +0x211d 1 0x50 0x50 0x50 0x52 +0x211e 2 0x60 0x50 0x60 0x50 0x50 0x50 +0x211f 2 0x50 0x50 0x5a 0x50 0x50 0x52 +######################################################################## +0x2120 1 0x50 0x50 0x50 0x50 +0x2121 1 0x50 0x5a 0x5a 0x50 +0x2122 1 0x50 0x50 0x50 0x50 +0x2123 1 0x50 0x54 0x50 0x50 +0x2124 1 0x54 0x50 0x50 0x50 +0x2125 1 0x50 0x50 0x50 0x50 +0x2126 1 0x60 0x50 0x50 0x50 +0x2127 1 0x52 0x58 0x50 0x50 +0x2128 1 0x50 0x50 0x50 0x50 +0x2129 1 0x50 0x50 0x50 0x50 +0x212a 1 0x50 0x50 0x50 0x50 +0x212b 1 0x50 0x50 0x50 0x50 +0x212c 1 0x60 0x50 0x50 0x50 +0x212d 1 0x50 0x50 0x50 0x50 +0x212e 2 0x5c 0x50 0x60 0x50 0x50 0x50 +0x212f 2 0x50 0x50 0x50 0x50 0x54 0x50 +######################################################################## +0x2130 1 0x50 0x50 0x5e 0x50 +0x2131 1 0x50 0x5c 0x50 0x50 +0x2132 1 0x50 0x50 0x50 0x50 +0x2133 1 0x50 0x50 0x50 0x50 +0x2134 1 0x50 0x50 0x50 0x50 +0x2135 1 0x5a 0x52 0x50 0x60 +0x2136 1 0x54 0x58 0x80 0x50 +0x2137 1 0x50 0x54 0x50 0x50 +0x2138 1 0x50 0x50 0x50 0x50 +0x2139 1 0x50 0x50 0x50 0x50 +0x213a 1 0x5a 0x50 0x5a 0x50 +0x213b 1 0x60 0x54 0x54 0x50 +0x213c 1 0x50 0x50 0x52 0x50 +0x213d 1 0x50 0x50 0x50 0x60 +0x213e 2 0x54 0x50 0x60 0x50 0x50 0x50 +0x213f 2 0x50 0x50 0x50 0x5e 0x50 0x50 +######################################################################## +0x2140 1 0x5a 0x5b 0x54 0x50 +0x2141 1 0x5c 0x60 0x70 0x58 +0x2142 1 0x60 0x50 0x5a 0x60 +0x2143 1 0x50 0x52 0x50 0x50 +0x2144 1 0x58 0x5a 0x50 0x50 +0x2145 1 0x50 0x50 0x5a 0x50 +0x2146 1 0x54 0x58 0x50 0x50 +0x2147 1 0x58 0x60 0x60 0x5e +0x2148 1 0x50 0x50 0x50 0x50 +0x2149 1 0x58 0x50 0x50 0x50 +0x214a 1 0x60 0x50 0x52 0x54 +0x214b 1 0x50 0x50 0x52 0x50 +0x214c 1 0x50 0x50 0x50 0x50 +0x214d 1 0x50 0x50 0x50 0x54 +0x214e 2 0x78 0x50 0x5a 0x50 0x50 0x50 +0x214f 2 0x50 0x50 0x50 0x50 0x50 0x5c +######################################################################## +0x2150 1 0x50 0x50 0x54 0x50 +0x2151 1 0x60 0x60 0x5a 0x5a +0x2152 1 0x50 0x50 0x50 0x50 +0x2153 1 0x50 0x50 0x50 0x50 +0x2154 1 0x50 0x50 0x50 0x50 +0x2155 1 0x50 0x50 0x5a 0x56 +0x2156 1 0x5e 0x50 0x5a 0x50 +0x2157 1 0x52 0x54 0x50 0x50 +0x2158 1 0x50 0x50 0x50 0x50 +0x2159 1 0x50 0x50 0x50 0x50 +0x215a 1 0x50 0x50 0x50 0x50 +0x215b 1 0x58 0x50 0x58 0x50 +0x215c 1 0x50 0x50 0x50 0x50 +0x215d 1 0x50 0x60 0x50 0x50 +0x215e 2 0x60 0x54 0x60 0x5a 0x50 0x60 +0x215f 2 0x50 0x50 0x5e 0x60 0x58 0x60 + +#Plane 3 +#OEP # Type # T0 # T1 # T2 # T3 # T4 # T5 +######################################################################## +0x2200 2 0x5a 0x50 0x60 0x60 0x58 0x5e +0x2201 1 0x58 0x58 0x54 0x58 +0x2202 1 0x60 0x60 0x60 0x60 +0x2203 1 0x60 0x5e 0x54 0x52 +0x2204 1 0x60 0x5e 0x5e 0x60 +0x2205 2 0x5e 0x60 0x5e 0x60 0x60 0x60 +0x2206 2 0x5e 0x52 0x5e 0x60 0x5c 0x60 +0x2207 1 0x60 0x56 0x60 0x5a +0x2208 1 0x60 0x5e 0x72 0x60 +0x2209 1 0x60 0x60 0x50 0x5e +0x220a 1 0x60 0x60 0x5a 0x5e +0x220b 2 0x60 0x5e 0x60 0x60 0x5e 0x5e +0x220c 1 0x50 0x54 0x5e 0x5a +0x220d 2 0x60 0x5e 0x60 0x5e 0x5a 0x54 +0x220e 2 0x54 0x50 0x5e 0x60 0x60 0x60 +0x220f 1 0x5e 0x5e 0x52 0x62 +######################################################################## +0x2210 2 0x50 0x50 0x50 0x50 0x50 0x50 +0x2211 1 0x5e 0x5a 0x60 0x60 +0x2212 1 0x5c 0x5a 0x60 0x5e +0x2213 1 0x5a 0x56 0x5c 0x60 +0x2214 1 0x5a 0x5a 0x54 0x5a +0x2215 2 0x52 0x50 0x60 0x60 0x5e 0x60 +0x2216 2 0x60 0x50 0x60 0x60 0x5a 0x60 +0x2217 1 0x70 0x60 0x70 0x64 +0x2218 1 0x54 0x50 0x60 0x60 +0x2219 1 0x5c 0x60 0x60 0x60 +0x221a 1 0x5e 0x5a 0x5a 0x5a +0x221b 2 0x60 0x5e 0x72 0x62 0x60 0x60 +0x221c 1 0x50 0x5a 0x50 0x50 +0x221d 2 0x50 0x50 0x5e 0x58 0x5c 0x60 +0x221e 2 0x50 0x54 0x5e 0x60 0x60 0x60 +0x221f 1 0x5a 0x54 0x50 0x50 +######################################################################## +0x2220 2 0x5a 0x5e 0x5e 0x58 0x50 0x5a +0x2221 1 0x60 0x60 0x60 0x5a +0x2222 1 0x60 0x5e 0x5e 0x60 +0x2223 1 0x5a 0x60 0x5c 0x5c +0x2224 1 0x5e 0x60 0x60 0x60 +0x2225 2 0x6e 0x60 0x60 0x5e 0x60 0x60 +0x2226 2 0x5a 0x5e 0x60 0x54 0x60 0x60 +0x2227 1 0x5a 0x5a 0x5e 0x60 +0x2228 1 0x60 0x60 0x60 0x5e +0x2229 1 0x60 0x60 0x60 0x60 +0x222a 1 0x55 0x60 0xff 0x60 +0x222b 2 0x60 0x60 0x7a 0x7a 0x60 0x7a +0x222c 1 0x50 0x60 0x60 0x5e +0x222d 2 0x52 0x5c 0x60 0x60 0x54 0x5a +0x222e 2 0x60 0x68 0x68 0x60 0x60 0x54 +0x222f 1 0x6c 0x6b 0x74 0x70 +######################################################################## +0x2230 2 0x50 0x50 0x50 0x60 0x50 0x5a +0x2231 1 0x50 0x52 0x50 0x54 +0x2232 1 0x5a 0x5a 0x5c 0x58 +0x2233 1 0x50 0x5a 0x60 0x5a +0x2234 1 0x5b 0x5a 0x5a 0x60 +0x2235 2 0x5e 0x50 0x5c 0x54 0x50 0x50 +0x2236 2 0x5c 0x50 0x50 0x50 0x50 0x50 +0x2237 1 0x50 0x50 0x52 0x50 +0x2238 1 0x54 0x50 0x5a 0x5a +0x2239 1 0x5e 0x60 0x50 0x50 +0x223a 1 0x60 0x5e 0x5e 0x54 +0x223b 2 0x58 0x50 0x5c 0x60 0x54 0x50 +0x223c 1 0x5e 0x5c 0x68 0x5a +0x223d 2 0x54 0x54 0x44 0x5e 0x52 0x52 +0x223e 2 0x5a 0x50 0x60 0x5e 0x60 0x60 +0x223f 1 0x5c 0x60 0x50 0x54 +######################################################################## +0x2240 2 0x50 0x50 0x5e 0x5e 0x50 0x5e +0x2241 1 0x5a 0x5e 0x5e 0x5c +0x2242 1 0x60 0x60 0x5e 0x5e +0x2243 1 0x5e 0x5e 0x60 0x60 +0x2244 1 0x5e 0x5c 0x5a 0x60 +0x2245 2 0x5a 0x60 0x60 0x60 0x60 0x60 +0x2246 2 0x50 0x50 0x52 0x60 0x60 0x60 +0x2247 1 0x60 0x60 0x60 0x5a +0x2248 1 0x60 0x54 0x54 0x5c +0x2249 1 0x60 0x5a 0x60 0x5e +0x224a 1 0x60 0x5e 0x54 0x50 +0x224b 2 0x50 0x50 0x5a 0x5a 0x50 0x52 +0x224c 1 0x60 0x60 0x60 0x50 +0x224d 2 0x60 0x60 0x5a 0x58 0x60 0x5e +0x224e 2 0x50 0x60 0x60 0x5e 0x5c 0x60 +0x224f 1 0x5a 0x50 0x50 0x5c +######################################################################## +0x2250 2 0x54 0x50 0x5c 0x50 0x50 0x50 +0x2251 1 0x60 0x60 0x68 0x60 +0x2252 1 0x60 0x58 0x60 0x60 +0x2253 1 0x62 0x62 0x60 0x5e +0x2254 1 0x5e 0x54 0x60 0x56 +0x2255 2 0x50 0x60 0x60 0x5a 0x60 0x60 +0x2256 2 0x50 0x50 0x5e 0x50 0x60 0x60 +0x2257 1 0x5e 0x5e 0x60 0x5c +0x2258 1 0x60 0x60 0x74 0x60 +0x2259 1 0x60 0x60 0x60 0x5e +0x225a 1 0x60 0x60 0x60 0x60 +0x225b 2 0x5e 0x5e 0x60 0x60 0x5c 0x60 +0x225c 1 0x5c 0x52 0x5a 0x50 +0x225d 2 0x60 0x5e 0x5c 0x60 0x60 0x60 +0x225e 2 0x54 0x5e 0x60 0x5e 0x60 0x60 +0x225f 1 0x60 0x5e 0x50 0x5a + +#Plane 4 +#OEP # Type # T0 # T1 # T2 # T3 # T4 # T5 +######################################################################## +0x2300 1 0x5c 0x62 0x60 0x60 +0x2301 1 0x60 0x60 0x6c 0x62 +0x2302 1 0x60 0x5c 0x60 0x60 +0x2303 2 0x5e 0x66 0x5e 0x60 0x60 0x60 +0x2304 2 0x60 0x60 0x60 0x60 0x60 0x58 +0x2305 1 0x72 0x5e 0x60 0x60 +0x2306 1 0x60 0x60 0x60 0x60 +0x2307 1 0x60 0x60 0x60 0x60 +0x2308 1 0x60 0x5e 0x60 0x60 +0x2309 2 0x60 0x60 0x60 0x60 0x60 0x60 +0x230a 2 0x72 0x6b 0x66 0x68 0x70 0x68 +0x230b 1 0x68 0x68 0x6e 0x64 +0x230c 1 0x5a 0x50 0x60 0x5a +0x230d 2 0x5e 0x60 0x60 0x60 0x52 0x54 +0x230e 2 0x60 0x5a 0x60 0x60 0x5e 0x5e +0x230f 1 0x68 0x5e 0x60 0x54 +######################################################################## +0x2310 1 0x6a 0x60 0x60 0x60 +# 0x2310 1 0x40 0x40 0x40 0x40 ## MDC test MBO, 14.5.2014 CW +0x2311 1 0x5c 0x5e 0x5c 0x60 +0x2312 1 0x5e 0x60 0x60 0x80 +0x2313 2 0x60 0x60 0x60 0x60 0x60 0x5e +0x2314 2 0x60 0x60 0x60 0x60 0x5a 0x60 +0x2315 1 0x60 0x60 0x5a 0x60 +0x2316 1 0x60 0x60 0x60 0x60 +0x2317 1 0x60 0x60 0x60 0x60 +0x2318 1 0x5e 0x5e 0x5e 0x5c +0x2319 2 0x60 0x60 0x60 0x60 0x5a 0x5e +0x231a 2 0x68 0x68 0x68 0x68 0x68 0x64 +0x231b 1 0x6a 0x68 0x7a 0x68 +0x231c 1 0x60 0x5e 0x60 0x5c +0x231d 2 0x60 0x5e 0x5e 0x5c 0x60 0x60 +0x231e 2 0x60 0x60 0x60 0x60 0x60 0x60 +## 0x231e 2 0x40 0x40 0x40 0x40 0x40 0x40 ## MDC test MBO, 14.5.2014 CW +0x231f 1 0x66 0x5e 0x5c 0x5a +######################################################################## +0x2320 1 0x80 0x60 0x60 0x5e +0x2321 1 0x60 0x60 0x60 0x60 +0x2322 1 0x60 0x5c 0x60 0x5c +0x2323 2 0x5e 0x60 0x60 0x60 0x60 0x60 +0x2324 2 0x60 0x60 0x60 0x5e 0x60 0x60 +0x2325 1 0x62 0x6a 0x60 0x60 +0x2326 1 0x60 0x60 0x60 0x60 +0x2327 1 0x60 0x60 0x60 0x5e +0x2328 1 0x5c 0x5e 0x60 0x60 +0x2329 2 0x60 0x60 0x5e 0x60 0x62 0x5e +0x232a 2 0x66 0x62 0x68 0x6a 0x5e 0x60 +0x232b 1 0x60 0x66 0x6e 0x66 +0x232c 1 0x60 0x5a 0x5c 0x5e +0x232d 2 0x5c 0x60 0x60 0x60 0x5c 0x5e +0x232e 2 0x60 0x60 0x60 0x5e 0x60 0x5c +0x232f 1 0x60 0x60 0x60 0x60 +######################################################################## +0x2330 1 0x60 0x56 0x60 0x5c +0x2331 1 0x60 0x60 0x60 0x60 +0x2332 1 0x60 0x5c 0x5e 0x56 +0x2333 2 0x60 0x5c 0x60 0x60 0x60 0x5c +0x2334 2 0x60 0x5e 0x60 0x60 0x60 0x5e +0x2335 1 0x60 0x60 0x60 0x60 +0x2336 1 0x60 0x54 0x60 0x5a +0x2337 1 0x60 0x60 0x5e 0x5b +0x2338 1 0x60 0x68 0x5c 0x58 +0x2339 2 0x60 0x60 0x5e 0x60 0x60 0x60 +0x233a 2 0x6a 0x60 0x66 0x60 0x60 0x60 +0x233b 1 0x6e 0x60 0x60 0x5e +0x233c 1 0x60 0x5b 0x60 0x60 +0x233d 2 0x60 0x60 0x60 0x60 0x60 0x54 +0x233e 2 0x60 0x60 0x60 0x60 0x60 0x60 +0x233f 1 0x60 0x60 0x60 0x60 +######################################################################## +0x2340 1 0x60 0x60 0x60 0x60 +0x2341 1 0x60 0x60 0x60 0x5c +0x2342 1 0x60 0x60 0x5e 0x5e +0x2343 2 0x60 0x60 0x60 0x60 0x60 0x60 +0x2344 2 0x60 0x60 0x60 0x60 0x60 0x60 +0x2345 1 0x60 0x60 0x60 0x60 +0x2346 1 0x60 0x60 0x60 0x58 +0x2347 1 0x60 0x60 0x60 0x5e +0x2348 1 0x60 0x5e 0x60 0x60 +0x2349 2 0x60 0x60 0x60 0x60 0x60 0x5e +0x234a 2 0x68 0x60 0x60 0x60 0x5e 0x5e +0x234b 1 0x60 0x60 0x6a 0x62 +0x234c 1 0x60 0x60 0x60 0x56 +0x234d 2 0x60 0x60 0x60 0x60 0x60 0x5e +0x234e 2 0x60 0x60 0x60 0x60 0x60 0x5a +0x234f 1 0x58 0x54 0x52 0x50 +######################################################################## +0x2350 1 0x60 0x5e 0x60 0x5e +0x2351 1 0x60 0x60 0x60 0x60 +0x2352 1 0x60 0x60 0x5e 0x5e +0x2353 2 0x6a 0x62 0x60 0x60 0x60 0x60 +0x2354 2 0x68 0x68 0x76 0x6e 0x68 0x68 +0x2355 1 0x80 0x80 0x60 0x68 +0x2356 1 0x54 0x5c 0x5e 0x58 +0x2357 1 0x60 0x60 0x5a 0x60 +0x2358 1 0x60 0x5c 0x60 0x5a +0x2359 2 0x60 0x5c 0x60 0x60 0x60 0x5e +0x235a 2 0x80 0x6c 0x76 0x68 0x6e 0x68 +0x235b 1 0x70 0x76 0x7a 0x78 +0x235c 1 0x6e 0x66 0x68 0x6e +0x235d 2 0x60 0x60 0x60 0x60 0x60 0x60 +0x235e 2 0x60 0x60 0x5e 0x60 0x60 0x60 +0x235f 1 0x5a 0x60 0x60 0x60 + + +#0x2444 2 0x10 0x10 0x1e 0x10 0x10 0x10 +#0x2444 1 0x10 0x10 0x10 0x10 diff --git a/oracle/runinfo2ora.pl b/oracle/runinfo2ora.pl index 3935c55..3b5239f 100755 --- a/oracle/runinfo2ora.pl +++ b/oracle/runinfo2ora.pl @@ -233,10 +233,11 @@ sub checkPrefix() # md COMMON MDC # rp COMMON RPC # fw COMMON FOREWARD WALL +# pt COMMON PIONTRACKER #no prefixes are excluded from @prefixList # my @prefixList = qw/be co ri ru sh tr ve st to md rp te pu fw/; - my @prefixList = qw/be co ri ru sh tr ve st to md rp fw/; + my @prefixList = qw/be co ri ru sh tr ve st to md rp fw pt/; my $pref; foreach $pref (@prefixList) { diff --git a/oracle/subevtids.txt b/oracle/subevtids.txt index 41d92ea..f4f9e7a 100644 --- a/oracle/subevtids.txt +++ b/oracle/subevtids.txt @@ -1,15 +1,18 @@ - Hub2 8100 MDC-Hub - Hub2 8400 RPC-Hub - Hub2 8700 Wall-Hub - Hub2 8600 TOF-Hub - Hub2 8000 Central-Hub - Hub2 8320 RICH-Hub - Hub2 8300 RICH-Hub - Hub2 8310 RICH-Hub - Hub2 8410 RPC-Hub - Hub2 8800 CTS-Hub - Hub2 8500 Shw-Hub - Hub2 8110 MDC-Hub + Hub2 8100 MDC-Hub + Hub2 8400 RPC-Hub + Hub2 8880 StartTrb3Hub + Hub2 8700 Wall-Hub + Hub2 8600 TOF-Hub + Hub2 8320 RICH-Hub + Hub2 8300 RICH-Hub + Hub2 8310 RICH-Hub + Hub2 8410 RPC-Hub + Hub2 8800 CTS-Hub + Hub2 8110 MDC-Hub + Hub2 8900 Pion-Hub + Hub2 8000 Central-Hub + Hub2 8910 Pion-Hub + Hub2 8890 StartTrb3Hub MDC-AddOn 1150 MDC-AddOn MDC-AddOn 1120 MDC-AddOn MDC-AddOn 1010 MDC-AddOn diff --git a/pion/addresses_pion.db b/pion/addresses_pion.db index effe8e4..f0e14c6 100644 --- a/pion/addresses_pion.db +++ b/pion/addresses_pion.db @@ -1,12 +1,12 @@ #Address # S/N # FPGA # Design # TRB # ################################################### -0x3800 0750 0 0 075 -0x3820 0751 1 0 075 -0x3821 0752 2 0 075 -0x3801 0753 3 0 075 +0x3820 0750 0 0 075 +0x3800 0751 1 0 075 +0x3801 0752 2 0 075 +0x3823 0753 3 0 075 -0x3810 0810 0 0 081 +0x3830 0810 0 0 081 0x3811 0811 1 0 081 -0x3832 0812 2 0 081 +0x3810 0812 2 0 081 0x3833 0813 3 0 081 diff --git a/pion/config/nxyter/trb3_setup.sh b/pion/config/nxyter/trb3_setup.sh index 5a34315..d1d53fb 100755 --- a/pion/config/nxyter/trb3_setup.sh +++ b/pion/config/nxyter/trb3_setup.sh @@ -3,73 +3,69 @@ echo "Loading nxyter read-out configuration" case $1 in - 0x38*) - board=$1 - ;; - *) - echo "Wrong board!" - exit - ;; + 0x38*) + board=$1 + ;; + *) + echo "Wrong board!" + exit + ;; esac - # i2c_sm_reset trbcmd w $board 0x8100 0x01 # i2c_reg_reset_start trbcmd w $board 0x8101 0x01 # Write nxsetup.dat to memory and transfer to nx-i2c-registers -trbcmd wm $board 0x8200 0 nxsetup_$board.dat echo "Using nxsetup_$board.dat" +trbcmd wm $board 0x8200 0 nxsetup_${board}.dat + +# Trigger Validate +trbcmd w $board 0x8400 0 # set readout mode +trbcmd w $board 0x8401 0 # window offset +trbcmd w $board 0x8402 0x0064 # window width 400ns + +# Data Validate +trbcmd w $board 0x8120 1 # reset all counters + +# CTS Delays and ADC_OFF +CTS_DELAY=0 +ADC_OFF=0 +case $board in + 0x3800) + CTS_DELAY=210 + ADC_OFF=0 + ;; + + 0x3801) + CTS_DELAY=210 + ADC_OFF=0 + ;; + + 0x3810) + CTS_DELAY=175 + ADC_OFF=0 + ;; + + 0x3811) + CTS_DELAY=175 + ADC_OFF=0 + ;; + + *) + echo "Wrong board!" + ;; +esac -#trbcmd w $board 0x8212 150 # threshold, load from dat file - -# nx_ts_reset_start -trbcmd w $board 0x8102 0x01 - -# -- DEPRECATED -- reset counters, flush FIFO, -#echo "clear data fifo" -#trbcmd rm $board 0x8600 4000 2>/dev/null - -# Set readout Mode -trbcmd w $board 0x8400 0x80000000 # 0: normal mode 4: no TS Window mode -trbcmd w $board 0x8401 0 # window offset 200ns -#trbcmd w $board 0x8402 250 # window width 800ns -trbcmd w $board 0x8402 100 # window width 1600ns -#trbcmd w $board 0x8403 100 # CTS-Delay 400ns - -#trbcmd w $board 0x8140 100 # test pulse length 400 ns - -# TS Sync -#if [[ ${board} -eq 0x3801 ]]; then -# trbcmd w $board 0x850d 7; # ts delay -#else - trbcmd w $board 0x850d 11; # ts delay -#fi - -# CVT -trbcmd w $board 0x841a 400 # reset all counters - -# Decoder Settings -trbcmd w $board 0x8120 0 # reset all counters - -# Enable nxyter -trbcmd w $board 0x8103 0 - -#Debugging to test ADC alignment / reset feature -# sleep 1; -# trbcmd w $board 0x8501 1 - -# turn of averaging -trbcmd w $board 0x8b80 0 +trbcmd w $board 0x8403 $CTS_DELAY +if [ $ADC_OFF -eq 1 ] ; then + trbcmd w $board 0x8504 0x80000000 +fi -trbcmd setbit $board 0x8419 0x80000000 +# TS Cut Level2 140 220 [ns] +trbcmd w $board 0x8420 0x008c00dc -# CTS delays -trbcmd w 0x3800 0x8403 0x00d2 -trbcmd w 0x3801 0x8403 0x00d2 -trbcmd w 0x3810 0x8403 0x00af -trbcmd w 0x3811 0x8403 0x00af +# Turn off Status Trigger +trbcmd w $board 0x8166 2 -# TS Cut Level2 140 220 [ns] -trbcmd w $board 0x841f 0x008c00dc diff --git a/pion/config/nxyter_wrapper.sh b/pion/config/nxyter_wrapper.sh index 472029f..8133c1a 100755 --- a/pion/config/nxyter_wrapper.sh +++ b/pion/config/nxyter_wrapper.sh @@ -1,5 +1,5 @@ #!/bin/bash cd /home/hadaq/trbsoft/hadesdaq/pion/config -./nxyter.sh &>> /tmp/nxyter.log +./nxyter.sh >> /tmp/nxyter.log diff --git a/rich/peds/current b/rich/peds/current index 0b2fc14..98db144 120000 --- a/rich/peds/current +++ b/rich/peds/current @@ -1 +1 @@ -ri1333906050801 \ No newline at end of file +ri1418511323201 \ No newline at end of file diff --git a/rich/register_thresholds.db b/rich/register_thresholds.db index a0f6435..2b32640 120000 --- a/rich/register_thresholds.db +++ b/rich/register_thresholds.db @@ -1 +1 @@ -/home/hadaq/trbsoft/daq/rich/peds/ri1333906050801/register_thresholds.db \ No newline at end of file +/home/hadaq/trbsoft/daq/rich/peds/ri1418511323201/register_thresholds.db \ No newline at end of file diff --git a/shower/configure_shower.script b/shower/configure_shower.script index e867363..ffb790f 100644 --- a/shower/configure_shower.script +++ b/shower/configure_shower.script @@ -1,8 +1,7 @@ -###WARNING: PEDESTALS SET TO CONSTANT FF for testing purposes -#exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds.dat write #NORMAL -exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_ff.dat write #QUIET MODE +exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds.dat write #NORMAL +#exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_ff.dat write #QUIET MODE #exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_00.dat write #no thresholds #exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerPed_1111_hv2300V.txt write #exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/test_pedestals_1703_new.txt write diff --git a/shower/generate.pl b/shower/generate.pl index 0caeb71..6113005 100755 --- a/shower/generate.pl +++ b/shower/generate.pl @@ -1,34 +1,17 @@ open FILE, ">correctionsNew.txt" or die "cannot open file"; for (my $i = 0; $i < 32; $i++) { -# print FILE "1 0 19 ".$i." +1\n"; -# -# -# print FILE "0 0 23 ".$i." +1\n"; -# print FILE "0 2 24 ".$i." +1\n"; -# print FILE "0 0 22 ".$i." +1\n"; -# print FILE "5 0 27".$i." +2\n"; -# print FILE "0 1 30 ".$i." 2047\n"; -# print FILE "0 1 31 ".$i." 1023\n"; -# print FILE "0 1 30 ".$i." 1023\n"; -# print FILE "1 0 19 ".$i." +1\n"; - print FILE "4 0 13 ".$i." -3\n"; - print FILE "4 0 14 ".$i." -3\n"; - print FILE "4 0 15 ".$i." -3\n"; - print FILE "4 0 16 ".$i." -3\n"; - print FILE "4 0 17 ".$i." -3\n"; - print FILE "4 0 27 ".$i." -3\n"; - print FILE "4 0 29 ".$i." -3\n"; -## -# print FILE "0 2 31 ".$i." +10\n"; -# print FILE "1 1 31 ".$i." +10\n"; -# print FILE "3 0 16 ".$i." -2\n"; -# print FILE "0 1 25 ".$i." +4\n"; -# print FILE "3 0 12 ".$i." +2\n"; -# print FILE "1 1 6 ".$i." -2\n"; -# print FILE "2 1 6 ".$i." -1\n"; -# print FILE "1 0 19 ".$i." +1\n"; -# print FILE "3 0 13 ".$i." -1\n"; -# print FILE "3 0 16 ".$i." -1\n"; - +# print FILE "3 0 20 ".$i." +30\n"; +# print FILE "3 0 22 ".$i." +30\n"; +# print FILE "3 0 23 ".$i." +15\n"; + + print FILE "3 1 7 ".$i." 195\n"; } + + +# print FILE "3 0 18 ".$i." +15\n"; +# print FILE "3 0 19 ".$i." +15\n"; +# print FILE "3 0 24 ".$i." +15\n"; + + + diff --git a/shower/showerpeds.dat b/shower/showerpeds.dat index f878ab5..6b44b10 120000 --- a/shower/showerpeds.dat +++ b/shower/showerpeds.dat @@ -1 +1 @@ -te1212710461802_060512_1604.dat \ No newline at end of file +sh1418220535202.hld.txt \ No newline at end of file diff --git a/start/ThreshNinoStart.db b/start/ThreshNinoStart.db index 902341b..31b24e4 100644 --- a/start/ThreshNinoStart.db +++ b/start/ThreshNinoStart.db @@ -1,146 +1,146 @@ # Board Chain ChainLen DAC Channel Command Value - 5000 1 2 0 0 3 0x8000 # ---Glob. Thres #1 + 5000 1 2 0 0 3 0x7000 # ---Glob. Thres #1 5000 1 2 0 1 3 0x7000 # - 5000 1 2 0 2 3 0x6000 # --- Str. 9-10ns, 7-20ns, 6 - 30ns, 5-70ns + 5000 1 2 0 2 3 0x7000 # --- Str. 9-10ns, 7-20ns, 6 - 30ns, 5-70ns 5000 1 2 0 3 3 0x7000 # - 5000 1 2 0 4 3 0x7000 # --- Hyst. min d + 5000 1 2 0 4 3 0xd000 # --- Hyst. min d 5000 1 2 0 5 3 0x7000 5000 1 2 0 6 3 0x7000 - 5000 1 2 0 7 3 0x7000 - 5000 1 2 1 0 3 0xc000 ### ch. 4 - 5000 1 2 1 1 3 0xb000 ### ch. 3 - 5000 1 2 1 2 3 0xc000 ### ch. 2 - 5000 1 2 1 3 3 0x1000 ### ch. 1 - 5000 1 2 1 4 3 0xa000 ### ch. 5 - 5000 1 2 1 5 3 0xb000 ### ch. 6 - 5000 1 2 1 6 3 0xb000 ### ch. 7 - 5000 1 2 1 7 3 0xa000 ### ch. 8 + 5000 1 2 0 7 3 0x2000 + 5000 1 2 1 0 3 0x7000 # ch. 4 + 5000 1 2 1 1 3 0x7000 # ch. 3 + 5000 1 2 1 2 3 0x7000 # ch. 2 + 5000 1 2 1 3 3 0x7000 # ch. 1 + 5000 1 2 1 4 3 0x7000 # ch. 5 + 5000 1 2 1 5 3 0x7000 # ch. 6 + 5000 1 2 1 6 3 0x7000 # ch. 7 + 5000 1 2 1 7 3 0x7000 # ch. 8 ############################################################################# - 5000 2 2 0 0 3 0x8000 # ---Glob. Thres #2 + 5000 2 2 0 0 3 0x7000 # ---Glob. Thres #2 5000 2 2 0 1 3 0x5000 # - 5000 2 2 0 2 3 0x6000 # --- Str. 9-20ns, 7-30ns, 5-80ns + 5000 2 2 0 2 3 0x7000 # --- Str. 9-20ns, 7-30ns, 5-80ns 5000 2 2 0 3 3 0x5000 # 5000 2 2 0 4 3 0xd000 # --- Hyst. min d 5000 2 2 0 5 3 0x9000 5000 2 2 0 6 3 0x9000 5000 2 2 0 7 3 0x9000 - 5000 2 2 1 0 3 0xb000 ### ch. 4 - 5000 2 2 1 1 3 0xc000 ### ch. 3 - 5000 2 2 1 2 3 0xb000 ### ch. 2 - 5000 2 2 1 3 3 0xa000 ### ch. 1 - 5000 2 2 1 4 3 0xb000 ### ch. 5 - 5000 2 2 1 5 3 0xa000 ### ch. 6 - 5000 2 2 1 6 3 0xa000 ### ch. 7 - 5000 2 2 1 7 3 0xb000 ### ch. 8 -####### + 5000 2 2 1 0 3 0x7000 ### ch. 4 + 5000 2 2 1 1 3 0x7000 ### ch. 3 + 5000 2 2 1 2 3 0x8000 ### ch. 2 + 5000 2 2 1 3 3 0x7000 ### ch. 1 + 5000 2 2 1 4 3 0x7000 ### ch. 5 + 5000 2 2 1 5 3 0x7000 ### ch. 6 + 5000 2 2 1 6 3 0x7000 ### ch. 7 + 5000 2 2 1 7 3 0x9000 ### ch. 8 +######7 ####### Next TDC ####### # Board Chain ChainLen DAC Channel Command Value 5001 1 2 0 0 3 0x8000 # ---Glob. Thres #3 5001 1 2 0 1 3 0x7000 # - 5001 1 2 0 2 3 0x5000 # --- Str. 9-20ns, 7-30ns, 5-80ns + 5001 1 2 0 2 3 0x7000 # --- Str. 9-20ns, 7-30ns, 5-80ns 5001 1 2 0 3 3 0x7000 # 5001 1 2 0 4 3 0x7000 # --- Hyst. min d 5001 1 2 0 5 3 0x7000 5001 1 2 0 6 3 0x7000 5001 1 2 0 7 3 0x7000 - 5001 1 2 1 0 3 0xf000 ### ch. 4 - 5001 1 2 1 1 3 0xa000 ### ch. 3 - 5001 1 2 1 2 3 0xb000 ### ch. 2 - 5001 1 2 1 3 3 0xa000 ### ch. 1 - 5001 1 2 1 4 3 0xf000 ### ch. 5 - 5001 1 2 1 5 3 0xb000 ### ch. 6 - 5001 1 2 1 6 3 0xf000 ### ch. 7 - 5001 1 2 1 7 3 0xc000 ### ch. 8 + 5001 1 2 1 0 3 0x3000 ### ch. 4 + 5001 1 2 1 1 3 0x3000 ### ch. 3 + 5001 1 2 1 2 3 0x3000 ### ch. 2 + 5001 1 2 1 3 3 0x3000 ### ch. 1 + 5001 1 2 1 4 3 0x3000 ### ch. 5 + 5001 1 2 1 5 3 0x3000 ### ch. 6 + 5001 1 2 1 6 3 0x3000 ### ch. 7 + 5001 1 2 1 7 3 0x3000 ### ch. 8 ############################################################################# - 5001 2 2 0 0 3 0xf000 # ---Glob. Thres #4 + 5001 2 2 0 0 3 0x6000 # ---Glob. Thres #4 5001 2 2 0 1 3 0x5000 # - 5001 2 2 0 2 3 0x6000 # --- Str. 9-20ns, 7-30ns, 5-80ns + 5001 2 2 0 2 3 0x7000 # --- Str. 9-20ns, 7-30ns, 5-80ns 5001 2 2 0 3 3 0x5000 # - 5001 2 2 0 4 3 0xf000 # --- Hyst. min d + 5001 2 2 0 4 3 0xd000 # --- Hyst. min d 5001 2 2 0 5 3 0x9000 5001 2 2 0 6 3 0x9000 5001 2 2 0 7 3 0x9000 - 5001 2 2 1 0 3 0xf000 ### ch. 4 - 5001 2 2 1 1 3 0xf000 ### ch. 3 - 5001 2 2 1 2 3 0xf000 ### ch. 2 - 5001 2 2 1 3 3 0xf000 ### ch. 1 - 5001 2 2 1 4 3 0xf000 ### ch. 5 - 5001 2 2 1 5 3 0xf000 ### ch. 6 - 5001 2 2 1 6 3 0xf000 ### ch. 7 - 5001 2 2 1 7 3 0xf000 ### ch. 8 + 5001 2 2 1 0 3 0x9000 ### ch. 4 + 5001 2 2 1 1 3 0x9000 ### ch. 3 + 5001 2 2 1 2 3 0x9000 ### ch. 2 + 5001 2 2 1 3 3 0x9000 ### ch. 1 + 5001 2 2 1 4 3 0x9000 ### ch. 5 + 5001 2 2 1 5 3 0x9000 ### ch. 6 + 5001 2 2 1 6 3 0x9000 ### ch. 7 + 5001 2 2 1 7 3 0x9000 ### ch. 8 ####### ####### Next TDC ####### # Board Chain ChainLen DAC Channel Command Value - 5002 1 2 0 0 3 0x8000 # ---Glob. Thres #5 + 5002 1 2 0 0 3 0x6000 # ---Glob. Thres #5 5002 1 2 0 1 3 0x0000 # - 5002 1 2 0 2 3 0x5000 # --- Str. 9-10ns, 7-20ns, 6 - 30ns, 5-70ns + 5002 1 2 0 2 3 0x7000 # --- Str. 9-10ns, 7-20ns, 6 - 30ns, 5-70ns 5002 1 2 0 3 3 0x6000 # - 5002 1 2 0 4 3 0x7000 # --- Hyst. min d + 5002 1 2 0 4 3 0xd000 # --- Hyst. min d 5002 1 2 0 5 3 0x8000 5002 1 2 0 6 3 0x9000 5002 1 2 0 7 3 0xa000 - 5002 1 2 1 0 3 0xb000 ### ch. 4 - 5002 1 2 1 1 3 0xc000 ### ch. 3 - 5002 1 2 1 2 3 0xc000 ### ch. 2 - 5002 1 2 1 3 3 0x4000 ### ch. 1 - 5002 1 2 1 4 3 0x4000 ### ch. 5 - 5002 1 2 1 5 3 0xa000 ### ch. 6 - 5002 1 2 1 6 3 0xb000 ### ch. 7 - 5002 1 2 1 7 3 0xb000 ### ch. 8 + 5002 1 2 1 0 3 0x6000 ### ch. 4 + 5002 1 2 1 1 3 0x6000 ### ch. 3 + 5002 1 2 1 2 3 0x6000 ### ch. 2 + 5002 1 2 1 3 3 0x6000 ### ch. 1 + 5002 1 2 1 4 3 0x6000 ### ch. 5 + 5002 1 2 1 5 3 0x6000 ### ch. 6 + 5002 1 2 1 6 3 0x6000 ### ch. 7 + 5002 1 2 1 7 3 0x6000 ### ch. 8 ############################################################################# 5002 2 2 0 0 3 0x8000 # ---Glob. Thres #6 5002 2 2 0 1 3 0x5000 # - 5002 2 2 0 2 3 0x8000 # --- Str. 9-20ns, 7-30ns, 5-80ns + 5002 2 2 0 2 3 0x7000 # --- Str. 9-20ns, 7-30ns, 5-80ns 5002 2 2 0 3 3 0x5000 # 5002 2 2 0 4 3 0xd000 # --- Hyst. min d 5002 2 2 0 5 3 0x9000 5002 2 2 0 6 3 0x9000 5002 2 2 0 7 3 0x9000 - 5002 2 2 1 0 3 0xb000 ### ch. 4 - 5002 2 2 1 1 3 0xc000 ### ch. 3 - 5002 2 2 1 2 3 0xb000 ### ch. 2 - 5002 2 2 1 3 3 0xa000 ### ch. 1 - 5002 2 2 1 4 3 0xa000 ### ch. 5 - 5002 2 2 1 5 3 0xb000 ### ch. 6 - 5002 2 2 1 6 3 0xb000 ### ch. 7 - 5002 2 2 1 7 3 0xa000 ### ch. 8 -####### + 5002 2 2 1 0 3 0x8000 ### ch. 4 + 5002 2 2 1 1 3 0x8000 ### ch. 3 + 5002 2 2 1 2 3 0x8000 ### ch. 2 + 5002 2 2 1 3 3 0x8000 ### ch. 1 + 5002 2 2 1 4 3 0x8000 ### ch. 5 + 5002 2 2 1 5 3 0x8000 ### ch. 6 + 5002 2 2 1 6 3 0x8000 ### ch. 7 + 5002 2 2 1 7 3 0x8000 ### ch. 8 +######6 ####### Next TDC ####### # Board Chain ChainLen DAC Channel Command Value - 5003 1 2 0 0 3 0x8000 # ---Glob. Thres #7 - 5003 1 2 0 1 3 0x7000 # - 5003 1 2 0 2 3 0x9000 # --- Str. 9-10ns, 7-20ns, 6 - 30ns, 5-70ns + 5003 1 2 0 0 3 0x6000 # ---Glob. Thres #7 + 5003 1 2 0 1 3 0x6000 # + 5003 1 2 0 2 3 0x7000 # --- Str. 9-10ns, 7-20ns, 6 - 30ns, 5-70ns 5003 1 2 0 3 3 0x7000 # - 5003 1 2 0 4 3 0x7000 # --- Hyst. min d + 5003 1 2 0 4 3 0xd000 # --- Hyst. min d 5003 1 2 0 5 3 0x7000 5003 1 2 0 6 3 0x7000 5003 1 2 0 7 3 0x7000 - 5003 1 2 1 0 3 0xc000 ### ch. 4 - 5003 1 2 1 1 3 0xc000 ### ch. 3 - 5003 1 2 1 2 3 0xb000 ### ch. 2 - 5003 1 2 1 3 3 0xb000 ### ch. 1 - 5003 1 2 1 4 3 0xc000 ### ch. 5 - 5003 1 2 1 5 3 0x5000 ### ch. 6 - 5003 1 2 1 6 3 0xb000 ### ch. 7 - 5003 1 2 1 7 3 0x5000 ### ch. 8 + 5003 1 2 1 0 3 0x6000 ### ch. 4 + 5003 1 2 1 1 3 0x6000 ### ch. 3 + 5003 1 2 1 2 3 0x6000 ### ch. 2 + 5003 1 2 1 3 3 0x6000 ### ch. 1 + 5003 1 2 1 4 3 0x6000 ### ch. 5 + 5003 1 2 1 5 3 0x6000 ### ch. 6 + 5003 1 2 1 6 3 0x6000 ### ch. 7 + 5003 1 2 1 7 3 0x6000 ### ch. 8 ############################################################################# - 5003 2 2 0 0 3 0x8000 # ---Glob. Thres #8 - 5003 2 2 0 1 3 0x5000 # - 5003 2 2 0 2 3 0x6000 # --- Str. 9-20ns, 7-30ns, 5-80ns - 5003 2 2 0 3 3 0x5000 # - 5003 2 2 0 4 3 0x7000 # --- Hyst. min d - 5003 2 2 0 5 3 0x9000 - 5003 2 2 0 6 3 0x9000 - 5003 2 2 0 7 3 0x9000 - 5003 2 2 1 0 3 0xc000 ### ch. 4 - 5003 2 2 1 1 3 0xc000 ### ch. 3 - 5003 2 2 1 2 3 0xa000 ### ch. 2 - 5003 2 2 1 3 3 0xa000 ### ch. 1 - 5003 2 2 1 4 3 0xc000 ### ch. 5 - 5003 2 2 1 5 3 0xb000 ### ch. 6 - 5003 2 2 1 6 3 0xb000 ### ch. 7 - 5003 2 2 1 7 3 0xb000 ### ch. 8 + 5003 2 2 0 0 3 0x7000 # ---Glob. Thres #8 + 5003 2 2 0 1 3 0xf000 # + 5003 2 2 0 2 3 0x7000 # --- Str. 9-20ns, 7-30ns, 5-80ns + 5003 2 2 0 3 3 0xf000 # + 5003 2 2 0 4 3 0xd000 # --- Hyst. min d + 5003 2 2 0 5 3 0xf000 + 5003 2 2 0 6 3 0xf000 + 5003 2 2 0 7 3 0xf000 + 5003 2 2 1 0 3 0x7000 ### ch. 4 + 5003 2 2 1 1 3 0x7000 ### ch. 3 + 5003 2 2 1 2 3 0x7000 ### ch. 2 + 5003 2 2 1 3 3 0x7000 ### ch. 1 + 5003 2 2 1 4 3 0x7000 ### ch. 5 + 5003 2 2 1 5 3 0x7000 ### ch. 6 + 5003 2 2 1 6 3 0x6000 ### ch. 7 + 5003 2 2 1 7 3 0x7000 ### ch. 8 # EndOF diff --git a/start/ThreshPadiwaVeto.db b/start/ThreshPadiwaVeto.db index a280c3d..c88f415 100644 --- a/start/ThreshPadiwaVeto.db +++ b/start/ThreshPadiwaVeto.db @@ -1,93 +1,76 @@ # Board Chain ChainLen DAC Channel Command Value - 5010 1 1 0 0 8 0x0633 - 5010 1 1 0 2 8 0x0633 - 5010 1 1 0 4 8 0x0717 - 5010 1 1 0 6 8 0x0617 - 5010 1 1 0 8 8 0x0582 - 5010 1 1 0 10 8 0x050d - 5010 1 1 0 12 8 0x050d - 5010 1 1 0 14 8 0x0582 - 5010 2 1 0 0 8 0x0572 - 5010 2 1 0 2 8 0x0705 - 5010 2 1 0 4 8 0x06ff - 5010 2 1 0 6 8 0x0562 - 5010 2 1 0 8 8 0x0582 - 5010 2 1 0 10 8 0x0642 - 5010 2 1 0 12 8 0x06d1 - 5010 2 1 0 14 8 0x04fc +#FAST channels (positive signal!): thresh=noise+5mV + 5010 1 1 0 0 8 0x0579 + 5010 1 1 0 2 8 0x05e5 + 5010 1 1 0 4 8 0x06fc + 5010 1 1 0 6 8 0x04dd + 5010 1 1 0 8 8 0x05b2 #noisy channel + 5010 1 1 0 10 8 0x0648 + 5010 1 1 0 12 8 0x05be + 5010 1 1 0 14 8 0x04ce #noisy channel + + 5011 1 1 0 0 8 0x0600 + 5011 1 1 0 2 8 0x0549 + 5011 1 1 0 4 8 0x0633 #noisy channel + 5011 1 1 0 6 8 0x05d2 + 5011 1 1 0 8 8 0x056c #noisy channel + 5011 1 1 0 10 8 0x04f9 + 5011 1 1 0 12 8 0x03ab + 5011 1 1 0 14 8 0x044e + + 5012 1 1 0 0 8 0x0603 + 5012 1 1 0 2 8 0x0728 #noisy channel + 5012 1 1 0 4 8 0x056e + 5012 1 1 0 6 8 0x0630 #noisy channel + 5012 1 1 0 8 8 0x04d8 + 5012 1 1 0 10 8 0x046d + 5012 1 1 0 12 8 0x0500 #noisy channel + 5012 1 1 0 14 8 0x052e - 5013 1 1 0 0 8 0x0560 - 5013 1 1 0 2 8 0x0556 - 5013 1 1 0 4 8 0x04fe - 5013 1 1 0 6 8 0x051d - 5013 1 1 0 8 8 0x0579 - 5013 1 1 0 10 8 0x0a7f - 5013 1 1 0 12 8 0x0632 - 5013 1 1 0 14 8 0x06f9 + 5013 1 1 0 0 8 0x06ed + 5013 1 1 0 2 8 0x0561 + 5013 1 1 0 4 8 0x0500 #noisy channel + 5013 1 1 0 6 8 0x0473 + 5013 1 1 0 8 8 0x0575 + 5013 1 1 0 10 8 0x0566 + 5013 1 1 0 12 8 0x04a8 + 5013 1 1 0 14 8 0x0612 #noisy channel - 5013 2 1 0 0 8 0x064a - 5013 2 1 0 2 8 0x0598 - 5013 2 1 0 4 8 0x0579 - 5013 2 1 0 6 8 0x061c - 5013 2 1 0 8 8 0x0549 - 5013 2 1 0 10 8 0x06ae - 5013 2 1 0 12 8 0x06c6 - 5013 2 1 0 14 8 0x0500 + +#SLOW channels (negative signal!): thresh=noise-20mV + 5010 1 1 0 1 8 0xdbb4 + 5010 1 1 0 3 8 0xda40 + 5010 1 1 0 5 8 0xdb08 + 5010 1 1 0 7 8 0xdad9 + 5010 1 1 0 9 8 0xda8d + 5010 1 1 0 11 8 0xd9b5 + 5010 1 1 0 13 8 0xdcd1 + 5010 1 1 0 15 8 0xd97f -#Unused slow channels - 5010 1 1 0 1 8 0xffff - 5010 1 1 0 3 8 0xffff - 5010 1 1 0 5 8 0xffff - 5010 1 1 0 7 8 0xffff - 5010 1 1 0 9 8 0xffff - 5010 1 1 0 11 8 0xffff - 5010 1 1 0 13 8 0xffff - 5010 1 1 0 15 8 0xffff - - 5010 2 1 0 1 8 0xffff - 5010 2 1 0 3 8 0xffff - 5010 2 1 0 5 8 0xffff - 5010 2 1 0 7 8 0xffff - 5010 2 1 0 9 8 0xffff - 5010 2 1 0 11 8 0xffff - 5010 2 1 0 13 8 0xffff - 5010 2 1 0 15 8 0xffff - - 5013 1 1 0 1 8 0xffff - 5013 1 1 0 3 8 0xffff - 5013 1 1 0 5 8 0xffff - 5013 1 1 0 7 8 0xffff - 5013 1 1 0 9 8 0xffff - 5013 1 1 0 11 8 0xffff - 5013 1 1 0 13 8 0xffff - 5013 1 1 0 15 8 0xffff - - 5013 2 1 0 1 8 0xffff - 5013 2 1 0 3 8 0xffff - 5013 2 1 0 5 8 0xffff - 5013 2 1 0 7 8 0xffff - 5013 2 1 0 9 8 0xffff - 5013 2 1 0 11 8 0xffff - 5013 2 1 0 13 8 0xffff - 5013 2 1 0 15 8 0xffff - -#External trigger - 5012 1 1 0 0 8 0xffff - 5012 1 1 0 2 8 0xffff - 5012 1 1 0 4 8 0xffff - 5012 1 1 0 6 8 0x0898 #ext. Trigger - 5012 1 1 0 8 8 0xffff - 5012 1 1 0 10 8 0x0627 #Pulser - 5012 1 1 0 12 8 0xffff - 5012 1 1 0 14 8 0x0706 #Pulser - - - 5012 1 1 0 1 8 0xffff - 5012 1 1 0 3 8 0xffff - 5012 1 1 0 5 8 0xffff - 5012 1 1 0 7 8 0xffff - 5012 1 1 0 9 8 0xffff - 5012 1 1 0 11 8 0xffff - 5012 1 1 0 13 8 0xffff - 5012 1 1 0 15 8 0xffff + 5011 1 1 0 1 8 0xdd1b + 5011 1 1 0 3 8 0xdd6c + 5011 1 1 0 5 8 0xdd48 + 5011 1 1 0 7 8 0xde7b + 5011 1 1 0 9 8 0xdedc + 5011 1 1 0 11 8 0xdc80 + 5011 1 1 0 13 8 0xdddc + 5011 1 1 0 15 8 0xdd83 + + 5012 1 1 0 1 8 0xdc43 + 5012 1 1 0 3 8 0xdcf3 + 5012 1 1 0 5 8 0xdd3a + 5012 1 1 0 7 8 0xdaaa + 5012 1 1 0 9 8 0xdcd6 + 5012 1 1 0 11 8 0xdc8b + 5012 1 1 0 13 8 0xdd1e + 5012 1 1 0 15 8 0xdd15 + + 5013 1 1 0 1 8 0xddb5 + 5013 1 1 0 3 8 0xddc0 + 5013 1 1 0 5 8 0xdcf4 + 5013 1 1 0 7 8 0xdd5d + 5013 1 1 0 9 8 0xddaf + 5013 1 1 0 11 8 0xdcd5 + 5013 1 1 0 13 8 0xddc8 + 5013 1 1 0 15 8 0xdefe diff --git a/start/configure_startveto.script b/start/configure_startveto.script index 6f6beb7..d1fd505 100644 --- a/start/configure_startveto.script +++ b/start/configure_startveto.script @@ -3,6 +3,6 @@ exec_cmd spi_trbv2_3 /home/hadaq/start_and_veto/thresholds_test_apr12_${TRBNUM} exec_cmd cd /home/hadaq/scripts/; ./trbv2_TDCs_configure.sh ${TRBNUM} -exec_cmd rw_trbv2 --trb w 0 c2 007E0100; rw_trbv2 --trb w 0 c0 0a000000; rw_trbv2 --trb w 0 c3 00000100# C0(31-24 ) delay trigger *25 ns; C2(23-16) delay token * 25ns; C2(31-24) version number +exec_cmd rw_trbv2 --trb w 0 c2 007E0000; rw_trbv2 --trb w 0 c0 0a000000; rw_trbv2 --trb w 0 c3 00000100# C0(31-24 ) delay trigger *25 ns; C2(23-16) delay token * 25ns; C2(31-24) data version; c2 007E0x00 x-high res mode; diff --git a/start/startup.script b/start/startup.script index 157e793..5e3d1eb 100644 --- a/start/startup.script +++ b/start/startup.script @@ -6,6 +6,10 @@ !endif +#Switch off Veto TRB2 +trbcmd clearbit 0x8801 0xc0 0x8 +trbcmd clearbit 0x8801 0xc1 0x8 +trbcmd clearbit 0x8801 0xc3 0x8 #TRB3 settings @@ -81,8 +85,8 @@ trbcmd w 0x5001 0xcf80 0x0000 trbcmd w 0x5002 0xcf80 0xfeee trbcmd w 0x5003 0xcf80 0xf81e trbcmd w 0x5010 0xcf80 0xffff -trbcmd w 0x5011 0xcf80 0x0000 -trbcmd w 0x5012 0xcf80 0x0008 +trbcmd w 0x5011 0xcf80 0xffff +trbcmd w 0x5012 0xcf80 0xffff trbcmd w 0x5013 0xcf80 0xffff -- 2.43.0