Skip to content
Snippets Groups Projects
Commit d2247a8b authored by Jean-François Denis's avatar Jean-François Denis
Browse files

Change IFCDAQ module for FASTAQUISITION module

parent 7758c509
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
db/EMU.substitutions
+ 37
− 7
View file @ d2247a8b
...@@ -294,15 +294,15 @@ file "scanDAQDetTrig.template" ...@@ -294,15 +294,15 @@ file "scanDAQDetTrig.template"
"3", "3",
"$(DAQNDSPREFIX):AI-STAT", "$(DAQNDSPREFIX):CARD0-STAT",
"ON", "ON",
"$(DAQNDSPREFIX):AI-STAT", "$(DAQNDSPREFIX):CARD0-STAT",
"RUNNING", "RUNNING",
"$(DEVICE):$(SCAN_EF)-SAVE_TS", "$(DEVICE):$(SCAN_EF)-SAVE_TS",
"$(DAQNDSPREFIX):AI-STAT-RB", "$(DAQNDSPREFIX):CARD0-STAT-RB",
"4" "4"
} }
} }
...@@ -335,7 +335,7 @@ file "scanDAQDet.template" ...@@ -335,7 +335,7 @@ file "scanDAQDet.template"
"55" "55"
"$(DAQBUFSIZE)", "$(DAQBUFSIZE)",
"$(DAQNDSPREFIX):AI-TRGR-RB", "$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
"$(DAQNDSPREFIX):$(DET1WF)", "$(DAQNDSPREFIX):$(DET1WF)",
"$(DAQNDSPREFIX):$(DET1WF).NORD" "$(DAQNDSPREFIX):$(DET1WF).NORD"
} }
...@@ -368,7 +368,7 @@ file "scanDAQDet.template" ...@@ -368,7 +368,7 @@ file "scanDAQDet.template"
"55" "55"
"$(DAQBUFSIZE)", "$(DAQBUFSIZE)",
"$(DAQNDSPREFIX):AI-TRGR-RB", "$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
"$(DAQNDSPREFIX):$(DET2WF)", "$(DAQNDSPREFIX):$(DET2WF)",
"$(DAQNDSPREFIX):$(DET2WF).NORD" "$(DAQNDSPREFIX):$(DET2WF).NORD"
} }
...@@ -401,12 +401,42 @@ file "scanDAQDet.template" ...@@ -401,12 +401,42 @@ file "scanDAQDet.template"
"55" "55"
"$(DAQBUFSIZE)", "$(DAQBUFSIZE)",
"$(DAQNDSPREFIX):AI-TRGR-RB", "$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
"$(DAQNDSPREFIX):$(DET3WF)", "$(DAQNDSPREFIX):$(DET3WF)",
"$(DAQNDSPREFIX):$(DET3WF).NORD" "$(DAQNDSPREFIX):$(DET3WF).NORD"
} }
} }
##########################################################################
################################ DTACQ ##################################
##########################################################################
file DataAcquisitionChannel.template
{
pattern
{ SECTION, SUBSECTION, DISC, DEVICE, SIGNAL,DESCRIPTION, EVENT_IN,NELM,SIZE,SAMPLING_RATE_PV}
{"LNS","ISRC-010","PBI-EM","FC","CurrR","Current FC",10,16000,520,LNS-ISRC-010:CARD0:SAMPLINGRATE-RB}
{"LNS","ISRC-010","PBI-EM","HV1","VoltR","Voltage HV1 FC",11,16000,520,LNS-ISRC-010:CARD0:SAMPLINGRATE-RB}
{"LNS","ISRC-010","PBI-EM","HV2","VoltR","Voltage HV2 FC",12,16000,520,LNS-ISRC-010:CARD0:SAMPLINGRATE-RB}
}
file FastAcquisition.template
{
pattern
{ SECTION, SUBSECTION, DISC, DEVICE, SIGNAL,NICKNAME,EVENT_OUT,CARD,CHANNEL,NELM }
{"LNS","ISRC-010","PBI-EM","FC","CurrR","CurrR",10,0,0,16000}
{"LNS","ISRC-010","PBI-EM","HV1","VoltR","HV1VoltR",11,0,1,16000}
{"LNS","ISRC-010","PBI-EM","HV2","VoltR","HV2VoltR",12,0,2,16000}
}
file FastAcquisitionInformation.template
{
pattern
{ CARD,FMC,NELM,PREFIX}
{0,2,16000,"LNS-ISRC-010"}
}
########################################################################## ##########################################################################
################################ PROCESS ################################ ################################ PROCESS ################################
########################################################################## ##########################################################################
...@@ -422,7 +452,7 @@ pattern {DEVICE, SCAN_EF} ...@@ -422,7 +452,7 @@ pattern {DEVICE, SCAN_EF}
file EMU_CALCUL.template file EMU_CALCUL.template
{ {
pattern {DEVICE,DAQPREFIX,DET2WF,DET3WF,DET2,DET3,NELM,SCAN_EF} pattern {DEVICE,DAQPREFIX,DET2WF,DET3WF,DET2,DET3,NELM,SCAN_EF}
{"$(DEVICE)","$(DAQNDSPREFIX)","AI-CH1-DATA","AI-CH2-DATA","DET2","DET3","$(DAQBUFSIZE)","PS"} {"$(DEVICE)","$(DAQNDSPREFIX)","PBI-EM-HV1:VoltR_Y","PBI-EM-HV2:VoltR_Y","DET2","DET3","$(DAQBUFSIZE)","PS"}
} }
########################################################################## ##########################################################################
......
opi/EMU.opi
+ 631
− 499
View file @ d2247a8b
This diff is collapsed.
startup/EMU.cmd
+ 29
− 25
View file @ d2247a8b
# Required modules ### # Required modules ###
require ifcdaq,0.2.0 require ifcdaq,0.2.0
require singlemotion require singlemotion,1.4.6
require mrfsample require mrfsample,1.1.1
require pev require pev,0.1.1
require emu,jfdenis
require ecat2db,0.3.2 require ecat2db,0.3.2
require FastAcquisition,agaget
require DataAcquisition,agaget
require emu,jfdenis
### MACROS ### ### MACROS ###
# PMAC common macros3 ) # PMAC common macros3 )
...@@ -58,7 +62,7 @@ epicsEnvSet("EVR_PUL0_DELAY", "$(EVR_EV14_OUT0_DELAY=0)") ...@@ -58,7 +62,7 @@ epicsEnvSet("EVR_PUL0_DELAY", "$(EVR_EV14_OUT0_DELAY=0)")
epicsEnvSet("EVR_PUL0_WIDTH", "$(EVR_EV14_OUT0_WIDTH=1000)") epicsEnvSet("EVR_PUL0_WIDTH", "$(EVR_EV14_OUT0_WIDTH=1000)")
#DAQ macros #DAQ macros
epicsEnvSet("DAQPREFIX", "SCANNINGDAQ" ) epicsEnvSet("DAQPREFIX", "LNS-ISRC-010" )
epicsEnvSet("DAQBUFSIZE", "1024" ) epicsEnvSet("DAQBUFSIZE", "1024" )
#Scanning macros #Scanning macros
...@@ -82,7 +86,7 @@ mrmEvgSetupVME($(EVG), $(EVG_VMESLOT), 0x100000, 1, 0x01) ...@@ -82,7 +86,7 @@ mrmEvgSetupVME($(EVG), $(EVG_VMESLOT), 0x100000, 1, 0x01)
mrmEvrSetupPCI($(EVR), $(EVR_PCIDOMAIN), $(EVR_PCIBUS), $(EVR_PCIDEVICE), $(EVR_PCIFUNCTION)) mrmEvrSetupPCI($(EVR), $(EVR_PCIDOMAIN), $(EVR_PCIBUS), $(EVR_PCIDEVICE), $(EVR_PCIFUNCTION))
# Initialize daq # Initialize daq
ndsCreateDevice(ifcdaq, $(DAQPREFIX), card=0, fmc=2) ndsCreateDevice(ifcdaq, CARD0, card=0, fmc=2)
### LOAD RECORDS ### ### LOAD RECORDS ###
...@@ -95,10 +99,10 @@ dbLoadRecords("evr-softEvent.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PU ...@@ -95,10 +99,10 @@ dbLoadRecords("evr-softEvent.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PU
dbLoadRecords("evr-pulserMap.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), PID=0, F=Trig, ID=0") dbLoadRecords("evr-pulserMap.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), PID=0, F=Trig, ID=0")
## Load ifcdaq instance ## Load ifcdaq instance
dbLoadRecords(IFCDAQAIChannelGroup.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI") #dbLoadRecords(IFCDAQAIChannelGroup.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI")
dbLoadRecords(IFCDAQAIChannel.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH0, NELM=$(DAQBUFSIZE)") #dbLoadRecords(IFCDAQAIChannel.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH0, NELM=$(DAQBUFSIZE)")
dbLoadRecords(IFCDAQAIChannel.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH1, NELM=$(DAQBUFSIZE)") #dbLoadRecords(IFCDAQAIChannel.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH1, NELM=$(DAQBUFSIZE)")
dbLoadRecords(IFCDAQAIChannel.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH2, NELM=$(DAQBUFSIZE)") #dbLoadRecords(IFCDAQAIChannel.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH2, NELM=$(DAQBUFSIZE)")
# #
# Load Single motions records # Load Single motions records
...@@ -122,7 +126,7 @@ dbLoadRecords("motorStatus.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_N ...@@ -122,7 +126,7 @@ dbLoadRecords("motorStatus.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_N
dbLoadRecords("motorHoming.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1),ASYN_PORT=$(PMACPORT),AXIS_NO=$(AXIS_NO1),PREC=$(PREC),EGU=$(EGU)") dbLoadRecords("motorHoming.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1),ASYN_PORT=$(PMACPORT),AXIS_NO=$(AXIS_NO1),PREC=$(PREC),EGU=$(EGU)")
dbLoadRecords("EMU.db", "DEVICE=$(SCANPREFIX), SCAN_SLIT=$(SCAN_SLIT), SCAN_EF=$(SCAN_EF),MTRREC=$(PMACPREFIX):$(MOTOR_NAME1), MAX_POINTS_EF=$(SCAN_POINTS_EF), MAX_POINTS_SLIT=$(SCAN_POINTS_SLIT), DAQNDSPREFIX=$(DAQPREFIX), DAQBUFSIZE=$(DAQBUFSIZE), DET1WF=AI-CH0-DATA, DET2WF=AI-CH1-DATA, DET3WF=AI-CH2-DATA, TR_TL=$(SYS)-$(EVR):Pul0-Ena-Sel, TR_TLTSEL=$(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME, PSU_SP=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU_RBV=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU2_SP=LNS-ISRC-010:PBI-EM:HVver-SP, PSU2_RBV=LNS-ISRC-010:PBI-EM:HVver-SP") dbLoadRecords("EMU.db", "DEVICE=$(SCANPREFIX), SCAN_SLIT=$(SCAN_SLIT), SCAN_EF=$(SCAN_EF),MTRREC=$(PMACPREFIX):$(MOTOR_NAME1), MAX_POINTS_EF=$(SCAN_POINTS_EF), MAX_POINTS_SLIT=$(SCAN_POINTS_SLIT), DAQNDSPREFIX=$(DAQPREFIX), DAQBUFSIZE=$(DAQBUFSIZE), DET1WF=PBI-EM-FC:CurrR_Y, DET2WF=PBI-EM-HV1:VoltR_Y, DET3WF=PBI-EM-HV2:VoltR_Y, TR_TL=$(SYS)-$(EVR):Pul0-Ena-Sel, TR_TLTSEL=$(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME, PSU_SP=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU_RBV=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU2_SP=LNS-ISRC-010:PBI-EM:HVver-SP, PSU2_RBV=LNS-ISRC-010:PBI-EM:HVver-SP")
# #
# Init ETHERCAT module # Init ETHERCAT module
...@@ -143,21 +147,21 @@ seq RampCurrent "PREFIX_PS=LNS-ISRC-010:PBI-EM,CONS_PS2=HVhor-SP,DEVICE=SCAN,SCA ...@@ -143,21 +147,21 @@ seq RampCurrent "PREFIX_PS=LNS-ISRC-010:PBI-EM,CONS_PS2=HVhor-SP,DEVICE=SCAN,SCA
# SET INTERFACE FROM IFCDAQ TO Allison scanner # SET INTERFACE FROM IFCDAQ TO Allison scanner
# Forward link wf record to Detector guard # Forward link wf record to Detector guard
dbpf $(DAQPREFIX):AI-CH0-DATA.FLNK $(SCANPREFIX):DET1-GUARD dbpf $(DAQPREFIX):PBI-EM-FC:CurrR_Y.FLNK $(SCANPREFIX):DET1-GUARD
dbpf $(DAQPREFIX):AI-CH1-DATA.FLNK $(SCANPREFIX):DET2-GUARD dbpf $(DAQPREFIX):PBI-EM-HV1:VoltR_Y.FLNK $(SCANPREFIX):DET2-GUARD
dbpf $(DAQPREFIX):AI-CH2-DATA.FLNK $(SCANPREFIX):DET3-GUARD dbpf $(DAQPREFIX):PBI-EM-HV2:VoltR_Y.FLNK $(SCANPREFIX):DET3-GUARD
# Forward link from state record to Detector trigger # Forward link from state record to Detector trigger
dbpf $(DAQPREFIX):AI-STAT-RB.FLNK $(SCANPREFIX):DAQTRG-DAQSTGUARD dbpf $(DAQPREFIX):CARD0-STAT-RB.FLNK $(SCANPREFIX):DAQTRG-DAQSTGUARD
# Forward link number of samples rbv to compress N record, so that detetor know number of elements to average over. # Forward link number of samples rbv to compress N record, so that detetor know number of elements to average over.
dbpf $(DAQPREFIX):AI-SMNM-RB.FLNK "$(SCANPREFIX):DET1-COMPRESSN" dbpf $(DAQPREFIX):CARD0:NSAMPLES-RB.FLNK "$(SCANPREFIX):DET1-COMPRESSN"
# Set tsel on WF record to event record in EVR # Set tsel on WF record to event record in EVR
dbpf $(DAQPREFIX):AI-CH0-DATA.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME dbpf $(DAQPREFIX):PBI-EM-FC:CurrR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
dbpf $(DAQPREFIX):AI-CH1-DATA.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME dbpf $(DAQPREFIX):PBI-EM-HV1:VoltR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
dbpf $(DAQPREFIX):AI-CH2-DATA.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME dbpf $(DAQPREFIX):PBI-EM-HV2:VoltR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
############################################################ ############################################################
################### Configuration Timing ################### ################### Configuration Timing ###################
...@@ -184,17 +188,17 @@ dbpf $(SYS)-$(EVR):FrontOut0-Ena-SP "Enabled" ...@@ -184,17 +188,17 @@ dbpf $(SYS)-$(EVR):FrontOut0-Ena-SP "Enabled"
### Setup IFCDAQ PVs ### ### Setup IFCDAQ PVs ###
# Set the DAQ to on state # Set the DAQ to on state
#dbpf $(DAQPREFIX):AI-STAT "ON" #dbpf $(DAQPREFIX):CARD0-STAT "ON"
# Set trigger repeat to 1 # Set trigger repeat to 1
dbpf $(DAQPREFIX):AI-TRGR 1 dbpf $(DAQPREFIX):CARD0:TriggerRepeat 1
# Set trigger source to external GPIO # Set trigger source to external GPIO
dbpf $(DAQPREFIX):AI-TRGS "EXT-GPIO" dbpf $(DAQPREFIX):CARD0:TRIGGERSOURCE "EXT-GPIO"
sleep(1) sleep(1)
dbpf $(DAQPREFIX):AI-STAT ON dbpf $(DAQPREFIX):CARD0-STAT ON
sleep(3) sleep(3)
dbpf $(DAQPREFIX):AI-STAT RUNNING dbpf $(DAQPREFIX):CARD0-STAT RUNNING
sleep(1) sleep(1)
dbpf $(DAQPREFIX):AI-STAT RUNNING dbpf $(DAQPREFIX):CARD0-STAT RUNNING
### Setup reasonable values for sscan record ### ### Setup reasonable values for sscan record ###
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment