From 21f8803346ab83f6e6192613343716919a7ad396 Mon Sep 17 00:00:00 2001 From: David Kline <dkline@aps.anl.gov> Date: Fri, 7 Mar 2008 18:14:19 +0000 Subject: [PATCH] Modified calling sequence for femto snl application. --- iocBoot/iocCygwin/st.cmd | 2 +- iocBoot/iocLinux/st.cmd | 2 +- iocBoot/iocSolaris/st.cmd | 2 +- iocBoot/iocvxWorks/auto_settings.req | 7 +++++-- iocBoot/iocvxWorks/st.cmd | 19 +++++++++++-------- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/iocBoot/iocCygwin/st.cmd b/iocBoot/iocCygwin/st.cmd index b97aff3..52cf4cd 100644 --- a/iocBoot/iocCygwin/st.cmd +++ b/iocBoot/iocCygwin/st.cmd @@ -199,7 +199,7 @@ seq &Io, "P=xxx:Io:,MONO=xxx:BraggEAO,VSC=xxx:scaler1" #seq pf4Dual,"P=xxx:pf401:seq01:,MONO=,A0=,A1=,A2=,A3=,B0=,B1=,B2=,B3=" # Start Femto amplifier sequence programs -#seq femto,"name=femto1,P=xxx:,H=fem01:,F=seq01:,GAIN1=,GAIN2=,GAIN3=,NOISE=" +#seq femto,"name=fem1,P=xxx:,H=fem01:,F=seq01:,G1=xxx:Unidig1Bo6,G2=xxx:Unidig1Bo7,G3=xxx:Unidig1Bo8,NO=xxx:Unidig1Bo10" ### Start up the autosave task and tell it what to do. # The task is actually named "save_restore". diff --git a/iocBoot/iocLinux/st.cmd b/iocBoot/iocLinux/st.cmd index 70153fa..52ee01e 100644 --- a/iocBoot/iocLinux/st.cmd +++ b/iocBoot/iocLinux/st.cmd @@ -173,7 +173,7 @@ iocInit #seq pf4Dual,"P=xxx:pf401:seq01:,MONO=,A0=,A1=,A2=,A3=,B0=,B1=,B2=,B3=" # Start Femto amplifier sequence programs -#seq femto,"name=femto1,P=xxx:,H=fem01:,F=seq01:,GAIN1=,GAIN2=,GAIN3=,NOISE=" +#seq femto,"name=fem1,P=xxx:,H=fem01:,F=seq01:,G1=xxx:Unidig1Bo6,G2=xxx:Unidig1Bo7,G3=xxx:Unidig1Bo8,NO=xxx:Unidig1Bo10" ### Start up the autosave task and tell it what to do. # The task is actually named "save_restore". diff --git a/iocBoot/iocSolaris/st.cmd b/iocBoot/iocSolaris/st.cmd index cc73b00..665b898 100644 --- a/iocBoot/iocSolaris/st.cmd +++ b/iocBoot/iocSolaris/st.cmd @@ -138,7 +138,7 @@ iocInit #seq pf4Dual,"P=xxx:pf401:seq01:,MONO=,A0=,A1=,A2=,A3=,B0=,B1=,B2=,B3=" # Start Femto amplifier sequence programs -#seq femto,"name=femto1,P=xxx:,H=fem01:,F=seq01:,GAIN1=,GAIN2=,GAIN3=,NOISE=" +#seq femto,"name=fem1,P=xxx:,H=fem01:,F=seq01:,G1=xxx:Unidig1Bo6,G2=xxx:Unidig1Bo7,G3=xxx:Unidig1Bo8,NO=xxx:Unidig1Bo10" ### Start up the autosave task and tell it what to do. # The task is actually named "save_restore". diff --git a/iocBoot/iocvxWorks/auto_settings.req b/iocBoot/iocvxWorks/auto_settings.req index 5313bbd..d8a6ead 100644 --- a/iocBoot/iocvxWorks/auto_settings.req +++ b/iocBoot/iocvxWorks/auto_settings.req @@ -160,12 +160,15 @@ $(P)hsc1:vID $(P)hsc1:enable $(P)hsc1:debug -## Femto amplifier 4 +## Femto amplifier #file femto.req P=$(P),H=fem01:,F=seq01: ## PF4 dual filter -#file pf4dual.req P=$(P),H=pf401:,F=seq01: +#file pf4common.req P=$(P),H=pf4: +#file pf4bank.req P=$(P),H=pf4:,B=A +#file pf4bank.req P=$(P),H=pf4:,B=B +## file deviceCmdReply_settings.req P=$(P),N=1 file deviceCmdReply_settings.req P=$(P),N=2 file deviceCmdReply_settings.req P=$(P),N=3 diff --git a/iocBoot/iocvxWorks/st.cmd b/iocBoot/iocvxWorks/st.cmd index 1a1305d..081f483 100644 --- a/iocBoot/iocvxWorks/st.cmd +++ b/iocBoot/iocvxWorks/st.cmd @@ -203,8 +203,10 @@ dbLoadTemplate("vxStats.substitutions") ### Load database records for Femto amplifiers #dbLoadRecords("$(STD)/stdApp/Db/femto.db","P=xxx:,H=fem01:,F=seq01:") -### Load database records for PF4 filters -#dbLoadRecords("$(OPTICS)/opticsApp/Db/pf4dual.db","P=xxx:,H=pf401:,F=seq01:") +### Load database records for dual PF4 filters +#dbLoadRecords("$(OPTICS)/opticsApp/Db/pf4common.db","P=xxx:,H=pf4:,A=A,B=B") +#dbLoadRecords("$(OPTICS)/opticsApp/Db/pf4bank.db","P=xxx:,H=pf4:,B=A") +#dbLoadRecords("$(OPTICS)/opticsApp/Db/pf4bank.db","P=xxx:,H=pf4:,B=B") ############################################################################### # Set shell prompt (otherwise it is left at mv167 or mv162) @@ -212,7 +214,9 @@ shellPromptSet "iocvxWorks> " iocLogDisable=0 iocInit -### startup State Notation Language programs +### Startup State Notation Language (SNL) programs +# NOTE: Command line limited to 128 characters + #seq &kohzuCtl, "P=xxx:, M_THETA=m9, M_Y=m10, M_Z=m11, GEOM=2, logfile=kohzuCtl.log" ### Example of specifying offset limits ##taskDelay(300) @@ -240,11 +244,11 @@ iocInit # Io calculation seq &Io, "P=xxx:Io:,MONO=xxx:BraggEAO,VSC=xxx:scaler1" -# Start PF4 filter sequence program -#seq pf4Dual,"P=xxx:pf401:seq01:,MONO=,A0=,A1=,A2=,A3=,B0=,B1=,B2=,B3=" - # Start Femto amplifier sequence programs -#seq femto,"name=femto1,P=xxx:,H=fem01:,F=seq01:,GAIN1=,GAIN2=,GAIN3=,NOISE=" +#seq &femto,"name=fem1,P=xxx:,H=fem01:,F=seq01:,G1=xxx:Unidig1Bo6,G2=xxx:Unidig1Bo7,G3=xxx:Unidig1Bo8,NO=xxx:Unidig1Bo10" + +# Start PF4 filter sequence program +#seq &pf4,"name=pf4,P=xxx:,H=pf4:,B=A,MONO=xxx:BraggEAO,B1=xxx:Unidig1Bo6,B2=xxx:Unidig1Bo7,B3=xxx:Unidig1Bo8,B4=xxx:Unidig1Bo9" ### Start up the autosave task and tell it what to do. # The task is actually named "save_restore". @@ -273,4 +277,3 @@ dbcar(0,1) # motorUtil (allstop & alldone) motorUtilInit("xxx:") - -- GitLab