From f8ab198603d6fae4a02002ac67f461f9f8d3439b Mon Sep 17 00:00:00 2001 From: David Kline <dkline@aps.anl.gov> Date: Fri, 7 Mar 2008 18:46:49 +0000 Subject: [PATCH] Modified PF4 implementation. --- iocBoot/iocCygwin/st.cmd | 7 +++++-- iocBoot/iocLinux/st.cmd | 9 ++++++--- iocBoot/iocSolaris/st.cmd | 7 +++++-- iocBoot/iocvxWorks/st.cmd | 4 ++-- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/iocBoot/iocCygwin/st.cmd b/iocBoot/iocCygwin/st.cmd index 52cf4cd..a598126 100644 --- a/iocBoot/iocCygwin/st.cmd +++ b/iocBoot/iocCygwin/st.cmd @@ -171,7 +171,9 @@ dbLoadRecords("$(STD)/stdApp/Db/misc.db","P=xxx:") #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:") +#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") ############################################################################### iocInit @@ -196,7 +198,8 @@ iocInit 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=" +#seq pf4,"name=pf1,P=xxx:,H=pf4:,B=A,M=xxx:BraggEAO,B1=xxx:Unidig1Bo3,B2=xxx:Unidig1Bo4,B3=xxx:Unidig1Bo5,B4=xxx:Unidig1Bo6" +#seq pf4,"name=pf2,P=xxx:,H=pf4:,B=B,M=xxx:BraggEAO,B1=xxx:Unidig1Bo7,B2=xxx:Unidig1Bo8,B3=xxx:Unidig1Bo9,B4=xxx:Unidig1Bo10" # Start Femto amplifier sequence programs #seq femto,"name=fem1,P=xxx:,H=fem01:,F=seq01:,G1=xxx:Unidig1Bo6,G2=xxx:Unidig1Bo7,G3=xxx:Unidig1Bo8,NO=xxx:Unidig1Bo10" diff --git a/iocBoot/iocLinux/st.cmd b/iocBoot/iocLinux/st.cmd index 52ee01e..8935fbf 100644 --- a/iocBoot/iocLinux/st.cmd +++ b/iocBoot/iocLinux/st.cmd @@ -147,8 +147,10 @@ dbLoadRecords("$(STD)/stdApp/Db/misc.db","P=xxx:") ### 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") ############################################################################### iocInit @@ -170,7 +172,8 @@ iocInit #seq &orient, "P=xxx:orient1:,PM=xxx:,mTTH=m9,mTH=m10,mCHI=m11,mPHI=m12" # Start PF4 filter sequence program -#seq pf4Dual,"P=xxx:pf401:seq01:,MONO=,A0=,A1=,A2=,A3=,B0=,B1=,B2=,B3=" +#seq pf4,"name=pf1,P=xxx:,H=pf4:,B=A,M=xxx:BraggEAO,B1=xxx:Unidig1Bo3,B2=xxx:Unidig1Bo4,B3=xxx:Unidig1Bo5,B4=xxx:Unidig1Bo6" +#seq pf4,"name=pf2,P=xxx:,H=pf4:,B=B,M=xxx:BraggEAO,B1=xxx:Unidig1Bo7,B2=xxx:Unidig1Bo8,B3=xxx:Unidig1Bo9,B4=xxx:Unidig1Bo10" # Start Femto amplifier sequence programs #seq femto,"name=fem1,P=xxx:,H=fem01:,F=seq01:,G1=xxx:Unidig1Bo6,G2=xxx:Unidig1Bo7,G3=xxx:Unidig1Bo8,NO=xxx:Unidig1Bo10" diff --git a/iocBoot/iocSolaris/st.cmd b/iocBoot/iocSolaris/st.cmd index 665b898..14f7e21 100644 --- a/iocBoot/iocSolaris/st.cmd +++ b/iocBoot/iocSolaris/st.cmd @@ -122,7 +122,9 @@ dbLoadRecords("$(STD)/stdApp/Db/misc.db","P=xxx:") #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:") +#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") ############################################################################### iocInit @@ -135,7 +137,8 @@ iocInit #seq &orient, "P=xxx:orient1:,PM=xxx:,mTTH=m9,mTH=m10,mCHI=m11,mPHI=m12" # Start PF4 filter sequence program -#seq pf4Dual,"P=xxx:pf401:seq01:,MONO=,A0=,A1=,A2=,A3=,B0=,B1=,B2=,B3=" +#seq &pf4,"name=pf1,P=xxx:,H=pf4:,B=A,M=xxx:BraggEAO,B1=xxx:Unidig1Bo3,B2=xxx:Unidig1Bo4,B3=xxx:Unidig1Bo5,B4=xxx:Unidig1Bo6" +#seq &pf4,"name=pf2,P=xxx:,H=pf4:,B=B,M=xxx:BraggEAO,B1=xxx:Unidig1Bo7,B2=xxx:Unidig1Bo8,B3=xxx:Unidig1Bo9,B4=xxx:Unidig1Bo10" # Start Femto amplifier sequence programs #seq femto,"name=fem1,P=xxx:,H=fem01:,F=seq01:,G1=xxx:Unidig1Bo6,G2=xxx:Unidig1Bo7,G3=xxx:Unidig1Bo8,NO=xxx:Unidig1Bo10" diff --git a/iocBoot/iocvxWorks/st.cmd b/iocBoot/iocvxWorks/st.cmd index 081f483..d4b36be 100644 --- a/iocBoot/iocvxWorks/st.cmd +++ b/iocBoot/iocvxWorks/st.cmd @@ -248,14 +248,14 @@ seq &Io, "P=xxx:Io:,MONO=xxx:BraggEAO,VSC=xxx:scaler1" #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" +#seq &pf4,"name=pf1,P=xxx:,H=pf4:,B=A,M=xxx:BraggEAO,B1=xxx:Unidig1Bo3,B2=xxx:Unidig1Bo4,B3=xxx:Unidig1Bo5,B4=xxx:Unidig1Bo6" +#seq &pf4,"name=pf2,P=xxx:,H=pf4:,B=B,M=xxx:BraggEAO,B1=xxx:Unidig1Bo7,B2=xxx:Unidig1Bo8,B3=xxx:Unidig1Bo9,B4=xxx:Unidig1Bo10" ### Start up the autosave task and tell it what to do. # The task is actually named "save_restore". create_monitor_set("dummy.req",0,"") - # Note that you can reload these sets after creating them: e.g., # reload_monitor_set("auto_settings.req",30,"P=xxx:") #save_restoreDebug=20 -- GitLab