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

Commit d0e932e

Browse files
author
WSmith
committed
latch timestamp and some changes to st.cmd
1 parent cbbc4bc commit d0e932e

6 files changed

+159
-136
lines changed

detint.cmd

+131-127
Large diffs are not rendered by default.

evr_seq_sync.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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 $SYNC_TRIG_EVT
2+
caput -a $SYS-$DEVICE:SoftSeq0-EvtCode-SP 2 $DET_CLK_RST_EVT $SYNC_TRIG_EVT
33

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

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

latch_timestamp.sh

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
caput ESSIP-DET:TS-EVR-01:SoftSeq0-Disable-Cmd 1
2+
caput ESSIP-DET:TS-EVR-01:SoftSeq0-Unload-Cmd 1
3+
caput ESSIP-DET:TS-EVR-01:SoftSeq0-Load-Cmd 1
4+
caput ESSIP-DET:TS-EVR-01:SoftSeq0-RunMode-Sel 0
5+
caput -a ESSIP-DET:TS-EVR-01:SoftSeq0-EvtCode-SP 1 16
6+
caput -a ESSIP-DET:TS-EVR-01:SoftSeq0-Timestamp-SP 1 0
7+
caput -n ESSIP-DET:TS-EVR-01:SoftSeq0-Commit-Cmd 1
8+
caput ESSIP-DET:TS-EVR-01:SoftSeq0-Enable-Cmd 1

st.hzb-v20-evr-02.cmd

+16-5
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ epicsEnvSet("SYNC_EVNT_LETTER", "EvtF")
3737
epicsEnvSet("SYNC_TRIG_EVT", "16")
3838
epicsEnvSet("NANO_DELTA", "1000000000")
3939

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

4343

4444

4545
# Load the detector interface module
46-
iocshLoad("$(DETINT_CMD_TOP)/detint.cmd", "DEV1=RO1, DEV2=RO2, COM1=COM1, COM2=COM2,COM1_USB_DEV_NUM=$(COM1_USB_DEV_NUM),COM2_USB_DEV_NUM=$(COM2_USB_DEV_NUM), SYS=$(SYS), SYNC_EVNT=$(DET_RST_EVT), SYNC_EVNT_LETTER=$(SYNC_EVNT_LETTER), N_SEC_TICKS=1000000000 ")
46+
iocshLoad("$(DETINT_CMD_TOP)/detint.cmd", "DEV1=RO1, DEV2=RO2, COM1=COM1, COM2=COM2,COM1_USB_DEV_NUM=$(COM1_USB_DEV_NUM),COM2_USB_DEV_NUM=$(COM2_USB_DEV_NUM), SYS=$(SYS), SYNC_EVNT=$(DET_RST_EVT), SYNC_EVNT_LETTER=$(SYNC_EVNT_LETTER), N_SEC_TICKS=$(NANO_DELTA),SCAN_EVNT=3 ")
4747

4848

4949

@@ -91,6 +91,15 @@ dbpf $(SYS)-$(DEVICE):OutFPUV13-Ena-SP 1
9191
dbpf $(SYS)-$(DEVICE):OutFPUV13-Src-SP 9
9292

9393

94+
95+
96+
# Map pulser 7 to event code 125
97+
dbpf $(SYS)-$(DEVICE):DlyGen7-Evt-Trig0-SP 125
98+
dbpf $(SYS)-$(DEVICE):DlyGen7-Width-SP 10
99+
100+
101+
102+
94103
######## load the sync sequence ######
95104

96105
dbpf $(SYS)-$(DEVICE):SoftSeq0-Disable-Cmd 1
@@ -101,7 +110,9 @@ dbpf $(SYS)-$(DEVICE):SoftSeq0-Load-Cmd 1
101110
dbpf $(SYS)-$(DEVICE):SoftSeq0-TsResolution-Sel "3"
102111

103112
#connect the sequence to software trigger
104-
dbpf $(SYS)-$(DEVICE):SoftSeq0-TrigSrc-Scale-Sel "Software"
113+
#dbpf $(SYS)-$(DEVICE):SoftSeq0-TrigSrc-Scale-Sel "Software"
114+
#connect the sequence to software trigger
115+
dbpf $(SYS)-$(DEVICE):SoftSeq0-TrigSrc-Pulse-Sel "Pulser 7"
105116

106117
dbpf $(SYS)-$(DEVICE):SoftSeq0-RunMode-Sel "Single"
107118

@@ -111,5 +122,5 @@ system "/bin/bash /home/root/epics/iocs/cmds/hzb-v20-evr-02-cmd/evr_seq_sync.sh"
111122
dbpf $(SYS)-$(DEVICE):SoftSeq0-Commit-Cmd 1
112123

113124
#perform sync one next event 125
114-
dbpf $(SYS)-$(DEVICE):SoftSeq0-Enable-Cmd 1
125+
#dbpf $(SYS)-$(DEVICE):SoftSeq0-Enable-Cmd 1
115126

start_background.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export BASE_VER="7.0.1.1"
55
export REQUIRE_VER="3.0.4"
66
export E3_BIN_DIR="/home/root/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
77
export PROCSERV="/usr/bin/procServ"
8-
export PROCSERV_PORT=2002
8+
export PROCSERV_PORT=2003
99
export PROCSERV_RUN_DIR=hzb-v20-evr-02
1010
export PROCSERV_LOG_FILE=out-HZB-V20-EVR-02
1111

start_systemd.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export BASE_VER="7.0.1.1"
77
export REQUIRE_VER="3.0.4"
88
export E3_BIN_DIR="/home/root/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
99
export PROCSERV="/usr/bin/procServ"
10-
export PROCSERV_PORT=2002
10+
export PROCSERV_PORT=2003
1111
export PROCSERV_RUN_DIR=$IOC_NAME
1212
export PROCSERV_LOG_FILE=out-HZB-V20-EVR-02
1313

0 commit comments

Comments
 (0)