Skip to content
This repository was archived by the owner on Nov 29, 2021. It is now read-only.

Commit cbbc4bc

Browse files
author
WSmith
committed
added registers for TS readback. TS sync from software event SoftSeq0-SoftTrig-Cmd 1
1 parent 3a54255 commit cbbc4bc

File tree

6 files changed

+48
-57
lines changed

6 files changed

+48
-57
lines changed

‎detint.cmd

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=ID-H,
2626
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=ID-M, DESC=device ID_M, OFF=3, PRO=ics-dg.proto")
2727
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=ID-L, DESC=device ID_L, OFF=4, PRO=ics-dg.proto")
2828
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=LPBK, DESC=loopback test register, OFF=5, PRO=ics-dg.proto")
29-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=RST, DESC=reset/enable vector, OFF=6, PRO=ics-dg.proto")
29+
30+
31+
#dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=RST, DESC=reset/enable vector, OFF=6, PRO=ics-dg.proto")
32+
dbLoadRecords("reset_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), DESC=reset/enable vector, OFF=6, PRO=ics-dg.proto")
33+
34+
3035
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=ADC-SEL, DESC=ADC channel select, OFF=7, PRO=ics-dg.proto")
3136
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=ADC-DEC, DESC=ADC DEC, OFF=8, PRO=ics-dg.proto")
3237
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=BPZ, DESC=ADC Bypass Zeros, OFF=9, PRO=ics-dg.proto")
@@ -73,7 +78,8 @@ dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=STATU
7378
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=STATUS2, DESC=Status 2, OFF=50, PRO=ics-dg.proto")
7479
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=CLKSEL, DESC=internal or external clk, OFF=51, PRO=ics-dg.proto")
7580
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=PAYSEL, DESC=Payload select, ADC or TST,OFF=52, PRO=ics-dg.proto")
76-
81+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=TSU, DESC=TS MSB RBV, OFF=53, PRO=ics-dg.proto")
82+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), REG=TSL, DESC=TS LSB RBV, OFF=54, PRO=ics-dg.proto")
7783

7884

7985
#Load register map for device 2
@@ -84,7 +90,11 @@ dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=ID-H,
8490
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=ID-M, DESC=device ID_M, OFF=3, PRO=ics-dg.proto")
8591
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=ID-L, DESC=device ID_L, OFF=4, PRO=ics-dg.proto")
8692
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=LPBK, DESC=loopback test register, OFF=5, PRO=ics-dg.proto")
87-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=RST, DESC=reset/enable vector, OFF=6, PRO=ics-dg.proto")
93+
94+
#dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=RST, DESC=reset/enable vector, OFF=6, PRO=ics-dg.proto")
95+
96+
dbLoadRecords("reset_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), DESC=reset/enable vector, OFF=6, PRO=ics-dg.proto")
97+
8898
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=ADC-SEL, DESC=ADC channel select, OFF=7, PRO=ics-dg.proto")
8999
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=ADC-DEC, DESC=ADC DEC, OFF=8, PRO=ics-dg.proto")
90100
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=BPZ, DESC=ADC Bypass Zeros, OFF=9, PRO=ics-dg.proto")
@@ -131,6 +141,8 @@ dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=STATU
131141
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=STATUS2, DESC=Status 2, OFF=50, PRO=ics-dg.proto")
132142
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=CLKSEL, DESC=internal or external clk, OFF=51, PRO=ics-dg.proto")
133143
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=PAYSEL, DESC=Payload select, ADC or TST,OFF=52, PRO=ics-dg.proto")
144+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=TSU, DESC=TS MSB RBV, OFF=53, PRO=ics-dg.proto")
145+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), REG=TSL, DESC=TS LSB RBV, OFF=54, PRO=ics-dg.proto")
134146

135147

136148
#dbLoadRecords("timestamp_sync.db", "SYS=$(SYS), DEV1=$(DEV1),EVR=$(EVR),TSEVT=$(SYNC_EVNT_LETTER), CODE=$(SYNC_EVNT), RST_ENA_DEL=0.1, ENA_TS_DEL=0.1, N_SEC_DELTA=$(N_SEC_TICKS), COM1=$(COM2), PRO=ics-dg.proto")

‎evr_seq_sync.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#Define the delays between event codes (Can only be defined with caput and save restore)
2-
caput -a $SYS-$DEVICE:SoftSeq0-EvtCode-SP 2 $DET_CLK_RST_EVT $SYNC_TRIG_EVT
2+
caput -a $SYS-$DEVICE:SoftSeq0-EvtCode-SP 2 $DET_CLK_RST_EVT $SYNC_TRIG_EVT $SYNC_TRIG_EVT
33

4-
caput -a $SYS-$DEVICE:SoftSeq0-Timestamp-SP 2 0 $NANO_DELTA
4+
caput -a $SYS-$DEVICE:SoftSeq0-Timestamp-SP 2 0 $NANO_DELTA 2000000000
55

66
caput -n $SYS-$DEVICE:SoftSeq0-Commit-Cmd 1
77

8-
sleep 30
8+
#sleep 30
99

‎st.hzb-v20-evr-02.cmd

Lines changed: 26 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# @Will Smith - uncomment if you want the timestamp buffer database
1+
#@Will Smith - uncomment if you want the timestamp buffer database
22
#require evr-timestamp-buffer,2.5.0
33
require dmsc_detector_interface,develop
44
require stream,2.7.14p
55

6-
epicsEnvSet("SYS", "HZB-V20:TS")
7-
epicsEnvSet("PCI_SLOT", "1:0.0")
8-
epicsEnvSet("DEVICE", "EVR-02")
6+
epicsEnvSet("SYS", "ESSIP-DET:TS")
7+
epicsEnvSet("PCI_SLOT", "5:0.0")
8+
epicsEnvSet("DEVICE", "EVR-01")
99
epicsEnvSet("EVR", "$(DEVICE)")
1010
epicsEnvSet("MRF_HW_DB", "evr-pcie-300dc-ess.db")
11-
epicsEnvSet("E3_MODULES", "/epics/iocs/e3")
12-
epicsEnvSet("EPICS_CMDS", "/epics/iocs/cmds")
11+
epicsEnvSet("E3_MODULES", "/home/root/epics/iocs/e3")
12+
epicsEnvSet("EPICS_CMDS", "/home/root/epics/iocs/cmds")
1313

1414
######## Temporary until chopper group ###########
1515
######## changes PV names ###########
@@ -27,18 +27,18 @@ dbLoadRecords("$(MRF_HW_DB)","EVR=$(EVR),SYS=$(SYS),D=$(DEVICE),FEVT=88.0525,PIN
2727
#iocshLoad("$(evr-timestamp-buffer_DIR)/evr-timestamp-buffer.iocsh", "CHIC_SYS=$(CHIC_SYS), CHIC_DEV=$(CHIC_DEV), CHOP_DRV=$(CHOP_DRV), SYS=$(SYS)")
2828

2929
############# -------- Detector Readout Interface ----------------- ##################
30-
epicsEnvSet("DETINT_CMD_TOP","/epics/iocs/cmds/hzb-v20-evr-02-cmd")
30+
epicsEnvSet("DETINT_CMD_TOP","/home/root/epics/iocs/cmds/hzb-v20-evr-02-cmd")
3131
#epicsEnvSet("DETINT_DB_TOP", "$(E3_MODULES)/e3-detectorinterface/m-epics-detectorinterface-dev/db")
32-
epicsEnvSet("STREAM_PROTOCOL_PATH","/epics/base-7.0.1.1/require/3.0.4/siteApps/dmsc_detector_interface/master/db")
32+
epicsEnvSet("STREAM_PROTOCOL_PATH","/home/root/epics/base-7.0.1.1/require/3.0.4/siteApps/dmsc_detector_interface/develop/db")
3333

3434
epicsEnvSet("DET_CLK_RST_EVT", "15")
3535
epicsEnvSet("DET_RST_EVT", "15")
3636
epicsEnvSet("SYNC_EVNT_LETTER", "EvtF")
3737
epicsEnvSet("SYNC_TRIG_EVT", "16")
3838
epicsEnvSet("NANO_DELTA", "1000000000")
3939

40-
epicsEnvSet("COM1_USB_DEV_NUM", "0")
41-
epicsEnvSet("COM2_USB_DEV_NUM", "1")
40+
epicsEnvSet("COM1_USB_DEV_NUM", "2")
41+
epicsEnvSet("COM2_USB_DEV_NUM", "3")
4242

4343

4444

@@ -56,25 +56,22 @@ dbpf $(SYS)-$(DEVICE):Time-Clock-SP 88.0525
5656

5757
# Set delay compensation target. This is required even when delay compensation
5858
# is disabled to avoid occasionally corrupting timestamps.
59-
#dbpf $(SYS)-$(DEVICE):DC-Tgt-SP 70
59+
dbpf $(SYS)-$(DEVICE):DC-Tgt-SP 70
6060
dbpf $(SYS)-$(DEVICE):DC-Tgt-SP 100
6161

6262
# Connect prescaler reset to event $(DET_CLK_RST_EVT)
6363
dbpf $(SYS)-$(DEVICE):Evt-ResetPS-SP $(DET_CLK_RST_EVT)
6464

6565

66-
# Connect FP08 to PS0
67-
dbpf $(SYS)-$(DEVICE):OutFPUV08-Ena-SP 1
68-
dbpf $(SYS)-$(DEVICE):OutFPUV08-Src-SP 40
69-
dbpf $(SYS)-$(DEVICE):PS0-Div-SP 2
70-
7166
# Map pulser 9 to event code SYNC_TRIG_EVT
7267
dbpf $(SYS)-$(DEVICE):DlyGen9-Evt-Trig0-SP $(SYNC_TRIG_EVT)
7368
dbpf $(SYS)-$(DEVICE):DlyGen9-Width-SP 10
7469

75-
# Connect FP09 to Pulser 9
76-
dbpf $(SYS)-$(DEVICE):OutFPUV09-Ena-SP 1
77-
dbpf $(SYS)-$(DEVICE):OutFPUV09-Src-SP 9
70+
# Set up Prescaler 0
71+
dbpf $(SYS)-$(DEVICE):PS0-Div-SP 2
72+
73+
74+
7875

7976
# Connect FP10 to PS0
8077
dbpf $(SYS)-$(DEVICE):OutFPUV10-Ena-SP 1
@@ -84,52 +81,34 @@ dbpf $(SYS)-$(DEVICE):OutFPUV10-Src-SP 40
8481
dbpf $(SYS)-$(DEVICE):OutFPUV11-Ena-SP 1
8582
dbpf $(SYS)-$(DEVICE):OutFPUV11-Src-SP 9
8683

87-
# Connect FP2 to Pulser 9
88-
#dbpf $(SYS)-$(DEVICE):OutFPUV02-Ena-SP 1
89-
#dbpf $(SYS)-$(DEVICE):OutFPUV02-Src-SP 9
90-
91-
# Connect FP3 to Pulser 9
92-
#dbpf $(SYS)-$(DEVICE):OutFPUV03-Ena-SP 1
93-
#dbpf $(SYS)-$(DEVICE):OutFPUV03-Src-SP 40
9484

85+
# Connect FP12 to PS0
86+
dbpf $(SYS)-$(DEVICE):OutFPUV12-Ena-SP 1
87+
dbpf $(SYS)-$(DEVICE):OutFPUV12-Src-SP 40
9588

96-
######## load the sync sequence ######
97-
98-
# Connect event 125 to pulser 8
99-
dbpf $(SYS)-$(DEVICE):DlyGen8-Evt-Trig0-SP 125
100-
dbpf $(SYS)-$(DEVICE):DlyGen8-Width-SP 1
89+
# Connect FP13 to Pulser 9
90+
dbpf $(SYS)-$(DEVICE):OutFPUV13-Ena-SP 1
91+
dbpf $(SYS)-$(DEVICE):OutFPUV13-Src-SP 9
10192

102-
# Connect FP2 to Pulser 8
103-
dbpf $(SYS)-$(DEVICE):OutFPUV02-Ena-SP 1
104-
dbpf $(SYS)-$(DEVICE):OutFPUV02-Src-SP 8
10593

94+
######## load the sync sequence ######
10695

10796
dbpf $(SYS)-$(DEVICE):SoftSeq0-Disable-Cmd 1
108-
109-
11097
dbpf $(SYS)-$(DEVICE):SoftSeq0-Unload-Cmd 1
11198
dbpf $(SYS)-$(DEVICE):SoftSeq0-Load-Cmd 1
11299

113100
#Use nanoseconds
114101
dbpf $(SYS)-$(DEVICE):SoftSeq0-TsResolution-Sel "3"
115102

116-
#connect the sequence to pulser 8
117-
dbpf $(SYS)-$(DEVICE):SoftSeq0-TrigSrc-Pulse-Sel 8
118-
119103
#connect the sequence to software trigger
120-
#dbpf $(SYS)-$(DEVICE):SoftSeq0-TrigSrc-Scale-Sel "Software"
104+
dbpf $(SYS)-$(DEVICE):SoftSeq0-TrigSrc-Scale-Sel "Software"
121105

122106
dbpf $(SYS)-$(DEVICE):SoftSeq0-RunMode-Sel "Single"
123107

124-
125108
#add sequence events and corresponding tick lists
126-
system "/bin/bash /epics/iocs/cmds/hzb-v20-evr-02-cmd/evr_seq_sync.sh"
127-
128-
#dbpf $(SYS)-$(DEVICE):SoftSeq0-Commit-Cmd 1
129-
130-
131-
109+
system "/bin/bash /home/root/epics/iocs/cmds/hzb-v20-evr-02-cmd/evr_seq_sync.sh"
132110

111+
dbpf $(SYS)-$(DEVICE):SoftSeq0-Commit-Cmd 1
133112

134113
#perform sync one next event 125
135114
dbpf $(SYS)-$(DEVICE):SoftSeq0-Enable-Cmd 1

‎start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export IOC_EXEC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd
33
export VAR_DIR="/var"
44
export BASE_VER="7.0.1.1"
55
export REQUIRE_VER="3.0.4"
6-
export E3_BIN_DIR="/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
6+
export E3_BIN_DIR="/home/root/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
77
export IOC_ST_CMD=st.hzb-v20-evr-02.cmd
88
source "$E3_BIN_DIR/setE3Env.bash"
99
$E3_BIN_DIR/iocsh.bash $IOC_EXEC_DIR/$IOC_ST_CMD &

‎start_background.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export IOC_EXEC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd
33
export VAR_DIR="/var"
44
export BASE_VER="7.0.1.1"
55
export REQUIRE_VER="3.0.4"
6-
export E3_BIN_DIR="/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
6+
export E3_BIN_DIR="/home/root/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
77
export PROCSERV="/usr/bin/procServ"
88
export PROCSERV_PORT=2002
99
export PROCSERV_RUN_DIR=hzb-v20-evr-02

‎start_systemd.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
22
#export IOC_EXEC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
33
export IOC_NAME=hzb-v20-evr-02
4-
export IOC_EXEC_DIR=/epics/iocs/cmds/$IOC_NAME-cmd
4+
export IOC_EXEC_DIR=/home/root/epics/iocs/cmds/$IOC_NAME-cmd
55
export VAR_DIR="/var"
66
export BASE_VER="7.0.1.1"
77
export REQUIRE_VER="3.0.4"
8-
export E3_BIN_DIR="/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
8+
export E3_BIN_DIR="/home/root/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
99
export PROCSERV="/usr/bin/procServ"
1010
export PROCSERV_PORT=2002
1111
export PROCSERV_RUN_DIR=$IOC_NAME

0 commit comments

Comments
 (0)