Skip to content
Snippets Groups Projects
Commit aa284ccf authored by Sector 29 service account's avatar Sector 29 service account
Browse files

Non-overlapping sweep sorted -- needs testing. Fixed and Baby sweep should still be working

parent fe917273
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
29idcScientaApp/Db/arrayFxns.db
+ 2
− 2
View file @ aa284ccf
......@@ -62,7 +62,7 @@ record(ai, "$(PHV)ROI:width")
{
field(DESC, "width of image in pixels")
field(DTYP, "Soft Channel")
field(INP, "29idcScienta:ROI2:SizeX_RBV CP")
field(INP, "$(P)ROI2:SizeX_RBV CP")
field(DISV, "1")
field(SDIS, "$(PHV)spectraInProgress")
}
......@@ -71,7 +71,7 @@ record(ai, "$(PHV)ROI:height")
{
field(DESC, "height in pixels of image")
field(DTYP, "Soft Channel")
field(INP, "29idcScienta:ROI2:SizeY_RBV CP")
field(INP, "$(P)ROI2:SizeY_RBV CP")
field(DISV, "1")
field(SDIS, "$(PHV)spectraInProgress")
}
......
29idcScientaApp/Db/scientaCalcs.db
+ 68
− 53
View file @ aa284ccf
......@@ -249,46 +249,46 @@ record(acalcout, "$(P)FixedArrSize") {
# Sweep calcs - common to both overlapping and non-overlapping and/or baby sweep
#------------------------------------------------------------------------------
record(calcout, "$(P)scanStartCalc") {
field(DESC, "Calculate start energy for all Sweeps")
field(INPA, "$(PHV)ROI:width CP NMS")
field(INPB, "$(PHV)pixelEnergy CP NMS")
field(INPC, "$(PHV)sweepStartEnergy CP NMS")
field(INPD, "$(PHV)sweepType CP NMS")
field(INPE, "$(PHV)babySweepSteps CP NMS")
field(CALC, "C-((D=0?E:A)-((D=0?E:A)%2=0?2:1))/2*B")
field(OUT, "$(PHV)scan2.P1SP NPP NMS")
field(DISV, "1")
field(SDIS, "$(PHV)spectraInProgress")
field(PREC, "8")
}
record(calcout, "$(P)scanStopCalc") {
field(DESC, "Calculate stop energy for all sweeps")
field(INPA, "$(PHV)ROI:width CP NMS")
field(INPB, "$(PHV)pixelEnergy CP NMS")
field(INPC, "$(PHV)sweepStopEnergy CP NMS")
field(INPD, "$(PHV)sweepType CP NMS")
field(INPE, "$(PHV)babySweepSteps CP NMS")
field(INPF, "$(PHV)sweepStartEnergy CP NMS")
field(CALC, "(D=2?C:F)+((D=0?E:A)-((D=0?E:A)%2=0?0:1))/2*B")
field(OUT, "$(PHV)scan2.P1EP NPP NMS")
field(DISV, "1")
field(SDIS, "$(PHV)spectraInProgress")
field(PREC, "8")
}
record(calcout, "$(P)scanStepCalc") {
field(DESC, "Calculate number of steps for sweeps")
field(INPA, "$(PHV)pixelEnergy CP NMS")
field(INPB, "$(P)scanStartCalc CP NMS")
field(INPC, "$(P)scanStopCalc CP NMS")
field(CALC, "((C-B)/A)+1")
field(OUT, "$(PHV)scan2.NPTS NPP NMS")
field(DISV, "1")
field(SDIS, "$(PHV)spectraInProgress")
field(PREC, "8")
}
#record(calcout, "$(P)scanStartCalc") {
# field(DESC, "Calculate start energy for all Sweeps")
# field(INPA, "$(PHV)ROI:width CP NMS")
# field(INPB, "$(PHV)pixelEnergy CP NMS")
# field(INPC, "$(PHV)sweepStartEnergy CP NMS")
# field(INPD, "$(PHV)sweepType CP NMS")
# field(INPE, "$(PHV)babySweepSteps CP NMS")
# field(CALC, "C-((D=0?E:A)-((D=0?E:A)%2=0?2:1))/2*B")
# field(OUT, "$(PHV)scan2.P1SP NPP NMS")
# field(DISV, "1")
# field(SDIS, "$(PHV)spectraInProgress")
# field(PREC, "8")
#}
#record(calcout, "$(P)scanStopCalc") {
# field(DESC, "Calculate stop energy for all sweeps")
# field(INPA, "$(PHV)ROI:width CP NMS")
# field(INPB, "$(PHV)pixelEnergy CP NMS")
# field(INPC, "$(PHV)sweepStopEnergy CP NMS")
# field(INPD, "$(PHV)sweepType CP NMS")
# field(INPE, "$(PHV)babySweepSteps CP NMS")
# field(INPF, "$(PHV)sweepStartEnergy CP NMS")
# field(CALC, "(D=2?C:F)+((D=0?E:A)-((D=0?E:A)%2=0?0:1))/2*B")
# field(OUT, "$(PHV)scan2.P1EP NPP NMS")
# field(DISV, "1")
# field(SDIS, "$(PHV)spectraInProgress")
# field(PREC, "8")
#}
#record(calcout, "$(P)scanStepCalc") {
# field(DESC, "Calculate number of steps for sweeps")
# field(INPA, "$(PHV)pixelEnergy CP NMS")
# field(INPB, "$(P)scanStartCalc CP NMS")
# field(INPC, "$(P)scanStopCalc CP NMS")
# field(CALC, "((C-B)/A)+1")
# field(OUT, "$(PHV)scan2.NPTS NPP NMS")
# field(DISV, "1")
# field(SDIS, "$(PHV)spectraInProgress")
# field(PREC, "8")
#}
# SweepStart - generally set by user
......@@ -314,6 +314,15 @@ record(ao, "$(PHV)osScanStartE")
field(SDIS, "$(PHV)spectraInProgress")
}
record(ao, "$(PHV)nosScanStartE")
{
field(DTYP, "Soft Channel")
field(DESC, "NO sweep start energy middle")
field(SCAN, "Passive")
field(EGU, "eV")
field(PREC, "8")
}
# SweepStop - generally set by user
record(ao, "$(PHV)bsScanStopE")
......@@ -338,6 +347,14 @@ record(ao, "$(PHV)osScanStopE")
field(SDIS, "$(PHV)spectraInProgress")
}
record(ao, "$(PHV)nosScanStopE")
{
field(DTYP, "Soft Channel")
field(DESC, "NO sweep stop energy")
field(SCAN, "Passive")
field(PREC, "8")
field(EGU, "eV")
}
#------------------------------------------------------------------------------
# baby sweep related calcs
......@@ -373,8 +390,6 @@ record(calcout, "$(PHV)BSStopCalc")
field(SDIS, "$(PHV)spectraInProgress")
}
#------------------------------------------------------------------------------
# Sweep (non-overlapping) related calcs
#------------------------------------------------------------------------------
......@@ -385,14 +400,14 @@ record(calcout, "$(PHV)BSStopCalc")
record(calcout, "$(PHV)NOSStartCalc")
{
field(DTYP, "Soft Channel")
field(DESC, "Calc start energy for BabySweep")
field(DESC, "Calc start energy for inner NOS")
field(SCAN, "Passive")
field(INPA, "$(PHV)KineticEnergy")
field(INPA, "$(PHV)SweepEnergy CP")
field(INPB, "$(PHV)pixelEnergy")
field(INPC, "$(PHV)ROI:width")
field(CALC, "A - B*(C-1)/2.0")
field(PREC, "8")
field(OUT, "$(PHV)scan2.P1SP")
field(OUT, "$(PHV)nosScanStartE")
field(DISV, "1")
field(SDIS, "0")
}
......@@ -400,14 +415,14 @@ record(calcout, "$(PHV)NOSStartCalc")
record(calcout, "$(PHV)NOSStopCalc")
{
field(DTYP, "Soft Channel")
field(DESC, "Calc stop energy for BabySweep")
field(DESC, "Calc stop energy for inner NOS")
field(SCAN, "Passive")
field(INPA, "$(PHV)KineticEnergy")
field(INPA, "$(PHV)SweepEnergy CP")
field(INPB, "$(PHV)pixelEnergy")
field(INPC, "$(PHV)ROI:width")
field(CALC, "A + B*(C-1)/2.0")
field(PREC, "8")
field(OUT, "$(PHV)scan2.P1EP")
field(OUT, "$(PHV)nosScanStopE")
field(DISV, "1")
field(SDIS, "0")
}
......@@ -416,7 +431,7 @@ record(calcout, "$(PHV)NOSStopCalc")
record(calcout, "$(PHV)sweepStepsCalc")
{
field(DTYP, "Soft Channel")
field(DESC, "Calc stop energy for NO Sweep")
field(DESC, "Calc number of steps for NO Sweep")
field(SCAN, "Passive")
field(INPA, "$(PHV)sweepStartEnergy CP")
field(INPB, "$(PHV)sweepStopEnergy CP")
......@@ -436,7 +451,7 @@ record(calcout, "$(PHV)sweepStepsCalc")
record(calcout, "$(PHV)OSStepsCalc")
{
field(DTYP, "Soft Channel")
field(DESC, "Calc start energy for BabySweep")
field(DESC, "Calc start energy for overlapping Sweep")
field(SCAN, "Passive")
field(INPA, "$(PHV)sweepStartEnergy CP")
field(INPB, "$(PHV)sweepStopEnergy CP")
......@@ -455,7 +470,7 @@ record(calcout, "$(PHV)OSStartCalc")
field(SCAN, "Passive")
field(INPA, "$(PHV)sweepStartEnergy CP")
field(INPB, "$(PHV)pixelEnergy CP")
field(INPC, "$(P)ROI:width CP")
field(INPC, "$(PHV)ROI:width CP")
field(CALC, "A - B*(C-1)/2.0")
field(PREC, "8")
field(OUT, "$(PHV)osScanStartE PP")
......@@ -468,9 +483,9 @@ record(calcout, "$(PHV)OSStopCalc")
field(DTYP, "Soft Channel")
field(DESC, "Calc stop energy for BabySweep")
field(SCAN, "Passive")
field(INPA, "$(PHV)sweepStartEnergy CP")
field(INPA, "$(PHV)sweepStopEnergy CP")
field(INPB, "$(PHV)pixelEnergy CP")
field(INPC, "$(P)ROI:width CP")
field(INPC, "$(PHV)ROI:width CP")
field(CALC, "A + B*(C-1)/2.0")
field(PREC, "8")
field(OUT, "$(PHV)osScanStopE PP")
......
29idcScientaApp/Db/scientaControl.db
+ 10
− 0
View file @ aa284ccf
......@@ -251,6 +251,16 @@ record(ai, "$(PHV)babySweepSteps")
## PVs for Sweep Spectrum
#------------------------------------------------------------------------------
# SweepEnergy - generally set by user
record(ao, "$(PHV)SweepEnergy")
{
field(DTYP, "Soft Channel")
field(DESC, "Sweep energy")
field(SCAN, "Passive")
field(EGU, "eV")
field(PREC, "8")
}
# SweepStart - generally set by user
record(ao, "$(PHV)sweepStartEnergy")
{
......
29idcScientaApp/Db/scientaSetup.db
+ 16
− 12
View file @ aa284ccf
......@@ -143,13 +143,13 @@ record(sseq, "$(PHV)babySweep:PreScan")
{
field(DESC, "Baby Sweep prescan setup")
field(DOL1, "$(PHV)bsScanStartE")
field(LNK1, "$(PHV)scan2.P1SP CA")
field(LNK1, "$(PHV)scan2.P1SP")
field(WAIT1, "1")
field(DOL2, "$(PHV)bsScanStopE")
field(LNK2, "$(PHV)scan2.P1EP CA")
field(LNK2, "$(PHV)scan2.P1EP")
field(WAIT2, "1")
field(DOL3, "$(PHV)babySweepSteps")
field(LNK3, "$(PHV)scan2.NPTS CA")
field(LNK3, "$(PHV)scan2.NPTS")
field(STR4, "Done")
field(LNK4, "$(CAM)cam1:Acquire CA")
field(WAIT4, "1")
......@@ -232,15 +232,15 @@ record(sseq, "$(PHV)babySweep:PostScan")
record(sseq, "$(PHV)oSweep:PreScan")
{
field(DESC, "Baby Sweep prescan setup")
field(DESC, "Overlapping prescan setup")
field(DOL1, "$(PHV)osScanStartE")
field(LNK1, "$(PHV)scan2.P1SP CA")
field(LNK1, "$(PHV)scan2.P1SP")
field(WAIT1, "1")
field(DOL2, "$(PHV)osScanStopE")
field(LNK2, "$(PHV)scan2.P1EP CA")
field(LNK2, "$(PHV)scan2.P1EP")
field(WAIT2, "1")
field(DOL3, "$(PHV)oSweepSteps")
field(LNK3, "$(PHV)scan2.NPTS CA")
field(LNK3, "$(PHV)scan2.NPTS")
field(STR4, "Done")
field(LNK4, "$(CAM)cam1:Acquire CA")
field(WAIT4, "1")
......@@ -311,7 +311,7 @@ record(sseq, "$(PHV)oSweep:PostScan")
}
#------------------------------------------------------------------------------
# Overlapping Sweep Mode setup
# No Overlap Sweep Mode setup
#------------------------------------------------------------------------------
......@@ -319,15 +319,15 @@ record(sseq, "$(PHV)noSweep:oPreScan")
{
field(DESC, "No overlap Sweep prescan setup")
field(DOL1, "$(PHV)sweepStartEnergy")
field(LNK1, "$(PHV)scan3.P1SP CA")
field(LNK1, "$(PHV)scan3.P1SP")
field(WAIT1, "1")
field(DOL2, "$(PHV)sweepStopEnergy")
field(LNK2, "$(PHV)scan3.P1EP CA")
field(LNK2, "$(PHV)scan3.P1EP")
field(WAIT2, "1")
field(DOL3, "$(PHV)SweepSteps")
field(LNK3, "$(PHV)scan3.NPTS CA")
field(LNK3, "$(PHV)scan3.NPTS")
field(DOL4, "$(PHV)ROI:width")
field(LNK4, "$(PHV)scan2.NPTS CA")
field(LNK4, "$(PHV)scan2.NPTS")
field(STR5, "Done")
field(LNK5, "$(CAM)cam1:Acquire CA")
field(WAIT5, "1")
......@@ -381,6 +381,10 @@ record(sseq, "$(PHV)noSweep:mPreScan")
field(LNK1, "$(PHV)NOSStartCalc.PROC")
field(DO2, "1")
field(LNK2, "$(PHV)NOSStopCalc.PROC")
field(DOL3, "$(PHV)nosScanStartE")
field(LNK3, "$(PHV)scan2.P1SP")
field(DOL4, "$(PHV)nosScanStopE")
field(LNK4, "$(PHV)scan2.P1EP")
}
record(sseq, "$(PHV)noSweep:iPreScan")
......
iocBoot/ioc29idcScienta/autosave/HVscan_sweepNO.cfg
+ 11
− 11
View file @ aa284ccf
# autosave R5.3 Automatically generated - DO NOT MODIFY - 210211-150722
# autosave R5.3 Automatically generated - DO NOT MODIFY - 210211-174041
29idcScienta:HV:HVscanMenu:currName sweepNO
29idcScienta:HV:HVscanMenu:currDesc
29idcScienta:HV:scan3.ATIME 0
29idcScienta:HV:scan3.COPYTO 0
29idcScienta:HV:scan3.FLNK
29idcScienta:HV:scan3.NPTS 10
29idcScienta:HV:scan3.NPTS 11
29idcScienta:HV:scan3.ACQT 0
29idcScienta:HV:scan3.ACQM 0
29idcScienta:HV:scan3.PASM 0
......@@ -22,11 +22,11 @@
29idcScienta:HV:scan3.T3CD 1
29idcScienta:HV:scan3.T4PV
29idcScienta:HV:scan3.T4CD 1
29idcScienta:HV:scan3.P1PV
29idcScienta:HV:scan3.P1PV 29idcScienta:HV:SweepEnergy
29idcScienta:HV:scan3.R1PV
29idcScienta:HV:scan3.P1SM 0
29idcScienta:HV:scan3.P1SP 0
29idcScienta:HV:scan3.P1EP 0
29idcScienta:HV:scan3.P1SP 200
29idcScienta:HV:scan3.P1EP 600
29idcScienta:HV:scan3.P1AR 0
29idcScienta:HV:scan3.P2PV
29idcScienta:HV:scan3.R2PV
......@@ -125,7 +125,7 @@
29idcScienta:HV:scan2.ATIME 0
29idcScienta:HV:scan2.COPYTO 0
29idcScienta:HV:scan2.FLNK
29idcScienta:HV:scan2.NPTS 50
29idcScienta:HV:scan2.NPTS 1392
29idcScienta:HV:scan2.ACQT 0
29idcScienta:HV:scan2.ACQM 0
29idcScienta:HV:scan2.PASM 0
......@@ -146,8 +146,8 @@
29idcScienta:HV:scan2.P1PV 29idcScienta:HV:KineticEnergy
29idcScienta:HV:scan2.R1PV
29idcScienta:HV:scan2.P1SM 0
29idcScienta:HV:scan2.P1SP 199.61
29idcScienta:HV:scan2.P1EP 200.39
29idcScienta:HV:scan2.P1SP 193.07979239621
29idcScienta:HV:scan2.P1EP 214.77939239621
29idcScienta:HV:scan2.P1AR 0
29idcScienta:HV:scan2.P2PV
29idcScienta:HV:scan2.R2PV
......@@ -491,7 +491,7 @@
29idcScienta:Proc1:FilterCallbacks 1
29idcScienta:Proc1:FilterType 2
29idcScienta:Proc1:FilterCallbacks 1
29idcScienta:Proc1:NumFilter 102
29idcScienta:Proc1:NumFilter 17
29idcScienta:Proc1:DataTypeOut 5
29idcScienta:ROI1:NDArrayPort NDSA
29idcScienta:ROI1:EnableCallbacks 0
......@@ -550,7 +550,7 @@
29idcScienta:ndsa:image10:EnableCallbacks 0
29idcScienta:HDF1:FileWriteMode 0
29idcScienta:HDF1:NDArrayPort TRANS2
29idcScienta:HDF1:EnableCallbacks 0
29idcScienta:HDF1:EnableCallbacks 1
29idcScienta:HDF2:FileWriteMode 0
29idcScienta:HDF2:NDArrayPort NDSA
29idcScienta:HDF2:EnableCallbacks 0
......@@ -569,5 +569,5 @@
29idcScienta:HV:AcquisitionMode 2
29idcScienta:HV:SpectraMode 2
29idcScienta:HV:babySweepSteps 51
29idcScienta:ExpFrames 102
29idcScienta:ExpFrames 17
<END>
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