diff --git a/tomoScanApp/Db/tomoScan.template b/tomoScanApp/Db/tomoScan.template
index 35b06222..dd4e806d 100755
--- a/tomoScanApp/Db/tomoScan.template
+++ b/tomoScanApp/Db/tomoScan.template
@@ -39,6 +39,21 @@ record(stringout, "$(P)$(R)OpenShutterValue")
field(VAL, "$(OPEN_VALUE)")
}
+record(bo, "$(P)$(R)AutoCloseShutter")
+{
+ field(ZNAM, "No")
+ field(ONAM, "Yes")
+}
+
+record(bo, "$(P)$(R)CloseShutterCmd")
+{
+}
+
+record(bo, "$(P)$(R)OpenShutterCmd")
+{
+}
+
+
#############################################
# Rotation, sample X and Y translation motors
#############################################
diff --git a/tomoScanApp/Db/tomoScan_settings.req b/tomoScanApp/Db/tomoScan_settings.req
index 8d60cf09..4eaeaf1e 100755
--- a/tomoScanApp/Db/tomoScan_settings.req
+++ b/tomoScanApp/Db/tomoScan_settings.req
@@ -20,6 +20,9 @@ $(P)$(R)CloseShutterPVName
$(P)$(R)CloseShutterValue
$(P)$(R)OpenShutterPVName
$(P)$(R)OpenShutterValue
+$(P)$(R)AutoCloseShutter
+#controlPV $(P)$(R)OpenShutterCmd
+#controlPV $(P)$(R)CloseShutterCmd
#############################################
# Rotation, sample X and Y translation motors
diff --git a/tomoScanApp/op/adl/tomoScan.adl b/tomoScanApp/op/adl/tomoScan.adl
index eedc34bf..b6251138 100644
--- a/tomoScanApp/op/adl/tomoScan.adl
+++ b/tomoScanApp/op/adl/tomoScan.adl
@@ -1,14 +1,14 @@
file {
- name="/home/beams19/USERTXM/epics/synApps/support/tomoscan/tomoScanApp/op/adl/tomoScan.adl"
- version=030111
+ name="/home/epics/support/tomoscan/tomoScanApp/op/adl/tomoScan.adl"
+ version=030117
}
display {
object {
- x=1598
- y=565
+ x=505
+ y=72
width=700
- height=850
+ height=925
}
clr=14
bclr=4
@@ -401,132 +401,6 @@ text {
textix="Flat Field Control"
align="horiz. centered"
}
-rectangle {
- object {
- x=5
- y=370
- width=690
- height=70
- }
- "basic attribute" {
- clr=14
- fill="outline"
- }
-}
-rectangle {
- object {
- x=220
- y=375
- width=260
- height=20
- }
- "basic attribute" {
- clr=2
- }
-}
-text {
- object {
- x=260
- y=375
- width=180
- height=20
- }
- "basic attribute" {
- clr=54
- }
- textix="Dark Field Control"
- align="horiz. centered"
-}
-rectangle {
- object {
- x=5
- y=445
- width=690
- height=130
- }
- "basic attribute" {
- clr=14
- fill="outline"
- }
-}
-rectangle {
- object {
- x=250
- y=450
- width=200
- height=20
- }
- "basic attribute" {
- clr=2
- }
-}
-text {
- object {
- x=290
- y=450
- width=120
- height=20
- }
- "basic attribute" {
- clr=54
- }
- textix="File Control"
- align="horiz. centered"
-}
-text {
- object {
- x=10
- y=410
- width=130
- height=20
- }
- "basic attribute" {
- clr=14
- }
- textix="# Dark fields"
-}
-"text entry" {
- object {
- x=145
- y=410
- width=70
- height=20
- }
- control {
- chan="$(P)$(R)NumDarkFields"
- clr=14
- bclr=51
- }
- limits {
- }
-}
-text {
- object {
- x=225
- y=410
- width=100
- height=20
- }
- "basic attribute" {
- clr=14
- }
- textix="Dark value"
-}
-"text entry" {
- object {
- x=330
- y=410
- width=70
- height=20
- }
- control {
- chan="$(P)$(R)DarkFieldValue"
- clr=14
- bclr=51
- }
- limits {
- }
-}
text {
object {
x=415
@@ -553,31 +427,6 @@ menu {
bclr=51
}
}
-text {
- object {
- x=415
- y=410
- width=190
- height=20
- }
- "basic attribute" {
- clr=14
- }
- textix="Collect dark fields"
-}
-menu {
- object {
- x=610
- y=410
- width=80
- height=20
- }
- control {
- chan="$(P)$(R)DarkFieldMode"
- clr=14
- bclr=51
- }
-}
text {
object {
x=495
@@ -657,684 +506,850 @@ text {
limits {
}
}
-rectangle {
- object {
- x=5
- y=580
- width=690
- height=70
- }
- "basic attribute" {
- clr=14
- fill="outline"
- }
-}
-rectangle {
- object {
- x=250
- y=586
- width=200
- height=20
- }
- "basic attribute" {
- clr=2
- }
-}
-text {
+"message button" {
object {
- x=275
- y=586
- width=150
+ x=565
+ y=260
+ width=120
height=20
}
- "basic attribute" {
- clr=54
+ control {
+ chan="$(P)$(R)MoveSampleIn"
+ clr=14
+ bclr=51
}
- textix="Data Collection"
- align="horiz. centered"
+ label="Move Sample In"
+ press_msg="1"
}
-rectangle {
+"message button" {
object {
- x=305
- y=660
- width=90
+ x=565
+ y=285
+ width=120
height=20
}
- "basic attribute" {
- clr=2
+ control {
+ chan="$(P)$(R)MoveSampleOut"
+ clr=14
+ bclr=51
}
+ label="Move Sample Out"
+ press_msg="1"
}
text {
object {
- x=314
- y=660
- width=72
+ x=350
+ y=340
+ width=130
height=20
}
"basic attribute" {
- clr=54
+ clr=14
}
- textix="Status"
- align="horiz. centered"
+ textix="Flat exposure"
+ align="horiz. right"
}
-"message button" {
+menu {
object {
- x=250
- y=620
- width=120
+ x=485
+ y=340
+ width=100
height=20
}
control {
- chan="$(P)$(R)StartScan"
+ chan="$(P)$(R)DifferentFlatExposure"
clr=14
- bclr=15
+ bclr=51
}
- label="Start Scan"
- press_msg="1"
}
-"message button" {
+"text entry" {
object {
- x=375
- y=620
- width=120
+ x=590
+ y=340
+ width=100
height=20
}
control {
- chan="$(P)$(R)AbortScan"
+ chan="$(P)$(R)FlatExposureTime"
clr=14
- bclr=20
+ bclr=51
+ }
+ limits {
}
- label="Abort Scan"
- press_msg="1"
- release_msg="0"
}
text {
object {
- x=15
- y=620
+ x=25
+ y=260
width=130
height=20
}
"basic attribute" {
clr=14
}
- textix="Exposure time"
+ textix="X in "
}
"text entry" {
object {
- x=150
- y=620
- width=70
+ x=73
+ y=260
+ width=100
height=20
}
control {
- chan="$(P)$(R)ExposureTime"
+ chan="$(P)$(R)SampleInX"
clr=14
bclr=51
}
limits {
}
}
-rectangle {
- object {
- x=5
- y=655
- width=690
- height=190
- }
- "basic attribute" {
- clr=14
- fill="outline"
- }
-}
-"text update" {
+"text entry" {
object {
- x=580
- y=620
+ x=73
+ y=285
width=100
height=20
}
- monitor {
- chan="$(P)$(R)StartScan"
+ control {
+ chan="$(P)$(R)SampleOutX"
clr=14
- bclr=2
+ bclr=51
}
- clrmod="alarm"
- format="string"
limits {
}
}
text {
object {
- x=515
- y=620
- width=60
+ x=15
+ y=285
+ width=140
height=20
}
"basic attribute" {
clr=14
}
- textix="Status"
+ textix="X out"
}
text {
object {
- x=65
- y=815
- width=130
+ x=183
+ y=285
+ width=140
height=20
}
"basic attribute" {
clr=14
}
- textix="Python server"
+ textix="Y out "
}
-text {
+"text entry" {
object {
- x=85
- y=690
- width=110
+ x=245
+ y=285
+ width=100
height=20
}
- "basic attribute" {
+ control {
+ chan="$(P)$(R)SampleOutY"
clr=14
+ bclr=51
+ }
+ limits {
}
- textix="Scan status"
}
-"text update" {
+"text entry" {
object {
- x=201
- y=690
- width=400
+ x=245
+ y=260
+ width=100
height=20
}
- monitor {
- chan="$(P)$(R)ScanStatus"
+ control {
+ chan="$(P)$(R)SampleInY"
clr=14
bclr=51
}
- format="string"
limits {
}
}
text {
object {
- x=55
- y=790
- width=140
+ x=193
+ y=260
+ width=130
height=20
}
"basic attribute" {
clr=14
}
- textix="Remaining time"
+ textix="Y in"
}
text {
object {
- x=75
- y=765
- width=120
+ x=396
+ y=284
+ width=140
height=20
}
"basic attribute" {
clr=14
}
- textix="Elapsed time"
+ textix="Angle"
}
-"text update" {
+"text entry" {
object {
- x=201
- y=765
+ x=458
+ y=284
width=100
height=20
}
- monitor {
- chan="$(P)$(R)ElapsedTime"
+ control {
+ chan="$(P)$(R)SampleOutAngle"
clr=14
bclr=51
}
- format="string"
limits {
}
}
-"text update" {
+text {
object {
- x=200
- y=790
- width=100
+ x=356
+ y=260
+ width=140
height=20
}
- monitor {
- chan="$(P)$(R)RemainingTime"
+ "basic attribute" {
clr=14
- bclr=51
- }
- format="string"
- limits {
}
+ textix="Use angle"
}
-text {
+menu {
object {
- x=35
- y=715
- width=160
+ x=458
+ y=260
+ width=100
height=20
}
- "basic attribute" {
+ control {
+ chan="$(P)$(R)SampleOutAngleEnable"
clr=14
+ bclr=51
}
- textix="Images collected"
}
-"text update" {
+"text entry" {
object {
- x=201
- y=715
- width=100
+ x=330
+ y=315
+ width=70
height=20
}
- monitor {
- chan="$(P)$(R)ImagesCollected"
+ control {
+ chan="$(P)$(R)FlatFieldValue"
clr=14
bclr=51
}
- format="string"
limits {
}
}
text {
object {
- x=75
- y=740
- width=120
+ x=225
+ y=315
+ width=100
height=20
}
"basic attribute" {
clr=14
}
- textix="Images saved"
+ textix="Flat value"
}
-"text update" {
+rectangle {
object {
- x=201
- y=740
- width=100
- height=20
+ x=5
+ y=520
+ width=690
+ height=130
}
- monitor {
- chan="$(P)$(R)ImagesSaved"
+ "basic attribute" {
clr=14
- bclr=51
- }
- format="string"
- limits {
+ fill="outline"
}
}
-"text update" {
+rectangle {
object {
- x=199
- y=815
- width=100
+ x=250
+ y=525
+ width=200
height=20
}
- monitor {
- chan="$(P)$(R)ServerRunning"
- clr=14
- bclr=2
- }
- clrmod="alarm"
- format="string"
- limits {
+ "basic attribute" {
+ clr=2
}
}
text {
object {
- x=15
- y=500
- width=140
+ x=290
+ y=525
+ width=120
height=20
}
"basic attribute" {
- clr=14
+ clr=54
}
- textix="File directory"
+ textix="File Control"
+ align="horiz. centered"
}
-"text entry" {
+rectangle {
object {
- x=160
- y=500
- width=530
- height=20
+ x=5
+ y=655
+ width=690
+ height=70
}
- control {
- chan="$(P)$(R)FilePath"
+ "basic attribute" {
clr=14
- bclr=51
+ fill="outline"
}
- format="string"
- limits {
+}
+rectangle {
+ object {
+ x=250
+ y=661
+ width=200
+ height=20
+ }
+ "basic attribute" {
+ clr=2
}
}
text {
object {
- x=15
- y=525
- width=140
+ x=275
+ y=661
+ width=150
height=20
}
"basic attribute" {
- clr=14
+ clr=54
}
- textix="Base file name"
+ textix="Data Collection"
+ align="horiz. centered"
}
-"text entry" {
+rectangle {
object {
- x=160
- y=525
- width=530
+ x=305
+ y=735
+ width=90
height=20
}
- control {
- chan="$(P)$(R)FileName"
- clr=14
- bclr=51
- }
- format="string"
- limits {
+ "basic attribute" {
+ clr=2
}
}
text {
object {
- x=570
- y=475
- width=70
+ x=314
+ y=735
+ width=72
height=20
}
"basic attribute" {
- clr=14
+ clr=54
}
- textix="Exists:"
+ textix="Status"
+ align="horiz. centered"
}
-"text update" {
+"message button" {
object {
- x=645
- y=475
- width=40
+ x=250
+ y=695
+ width=120
height=20
}
- monitor {
- chan="$(P)$(R)FilePathExists"
+ control {
+ chan="$(P)$(R)StartScan"
clr=14
- bclr=2
+ bclr=15
}
- clrmod="alarm"
- format="string"
- limits {
+ label="Start Scan"
+ press_msg="1"
+}
+"message button" {
+ object {
+ x=375
+ y=695
+ width=120
+ height=20
+ }
+ control {
+ chan="$(P)$(R)AbortScan"
+ clr=14
+ bclr=20
}
+ label="Abort Scan"
+ press_msg="1"
+ release_msg="0"
}
text {
object {
x=15
- y=475
- width=180
+ y=695
+ width=130
height=20
}
"basic attribute" {
clr=14
}
- textix="Overwrite warning:"
+ textix="Exposure time"
}
-menu {
+"text entry" {
object {
- x=200
- y=475
- width=80
+ x=150
+ y=695
+ width=70
height=20
}
control {
- chan="$(P)$(R)OverwriteWarning"
+ chan="$(P)$(R)ExposureTime"
clr=14
bclr=51
}
+ limits {
+ }
}
-"message button" {
+rectangle {
object {
- x=565
- y=260
- width=120
+ x=5
+ y=730
+ width=690
+ height=190
+ }
+ "basic attribute" {
+ clr=14
+ fill="outline"
+ }
+}
+"text update" {
+ object {
+ x=580
+ y=695
+ width=100
height=20
}
- control {
- chan="$(P)$(R)MoveSampleIn"
+ monitor {
+ chan="$(P)$(R)StartScan"
clr=14
- bclr=51
+ bclr=2
+ }
+ clrmod="alarm"
+ format="string"
+ limits {
}
- label="Move Sample In"
- press_msg="1"
}
-"message button" {
+text {
object {
- x=565
- y=285
- width=120
+ x=515
+ y=695
+ width=60
height=20
}
- control {
- chan="$(P)$(R)MoveSampleOut"
+ "basic attribute" {
clr=14
- bclr=51
}
- label="Move Sample Out"
- press_msg="1"
+ textix="Status"
}
text {
object {
- x=350
- y=340
+ x=65
+ y=890
width=130
height=20
}
"basic attribute" {
clr=14
}
- textix="Flat exposure"
- align="horiz. right"
+ textix="Python server"
}
-menu {
+text {
object {
- x=485
- y=340
+ x=85
+ y=765
+ width=110
+ height=20
+ }
+ "basic attribute" {
+ clr=14
+ }
+ textix="Scan status"
+}
+"text update" {
+ object {
+ x=201
+ y=765
+ width=400
+ height=20
+ }
+ monitor {
+ chan="$(P)$(R)ScanStatus"
+ clr=14
+ bclr=51
+ }
+ format="string"
+ limits {
+ }
+}
+text {
+ object {
+ x=55
+ y=865
+ width=140
+ height=20
+ }
+ "basic attribute" {
+ clr=14
+ }
+ textix="Remaining time"
+}
+text {
+ object {
+ x=75
+ y=840
+ width=120
+ height=20
+ }
+ "basic attribute" {
+ clr=14
+ }
+ textix="Elapsed time"
+}
+"text update" {
+ object {
+ x=201
+ y=840
width=100
height=20
}
- control {
- chan="$(P)$(R)DifferentFlatExposure"
+ monitor {
+ chan="$(P)$(R)ElapsedTime"
clr=14
bclr=51
}
+ format="string"
+ limits {
+ }
}
-"text entry" {
+"text update" {
object {
- x=590
- y=340
+ x=200
+ y=865
width=100
height=20
}
- control {
- chan="$(P)$(R)FlatExposureTime"
+ monitor {
+ chan="$(P)$(R)RemainingTime"
clr=14
bclr=51
}
+ format="string"
limits {
}
}
text {
object {
- x=25
- y=260
- width=130
+ x=35
+ y=790
+ width=160
height=20
}
"basic attribute" {
clr=14
}
- textix="X in "
+ textix="Images collected"
}
-"text entry" {
+"text update" {
object {
- x=73
- y=260
+ x=201
+ y=790
width=100
height=20
}
- control {
- chan="$(P)$(R)SampleInX"
+ monitor {
+ chan="$(P)$(R)ImagesCollected"
clr=14
bclr=51
}
+ format="string"
limits {
}
}
-"text entry" {
+text {
object {
- x=73
- y=285
+ x=75
+ y=815
+ width=120
+ height=20
+ }
+ "basic attribute" {
+ clr=14
+ }
+ textix="Images saved"
+}
+"text update" {
+ object {
+ x=201
+ y=815
width=100
height=20
}
- control {
- chan="$(P)$(R)SampleOutX"
+ monitor {
+ chan="$(P)$(R)ImagesSaved"
clr=14
bclr=51
}
+ format="string"
limits {
}
}
-text {
+"text update" {
object {
- x=15
- y=285
- width=140
+ x=199
+ y=890
+ width=100
height=20
}
- "basic attribute" {
+ monitor {
+ chan="$(P)$(R)ServerRunning"
clr=14
+ bclr=2
+ }
+ clrmod="alarm"
+ format="string"
+ limits {
}
- textix="X out"
}
text {
object {
- x=183
- y=285
+ x=15
+ y=575
width=140
height=20
}
"basic attribute" {
clr=14
}
- textix="Y out "
+ textix="File directory"
}
"text entry" {
object {
- x=245
- y=285
- width=100
+ x=160
+ y=575
+ width=530
height=20
}
control {
- chan="$(P)$(R)SampleOutY"
+ chan="$(P)$(R)FilePath"
clr=14
bclr=51
}
+ format="string"
limits {
}
}
+text {
+ object {
+ x=15
+ y=600
+ width=140
+ height=20
+ }
+ "basic attribute" {
+ clr=14
+ }
+ textix="Base file name"
+}
"text entry" {
object {
- x=245
- y=260
- width=100
+ x=160
+ y=600
+ width=530
height=20
}
control {
- chan="$(P)$(R)SampleInY"
+ chan="$(P)$(R)FileName"
clr=14
bclr=51
}
+ format="string"
limits {
}
}
text {
object {
- x=193
- y=260
- width=130
+ x=570
+ y=550
+ width=70
height=20
}
"basic attribute" {
clr=14
}
- textix="Y in"
+ textix="Exists:"
+}
+"text update" {
+ object {
+ x=645
+ y=550
+ width=40
+ height=20
+ }
+ monitor {
+ chan="$(P)$(R)FilePathExists"
+ clr=14
+ bclr=2
+ }
+ clrmod="alarm"
+ format="string"
+ limits {
+ }
}
text {
object {
- x=396
- y=284
- width=140
+ x=15
+ y=550
+ width=180
height=20
}
"basic attribute" {
clr=14
}
- textix="Angle"
+ textix="Overwrite warning:"
}
-"text entry" {
+menu {
object {
- x=458
- y=284
- width=100
+ x=200
+ y=550
+ width=80
height=20
}
control {
- chan="$(P)$(R)SampleOutAngle"
+ chan="$(P)$(R)OverwriteWarning"
clr=14
bclr=51
}
+}
+text {
+ object {
+ x=15
+ y=625
+ width=140
+ height=20
+ }
+ "basic attribute" {
+ clr=14
+ }
+ textix="Last file name"
+}
+"text update" {
+ object {
+ x=160
+ y=628
+ width=530
+ height=15
+ }
+ monitor {
+ chan="$(P)$(R)FullFileName"
+ clr=14
+ bclr=51
+ }
+ format="string"
limits {
}
}
+rectangle {
+ object {
+ x=5
+ y=370
+ width=690
+ height=70
+ }
+ "basic attribute" {
+ clr=14
+ fill="outline"
+ }
+}
+rectangle {
+ object {
+ x=220
+ y=375
+ width=260
+ height=20
+ }
+ "basic attribute" {
+ clr=2
+ }
+}
text {
object {
- x=356
- y=260
- width=140
+ x=260
+ y=375
+ width=180
+ height=20
+ }
+ "basic attribute" {
+ clr=54
+ }
+ textix="Dark Field Control"
+ align="horiz. centered"
+}
+text {
+ object {
+ x=10
+ y=410
+ width=130
height=20
}
"basic attribute" {
clr=14
}
- textix="Use angle"
+ textix="# Dark fields"
}
-menu {
+"text entry" {
object {
- x=458
- y=260
- width=100
+ x=145
+ y=410
+ width=70
height=20
}
control {
- chan="$(P)$(R)SampleOutAngleEnable"
+ chan="$(P)$(R)NumDarkFields"
clr=14
bclr=51
}
+ limits {
+ }
+}
+text {
+ object {
+ x=225
+ y=410
+ width=100
+ height=20
+ }
+ "basic attribute" {
+ clr=14
+ }
+ textix="Dark value"
}
"text entry" {
object {
x=330
- y=315
+ y=410
width=70
height=20
}
control {
- chan="$(P)$(R)FlatFieldValue"
+ chan="$(P)$(R)DarkFieldValue"
clr=14
bclr=51
}
@@ -1343,41 +1358,119 @@ menu {
}
text {
object {
- x=225
- y=315
- width=100
+ x=415
+ y=410
+ width=190
height=20
}
"basic attribute" {
clr=14
}
- textix="Flat value"
+ textix="Collect dark fields"
+}
+menu {
+ object {
+ x=610
+ y=410
+ width=80
+ height=20
+ }
+ control {
+ chan="$(P)$(R)DarkFieldMode"
+ clr=14
+ bclr=51
+ }
+}
+rectangle {
+ object {
+ x=5
+ y=445
+ width=690
+ height=70
+ }
+ "basic attribute" {
+ clr=14
+ fill="outline"
+ }
+}
+rectangle {
+ object {
+ x=220
+ y=450
+ width=260
+ height=20
+ }
+ "basic attribute" {
+ clr=2
+ }
}
text {
object {
- x=15
- y=550
- width=140
+ x=275
+ y=450
+ width=150
+ height=20
+ }
+ "basic attribute" {
+ clr=54
+ }
+ textix="Shutter Control"
+ align="horiz. centered"
+}
+text {
+ object {
+ x=425
+ y=485
+ width=180
height=20
}
"basic attribute" {
clr=14
}
- textix="Last file name"
+ textix="Auto close shutter"
}
-"text update" {
+menu {
object {
- x=160
- y=553
- width=530
- height=15
+ x=610
+ y=485
+ width=80
+ height=20
}
- monitor {
- chan="$(P)$(R)FullFileName"
+ control {
+ chan="$(P)$(R)AutoCloseShutter"
clr=14
bclr=51
}
- format="string"
- limits {
+}
+"message button" {
+ object {
+ x=50
+ y=485
+ width=120
+ height=20
+ }
+ control {
+ chan="$(P)$(R)OpenShutterCmd"
+ clr=14
+ bclr=15
}
+ label="Open shutter"
+ press_msg="1"
+ release_msg="0"
+}
+"message button" {
+ object {
+ x=200
+ y=485
+ width=120
+ height=20
+ }
+ control {
+ chan="$(P)$(R)CloseShutterCmd"
+ clr=14
+ bclr=20
+ }
+ label="Close shutter"
+ press_msg="1"
+ release_msg="0"
}
diff --git a/tomoScanApp/op/bob/autoconvert/tomoScan.bob b/tomoScanApp/op/bob/autoconvert/tomoScan.bob
index d7cb1e13..1d3f466d 100644
--- a/tomoScanApp/op/bob/autoconvert/tomoScan.bob
+++ b/tomoScanApp/op/bob/autoconvert/tomoScan.bob
@@ -1,10 +1,11 @@
+
tomoScan
- 242
- 64
+ 505
+ 72
700
- 825
+ 925
@@ -292,7 +293,7 @@
menu #65
$(P)$(R)FlatFieldAxis
170
- 310
+ 340
20
@@ -304,7 +305,7 @@
text #68
Flat field axis
15
- 310
+ 340
150
@@ -315,8 +316,9 @@
text entry #71
$(P)$(R)NumFlatFields
- 575
- 335
+ 145
+ 315
+ 70
@@ -332,8 +334,8 @@
text #75
# Flat fields
- 440
- 335
+ 10
+ 315
130
@@ -371,164 +373,11 @@
1
-
- rectangle #84
- 5
- 370
- 690
- 70
- 1
-
-
-
-
-
-
-
-
- true
-
-
- rectangle #87
- 220
- 375
- 260
-
-
-
-
-
-
-
-
-
-
- text #90
- Dark Field Control
- 260
- 375
- 180
-
-
-
-
-
-
-
-
- 1
-
-
- rectangle #93
- 5
- 445
- 690
- 105
- 1
-
-
-
-
-
-
-
-
- true
-
-
- rectangle #96
- 250
- 450
- 200
-
-
-
-
-
-
-
-
-
-
- text #99
- File Control
- 290
- 450
- 120
-
-
-
-
-
-
-
-
- 1
-
-
- text #102
- # Dark fields
- 10
- 410
- 130
-
-
-
-
- true
-
-
- text entry #105
- $(P)$(R)NumDarkFields
- 145
- 410
- 70
-
-
-
-
-
-
-
-
- 1
- false
- false
-
-
- text #109
- Dark value
- 226
- 410
-
-
-
-
- true
-
-
- text entry #112
- $(P)$(R)DarkFieldValue
- 331
- 410
- 70
-
-
-
-
-
-
-
-
- 1
- false
- false
-
- text #116
+ text #84
Collect flat fields
- 380
- 310
+ 415
+ 317
190
@@ -537,34 +386,10 @@
2
- menu #119
+ menu #87
$(P)$(R)FlatFieldMode
- 575
- 310
- 20
-
-
-
-
- false
-
-
- text #122
- Collect dark fields
- 415
- 410
- 190
-
-
-
-
- true
-
-
- menu #125
- $(P)$(R)DarkFieldMode
610
- 410
+ 317
80
20
@@ -574,7 +399,7 @@
false
- text #128
+ text #90
Return to start
495
160
@@ -586,7 +411,7 @@
true
- menu #131
+ menu #93
$(P)$(R)ReturnRotation
525
185
@@ -599,7 +424,7 @@
false
- text #134
+ text #96
# of angles
245
160
@@ -611,7 +436,7 @@
true
- text entry #137
+ text entry #99
$(P)$(R)NumAngles
360
160
@@ -628,7 +453,7 @@
false
- text #141
+ text #103
Stop angle
255
185
@@ -639,7 +464,7 @@
true
- text update #144
+ text update #106
$(P)$(R)RotationStop
360
187
@@ -656,132 +481,92 @@
false
false
-
- rectangle #148
- 5
- 555
- 690
- 70
- 1
-
-
-
-
+
+ message button #110
+
+
+ $(P)$(R)MoveSampleIn
+ 1
+ Write
+
+
+ $(P)$(R)MoveSampleIn
+ Move Sample In
+ 565
+ 260
+ 120
+ 20
-
+
- true
-
- rectangle #151
- 250
- 561
- 200
-
-
-
-
+
+ message button #113
+
+
+ $(P)$(R)MoveSampleOut
+ 1
+ Write
+
+
+ $(P)$(R)MoveSampleOut
+ Move Sample Out
+ 565
+ 285
+ 120
+ 20
-
+
- text #154
- Data Collection
- 275
- 561
- 150
+ text #116
+ Flat exposure
+ 350
+ 340
+ 130
-
-
-
-
- 1
+ 2
-
- rectangle #157
- 305
- 635
- 90
-
-
-
-
+
+ menu #119
+ $(P)$(R)DifferentFlatExposure
+ 485
+ 340
+ 20
-
+
+ false
-
- text #160
- Status
- 314
- 635
- 72
+
+ text entry #122
+ $(P)$(R)FlatExposureTime
+ 590
+ 340
-
-
-
-
- 1
-
-
- message button #163
-
-
- $(P)$(R)StartScan
- 1
- Write
-
-
- $(P)$(R)StartScan
- Start Scan
- 250
- 595
- 120
- 20
-
-
-
-
-
-
- message button #166
- $(P)$(R)AbortScan
- 375
- 595
- 120
- 20
- Abort Scan
-
-
-
-
- Abort Scan
-
-
-
-
- false
-
-
+
+
- 1
+ 1
+ false
+ false
- text #169
- Exposure time
- 15
- 595
+ text #126
+ X in
+ 25
+ 260
130
@@ -790,11 +575,10 @@
true
- text entry #172
- $(P)$(R)ExposureTime
- 150
- 595
- 70
+ text entry #129
+ $(P)$(R)SampleInX
+ 73
+ 260
@@ -807,45 +591,29 @@
false
false
-
- rectangle #176
- 5
- 630
- 690
- 190
- 1
-
-
-
-
-
-
-
-
- true
-
-
- text update #179
- $(P)$(R)StartScan
- 580
- 595
+
+ text entry #133
+ $(P)$(R)SampleOutX
+ 73
+ 285
-
+
- 6
+ 1
false
+ false
- text #183
- Status
- 515
- 595
- 60
+ text #137
+ X out
+ 15
+ 285
+ 140
@@ -853,35 +621,39 @@
true
- text #186
- Python server
- 65
- 790
- 130
+ text #140
+ Y out
+ 183
+ 285
+ 140
true
-
- text #189
- Scan status
- 85
- 665
- 110
+
+ text entry #143
+ $(P)$(R)SampleOutY
+ 245
+ 285
- true
+
+
+
+
+ 1
+ false
+ false
-
- text update #192
- $(P)$(R)ScanStatus
- 201
- 665
- 400
+
+ text entry #147
+ $(P)$(R)SampleInY
+ 245
+ 260
@@ -890,16 +662,16 @@
- 6
+ 1
false
false
- text #196
- Remaining time
- 55
- 765
- 140
+ text #151
+ Y in
+ 193
+ 260
+ 130
@@ -907,22 +679,22 @@
true
- text #199
- Elapsed time
- 75
- 740
- 120
+ text #154
+ Angle
+ 396
+ 284
+ 140
true
-
- text update #202
- $(P)$(R)ElapsedTime
- 201
- 740
+
+ text entry #157
+ $(P)$(R)SampleOutAngle
+ 458
+ 284
@@ -931,44 +703,40 @@
- 6
+ 1
false
false
-
- text update #206
- $(P)$(R)RemainingTime
- 200
- 765
+
+ text #161
+ Use angle
+ 356
+ 260
+ 140
+ true
+
+
+ menu #164
+ $(P)$(R)SampleOutAngleEnable
+ 458
+ 260
+ 20
- 6
- false
false
-
- text #210
- Images collected
- 35
- 690
- 160
-
-
-
-
- true
-
-
- text update #213
- $(P)$(R)ImagesCollected
- 201
- 690
+
+ text entry #167
+ $(P)$(R)FlatFieldValue
+ 330
+ 315
+ 70
@@ -977,255 +745,269 @@
- 6
+ 1
false
false
- text #217
- Images saved
- 75
- 715
- 120
+ text #171
+ Flat value
+ 225
+ 315
true
-
- text update #220
- $(P)$(R)ImagesSaved
- 201
- 715
-
-
-
-
+
+ rectangle #174
+ 5
+ 520
+ 690
+ 130
+ 1
+
+
+
+
-
+
- 6
- false
- false
+ true
-
- text update #224
- $(P)$(R)ServerRunning
- 199
- 790
-
-
-
-
-
+
+ rectangle #177
+ 250
+ 525
+ 200
+
-
- 6
- false
-
-
- text #228
- File directory
- 15
- 500
- 140
-
-
-
-
- true
-
-
- text entry #231
- $(P)$(R)FilePath
- 160
- 500
- 530
-
-
-
-
+
-
+
- 6
- false
- false
- text #235
- Base file name
- 15
+ text #180
+ File Control
+ 290
525
- 140
+ 120
- true
+
+
+
+
+ 1
-
- text entry #238
- $(P)$(R)FileName
- 160
- 525
- 530
-
-
-
-
+
+ rectangle #183
+ 5
+ 655
+ 690
+ 70
+ 1
+
+
+
+
-
+
+
+
+ true
+
+
+ rectangle #186
+ 250
+ 661
+ 200
+
+
+
+
+
+
- 6
- false
- false
- text #242
- Exists:
- 570
- 475
- 70
+ text #189
+ Data Collection
+ 275
+ 661
+ 150
- true
+
+
+
+
+ 1
-
- text update #245
- $(P)$(R)FilePathExists
- 645
- 475
- 40
-
-
-
-
+
+ rectangle #192
+ 305
+ 735
+ 90
+
+
+
+
- 6
- false
- text #249
- Overwrite warning:
- 15
- 475
- 180
+ text #195
+ Status
+ 314
+ 735
+ 72
- true
-
-
- menu #252
- $(P)$(R)OverwriteWarning
- 200
- 475
- 80
- 20
-
-
+
+
-
- false
+
+ 1
- message button #255
+ message button #198
- $(P)$(R)MoveSampleIn
+ $(P)$(R)StartScan
1
Write
- $(P)$(R)MoveSampleIn
- Move Sample In
- 565
- 260
+ $(P)$(R)StartScan
+ Start Scan
+ 250
+ 695
120
20
-
+
-
- message button #258
-
-
- $(P)$(R)MoveSampleOut
- 1
- Write
-
-
- $(P)$(R)MoveSampleOut
- Move Sample Out
- 565
- 285
+
+ message button #201
+ $(P)$(R)AbortScan
+ 375
+ 695
120
20
+ Abort Scan
+
+
+
+
+ Abort Scan
+
+
+
+
+ false
-
+
+ 1
- text #261
- Flat exposure
- 35
- 335
+ text #204
+ Exposure time
+ 15
+ 695
130
- 2
+ true
-
- menu #264
- $(P)$(R)DifferentFlatExposure
- 170
- 335
- 20
+
+ text entry #207
+ $(P)$(R)ExposureTime
+ 150
+ 695
+ 70
+
+
+
+
+ 1
+ false
false
-
- text entry #267
- $(P)$(R)FlatExposureTime
- 275
- 335
+
+ rectangle #211
+ 5
+ 730
+ 690
+ 190
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ text update #214
+ $(P)$(R)StartScan
+ 580
+ 695
-
+
- 1
+ 6
false
- false
- text #271
- X in
- 25
- 260
+ text #218
+ Status
+ 515
+ 695
+ 60
+
+
+
+
+ true
+
+
+ text #221
+ Python server
+ 65
+ 890
130
@@ -1233,28 +1015,24 @@
true
-
- text entry #274
- $(P)$(R)SampleInX
- 73
- 260
+
+ text #224
+ Scan status
+ 85
+ 765
+ 110
-
-
-
-
- 1
- false
- false
+ true
-
- text entry #278
- $(P)$(R)SampleOutX
- 73
- 285
+
+ text update #227
+ $(P)$(R)ScanStatus
+ 201
+ 765
+ 400
@@ -1263,15 +1041,15 @@
- 1
+ 6
false
false
- text #282
- X out
- 15
- 285
+ text #231
+ Remaining time
+ 55
+ 865
140
@@ -1280,22 +1058,22 @@
true
- text #285
- Y out
- 183
- 285
- 140
+ text #234
+ Elapsed time
+ 75
+ 840
+ 120
true
-
- text entry #288
- $(P)$(R)SampleOutY
- 245
- 285
+
+ text update #237
+ $(P)$(R)ElapsedTime
+ 201
+ 840
@@ -1304,15 +1082,15 @@
- 1
+ 6
false
false
-
- text entry #292
- $(P)$(R)SampleInY
- 245
- 260
+
+ text update #241
+ $(P)$(R)RemainingTime
+ 200
+ 865
@@ -1321,27 +1099,89 @@
- 1
+ 6
false
false
- text #296
- Y in
- 193
- 260
- 130
-
+ text #245
+ Images collected
+ 35
+ 790
+ 160
+
true
+
+ text update #248
+ $(P)$(R)ImagesCollected
+ 201
+ 790
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
- text #299
- Angle
- 396
- 284
+ text #252
+ Images saved
+ 75
+ 815
+ 120
+
+
+
+
+ true
+
+
+ text update #255
+ $(P)$(R)ImagesSaved
+ 201
+ 815
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text update #259
+ $(P)$(R)ServerRunning
+ 199
+ 890
+
+
+
+
+
+
+
+
+ 6
+ false
+
+
+ text #263
+ File directory
+ 15
+ 575
140
@@ -1350,10 +1190,11 @@
true
- text entry #302
- $(P)$(R)SampleOutAngle
- 458
- 284
+ text entry #266
+ $(P)$(R)FilePath
+ 160
+ 575
+ 530
@@ -1362,15 +1203,15 @@
- 1
+ 6
false
false
- text #306
- Use angle
- 356
- 260
+ text #270
+ Base file name
+ 15
+ 600
140
@@ -1378,11 +1219,233 @@
true
+
+ text entry #273
+ $(P)$(R)FileName
+ 160
+ 600
+ 530
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #277
+ Exists:
+ 570
+ 550
+ 70
+
+
+
+
+ true
+
+
+ text update #280
+ $(P)$(R)FilePathExists
+ 645
+ 550
+ 40
+
+
+
+
+
+
+
+
+ 6
+ false
+
+
+ text #284
+ Overwrite warning:
+ 15
+ 550
+ 180
+
+
+
+
+ true
+
- menu #309
- $(P)$(R)SampleOutAngleEnable
- 458
- 260
+ menu #287
+ $(P)$(R)OverwriteWarning
+ 200
+ 550
+ 80
+ 20
+
+
+
+
+ false
+
+
+ text #290
+ Last file name
+ 15
+ 625
+ 140
+
+
+
+
+ true
+
+
+ text update #293
+ $(P)$(R)FullFileName
+ 160
+ 628
+ 530
+ 15
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ rectangle #297
+ 5
+ 370
+ 690
+ 70
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ rectangle #300
+ 220
+ 375
+ 260
+
+
+
+
+
+
+
+
+
+
+ text #303
+ Dark Field Control
+ 260
+ 375
+ 180
+
+
+
+
+
+
+
+
+ 1
+
+
+ text #306
+ # Dark fields
+ 10
+ 410
+ 130
+
+
+
+
+ true
+
+
+ text entry #309
+ $(P)$(R)NumDarkFields
+ 145
+ 410
+ 70
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text #313
+ Dark value
+ 225
+ 410
+
+
+
+
+ true
+
+
+ text entry #316
+ $(P)$(R)DarkFieldValue
+ 330
+ 410
+ 70
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text #320
+ Collect dark fields
+ 415
+ 410
+ 190
+
+
+
+
+ true
+
+
+ menu #323
+ $(P)$(R)DarkFieldMode
+ 610
+ 410
+ 80
20
@@ -1390,4 +1453,124 @@
false
+
+ rectangle #326
+ 5
+ 445
+ 690
+ 70
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ rectangle #329
+ 220
+ 450
+ 260
+
+
+
+
+
+
+
+
+
+
+ text #332
+ Shutter Control
+ 275
+ 450
+ 150
+
+
+
+
+
+
+
+
+ 1
+
+
+ text #335
+ Auto close shutter
+ 425
+ 485
+ 180
+
+
+
+
+ true
+
+
+ menu #338
+ $(P)$(R)AutoCloseShutter
+ 610
+ 485
+ 80
+ 20
+
+
+
+
+ false
+
+
+ message button #341
+ $(P)$(R)OpenShutterCmd
+ 50
+ 485
+ 120
+ 20
+ Open shutter
+
+
+
+
+ Open shutter
+
+
+
+
+ false
+
+
+
+
+ 1
+
+
+ message button #344
+ $(P)$(R)CloseShutterCmd
+ 200
+ 485
+ 120
+ 20
+ Close shutter
+
+
+
+
+ Close shutter
+
+
+
+
+ false
+
+
+
+
+ 1
+
diff --git a/tomoScanApp/op/bob/autoconvert/tomoScanStream.bob b/tomoScanApp/op/bob/autoconvert/tomoScanStream.bob
index 7dda59c2..9d95251a 100644
--- a/tomoScanApp/op/bob/autoconvert/tomoScanStream.bob
+++ b/tomoScanApp/op/bob/autoconvert/tomoScanStream.bob
@@ -1,10 +1,11 @@
+
tomoScanStream
- 402
- 286
+ 3768
+ 365
700
- 960
+ 1042
@@ -643,8 +644,8 @@
text #144
Collect flat fields
- 380
- 310
+ 34
+ 734
190
@@ -655,8 +656,8 @@
text #147
Collect dark fields
- 415
- 410
+ 379
+ 735
190
@@ -953,11 +954,11 @@
$(P)$(R)StreamRetakeFlat
Now
- 575
- 310
+ 229
+ 735
20
-
+
@@ -972,8 +973,8 @@
$(P)$(R)StreamRetakeDark
Now
- 610
- 410
+ 574
+ 735
80
20
@@ -981,387 +982,381 @@
-
- composite #219
+
+ rectangle #219
5
- 690
+ 768
690
- 265
-
+ 70
+ 1
+
+
+
+
+
+
+
+
true
-
- rectangle #222
- 690
- 70
- 1
-
-
-
-
-
-
-
-
- true
-
-
- rectangle #225
- 245
- 6
- 200
-
-
-
-
-
-
-
-
-
-
- text #228
- Data Collection
- 270
- 6
- 150
-
-
-
-
-
-
-
-
- 1
-
-
- rectangle #231
- 300
- 80
- 90
-
-
-
-
-
-
-
-
-
-
- text #234
- Status
- 309
- 80
- 72
-
-
-
-
-
-
-
-
- 1
-
-
- message button #237
-
-
- $(P)$(R)StartScan
- 1
- Write
-
-
- $(P)$(R)StartScan
- Start Scan
- 245
- 40
- 120
- 20
-
-
-
-
-
-
- message button #240
- $(P)$(R)AbortScan
- 370
- 40
- 120
- 20
- Abort Scan
-
-
-
-
- Abort Scan
-
-
-
-
- false
-
-
-
-
- 1
-
-
- text #243
- Exposure time
- 10
- 40
- 130
-
-
-
-
- true
-
-
- text entry #246
- $(P)$(R)ExposureTime
- 145
- 40
- 70
-
-
-
-
-
-
-
-
- 1
- false
- false
-
-
- rectangle #250
- 75
- 690
- 190
- 1
-
-
-
-
-
-
-
-
- true
-
-
- text update #253
- $(P)$(R)StartScan
- 575
- 40
-
-
-
-
-
-
-
-
- 6
- false
-
-
- text #257
- Status
- 510
- 40
- 60
-
-
-
-
- true
-
-
- text #260
- Python server
- 60
- 235
- 130
-
-
-
-
- true
-
-
- text #263
- Scan status
- 80
- 110
- 110
-
-
-
-
- true
-
-
- text update #266
- $(P)$(R)ScanStatus
- 196
- 110
- 400
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
- text #270
- Remaining time
- 50
- 210
- 140
-
-
-
-
- true
-
-
- text #273
- Elapsed time
- 70
- 185
- 120
-
-
-
-
- true
-
-
- text update #276
- $(P)$(R)ElapsedTime
- 196
- 185
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
- text update #280
- $(P)$(R)RemainingTime
- 195
- 210
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
- text #284
- Images collected
- 30
- 135
- 160
-
-
-
-
- true
-
-
- text update #287
- $(P)$(R)ImagesCollected
- 196
- 135
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
- text #291
- Images saved
- 70
- 160
- 120
-
-
-
-
- true
-
-
- text update #294
- $(P)$(R)ImagesSaved
- 196
- 160
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
- text update #298
- $(P)$(R)ServerRunning
- 194
- 235
-
-
-
-
-
-
-
-
- 6
- false
-
+
+
+ rectangle #222
+ 250
+ 774
+ 200
+
+
+
+
+
+
+
+
+
+
+ text #225
+ Data Collection
+ 275
+ 774
+ 150
+
+
+
+
+
+
+
+
+ 1
+
+
+ rectangle #228
+ 305
+ 848
+ 90
+
+
+
+
+
+
+
+
- text #302
+ text #231
+ Status
+ 314
+ 848
+ 72
+
+
+
+
+
+
+
+
+ 1
+
+
+ message button #234
+
+
+ $(P)$(R)StartScan
+ 1
+ Write
+
+
+ $(P)$(R)StartScan
+ Start Scan
+ 250
+ 808
+ 120
+ 20
+
+
+
+
+
+
+ message button #237
+ $(P)$(R)AbortScan
+ 375
+ 808
+ 120
+ 20
+ Abort Scan
+
+
+
+
+ Abort Scan
+
+
+
+
+ false
+
+
+
+
+ 1
+
+
+ text #240
+ Exposure time
+ 15
+ 808
+ 130
+
+
+
+
+ true
+
+
+ text entry #243
+ $(P)$(R)ExposureTime
+ 150
+ 808
+ 70
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ rectangle #247
+ 5
+ 843
+ 690
+ 190
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ text update #250
+ $(P)$(R)StartScan
+ 580
+ 808
+
+
+
+
+
+
+
+
+ 6
+ false
+
+
+ text #254
+ Status
+ 515
+ 808
+ 60
+
+
+
+
+ true
+
+
+ text #257
+ Python server
+ 65
+ 1003
+ 130
+
+
+
+
+ true
+
+
+ text #260
+ Scan status
+ 85
+ 878
+ 110
+
+
+
+
+ true
+
+
+ text update #263
+ $(P)$(R)ScanStatus
+ 201
+ 878
+ 400
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #267
+ Remaining time
+ 55
+ 978
+ 140
+
+
+
+
+ true
+
+
+ text #270
+ Elapsed time
+ 75
+ 953
+ 120
+
+
+
+
+ true
+
+
+ text update #273
+ $(P)$(R)ElapsedTime
+ 201
+ 953
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text update #277
+ $(P)$(R)RemainingTime
+ 200
+ 978
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #281
+ Images collected
+ 35
+ 903
+ 160
+
+
+
+
+ true
+
+
+ text update #284
+ $(P)$(R)ImagesCollected
+ 201
+ 903
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #288
+ Images saved
+ 75
+ 928
+ 120
+
+
+
+
+ true
+
+
+ text update #291
+ $(P)$(R)ImagesSaved
+ 201
+ 928
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text update #295
+ $(P)$(R)ServerRunning
+ 199
+ 1003
+
+
+
+
+
+
+
+
+ 6
+ false
+
+
+ text #299
# Pre count
- 20
- 585
+ -32
+ 625
170
@@ -1370,10 +1365,10 @@
2
- text entry #305
+ text entry #302
$(P)$(R)StreamPreCount
- 200
- 585
+ 148
+ 625
80
@@ -1388,10 +1383,10 @@
false
- text update #309
+ text update #306
$(P)$(R)StreamPreCounted
- 285
- 585
+ 233
+ 625
80
@@ -1410,11 +1405,11 @@
false
- text update #313
+ text update #310
$(P)$(R)StreamCBStatusMessage
- 380
- 585
- 300
+ 319
+ 625
+ 130
@@ -1431,20 +1426,8 @@
false
false
-
- text #317
- Capture proj
- 20
- 610
- 170
-
-
-
-
- 2
-
- message button #320
+ message button #314
$(P)$(R)StreamCapture
@@ -1453,18 +1436,18 @@
$(P)$(R)StreamCapture
- Start
- 200
- 610
- 80
- 20
+ Capture
+ 459
+ 625
+ 130
+ 50
-
+
- message button #323
+ message button #317
$(P)$(R)StreamCapture
@@ -1474,8 +1457,8 @@
$(P)$(R)StreamCapture
Stop
- 285
- 610
+ 596
+ 653
80
20
@@ -1484,10 +1467,10 @@
- text #326
+ text #320
# Capture
- 370
- 610
+ 54
+ 650
90
@@ -1496,10 +1479,10 @@
2
- text entry #329
+ text entry #323
$(P)$(R)StreamNumCapture
- 465
- 610
+ 149
+ 650
80
@@ -1514,10 +1497,10 @@
false
- text update #333
+ text update #327
$(P)$(R)StreamNumCaptured
- 555
- 610
+ 239
+ 650
80
@@ -1536,7 +1519,7 @@
false
- rectangle #337
+ rectangle #331
223
560
260
@@ -1550,7 +1533,7 @@
- text #340
+ text #334
Streaming Control
263
560
@@ -1566,10 +1549,10 @@
1
- text update #343
+ text update #337
$(P)$(R)StreamFileName
- 200
- 635
+ 148
+ 675
275
@@ -1588,10 +1571,10 @@
false
- text #347
+ text #341
File name
- 20
- 635
+ -32
+ 675
170
@@ -1600,10 +1583,10 @@
2
- text #350
+ text #344
# Proj
465
- 635
+ 675
80
@@ -1612,10 +1595,10 @@
2
- text update #353
+ text update #347
$(P)$(R)StreamNumTotalCaptured
555
- 635
+ 675
80
@@ -1634,10 +1617,10 @@
false
- text #357
+ text #351
Broadcast binning
20
- 660
+ 700
170
@@ -1646,10 +1629,10 @@
2
- menu #360
+ menu #354
$(P)$(R)StreamBinning
200
- 660
+ 700
80
20
@@ -1659,10 +1642,10 @@
false
- text update #363
+ text update #357
$(P)$(R)StreamMessage
380
- 660
+ 700
300
@@ -1681,11 +1664,11 @@
false
- rectangle #367
+ rectangle #361
5
555
690
- 130
+ 208
1
@@ -1697,4 +1680,72 @@
true
+
+ message button #364
+
+
+ $(P)$(R)StreamSync
+ 1
+ Write
+
+
+ $(P)$(R)StreamSync
+ Sync
+ 608
+ 587
+ 80
+ 20
+
+
+
+
+
+
+ text #367
+ Sync exposure and rotation step
+ 408
+ 586
+ 190
+
+
+
+
+ 2
+
+
+ text #370
+ Scan type
+ 15
+ 586
+
+
+
+
+ 2
+
+
+ menu #373
+ $(P)$(R)StreamScanType
+ 131
+ 588
+ 140
+ 20
+
+
+
+
+ false
+
+
+ text #376
+ (only in continuous mode)
+ 380
+ 602
+ 190
+
+
+
+
+ 2
+
diff --git a/tomoScanApp/op/bob/autoconvert/tomoScanStream_2BM_otherpvs.bob b/tomoScanApp/op/bob/autoconvert/tomoScanStream_2BM_otherpvs.bob
index 6ddb1305..7fc0ea97 100644
--- a/tomoScanApp/op/bob/autoconvert/tomoScanStream_2BM_otherpvs.bob
+++ b/tomoScanApp/op/bob/autoconvert/tomoScanStream_2BM_otherpvs.bob
@@ -1,10 +1,11 @@
+
tomoScanStream_2BM_otherpvs
- 84
- 691
+ 61
+ 879
640
- 240
+ 290
@@ -255,7 +256,7 @@
text #61
PSO setup
159
- 215
+ 265
90
@@ -274,11 +275,61 @@
PSO setup
254
+ 265
+ 20
+
+
+
+
+
+
+ text #67
+ Scan type
+ 119
+ 215
+ 130
+
+
+
+
+ 2
+
+
+ text #70
+ Flip&Stitch
+ 119
+ 240
+ 130
+
+
+
+
+ 2
+
+
+ menu #73
+ $(P)$(R)ScanType
+ 254
215
+ 80
20
+ false
+
+
+ menu #76
+ $(P)$(R)FlipStitch
+ 254
+ 240
+ 80
+ 20
+
+
+
+
+ false
diff --git a/tomoScanApp/op/bob/autoconvert/tomoScan_2BM.bob b/tomoScanApp/op/bob/autoconvert/tomoScan_2BM.bob
index 3239b427..c8907443 100644
--- a/tomoScanApp/op/bob/autoconvert/tomoScan_2BM.bob
+++ b/tomoScanApp/op/bob/autoconvert/tomoScan_2BM.bob
@@ -1,4 +1,5 @@
+
tomoScan_2BM
561
@@ -79,24 +80,6 @@
related display #18
-
-
- $(BEAMLINE)_energy.opi
- tab
- Energy Information
-
-
- Energy & Filters
- 10
- 164
- 280
-
-
-
-
-
-
- related display #21
$(BEAMLINE)_dm.opi
@@ -114,25 +97,7 @@
- related display #24
-
-
- $(BEAMLINE)_optics.opi
- tab
- Optics Information
-
-
- Optics
- 335
- 44
- 280
-
-
-
-
-
-
- related display #27
+ related display #21
$(BEAMLINE)_otherpvs.opi
@@ -142,7 +107,7 @@
Other PVs
335
- 84
+ 44
280
@@ -150,7 +115,7 @@
- menu #30
+ menu #24
$(P)$(R)Testing
494
164
@@ -162,7 +127,7 @@
false
- text #33
+ text #27
Testing
338
164
diff --git a/tomoScanApp/op/bob/autoconvert/tomoScan_2BM_otherpvs.bob b/tomoScanApp/op/bob/autoconvert/tomoScan_2BM_otherpvs.bob
index 41121aa7..ba049dab 100644
--- a/tomoScanApp/op/bob/autoconvert/tomoScan_2BM_otherpvs.bob
+++ b/tomoScanApp/op/bob/autoconvert/tomoScan_2BM_otherpvs.bob
@@ -1,10 +1,11 @@
+
tomoScan_2BM_otherpvs
- 84
- 691
+ 342
+ 927
640
- 240
+ 405
@@ -44,8 +45,8 @@
text entry #12
$(P)$(R)BeamReadyPVName
- 254
- 40
+ 255
+ 70
380
@@ -62,8 +63,8 @@
text entry #16
$(P)$(R)BeamReadyValue
- 254
- 65
+ 255
+ 95
380
@@ -80,9 +81,9 @@
text #20
Beam ready value
- 89
- 65
- 160
+ 10
+ 95
+ 240
@@ -92,9 +93,9 @@
text #23
Beam ready PV
- 119
- 40
- 130
+ 10
+ 70
+ 240
@@ -104,9 +105,9 @@
text #26
Open fast shutter value
- 89
- 115
- 160
+ 10
+ 145
+ 240
@@ -116,8 +117,8 @@
text entry #29
$(P)$(R)OpenFastShutterValue
- 254
- 115
+ 255
+ 145
380
@@ -134,9 +135,9 @@
text #33
Open fast shutter PV
- 119
- 90
- 130
+ 10
+ 120
+ 240
@@ -146,8 +147,8 @@
text entry #36
$(P)$(R)OpenFastShutterPVName
- 254
- 90
+ 255
+ 120
380
@@ -164,9 +165,9 @@
text #40
Close fast shutter PV
- 119
- 140
- 130
+ 10
+ 170
+ 240
@@ -176,9 +177,9 @@
text #43
Close fast shutter value
- 89
- 165
- 160
+ 10
+ 195
+ 240
@@ -188,8 +189,8 @@
text entry #46
$(P)$(R)CloseFastShutterValue
- 254
- 165
+ 255
+ 195
380
@@ -206,8 +207,8 @@
text entry #50
$(P)$(R)CloseFastShutterPVName
- 254
- 140
+ 255
+ 170
380
@@ -223,10 +224,10 @@
text #54
- Shutter status PV
- 119
- 190
- 130
+ Shutter Status PV
+ 10
+ 45
+ 240
@@ -236,8 +237,8 @@
text entry #57
$(P)$(R)ShutterStatusPVName
- 254
- 190
+ 255
+ 45
380
@@ -253,32 +254,290 @@
text #61
- PSO setup
- 159
- 215
- 90
+ mctOptics Prefix
+ 10
+ 220
+ 240
2
-
- related display #64
-
-
- tomoScan_pso.opi
- tab
- PSO setup
-
-
- PSO setup
- 254
- 215
- 20
+
+ text entry #64
+ $(P)$(R)MctOpticsPVPrefix
+ 255
+ 220
+ 380
+
+
+
+
+ 6
+ false
+ false
+
+
+ composite #68
+ 10
+ 330
+ 630
+ 70
+
+ true
+
+ text #71
+ Scan type
+ 130
+
+
+
+
+ 2
+
+
+ menu #74
+ $(P)$(R)ScanType
+ 135
+ 80
+ 20
+
+
+
+
+ false
+
+
+ menu #77
+ $(P)$(R)FlipStitch
+ 135
+ 25
+ 80
+ 20
+
+
+
+
+ false
+
+
+ text #80
+ Flip&Stitch
+ 25
+ 130
+
+
+
+
+ 2
+
+
+ text #83
+ PSO setup
+ 150
+ 50
+ 90
+
+
+
+
+ 2
+
+
+ related display #86
+
+
+ tomoScan_pso.opi
+ tab
+ PSO setup
+
+
+ PSO setup
+ 245
+ 50
+ 20
+
+
+
+
+
+
+ text #89
+ Y Pixels Per 360 Deg
+ 404
+ 130
+
+
+
+
+ 2
+
+
+ text entry #92
+ $(P)$(R)PixelsYPer360Deg
+ 549
+ 75
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #96
+ Helical Misalignment (mrad)
+ 403
+ 25
+ 130
+
+
+
+
+ 2
+
+
+ text entry #99
+ $(P)$(R)HelicalMisalignment
+ 549
+ 25
+ 75
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #103
+ Program PSO
+ 355
+ 50
+ 150
+
+
+
+
+ 2
+
+
+ menu #106
+ $(P)$(R)ProgramPSO
+ 510
+ 50
+ 120
+ 20
+
+
+
+
+ false
+
+
+
+ text #109
+ PVA plugin prefix
+ 10
+ 245
+ 240
+
+
+
+
+ 2
+
+
+ text entry #112
+ $(P)$(R)PvaPluginPVPrefix
+ 255
+ 245
+ 380
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #116
+ ROI plugin prefix
+ 10
+ 270
+ 240
+
+
+
+
+ 2
+
+
+ text entry #119
+ $(P)$(R)RoiPluginPVPrefix
+ 255
+ 270
+ 380
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #123
+ CB plugin prefix
+ 10
+ 295
+ 240
+
+
+
+
+ 2
+
+
+ text entry #126
+ $(P)$(R)CbPluginPVPrefix
+ 255
+ 295
+ 380
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
diff --git a/tomoScanApp/op/bob/autoconvert/tomoScan_32ID_main.bob b/tomoScanApp/op/bob/autoconvert/tomoScan_32ID_main.bob
new file mode 100644
index 00000000..4aec4c8a
--- /dev/null
+++ b/tomoScanApp/op/bob/autoconvert/tomoScan_32ID_main.bob
@@ -0,0 +1,1456 @@
+
+
+
+ tomoScan_32ID_main
+ 426
+ 968
+ 699
+ 820
+
+
+
+
+ false
+ 5
+
+ rectangle #6
+ 10
+ 700
+ 25
+
+
+
+
+
+
+
+
+
+
+ text #9
+ Tomography Data Collection $(P)$(R)
+ 10
+ 700
+ 25
+
+
+
+
+
+
+
+
+ 1
+
+
+ composite #12
+ 4000
+ 4000
+ 1
+ 1
+
+ true
+
+
+ composite #15
+ 4000
+ 4000
+ 1
+ 1
+
+ true
+
+
+ related display #18
+
+
+ $(BEAMLINE).opi
+ tab
+ Beamline-specific display
+
+
+
+ 508
+ 90
+ 20
+
+
+
+
+
+
+ related display #21
+
+
+ tomoScanEPICS_PVs.opi
+ tab
+ Epics PV Names
+
+
+
+ 160
+ 90
+ 50
+ 20
+
+
+
+
+
+
+ text #24
+ Epics PV names
+ 15
+ 92
+ 140
+
+
+
+
+ true
+
+
+ text #27
+ Beamline-specific display
+ 253
+ 91
+ 250
+
+
+
+
+ true
+
+
+ rectangle #30
+ 7
+ 50
+ 690
+ 65
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ rectangle #33
+ 290
+ 55
+ 120
+
+
+
+
+
+
+
+
+
+
+ text #36
+ Setup
+ 325
+ 55
+ 50
+
+
+
+
+
+
+
+
+ 1
+
+
+ rectangle #39
+ 5
+ 120
+ 690
+ 95
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ text #42
+ Angle step
+ 25
+ 185
+
+
+
+
+ true
+
+
+ text #45
+ Start angle
+ 15
+ 160
+ 110
+
+
+
+
+ true
+
+
+ text entry #48
+ $(P)$(R)RotationStep
+ 130
+ 185
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text entry #52
+ $(P)$(R)RotationStart
+ 130
+ 160
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ rectangle #56
+ 275
+ 125
+ 150
+
+
+
+
+
+
+
+
+
+
+ text #59
+ Rotation
+ 303
+ 124
+ 80
+
+
+
+
+
+
+
+
+ true
+
+
+ rectangle #62
+ 5
+ 220
+ 690
+ 145
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ menu #65
+ $(P)$(R)FlatFieldAxis
+ 170
+ 340
+ 20
+
+
+
+
+ false
+
+
+ text #68
+ Flat field axis
+ 15
+ 340
+ 150
+
+
+
+
+ true
+
+
+ text entry #71
+ $(P)$(R)NumFlatFields
+ 145
+ 315
+ 70
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text #75
+ # Flat fields
+ 10
+ 315
+ 130
+
+
+
+
+ 2
+
+
+ rectangle #78
+ 220
+ 225
+ 260
+
+
+
+
+
+
+
+
+
+
+ text #81
+ Flat Field Control
+ 260
+ 225
+ 180
+
+
+
+
+
+
+
+
+ 1
+
+
+ rectangle #84
+ 5
+ 370
+ 690
+ 70
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ rectangle #87
+ 220
+ 375
+ 260
+
+
+
+
+
+
+
+
+
+
+ text #90
+ Dark Field Control
+ 260
+ 375
+ 180
+
+
+
+
+
+
+
+
+ 1
+
+
+ rectangle #93
+ 5
+ 445
+ 690
+ 105
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ rectangle #96
+ 250
+ 450
+ 200
+
+
+
+
+
+
+
+
+
+
+ text #99
+ File Control
+ 290
+ 450
+ 120
+
+
+
+
+
+
+
+
+ 1
+
+
+ text #102
+ # Dark fields
+ 10
+ 410
+ 130
+
+
+
+
+ true
+
+
+ text entry #105
+ $(P)$(R)NumDarkFields
+ 145
+ 410
+ 70
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text #109
+ Dark value
+ 225
+ 410
+
+
+
+
+ true
+
+
+ text entry #112
+ $(P)$(R)DarkFieldValue
+ 330
+ 410
+ 70
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text #116
+ Collect flat fields
+ 415
+ 317
+ 190
+
+
+
+
+ 2
+
+
+ menu #119
+ $(P)$(R)FlatFieldMode
+ 610
+ 317
+ 80
+ 20
+
+
+
+
+ false
+
+
+ text #122
+ Collect dark fields
+ 415
+ 410
+ 190
+
+
+
+
+ true
+
+
+ menu #125
+ $(P)$(R)DarkFieldMode
+ 610
+ 410
+ 80
+ 20
+
+
+
+
+ false
+
+
+ text #128
+ Return to start
+ 495
+ 160
+ 150
+
+
+
+
+ true
+
+
+ menu #131
+ $(P)$(R)ReturnRotation
+ 525
+ 185
+ 80
+ 20
+
+
+
+
+ false
+
+
+ text #134
+ # of angles
+ 245
+ 160
+ 110
+
+
+
+
+ true
+
+
+ text entry #137
+ $(P)$(R)NumAngles
+ 360
+ 160
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text #141
+ Stop angle
+ 255
+ 185
+
+
+
+
+ true
+
+
+ text update #144
+ $(P)$(R)RotationStop
+ 360
+ 187
+ 18
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ rectangle #148
+ 5
+ 554
+ 703
+ 70
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ rectangle #151
+ 250
+ 560
+ 200
+
+
+
+
+
+
+
+
+
+
+ text #154
+ Data Collection
+ 275
+ 560
+ 150
+
+
+
+
+
+
+
+
+ 1
+
+
+ rectangle #157
+ 305
+ 634
+ 90
+
+
+
+
+
+
+
+
+
+
+ text #160
+ Status
+ 314
+ 634
+ 72
+
+
+
+
+
+
+
+
+ 1
+
+
+ message button #163
+
+
+ $(P)$(R)StartScan
+ 1
+ Write
+
+
+ $(P)$(R)StartScan
+ Start Scan
+ 250
+ 594
+ 120
+ 20
+
+
+
+
+
+
+ message button #166
+ $(P)$(R)AbortScan
+ 375
+ 594
+ 120
+ 20
+ Abort Scan
+
+
+
+
+ Abort Scan
+
+
+
+
+ false
+
+
+
+
+ 1
+
+
+ text #169
+ Exposure time
+ 15
+ 594
+ 130
+
+
+
+
+ true
+
+
+ text entry #172
+ $(P)$(R)ExposureTime
+ 150
+ 594
+ 70
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ rectangle #176
+ 5
+ 629
+ 690
+ 185
+ 1
+
+
+
+
+
+
+
+
+ true
+
+
+ text update #179
+ $(P)$(R)StartScan
+ 580
+ 594
+
+
+
+
+
+
+
+
+ 6
+ false
+
+
+ text #183
+ Status
+ 515
+ 594
+ 60
+
+
+
+
+ true
+
+
+ text #186
+ Python server
+ 65
+ 789
+ 130
+
+
+
+
+ true
+
+
+ text #189
+ Scan status
+ 85
+ 664
+ 110
+
+
+
+
+ true
+
+
+ text update #192
+ $(P)$(R)ScanStatus
+ 201
+ 664
+ 400
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #196
+ Remaining time
+ 55
+ 764
+ 140
+
+
+
+
+ true
+
+
+ text #199
+ Elapsed time
+ 75
+ 739
+ 120
+
+
+
+
+ true
+
+
+ text update #202
+ $(P)$(R)ElapsedTime
+ 201
+ 739
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text update #206
+ $(P)$(R)RemainingTime
+ 200
+ 764
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #210
+ Images collected
+ 35
+ 689
+ 160
+
+
+
+
+ true
+
+
+ text update #213
+ $(P)$(R)ImagesCollected
+ 201
+ 689
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #217
+ Images saved
+ 75
+ 714
+ 120
+
+
+
+
+ true
+
+
+ text update #220
+ $(P)$(R)ImagesSaved
+ 201
+ 714
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text update #224
+ $(P)$(R)ServerRunning
+ 199
+ 789
+
+
+
+
+
+
+
+
+ 6
+ false
+
+
+ text #228
+ Base file name
+ 15
+ 525
+ 140
+
+
+
+
+ true
+
+
+ text entry #231
+ $(P)$(R)FileName
+ 160
+ 525
+ 530
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #235
+ Exists:
+ 570
+ 475
+ 70
+
+
+
+
+ true
+
+
+ text update #238
+ $(P)$(R)FilePathExists
+ 645
+ 475
+ 40
+
+
+
+
+
+
+
+
+ 6
+ false
+
+
+ text #242
+ Overwrite warning:
+ 15
+ 475
+ 180
+
+
+
+
+ true
+
+
+ menu #245
+ $(P)$(R)OverwriteWarning
+ 200
+ 475
+ 80
+ 20
+
+
+
+
+ false
+
+
+ message button #248
+
+
+ $(P)$(R)MoveSampleIn
+ 1
+ Write
+
+
+ $(P)$(R)MoveSampleIn
+ Move Sample In
+ 565
+ 260
+ 120
+ 20
+
+
+
+
+
+
+ message button #251
+
+
+ $(P)$(R)MoveSampleOut
+ 1
+ Write
+
+
+ $(P)$(R)MoveSampleOut
+ Move Sample Out
+ 565
+ 285
+ 120
+ 20
+
+
+
+
+
+
+ text #254
+ Flat exposure
+ 350
+ 340
+ 130
+
+
+
+
+ 2
+
+
+ menu #257
+ $(P)$(R)DifferentFlatExposure
+ 485
+ 340
+ 20
+
+
+
+
+ false
+
+
+ text entry #260
+ $(P)$(R)FlatExposureTime
+ 590
+ 340
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text #264
+ Top X in
+ 10
+ 260
+ 130
+
+
+
+
+ true
+
+
+ text #267
+ Top X out
+ 10
+ 285
+ 140
+
+
+
+
+ true
+
+
+ text #270
+ Top Z out
+ 178
+ 285
+ 140
+
+
+
+
+ true
+
+
+ text #273
+ Top Z in
+ 178
+ 260
+ 130
+
+
+
+
+ true
+
+
+ text #276
+ Angle
+ 396
+ 284
+ 140
+
+
+
+
+ true
+
+
+ text entry #279
+ $(P)$(R)SampleOutAngle
+ 458
+ 284
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text #283
+ Use angle
+ 356
+ 260
+ 140
+
+
+
+
+ true
+
+
+ menu #286
+ $(P)$(R)SampleOutAngleEnable
+ 458
+ 260
+ 20
+
+
+
+
+ false
+
+
+ text entry #289
+ $(P)$(R)FlatFieldValue
+ 330
+ 315
+ 70
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text #293
+ Flat value
+ 225
+ 315
+
+
+
+
+ true
+
+
+ text entry #296
+ $(P)$(R)SampleInX
+ 101
+ 260
+ 73
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text entry #300
+ $(P)$(R)SampleOutX
+ 101
+ 285
+ 73
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text entry #304
+ $(P)$(R)SampleOutY
+ 278
+ 285
+ 73
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ text entry #308
+ $(P)$(R)SampleInY
+ 278
+ 260
+ 73
+
+
+
+
+
+
+
+
+ 1
+ false
+ false
+
+
+ menu #312
+ $(P)$(R)CollectMicroCTdata
+ 611
+ 450
+ 80
+ 20
+
+
+
+
+ false
+
+
+ text #315
+ Collect MicroCT
+ 471
+ 453
+ 150
+ 15
+
+
+
+
+ true
+
+
+ text #318
+ Last file name
+ 15
+ 500
+ 140
+
+
+
+
+ true
+
+
+ text update #321
+ 32idcSP1:HDF1:FullFileName_RBV
+ 160
+ 505
+ 530
+ 15
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
diff --git a/tomoScanApp/op/bob/autoconvert/tomoScan_32ID_otherpvs.bob b/tomoScanApp/op/bob/autoconvert/tomoScan_32ID_otherpvs.bob
index 34398220..93d39d5a 100644
--- a/tomoScanApp/op/bob/autoconvert/tomoScan_32ID_otherpvs.bob
+++ b/tomoScanApp/op/bob/autoconvert/tomoScan_32ID_otherpvs.bob
@@ -1,10 +1,11 @@
+
tomoScan_32ID_otherpvs
- 74
- 683
+ 429
+ 810
640
- 290
+ 340
@@ -44,7 +45,7 @@
text entry #12
$(P)$(R)BeamReadyPVName
- 254
+ 255
40
380
@@ -62,7 +63,7 @@
text entry #16
$(P)$(R)BeamReadyValue
- 254
+ 255
65
380
@@ -80,9 +81,9 @@
text #20
Beam ready value
- 89
+ 10
65
- 160
+ 240
@@ -92,9 +93,9 @@
text #23
Beam ready PV
- 119
+ 10
40
- 130
+ 240
@@ -104,9 +105,9 @@
text #26
Open fast shutter value
- 89
+ 10
115
- 160
+ 240
@@ -116,7 +117,7 @@
text entry #29
$(P)$(R)OpenFastShutterValue
- 254
+ 255
115
380
@@ -134,9 +135,9 @@
text #33
Open fast shutter PV
- 119
+ 10
90
- 130
+ 240
@@ -146,7 +147,7 @@
text entry #36
$(P)$(R)OpenFastShutterPVName
- 254
+ 255
90
380
@@ -164,9 +165,9 @@
text #40
Close fast shutter PV
- 119
+ 10
140
- 130
+ 240
@@ -176,9 +177,9 @@
text #43
Close fast shutter value
- 89
+ 10
165
- 160
+ 240
@@ -188,7 +189,7 @@
text entry #46
$(P)$(R)CloseFastShutterValue
- 254
+ 255
165
380
@@ -206,7 +207,7 @@
text entry #50
$(P)$(R)CloseFastShutterPVName
- 254
+ 255
140
380
@@ -224,9 +225,9 @@
text #54
Shutter status PV
- 119
+ 10
190
- 130
+ 240
@@ -236,7 +237,7 @@
text entry #57
$(P)$(R)ShutterStatusPVName
- 254
+ 255
190
380
@@ -255,7 +256,7 @@
text #61
PSO setup
159
- 268
+ 315
90
@@ -274,7 +275,7 @@
PSO setup
254
- 268
+ 315
20
@@ -283,10 +284,10 @@
text #67
- Sample Top X PV
- 87
- 216
- 160
+ Scan type
+ 119
+ 265
+ 130
@@ -295,21 +296,47 @@
text #70
- Sample Top Z PV
- 87
- 241
- 160
+ Flip&Stitch
+ 119
+ 290
+ 130
2
+
+ menu #73
+ $(P)$(R)ScanType
+ 254
+ 265
+ 80
+ 20
+
+
+
+
+ false
+
+
+ menu #76
+ $(P)$(R)FlipStitch
+ 254
+ 290
+ 80
+ 20
+
+
+
+
+ false
+
- text entry #73
- $(P)$(R)SampleTopZPVName
- 253
- 241
+ text entry #79
+ $(P)$(R)TxmOpticsPVPrefix
+ 255
+ 215
380
@@ -323,11 +350,23 @@
false
false
+
+ text #83
+ txmOptics Prefix
+ 10
+ 215
+ 240
+
+
+
+
+ 2
+
- text entry #77
- $(P)$(R)SampleTopXPVName
- 253
- 216
+ text entry #86
+ $(P)$(R)ImagePVPrefix
+ 255
+ 240
380
@@ -341,4 +380,16 @@
false
false
+
+ text #90
+ Image Prefix
+ 10
+ 240
+ 240
+
+
+
+
+ 2
+
diff --git a/tomoScanApp/op/bob/autoconvert/tomoScan_7BM_optics.bob b/tomoScanApp/op/bob/autoconvert/tomoScan_7BM_optics.bob
index 43e5e4c0..d6b5e47b 100644
--- a/tomoScanApp/op/bob/autoconvert/tomoScan_7BM_optics.bob
+++ b/tomoScanApp/op/bob/autoconvert/tomoScan_7BM_optics.bob
@@ -1,10 +1,11 @@
+
tomoScan_7BM_optics
- 13
+ 3
64
600
- 200
+ 225
@@ -41,199 +42,214 @@
1
-
- composite #12
+
+ text #12
+ Tube length (mm)
+ 160
+ 171
+ 160
+
+
+
+
+ 2
+
+
+ text #15
+ Scintillator type
+ 150
+ 46
+ 170
+
+
+
+
+ 2
+
+
+ text #18
+ Scint. thickness (microns)
+ 60
+ 71
+ 260
+
+
+
+
+ 2
+
+
+ text #21
+ Image pixel size (microns)
+ 60
+ 96
+ 260
+
+
+
+
+ 2
+
+
+ text #24
+ Detector pixel size (microns)
30
+ 121
+ 290
+
+
+
+
+ 2
+
+
+ text #27
+ Camera objective
+ 160
+ 146
+ 160
+
+
+
+
+ 2
+
+
+ text entry #30
+ $(P)$(R)ScintillatorThickness
+ 325
+ 71
+ 230
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text entry #34
+ $(P)$(R)ScintillatorType
+ 325
46
- 525
- 145
-
- true
-
- composite #15
- 290
- 145
-
- true
-
- text #18
- Tube length (mm)
- 130
- 125
- 160
-
-
-
-
- 2
-
-
- text #21
- Scintillator type
- 120
- 170
-
-
-
-
- 2
-
-
- text #24
- Scint. thickness (microns)
- 30
- 25
- 260
-
-
-
-
- 2
-
-
- text #27
- Image pixel size (microns)
- 30
- 50
- 260
-
-
-
-
- 2
-
-
- text #30
- Detector pixel size (microns)
- 75
- 290
-
-
-
-
- 2
-
-
- text #33
- Camera objective
- 130
- 100
- 160
-
-
-
-
- 2
-
-
-
- composite #36
- 295
- 230
- 145
-
- true
-
- text entry #39
- $(P)$(R)ScintillatorThickness
- 25
- 230
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
- text entry #43
- $(P)$(R)ScintillatorType
- 230
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
- text entry #47
- $(P)$(R)DetectorPixelSize
- 75
- 230
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
- text entry #51
- $(P)$(R)CameraObjective
- 100
- 230
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
- text entry #55
- $(P)$(R)CameraTubeLength
- 125
- 230
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
- text entry #59
- $(P)$(R)ImagePixelSize
- 50
- 230
-
-
-
-
-
-
-
-
- 6
- false
- false
-
-
+ 230
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text entry #38
+ $(P)$(R)DetectorPixelSize
+ 325
+ 121
+ 230
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text entry #42
+ $(P)$(R)CameraObjective
+ 325
+ 146
+ 230
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text entry #46
+ $(P)$(R)CameraTubeLength
+ 325
+ 171
+ 230
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text entry #50
+ $(P)$(R)ImagePixelSize
+ 325
+ 96
+ 230
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text entry #54
+ $(P)$(R)CameraDistance
+ 325
+ 196
+ 230
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #58
+ Camera Distance (mm)
+ 120
+ 196
+ 200
+
+
+
+
+ 2
diff --git a/tomoScanApp/op/bob/autoconvert/tomoScan_7BM_otherpvs.bob b/tomoScanApp/op/bob/autoconvert/tomoScan_7BM_otherpvs.bob
index 905d7f4f..df126b84 100644
--- a/tomoScanApp/op/bob/autoconvert/tomoScan_7BM_otherpvs.bob
+++ b/tomoScanApp/op/bob/autoconvert/tomoScan_7BM_otherpvs.bob
@@ -1,10 +1,11 @@
+
tomoScan_7BM_otherpvs
- 1238
- 514
+ 1943
+ 236
640
- 260
+ 350
@@ -281,4 +282,174 @@
false
false
+
+ text #68
+ Scan type
+ 10
+ 276
+ 130
+
+
+
+
+ 2
+
+
+ menu #71
+ $(P)$(R)ScanType
+ 145
+ 276
+ 80
+ 20
+
+
+
+
+ false
+
+
+ menu #74
+ $(P)$(R)FlipStitch
+ 145
+ 301
+ 80
+ 20
+
+
+
+
+ false
+
+
+ text #77
+ Flip&Stitch
+ 10
+ 301
+ 130
+
+
+
+
+ 2
+
+
+ text #80
+ PSO setup
+ 159
+ 324
+ 90
+
+
+
+
+ 2
+
+
+ related display #83
+
+
+ tomoScan_pso.opi
+ tab
+ PSO setup
+
+
+ PSO setup
+ 254
+ 324
+ 20
+
+
+
+
+
+
+ text #86
+ Y Pixels Per 360 Deg
+ 414
+ 276
+ 130
+
+
+
+
+ 2
+
+
+ text entry #89
+ $(P)$(R)PixelsYPer360Deg
+ 559
+ 276
+ 75
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #93
+ Helical Misalignment (mrad)
+ 413
+ 301
+ 130
+
+
+
+
+ 2
+
+
+ text entry #96
+ $(P)$(R)HelicalMisalignment
+ 559
+ 301
+ 75
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
+
+ text #100
+ Number of Gain Images
+ 19
+ 245
+ 230
+
+
+
+
+ 2
+
+
+ text entry #103
+ $(P)$(R)NumGainFields
+ 254
+ 245
+ 380
+
+
+
+
+
+
+
+
+ 6
+ false
+ false
+
diff --git a/tomoScanApp/op/edl/autoconvert/tomoScan.edl b/tomoScanApp/op/edl/autoconvert/tomoScan.edl
index 9fb4e6ce..3b69c5d6 100644
--- a/tomoScanApp/op/edl/autoconvert/tomoScan.edl
+++ b/tomoScanApp/op/edl/autoconvert/tomoScan.edl
@@ -3,10 +3,10 @@ beginScreenProperties
major 4
minor 0
release 1
-x 242
-y 64
+x 505
+y 72
w 700
-h 825
+h 925
font "helvetica-medium-r-18.0"
ctlFont "helvetica-bold-r-10.0"
btnFont "helvetica-medium-r-18.0"
@@ -347,7 +347,7 @@ major 4
minor 1
release 1
x 15
-y 310
+y 340
w 150
h 20
font "helvetica-medium-r-14.0"
@@ -365,9 +365,9 @@ beginObjectProperties
major 4
minor 7
release 0
-x 575
-y 335
-w 100
+x 145
+y 315
+w 70
h 20
controlPv "$(P)$(R)NumFlatFields"
format "decimal"
@@ -391,8 +391,8 @@ beginObjectProperties
major 4
minor 1
release 1
-x 440
-y 335
+x 10
+y 315
w 130
h 20
font "helvetica-medium-r-14.0"
@@ -441,35 +441,24 @@ value {
}
endObjectProperties
-# (Rectangle)
-object activeRectangleClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 5
-y 370
-w 690
-h 70
-lineColor rgb 0 0 0
-fillColor rgb 0 0 0
-lineWidth 0
-endObjectProperties
-
-# (Rectangle)
-object activeRectangleClass
+# (Static Text)
+object activeXTextClass
beginObjectProperties
major 4
-minor 0
-release 0
-x 220
-y 375
-w 259
-h 19
-lineColor rgb 55808 55808 55808
-fill
-fillColor rgb 55808 55808 55808
-lineWidth 0
+minor 1
+release 1
+x 415
+y 317
+w 190
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Collect flat fields"
+}
endObjectProperties
# (Static Text)
@@ -478,49 +467,62 @@ beginObjectProperties
major 4
minor 1
release 1
-x 260
-y 375
-w 180
+x 495
+y 160
+w 150
h 20
font "helvetica-medium-r-14.0"
-fontAlign "center"
-fgColor rgb 2560 0 47104
+fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Dark Field Control"
+ "Return to start"
}
endObjectProperties
-# (Rectangle)
-object activeRectangleClass
+# (Static Text)
+object activeXTextClass
beginObjectProperties
major 4
-minor 0
-release 0
-x 5
-y 445
-w 690
-h 105
-lineColor rgb 0 0 0
-fillColor rgb 0 0 0
-lineWidth 0
+minor 1
+release 1
+x 245
+y 160
+w 110
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "# of angles"
+}
endObjectProperties
-# (Rectangle)
-object activeRectangleClass
+# (Text Control)
+object activeXTextDspClass
beginObjectProperties
major 4
-minor 0
+minor 7
release 0
-x 250
-y 450
-w 199
-h 19
-lineColor rgb 55808 55808 55808
-fill
-fillColor rgb 55808 55808 55808
-lineWidth 0
+x 360
+y 160
+w 100
+h 20
+controlPv "$(P)$(R)NumAngles"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
endObjectProperties
# (Static Text)
@@ -529,36 +531,60 @@ beginObjectProperties
major 4
minor 1
release 1
-x 290
-y 450
-w 120
+x 255
+y 185
+w 100
h 20
font "helvetica-medium-r-14.0"
-fontAlign "center"
-fgColor rgb 2560 0 47104
+fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "File Control"
+ "Stop angle"
}
endObjectProperties
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 360
+y 187
+w 100
+h 18
+controlPv "$(P)$(R)RotationStop"
+format "decimal"
+font "helvetica-medium-r-14.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
-x 10
-y 410
+x 350
+y 340
w 130
h 20
font "helvetica-medium-r-14.0"
+fontAlign "right"
fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "# Dark fields"
+ "Flat exposure"
}
endObjectProperties
@@ -568,11 +594,11 @@ beginObjectProperties
major 4
minor 7
release 0
-x 145
-y 410
-w 70
+x 590
+y 340
+w 100
h 20
-controlPv "$(P)$(R)NumDarkFields"
+controlPv "$(P)$(R)FlatExposureTime"
format "decimal"
font "helvetica-medium-r-12.0"
fontAlign "left"
@@ -594,16 +620,16 @@ beginObjectProperties
major 4
minor 1
release 1
-x 226
-y 410
-w 100
+x 25
+y 260
+w 130
h 20
font "helvetica-medium-r-14.0"
fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Dark value"
+ "X in "
}
endObjectProperties
@@ -613,11 +639,37 @@ beginObjectProperties
major 4
minor 7
release 0
-x 331
-y 410
-w 70
+x 73
+y 260
+w 100
h 20
-controlPv "$(P)$(R)DarkFieldValue"
+controlPv "$(P)$(R)SampleInX"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 73
+y 285
+w 100
+h 20
+controlPv "$(P)$(R)SampleOutX"
format "decimal"
font "helvetica-medium-r-12.0"
fontAlign "left"
@@ -639,17 +691,16 @@ beginObjectProperties
major 4
minor 1
release 1
-x 380
-y 310
-w 190
+x 15
+y 285
+w 140
h 20
font "helvetica-medium-r-14.0"
-fontAlign "right"
fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Collect flat fields"
+ "X out"
}
endObjectProperties
@@ -659,54 +710,151 @@ beginObjectProperties
major 4
minor 1
release 1
-x 415
-y 410
-w 190
+x 183
+y 285
+w 140
h 20
font "helvetica-medium-r-14.0"
fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Collect dark fields"
+ "Y out "
}
endObjectProperties
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 245
+y 285
+w 100
+h 20
+controlPv "$(P)$(R)SampleOutY"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 245
+y 260
+w 100
+h 20
+controlPv "$(P)$(R)SampleInY"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
-x 495
-y 160
-w 150
+x 193
+y 260
+w 130
h 20
font "helvetica-medium-r-14.0"
fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Return to start"
+ "Y in"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 396
+y 284
+w 140
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Angle"
}
endObjectProperties
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 458
+y 284
+w 100
+h 20
+controlPv "$(P)$(R)SampleOutAngle"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
-x 245
-y 160
-w 110
+x 356
+y 260
+w 140
h 20
font "helvetica-medium-r-14.0"
fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "# of angles"
+ "Use angle"
}
endObjectProperties
@@ -716,11 +864,11 @@ beginObjectProperties
major 4
minor 7
release 0
-x 360
-y 160
-w 100
+x 330
+y 315
+w 70
h 20
-controlPv "$(P)$(R)NumAngles"
+controlPv "$(P)$(R)FlatFieldValue"
format "decimal"
font "helvetica-medium-r-12.0"
fontAlign "left"
@@ -742,8 +890,8 @@ beginObjectProperties
major 4
minor 1
release 1
-x 255
-y 185
+x 225
+y 315
w 100
h 20
font "helvetica-medium-r-14.0"
@@ -751,32 +899,59 @@ fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Stop angle"
+ "Flat value"
}
endObjectProperties
-# (Text Monitor)
-object activeXTextDspClass:noedit
+# (Rectangle)
+object activeRectangleClass
beginObjectProperties
major 4
-minor 7
+minor 0
release 0
-x 360
-y 187
-w 100
-h 18
-controlPv "$(P)$(R)RotationStop"
-format "decimal"
+x 5
+y 520
+w 690
+h 130
+lineColor rgb 0 0 0
+fillColor rgb 0 0 0
+lineWidth 0
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 250
+y 525
+w 199
+h 19
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 290
+y 525
+w 120
+h 20
font "helvetica-medium-r-14.0"
-fontAlign "left"
-fgColor rgb 0 0 0
-bgColor rgb 29440 57088 65280
-limitsFromDb
-nullColor rgb 60928 46592 11008
-smartRefresh
-fastUpdate
-newPos
-objType "controls"
+fontAlign "center"
+fgColor rgb 2560 0 47104
+bgColor index 3
+useDisplayBg
+value {
+ "File Control"
+}
endObjectProperties
# (Rectangle)
@@ -786,7 +961,7 @@ major 4
minor 0
release 0
x 5
-y 555
+y 655
w 690
h 70
lineColor rgb 0 0 0
@@ -801,7 +976,7 @@ major 4
minor 0
release 0
x 250
-y 561
+y 661
w 199
h 19
lineColor rgb 55808 55808 55808
@@ -817,7 +992,7 @@ major 4
minor 1
release 1
x 275
-y 561
+y 661
w 150
h 20
font "helvetica-medium-r-14.0"
@@ -837,7 +1012,7 @@ major 4
minor 0
release 0
x 305
-y 635
+y 735
w 89
h 19
lineColor rgb 55808 55808 55808
@@ -853,7 +1028,7 @@ major 4
minor 1
release 1
x 314
-y 635
+y 735
w 72
h 20
font "helvetica-medium-r-14.0"
@@ -873,7 +1048,7 @@ major 4
minor 1
release 1
x 15
-y 595
+y 695
w 130
h 20
font "helvetica-medium-r-14.0"
@@ -892,7 +1067,7 @@ major 4
minor 7
release 0
x 150
-y 595
+y 695
w 70
h 20
controlPv "$(P)$(R)ExposureTime"
@@ -918,7 +1093,7 @@ major 4
minor 0
release 0
x 5
-y 630
+y 730
w 690
h 190
lineColor rgb 0 0 0
@@ -933,7 +1108,7 @@ major 4
minor 7
release 0
x 580
-y 595
+y 695
w 100
h 20
controlPv "$(P)$(R)StartScan"
@@ -958,7 +1133,7 @@ major 4
minor 1
release 1
x 515
-y 595
+y 695
w 60
h 20
font "helvetica-medium-r-14.0"
@@ -977,7 +1152,7 @@ major 4
minor 1
release 1
x 65
-y 790
+y 890
w 130
h 20
font "helvetica-medium-r-14.0"
@@ -996,7 +1171,7 @@ major 4
minor 1
release 1
x 85
-y 665
+y 765
w 110
h 20
font "helvetica-medium-r-14.0"
@@ -1015,7 +1190,7 @@ major 4
minor 7
release 0
x 201
-y 665
+y 765
w 400
h 20
controlPv "$(P)$(R)ScanStatus"
@@ -1039,7 +1214,7 @@ major 4
minor 1
release 1
x 55
-y 765
+y 865
w 140
h 20
font "helvetica-medium-r-14.0"
@@ -1058,7 +1233,7 @@ major 4
minor 1
release 1
x 75
-y 740
+y 840
w 120
h 20
font "helvetica-medium-r-14.0"
@@ -1077,7 +1252,7 @@ major 4
minor 7
release 0
x 201
-y 740
+y 840
w 100
h 20
controlPv "$(P)$(R)ElapsedTime"
@@ -1101,7 +1276,7 @@ major 4
minor 7
release 0
x 200
-y 765
+y 865
w 100
h 20
controlPv "$(P)$(R)RemainingTime"
@@ -1125,7 +1300,7 @@ major 4
minor 1
release 1
x 35
-y 690
+y 790
w 160
h 20
font "helvetica-medium-r-14.0"
@@ -1144,7 +1319,7 @@ major 4
minor 7
release 0
x 201
-y 690
+y 790
w 100
h 20
controlPv "$(P)$(R)ImagesCollected"
@@ -1168,7 +1343,7 @@ major 4
minor 1
release 1
x 75
-y 715
+y 815
w 120
h 20
font "helvetica-medium-r-14.0"
@@ -1187,7 +1362,7 @@ major 4
minor 7
release 0
x 201
-y 715
+y 815
w 100
h 20
controlPv "$(P)$(R)ImagesSaved"
@@ -1211,7 +1386,7 @@ major 4
minor 7
release 0
x 199
-y 790
+y 890
w 100
h 20
controlPv "$(P)$(R)ServerRunning"
@@ -1236,7 +1411,7 @@ major 4
minor 1
release 1
x 15
-y 500
+y 575
w 140
h 20
font "helvetica-medium-r-14.0"
@@ -1255,7 +1430,7 @@ major 4
minor 7
release 0
x 160
-y 500
+y 575
w 530
h 20
controlPv "$(P)$(R)FilePath"
@@ -1281,7 +1456,7 @@ major 4
minor 1
release 1
x 15
-y 525
+y 600
w 140
h 20
font "helvetica-medium-r-14.0"
@@ -1300,7 +1475,7 @@ major 4
minor 7
release 0
x 160
-y 525
+y 600
w 530
h 20
controlPv "$(P)$(R)FileName"
@@ -1326,7 +1501,7 @@ major 4
minor 1
release 1
x 570
-y 475
+y 550
w 70
h 20
font "helvetica-medium-r-14.0"
@@ -1345,7 +1520,7 @@ major 4
minor 7
release 0
x 645
-y 475
+y 550
w 40
h 20
controlPv "$(P)$(R)FilePathExists"
@@ -1370,7 +1545,7 @@ major 4
minor 1
release 1
x 15
-y 475
+y 550
w 180
h 20
font "helvetica-medium-r-14.0"
@@ -1388,38 +1563,35 @@ beginObjectProperties
major 4
minor 1
release 1
-x 35
-y 335
-w 130
+x 15
+y 625
+w 140
h 20
font "helvetica-medium-r-14.0"
-fontAlign "right"
fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Flat exposure"
+ "Last file name"
}
endObjectProperties
-# (Text Control)
-object activeXTextDspClass
+# (Text Monitor)
+object activeXTextDspClass:noedit
beginObjectProperties
major 4
minor 7
release 0
-x 275
-y 335
-w 100
-h 20
-controlPv "$(P)$(R)FlatExposureTime"
-format "decimal"
+x 160
+y 628
+w 530
+h 15
+controlPv "$(P)$(R)FullFileName"
+format "string"
font "helvetica-medium-r-12.0"
fontAlign "left"
fgColor rgb 0 0 0
bgColor rgb 29440 57088 65280
-editable
-motifWidget
limitsFromDb
nullColor rgb 60928 46592 11008
smartRefresh
@@ -1428,75 +1600,35 @@ newPos
objType "controls"
endObjectProperties
-# (Static Text)
-object activeXTextClass
-beginObjectProperties
-major 4
-minor 1
-release 1
-x 25
-y 260
-w 130
-h 20
-font "helvetica-medium-r-14.0"
-fgColor rgb 0 0 0
-bgColor index 3
-useDisplayBg
-value {
- "X in "
-}
-endObjectProperties
-
-# (Text Control)
-object activeXTextDspClass
+# (Rectangle)
+object activeRectangleClass
beginObjectProperties
major 4
-minor 7
+minor 0
release 0
-x 73
-y 260
-w 100
-h 20
-controlPv "$(P)$(R)SampleInX"
-format "decimal"
-font "helvetica-medium-r-12.0"
-fontAlign "left"
-fgColor rgb 0 0 0
-bgColor rgb 29440 57088 65280
-editable
-motifWidget
-limitsFromDb
-nullColor rgb 60928 46592 11008
-smartRefresh
-fastUpdate
-newPos
-objType "controls"
+x 5
+y 370
+w 690
+h 70
+lineColor rgb 0 0 0
+fillColor rgb 0 0 0
+lineWidth 0
endObjectProperties
-# (Text Control)
-object activeXTextDspClass
+# (Rectangle)
+object activeRectangleClass
beginObjectProperties
major 4
-minor 7
+minor 0
release 0
-x 73
-y 285
-w 100
-h 20
-controlPv "$(P)$(R)SampleOutX"
-format "decimal"
-font "helvetica-medium-r-12.0"
-fontAlign "left"
-fgColor rgb 0 0 0
-bgColor rgb 29440 57088 65280
-editable
-motifWidget
-limitsFromDb
-nullColor rgb 60928 46592 11008
-smartRefresh
-fastUpdate
-newPos
-objType "controls"
+x 220
+y 375
+w 259
+h 19
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
endObjectProperties
# (Static Text)
@@ -1505,16 +1637,17 @@ beginObjectProperties
major 4
minor 1
release 1
-x 15
-y 285
-w 140
+x 260
+y 375
+w 180
h 20
font "helvetica-medium-r-14.0"
-fgColor rgb 0 0 0
+fontAlign "center"
+fgColor rgb 2560 0 47104
bgColor index 3
useDisplayBg
value {
- "X out"
+ "Dark Field Control"
}
endObjectProperties
@@ -1524,16 +1657,16 @@ beginObjectProperties
major 4
minor 1
release 1
-x 183
-y 285
-w 140
+x 10
+y 410
+w 130
h 20
font "helvetica-medium-r-14.0"
fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Y out "
+ "# Dark fields"
}
endObjectProperties
@@ -1543,11 +1676,11 @@ beginObjectProperties
major 4
minor 7
release 0
-x 245
-y 285
-w 100
+x 145
+y 410
+w 70
h 20
-controlPv "$(P)$(R)SampleOutY"
+controlPv "$(P)$(R)NumDarkFields"
format "decimal"
font "helvetica-medium-r-12.0"
fontAlign "left"
@@ -1563,17 +1696,36 @@ newPos
objType "controls"
endObjectProperties
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 225
+y 410
+w 100
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Dark value"
+}
+endObjectProperties
+
# (Text Control)
object activeXTextDspClass
beginObjectProperties
major 4
minor 7
release 0
-x 245
-y 260
-w 100
+x 330
+y 410
+w 70
h 20
-controlPv "$(P)$(R)SampleInY"
+controlPv "$(P)$(R)DarkFieldValue"
format "decimal"
font "helvetica-medium-r-12.0"
fontAlign "left"
@@ -1595,80 +1747,86 @@ beginObjectProperties
major 4
minor 1
release 1
-x 193
-y 260
-w 130
+x 415
+y 410
+w 190
h 20
font "helvetica-medium-r-14.0"
fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Y in"
+ "Collect dark fields"
}
endObjectProperties
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 5
+y 445
+w 690
+h 70
+lineColor rgb 0 0 0
+fillColor rgb 0 0 0
+lineWidth 0
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 220
+y 450
+w 259
+h 19
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
+endObjectProperties
+
# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
-x 396
-y 284
-w 140
+x 275
+y 450
+w 150
h 20
font "helvetica-medium-r-14.0"
-fgColor rgb 0 0 0
+fontAlign "center"
+fgColor rgb 2560 0 47104
bgColor index 3
useDisplayBg
value {
- "Angle"
+ "Shutter Control"
}
endObjectProperties
-# (Text Control)
-object activeXTextDspClass
-beginObjectProperties
-major 4
-minor 7
-release 0
-x 458
-y 284
-w 100
-h 20
-controlPv "$(P)$(R)SampleOutAngle"
-format "decimal"
-font "helvetica-medium-r-12.0"
-fontAlign "left"
-fgColor rgb 0 0 0
-bgColor rgb 29440 57088 65280
-editable
-motifWidget
-limitsFromDb
-nullColor rgb 60928 46592 11008
-smartRefresh
-fastUpdate
-newPos
-objType "controls"
-endObjectProperties
-
# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
-x 356
-y 260
-w 140
+x 425
+y 485
+w 180
h 20
font "helvetica-medium-r-14.0"
fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Use angle"
+ "Auto close shutter"
}
endObjectProperties
# (Group)
@@ -1777,7 +1935,7 @@ major 4
minor 0
release 0
x 170
-y 310
+y 340
w 100
h 20
fgColor rgb 0 0 0
@@ -1790,26 +1948,6 @@ indicatorPv "$(P)$(R)FlatFieldAxis"
font "helvetica-medium-r-12.0"
endObjectProperties
-# (Menu Button)
-object activeMenuButtonClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 575
-y 310
-w 100
-h 20
-fgColor rgb 0 0 0
-bgColor rgb 29440 57088 65280
-inconsistentColor rgb 17920 17920 17920
-topShadowColor rgb 55808 55808 55808
-botShadowColor rgb 17920 17920 17920
-controlPv "$(P)$(R)FlatFieldMode"
-indicatorPv "$(P)$(R)FlatFieldMode"
-font "helvetica-medium-r-12.0"
-endObjectProperties
-
# (Menu Button)
object activeMenuButtonClass
beginObjectProperties
@@ -1817,7 +1955,7 @@ major 4
minor 0
release 0
x 610
-y 410
+y 317
w 80
h 20
fgColor rgb 0 0 0
@@ -1825,8 +1963,8 @@ bgColor rgb 29440 57088 65280
inconsistentColor rgb 17920 17920 17920
topShadowColor rgb 55808 55808 55808
botShadowColor rgb 17920 17920 17920
-controlPv "$(P)$(R)DarkFieldMode"
-indicatorPv "$(P)$(R)DarkFieldMode"
+controlPv "$(P)$(R)FlatFieldMode"
+indicatorPv "$(P)$(R)FlatFieldMode"
font "helvetica-medium-r-12.0"
endObjectProperties
@@ -1856,20 +1994,20 @@ beginObjectProperties
major 4
minor 0
release 0
-x 250
-y 595
+x 565
+y 260
w 120
h 20
fgColor rgb 0 0 0
-onColor rgb 0 55296 0
-offColor rgb 0 55296 0
+onColor rgb 29440 57088 65280
+offColor rgb 29440 57088 65280
topShadowColor rgb 65280 65280 65280
botShadowColor rgb 0 0 0
-controlPv "$(P)$(R)StartScan"
+controlPv "$(P)$(R)MoveSampleIn"
pressValue "1"
releaseValue
-onLabel "Start Scan"
-offLabel "Start Scan"
+onLabel "Move Sample In"
+offLabel "Move Sample In"
3d
useEnumNumeric
font "helvetica-medium-r-12.0"
@@ -1881,20 +2019,20 @@ beginObjectProperties
major 4
minor 0
release 0
-x 375
-y 595
+x 565
+y 285
w 120
h 20
fgColor rgb 0 0 0
-onColor rgb 64768 0 0
-offColor rgb 64768 0 0
+onColor rgb 29440 57088 65280
+offColor rgb 29440 57088 65280
topShadowColor rgb 65280 65280 65280
botShadowColor rgb 0 0 0
-controlPv "$(P)$(R)AbortScan"
+controlPv "$(P)$(R)MoveSampleOut"
pressValue "1"
-releaseValue "0"
-onLabel "Abort Scan"
-offLabel "Abort Scan"
+releaseValue
+onLabel "Move Sample Out"
+offLabel "Move Sample Out"
3d
useEnumNumeric
font "helvetica-medium-r-12.0"
@@ -1906,17 +2044,37 @@ beginObjectProperties
major 4
minor 0
release 0
-x 200
-y 475
-w 80
+x 485
+y 340
+w 100
h 20
fgColor rgb 0 0 0
bgColor rgb 29440 57088 65280
inconsistentColor rgb 17920 17920 17920
topShadowColor rgb 55808 55808 55808
botShadowColor rgb 17920 17920 17920
-controlPv "$(P)$(R)OverwriteWarning"
-indicatorPv "$(P)$(R)OverwriteWarning"
+controlPv "$(P)$(R)DifferentFlatExposure"
+indicatorPv "$(P)$(R)DifferentFlatExposure"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 458
+y 260
+w 100
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)SampleOutAngleEnable"
+indicatorPv "$(P)$(R)SampleOutAngleEnable"
font "helvetica-medium-r-12.0"
endObjectProperties
@@ -1926,20 +2084,20 @@ beginObjectProperties
major 4
minor 0
release 0
-x 565
-y 260
+x 250
+y 695
w 120
h 20
fgColor rgb 0 0 0
-onColor rgb 29440 57088 65280
-offColor rgb 29440 57088 65280
+onColor rgb 0 55296 0
+offColor rgb 0 55296 0
topShadowColor rgb 65280 65280 65280
botShadowColor rgb 0 0 0
-controlPv "$(P)$(R)MoveSampleIn"
+controlPv "$(P)$(R)StartScan"
pressValue "1"
releaseValue
-onLabel "Move Sample In"
-offLabel "Move Sample In"
+onLabel "Start Scan"
+offLabel "Start Scan"
3d
useEnumNumeric
font "helvetica-medium-r-12.0"
@@ -1951,20 +2109,20 @@ beginObjectProperties
major 4
minor 0
release 0
-x 565
-y 285
+x 375
+y 695
w 120
h 20
fgColor rgb 0 0 0
-onColor rgb 29440 57088 65280
-offColor rgb 29440 57088 65280
+onColor rgb 64768 0 0
+offColor rgb 64768 0 0
topShadowColor rgb 65280 65280 65280
botShadowColor rgb 0 0 0
-controlPv "$(P)$(R)MoveSampleOut"
+controlPv "$(P)$(R)AbortScan"
pressValue "1"
-releaseValue
-onLabel "Move Sample Out"
-offLabel "Move Sample Out"
+releaseValue "0"
+onLabel "Abort Scan"
+offLabel "Abort Scan"
3d
useEnumNumeric
font "helvetica-medium-r-12.0"
@@ -1976,17 +2134,17 @@ beginObjectProperties
major 4
minor 0
release 0
-x 170
-y 335
-w 100
+x 200
+y 550
+w 80
h 20
fgColor rgb 0 0 0
bgColor rgb 29440 57088 65280
inconsistentColor rgb 17920 17920 17920
topShadowColor rgb 55808 55808 55808
botShadowColor rgb 17920 17920 17920
-controlPv "$(P)$(R)DifferentFlatExposure"
-indicatorPv "$(P)$(R)DifferentFlatExposure"
+controlPv "$(P)$(R)OverwriteWarning"
+indicatorPv "$(P)$(R)OverwriteWarning"
font "helvetica-medium-r-12.0"
endObjectProperties
@@ -1996,17 +2154,87 @@ beginObjectProperties
major 4
minor 0
release 0
-x 458
-y 260
-w 100
+x 610
+y 410
+w 80
h 20
fgColor rgb 0 0 0
bgColor rgb 29440 57088 65280
inconsistentColor rgb 17920 17920 17920
topShadowColor rgb 55808 55808 55808
botShadowColor rgb 17920 17920 17920
-controlPv "$(P)$(R)SampleOutAngleEnable"
-indicatorPv "$(P)$(R)SampleOutAngleEnable"
+controlPv "$(P)$(R)DarkFieldMode"
+indicatorPv "$(P)$(R)DarkFieldMode"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 610
+y 485
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)AutoCloseShutter"
+indicatorPv "$(P)$(R)AutoCloseShutter"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Message Button)
+object activeMessageButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 50
+y 485
+w 120
+h 20
+fgColor rgb 0 0 0
+onColor rgb 0 55296 0
+offColor rgb 0 55296 0
+topShadowColor rgb 65280 65280 65280
+botShadowColor rgb 0 0 0
+controlPv "$(P)$(R)OpenShutterCmd"
+pressValue "1"
+releaseValue "0"
+onLabel "Open shutter"
+offLabel "Open shutter"
+3d
+useEnumNumeric
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Message Button)
+object activeMessageButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 200
+y 485
+w 120
+h 20
+fgColor rgb 0 0 0
+onColor rgb 64768 0 0
+offColor rgb 64768 0 0
+topShadowColor rgb 65280 65280 65280
+botShadowColor rgb 0 0 0
+controlPv "$(P)$(R)CloseShutterCmd"
+pressValue "1"
+releaseValue "0"
+onLabel "Close shutter"
+offLabel "Close shutter"
+3d
+useEnumNumeric
font "helvetica-medium-r-12.0"
endObjectProperties
diff --git a/tomoScanApp/op/edl/autoconvert/tomoScanStream.edl b/tomoScanApp/op/edl/autoconvert/tomoScanStream.edl
index d1c6d15e..9b5f5753 100644
--- a/tomoScanApp/op/edl/autoconvert/tomoScanStream.edl
+++ b/tomoScanApp/op/edl/autoconvert/tomoScanStream.edl
@@ -3,10 +3,10 @@ beginScreenProperties
major 4
minor 0
release 1
-x 402
-y 286
+x 3768
+y 365
w 700
-h 960
+h 1042
font "helvetica-medium-r-18.0"
ctlFont "helvetica-bold-r-10.0"
btnFont "helvetica-medium-r-18.0"
@@ -819,8 +819,8 @@ beginObjectProperties
major 4
minor 1
release 1
-x 380
-y 310
+x 34
+y 734
w 190
h 20
font "helvetica-medium-r-14.0"
@@ -839,8 +839,8 @@ beginObjectProperties
major 4
minor 1
release 1
-x 415
-y 410
+x 379
+y 735
w 190
h 20
font "helvetica-medium-r-14.0"
@@ -1158,19 +1158,6 @@ newPos
objType "controls"
endObjectProperties
-# (Group)
-object activeGroupClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 5
-y 690
-w 690
-h 265
-
-beginGroup
-
# (Rectangle)
object activeRectangleClass
beginObjectProperties
@@ -1178,7 +1165,7 @@ major 4
minor 0
release 0
x 5
-y 690
+y 768
w 690
h 70
lineColor rgb 0 0 0
@@ -1193,7 +1180,7 @@ major 4
minor 0
release 0
x 250
-y 696
+y 774
w 199
h 19
lineColor rgb 55808 55808 55808
@@ -1209,7 +1196,7 @@ major 4
minor 1
release 1
x 275
-y 696
+y 774
w 150
h 20
font "helvetica-medium-r-14.0"
@@ -1229,7 +1216,7 @@ major 4
minor 0
release 0
x 305
-y 770
+y 848
w 89
h 19
lineColor rgb 55808 55808 55808
@@ -1245,7 +1232,7 @@ major 4
minor 1
release 1
x 314
-y 770
+y 848
w 72
h 20
font "helvetica-medium-r-14.0"
@@ -1265,7 +1252,7 @@ major 4
minor 1
release 1
x 15
-y 730
+y 808
w 130
h 20
font "helvetica-medium-r-14.0"
@@ -1284,7 +1271,7 @@ major 4
minor 7
release 0
x 150
-y 730
+y 808
w 70
h 20
controlPv "$(P)$(R)ExposureTime"
@@ -1310,7 +1297,7 @@ major 4
minor 0
release 0
x 5
-y 765
+y 843
w 690
h 190
lineColor rgb 0 0 0
@@ -1325,7 +1312,7 @@ major 4
minor 7
release 0
x 580
-y 730
+y 808
w 100
h 20
controlPv "$(P)$(R)StartScan"
@@ -1350,7 +1337,7 @@ major 4
minor 1
release 1
x 515
-y 730
+y 808
w 60
h 20
font "helvetica-medium-r-14.0"
@@ -1369,7 +1356,7 @@ major 4
minor 1
release 1
x 65
-y 925
+y 1003
w 130
h 20
font "helvetica-medium-r-14.0"
@@ -1388,7 +1375,7 @@ major 4
minor 1
release 1
x 85
-y 800
+y 878
w 110
h 20
font "helvetica-medium-r-14.0"
@@ -1407,7 +1394,7 @@ major 4
minor 7
release 0
x 201
-y 800
+y 878
w 400
h 20
controlPv "$(P)$(R)ScanStatus"
@@ -1431,7 +1418,7 @@ major 4
minor 1
release 1
x 55
-y 900
+y 978
w 140
h 20
font "helvetica-medium-r-14.0"
@@ -1450,7 +1437,7 @@ major 4
minor 1
release 1
x 75
-y 875
+y 953
w 120
h 20
font "helvetica-medium-r-14.0"
@@ -1469,7 +1456,7 @@ major 4
minor 7
release 0
x 201
-y 875
+y 953
w 100
h 20
controlPv "$(P)$(R)ElapsedTime"
@@ -1493,7 +1480,7 @@ major 4
minor 7
release 0
x 200
-y 900
+y 978
w 100
h 20
controlPv "$(P)$(R)RemainingTime"
@@ -1517,7 +1504,7 @@ major 4
minor 1
release 1
x 35
-y 825
+y 903
w 160
h 20
font "helvetica-medium-r-14.0"
@@ -1536,7 +1523,7 @@ major 4
minor 7
release 0
x 201
-y 825
+y 903
w 100
h 20
controlPv "$(P)$(R)ImagesCollected"
@@ -1560,7 +1547,7 @@ major 4
minor 1
release 1
x 75
-y 850
+y 928
w 120
h 20
font "helvetica-medium-r-14.0"
@@ -1579,7 +1566,7 @@ major 4
minor 7
release 0
x 201
-y 850
+y 928
w 100
h 20
controlPv "$(P)$(R)ImagesSaved"
@@ -1603,7 +1590,7 @@ major 4
minor 7
release 0
x 199
-y 925
+y 1003
w 100
h 20
controlPv "$(P)$(R)ServerRunning"
@@ -1621,19 +1608,14 @@ newPos
objType "controls"
endObjectProperties
-endGroup
-
-endObjectProperties
-
-
# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
-x 20
-y 585
+x -32
+y 625
w 170
h 20
font "helvetica-medium-r-14.0"
@@ -1652,8 +1634,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 200
-y 585
+x 148
+y 625
w 80
h 20
controlPv "$(P)$(R)StreamPreCount"
@@ -1678,8 +1660,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 285
-y 585
+x 233
+y 625
w 80
h 20
controlPv "$(P)$(R)StreamPreCounted"
@@ -1702,9 +1684,9 @@ beginObjectProperties
major 4
minor 7
release 0
-x 380
-y 585
-w 300
+x 319
+y 625
+w 130
h 20
controlPv "$(P)$(R)StreamCBStatusMessage"
format "string"
@@ -1726,28 +1708,8 @@ beginObjectProperties
major 4
minor 1
release 1
-x 20
-y 610
-w 170
-h 20
-font "helvetica-medium-r-14.0"
-fontAlign "right"
-fgColor rgb 0 0 0
-bgColor index 3
-useDisplayBg
-value {
- "Capture proj"
-}
-endObjectProperties
-
-# (Static Text)
-object activeXTextClass
-beginObjectProperties
-major 4
-minor 1
-release 1
-x 370
-y 610
+x 54
+y 650
w 90
h 20
font "helvetica-medium-r-14.0"
@@ -1766,8 +1728,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 465
-y 610
+x 149
+y 650
w 80
h 20
controlPv "$(P)$(R)StreamNumCapture"
@@ -1792,8 +1754,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 555
-y 610
+x 239
+y 650
w 80
h 20
controlPv "$(P)$(R)StreamNumCaptured"
@@ -1852,8 +1814,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 200
-y 635
+x 148
+y 675
w 275
h 20
controlPv "$(P)$(R)StreamFileName"
@@ -1876,8 +1838,8 @@ beginObjectProperties
major 4
minor 1
release 1
-x 20
-y 635
+x -32
+y 675
w 170
h 20
font "helvetica-medium-r-14.0"
@@ -1897,7 +1859,7 @@ major 4
minor 1
release 1
x 465
-y 635
+y 675
w 80
h 20
font "helvetica-medium-r-14.0"
@@ -1917,7 +1879,7 @@ major 4
minor 7
release 0
x 555
-y 635
+y 675
w 80
h 20
controlPv "$(P)$(R)StreamNumTotalCaptured"
@@ -1941,7 +1903,7 @@ major 4
minor 1
release 1
x 20
-y 660
+y 700
w 170
h 20
font "helvetica-medium-r-14.0"
@@ -1961,7 +1923,7 @@ major 4
minor 7
release 0
x 380
-y 660
+y 700
w 300
h 20
controlPv "$(P)$(R)StreamMessage"
@@ -1987,11 +1949,71 @@ release 0
x 5
y 555
w 690
-h 130
+h 208
lineColor rgb 0 0 0
fillColor rgb 0 0 0
lineWidth 0
endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 376
+y 586
+w 222
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Sync exposure and rotation step"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 15
+y 586
+w 100
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Scan type"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 380
+y 602
+w 190
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "(only in continuous mode)"
+}
+endObjectProperties
# (Group)
object activeGroupClass
beginObjectProperties
@@ -2227,13 +2249,13 @@ beginObjectProperties
major 4
minor 0
release 0
-x 575
-y 310
+x 229
+y 735
w 100
h 20
fgColor rgb 0 0 0
-onColor rgb 29440 57088 65280
-offColor rgb 29440 57088 65280
+onColor rgb 0 55296 0
+offColor rgb 0 55296 0
topShadowColor rgb 65280 65280 65280
botShadowColor rgb 0 0 0
controlPv "$(P)$(R)StreamRetakeFlat"
@@ -2252,8 +2274,8 @@ beginObjectProperties
major 4
minor 0
release 0
-x 610
-y 410
+x 574
+y 735
w 80
h 20
fgColor rgb 0 0 0
@@ -2270,18 +2292,6 @@ offLabel "Now"
useEnumNumeric
font "helvetica-medium-r-12.0"
endObjectProperties
-# (Group)
-object activeGroupClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 5
-y 690
-w 690
-h 265
-
-beginGroup
# (Message Button)
object activeMessageButtonClass
@@ -2290,7 +2300,7 @@ major 4
minor 0
release 0
x 250
-y 730
+y 808
w 120
h 20
fgColor rgb 0 0 0
@@ -2315,7 +2325,7 @@ major 4
minor 0
release 0
x 375
-y 730
+y 808
w 120
h 20
fgColor rgb 0 0 0
@@ -2333,34 +2343,29 @@ useEnumNumeric
font "helvetica-medium-r-12.0"
endObjectProperties
-endGroup
-
-endObjectProperties
-
-
# (Message Button)
object activeMessageButtonClass
beginObjectProperties
major 4
minor 0
release 0
-x 200
-y 610
-w 80
-h 20
+x 459
+y 625
+w 130
+h 50
fgColor rgb 0 0 0
-onColor rgb 29440 57088 65280
-offColor rgb 29440 57088 65280
+onColor rgb 0 55296 0
+offColor rgb 0 55296 0
topShadowColor rgb 65280 65280 65280
botShadowColor rgb 0 0 0
controlPv "$(P)$(R)StreamCapture"
pressValue "1"
releaseValue
-onLabel "Start"
-offLabel "Start"
+onLabel "Capture"
+offLabel "Capture"
3d
useEnumNumeric
-font "helvetica-medium-r-12.0"
+font "utopia-medium-r-24.0"
endObjectProperties
# (Message Button)
@@ -2369,8 +2374,8 @@ beginObjectProperties
major 4
minor 0
release 0
-x 285
-y 610
+x 596
+y 653
w 80
h 20
fgColor rgb 0 0 0
@@ -2395,7 +2400,7 @@ major 4
minor 0
release 0
x 200
-y 660
+y 700
w 80
h 20
fgColor rgb 0 0 0
@@ -2408,3 +2413,48 @@ indicatorPv "$(P)$(R)StreamBinning"
font "helvetica-medium-r-12.0"
endObjectProperties
+# (Message Button)
+object activeMessageButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 608
+y 587
+w 80
+h 20
+fgColor rgb 0 0 0
+onColor rgb 64256 62208 18944
+offColor rgb 64256 62208 18944
+topShadowColor rgb 65280 65280 65280
+botShadowColor rgb 0 0 0
+controlPv "$(P)$(R)StreamSync"
+pressValue "1"
+releaseValue
+onLabel "Sync"
+offLabel "Sync"
+3d
+useEnumNumeric
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 131
+y 588
+w 140
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)StreamScanType"
+indicatorPv "$(P)$(R)StreamScanType"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
diff --git a/tomoScanApp/op/edl/autoconvert/tomoScanStream_2BM_otherpvs.edl b/tomoScanApp/op/edl/autoconvert/tomoScanStream_2BM_otherpvs.edl
index c8002878..355d2d4a 100644
--- a/tomoScanApp/op/edl/autoconvert/tomoScanStream_2BM_otherpvs.edl
+++ b/tomoScanApp/op/edl/autoconvert/tomoScanStream_2BM_otherpvs.edl
@@ -3,10 +3,10 @@ beginScreenProperties
major 4
minor 0
release 1
-x 84
-y 691
+x 61
+y 879
w 640
-h 240
+h 290
font "helvetica-medium-r-18.0"
ctlFont "helvetica-bold-r-10.0"
btnFont "helvetica-medium-r-18.0"
@@ -389,7 +389,7 @@ major 4
minor 1
release 1
x 159
-y 215
+y 265
w 90
h 20
font "helvetica-medium-r-14.0"
@@ -402,6 +402,46 @@ value {
}
endObjectProperties
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 119
+y 215
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Scan type"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 119
+y 240
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Flip&Stitch"
+}
+endObjectProperties
+
# (Related Display)
object relatedDisplayClass
beginObjectProperties
@@ -409,7 +449,7 @@ major 4
minor 0
release 0
x 254
-y 215
+y 265
w 100
h 20
fgColor rgb 0 0 0
@@ -435,3 +475,43 @@ replaceSymbols {
}
endObjectProperties
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 254
+y 215
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)ScanType"
+indicatorPv "$(P)$(R)ScanType"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 254
+y 240
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)FlipStitch"
+indicatorPv "$(P)$(R)FlipStitch"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
diff --git a/tomoScanApp/op/edl/autoconvert/tomoScan_2BM.edl b/tomoScanApp/op/edl/autoconvert/tomoScan_2BM.edl
index d361c6e7..f3a018f7 100644
--- a/tomoScanApp/op/edl/autoconvert/tomoScan_2BM.edl
+++ b/tomoScanApp/op/edl/autoconvert/tomoScan_2BM.edl
@@ -146,39 +146,6 @@ replaceSymbols {
}
endObjectProperties
-# (Related Display)
-object relatedDisplayClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 10
-y 164
-w 280
-h 30
-fgColor rgb 0 0 0
-bgColor rgb 29440 57088 65280
-topShadowColor rgb 55808 55808 55808
-botShadowColor rgb 17920 17920 17920
-font "helvetica-medium-r-18.0"
-icon
-buttonLabel "Energy & Filters"
-numPvs 2
-numDsps 1
-displayFileName {
- 0 "$(BEAMLINE)_energy.edl"
-}
-menuLabel {
- 0 "Energy Information"
-}
-symbols {
- 0 "P=$(P),R=$(R)"
-}
-replaceSymbols {
- 0 1
-}
-endObjectProperties
-
# (Related Display)
object relatedDisplayClass
beginObjectProperties
@@ -228,39 +195,6 @@ topShadowColor rgb 55808 55808 55808
botShadowColor rgb 17920 17920 17920
font "helvetica-medium-r-18.0"
icon
-buttonLabel "Optics"
-numPvs 2
-numDsps 1
-displayFileName {
- 0 "$(BEAMLINE)_optics.edl"
-}
-menuLabel {
- 0 "Optics Information"
-}
-symbols {
- 0 "P=$(P),R=$(R)"
-}
-replaceSymbols {
- 0 1
-}
-endObjectProperties
-
-# (Related Display)
-object relatedDisplayClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 335
-y 84
-w 280
-h 30
-fgColor rgb 0 0 0
-bgColor rgb 29440 57088 65280
-topShadowColor rgb 55808 55808 55808
-botShadowColor rgb 17920 17920 17920
-font "helvetica-medium-r-18.0"
-icon
buttonLabel "Other PVs"
numPvs 2
numDsps 1
diff --git a/tomoScanApp/op/edl/autoconvert/tomoScan_2BM_otherpvs.edl b/tomoScanApp/op/edl/autoconvert/tomoScan_2BM_otherpvs.edl
index c8002878..51437a01 100644
--- a/tomoScanApp/op/edl/autoconvert/tomoScan_2BM_otherpvs.edl
+++ b/tomoScanApp/op/edl/autoconvert/tomoScan_2BM_otherpvs.edl
@@ -3,10 +3,10 @@ beginScreenProperties
major 4
minor 0
release 1
-x 84
-y 691
+x 342
+y 927
w 640
-h 240
+h 405
font "helvetica-medium-r-18.0"
ctlFont "helvetica-bold-r-10.0"
btnFont "helvetica-medium-r-18.0"
@@ -66,8 +66,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
-y 40
+x 255
+y 70
w 380
h 20
controlPv "$(P)$(R)BeamReadyPVName"
@@ -92,8 +92,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
-y 65
+x 255
+y 95
w 380
h 20
controlPv "$(P)$(R)BeamReadyValue"
@@ -118,9 +118,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 89
-y 65
-w 160
+x 10
+y 95
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -138,9 +138,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 119
-y 40
-w 130
+x 10
+y 70
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -158,9 +158,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 85
-y 115
-w 164
+x 10
+y 145
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -178,8 +178,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
-y 115
+x 255
+y 145
w 380
h 20
controlPv "$(P)$(R)OpenFastShutterValue"
@@ -204,9 +204,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 100
-y 90
-w 149
+x 10
+y 120
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -224,8 +224,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
-y 90
+x 255
+y 120
w 380
h 20
controlPv "$(P)$(R)OpenFastShutterPVName"
@@ -250,9 +250,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 98
-y 140
-w 151
+x 10
+y 170
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -270,9 +270,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 83
-y 165
-w 166
+x 10
+y 195
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -290,8 +290,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
-y 165
+x 255
+y 195
w 380
h 20
controlPv "$(P)$(R)CloseFastShutterValue"
@@ -316,8 +316,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
-y 140
+x 255
+y 170
w 380
h 20
controlPv "$(P)$(R)CloseFastShutterPVName"
@@ -342,9 +342,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 119
-y 190
-w 130
+x 10
+y 45
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -352,7 +352,7 @@ fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Shutter status PV"
+ "Shutter Status PV"
}
endObjectProperties
@@ -362,8 +362,8 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
-y 190
+x 255
+y 45
w 380
h 20
controlPv "$(P)$(R)ShutterStatusPVName"
@@ -388,8 +388,107 @@ beginObjectProperties
major 4
minor 1
release 1
-x 159
-y 215
+x 10
+y 220
+w 240
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "mctOptics Prefix"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 255
+y 220
+w 380
+h 20
+controlPv "$(P)$(R)MctOpticsPVPrefix"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Group)
+object activeGroupClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 10
+y 330
+w 630
+h 70
+
+beginGroup
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 330
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Scan type"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 355
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Flip&Stitch"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 160
+y 380
w 90
h 20
font "helvetica-medium-r-14.0"
@@ -402,14 +501,321 @@ value {
}
endObjectProperties
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 395
+y 330
+w 149
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Y Pixels Per 360 Deg"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 559
+y 330
+w 75
+h 20
+controlPv "$(P)$(R)PixelsYPer360Deg"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 351
+y 355
+w 192
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Helical Misalignment (mrad)"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 559
+y 355
+w 75
+h 20
+controlPv "$(P)$(R)HelicalMisalignment"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 365
+y 380
+w 150
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Program PSO"
+}
+endObjectProperties
+
+endGroup
+
+endObjectProperties
+
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 245
+w 240
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "PVA plugin prefix"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 255
+y 245
+w 380
+h 20
+controlPv "$(P)$(R)PvaPluginPVPrefix"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 270
+w 240
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "ROI plugin prefix"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 255
+y 270
+w 380
+h 20
+controlPv "$(P)$(R)RoiPluginPVPrefix"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 295
+w 240
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "CB plugin prefix"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 255
+y 295
+w 380
+h 20
+controlPv "$(P)$(R)CbPluginPVPrefix"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+# (Group)
+object activeGroupClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 10
+y 330
+w 630
+h 70
+
+beginGroup
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 145
+y 330
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)ScanType"
+indicatorPv "$(P)$(R)ScanType"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 145
+y 355
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)FlipStitch"
+indicatorPv "$(P)$(R)FlipStitch"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
# (Related Display)
object relatedDisplayClass
beginObjectProperties
major 4
minor 0
release 0
-x 254
-y 215
+x 255
+y 380
w 100
h 20
fgColor rgb 0 0 0
@@ -435,3 +841,28 @@ replaceSymbols {
}
endObjectProperties
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 520
+y 380
+w 120
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)ProgramPSO"
+indicatorPv "$(P)$(R)ProgramPSO"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+endGroup
+
+endObjectProperties
+
+
diff --git a/tomoScanApp/op/edl/autoconvert/tomoScan_32ID_main.edl b/tomoScanApp/op/edl/autoconvert/tomoScan_32ID_main.edl
new file mode 100644
index 00000000..3e260f95
--- /dev/null
+++ b/tomoScanApp/op/edl/autoconvert/tomoScan_32ID_main.edl
@@ -0,0 +1,2094 @@
+4 0 1
+beginScreenProperties
+major 4
+minor 0
+release 1
+x 426
+y 968
+w 699
+h 820
+font "helvetica-medium-r-18.0"
+ctlFont "helvetica-bold-r-10.0"
+btnFont "helvetica-medium-r-18.0"
+fgColor rgb 0 0 0
+bgColor rgb 47872 47872 47872
+textColor rgb 0 0 0
+ctlFgColor1 rgb 64256 62208 18944
+ctlFgColor2 rgb 60928 46592 11008
+ctlBgColor1 rgb 52480 24832 0
+ctlBgColor2 rgb 65280 45056 65280
+topShadowColor rgb 44544 19968 48128
+botShadowColor rgb 13312 13056 34304
+showGrid
+snapToGrid
+gridSize 4
+endScreenProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 0
+y 10
+w 699
+h 24
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 0
+y 10
+w 700
+h 25
+font "helvetica-medium-r-18.0"
+fontAlign "center"
+fgColor rgb 2560 0 47104
+bgColor index 3
+useDisplayBg
+value {
+ "Tomography Data Collection $(P)$(R)"
+}
+endObjectProperties
+
+# (Group)
+object activeGroupClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x -2147483624
+y -2147483604
+w 1
+h 1
+
+beginGroup
+
+endGroup
+
+endObjectProperties
+
+
+# (Group)
+object activeGroupClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x -2147483624
+y -2147483604
+w 1
+h 1
+
+beginGroup
+
+endGroup
+
+endObjectProperties
+
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 15
+y 92
+w 140
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Epics PV names"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 253
+y 91
+w 250
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Beamline-specific display"
+}
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 7
+y 50
+w 690
+h 65
+lineColor rgb 0 0 0
+fillColor rgb 0 0 0
+lineWidth 0
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 290
+y 55
+w 119
+h 19
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 325
+y 55
+w 51
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "center"
+fgColor rgb 2560 0 47104
+bgColor index 3
+useDisplayBg
+value {
+ "Setup"
+}
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 5
+y 120
+w 690
+h 95
+lineColor rgb 0 0 0
+fillColor rgb 0 0 0
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 25
+y 185
+w 100
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Angle step"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 15
+y 160
+w 110
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Start angle"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 130
+y 185
+w 100
+h 20
+controlPv "$(P)$(R)RotationStep"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 130
+y 160
+w 100
+h 20
+controlPv "$(P)$(R)RotationStart"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 275
+y 125
+w 149
+h 19
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 303
+y 124
+w 80
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 2560 0 47104
+bgColor index 3
+useDisplayBg
+value {
+ "Rotation"
+}
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 5
+y 220
+w 690
+h 145
+lineColor rgb 0 0 0
+fillColor rgb 0 0 0
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 15
+y 340
+w 150
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Flat field axis"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 145
+y 315
+w 70
+h 20
+controlPv "$(P)$(R)NumFlatFields"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 315
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "# Flat fields"
+}
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 220
+y 225
+w 259
+h 19
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 260
+y 225
+w 180
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "center"
+fgColor rgb 2560 0 47104
+bgColor index 3
+useDisplayBg
+value {
+ "Flat Field Control"
+}
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 5
+y 370
+w 690
+h 70
+lineColor rgb 0 0 0
+fillColor rgb 0 0 0
+lineWidth 0
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 220
+y 375
+w 259
+h 19
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 260
+y 375
+w 180
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "center"
+fgColor rgb 2560 0 47104
+bgColor index 3
+useDisplayBg
+value {
+ "Dark Field Control"
+}
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 5
+y 445
+w 690
+h 105
+lineColor rgb 0 0 0
+fillColor rgb 0 0 0
+lineWidth 0
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 250
+y 450
+w 199
+h 19
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 290
+y 450
+w 120
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "center"
+fgColor rgb 2560 0 47104
+bgColor index 3
+useDisplayBg
+value {
+ "File Control"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 410
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "# Dark fields"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 145
+y 410
+w 70
+h 20
+controlPv "$(P)$(R)NumDarkFields"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 225
+y 410
+w 100
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Dark value"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 330
+y 410
+w 70
+h 20
+controlPv "$(P)$(R)DarkFieldValue"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 415
+y 317
+w 190
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Collect flat fields"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 415
+y 410
+w 190
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Collect dark fields"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 495
+y 160
+w 150
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Return to start"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 245
+y 160
+w 110
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "# of angles"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 360
+y 160
+w 100
+h 20
+controlPv "$(P)$(R)NumAngles"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 255
+y 185
+w 100
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Stop angle"
+}
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 360
+y 187
+w 100
+h 18
+controlPv "$(P)$(R)RotationStop"
+format "decimal"
+font "helvetica-medium-r-14.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 5
+y 554
+w 703
+h 70
+lineColor rgb 0 0 0
+fillColor rgb 0 0 0
+lineWidth 0
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 250
+y 560
+w 199
+h 19
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 275
+y 560
+w 150
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "center"
+fgColor rgb 2560 0 47104
+bgColor index 3
+useDisplayBg
+value {
+ "Data Collection"
+}
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 305
+y 634
+w 89
+h 19
+lineColor rgb 55808 55808 55808
+fill
+fillColor rgb 55808 55808 55808
+lineWidth 0
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 314
+y 634
+w 72
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "center"
+fgColor rgb 2560 0 47104
+bgColor index 3
+useDisplayBg
+value {
+ "Status"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 15
+y 594
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Exposure time"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 150
+y 594
+w 70
+h 20
+controlPv "$(P)$(R)ExposureTime"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Rectangle)
+object activeRectangleClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 5
+y 629
+w 690
+h 185
+lineColor rgb 0 0 0
+fillColor rgb 0 0 0
+lineWidth 0
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 580
+y 594
+w 100
+h 20
+controlPv "$(P)$(R)StartScan"
+format "string"
+font "helvetica-medium-r-14.0"
+fontAlign "left"
+fgColor rgb 0 65535 0
+fgAlarm
+bgColor rgb 55808 55808 55808
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 515
+y 594
+w 60
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Status"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 65
+y 789
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Python server"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 85
+y 664
+w 110
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Scan status"
+}
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 201
+y 664
+w 400
+h 20
+controlPv "$(P)$(R)ScanStatus"
+format "string"
+font "helvetica-medium-r-14.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 55
+y 764
+w 140
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Remaining time"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 75
+y 739
+w 120
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Elapsed time"
+}
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 201
+y 739
+w 100
+h 20
+controlPv "$(P)$(R)ElapsedTime"
+format "string"
+font "helvetica-medium-r-14.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 200
+y 764
+w 100
+h 20
+controlPv "$(P)$(R)RemainingTime"
+format "string"
+font "helvetica-medium-r-14.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 35
+y 689
+w 160
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Images collected"
+}
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 201
+y 689
+w 100
+h 20
+controlPv "$(P)$(R)ImagesCollected"
+format "string"
+font "helvetica-medium-r-14.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 75
+y 714
+w 120
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Images saved"
+}
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 201
+y 714
+w 100
+h 20
+controlPv "$(P)$(R)ImagesSaved"
+format "string"
+font "helvetica-medium-r-14.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 199
+y 789
+w 100
+h 20
+controlPv "$(P)$(R)ServerRunning"
+format "string"
+font "helvetica-medium-r-14.0"
+fontAlign "left"
+fgColor rgb 0 65535 0
+fgAlarm
+bgColor rgb 55808 55808 55808
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 15
+y 525
+w 140
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Base file name"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 160
+y 525
+w 530
+h 20
+controlPv "$(P)$(R)FileName"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 570
+y 475
+w 70
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Exists:"
+}
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 645
+y 475
+w 40
+h 20
+controlPv "$(P)$(R)FilePathExists"
+format "string"
+font "helvetica-medium-r-14.0"
+fontAlign "left"
+fgColor rgb 0 65535 0
+fgAlarm
+bgColor rgb 55808 55808 55808
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 15
+y 475
+w 180
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Overwrite warning:"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 350
+y 340
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Flat exposure"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 590
+y 340
+w 100
+h 20
+controlPv "$(P)$(R)FlatExposureTime"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 260
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Top X in "
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 285
+w 140
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Top X out"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 178
+y 285
+w 140
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Top Z out"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 178
+y 260
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Top Z in"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 396
+y 284
+w 140
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Angle"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 458
+y 284
+w 100
+h 20
+controlPv "$(P)$(R)SampleOutAngle"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 356
+y 260
+w 140
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Use angle"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 330
+y 315
+w 70
+h 20
+controlPv "$(P)$(R)FlatFieldValue"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 225
+y 315
+w 100
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Flat value"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 101
+y 260
+w 73
+h 20
+controlPv "$(P)$(R)SampleInX"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 101
+y 285
+w 73
+h 20
+controlPv "$(P)$(R)SampleOutX"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 278
+y 285
+w 73
+h 20
+controlPv "$(P)$(R)SampleOutY"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 278
+y 260
+w 73
+h 20
+controlPv "$(P)$(R)SampleInY"
+format "decimal"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 471
+y 453
+w 150
+h 15
+font "helvetica-medium-r-12.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Collect MicroCT"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 15
+y 500
+w 140
+h 20
+font "helvetica-medium-r-14.0"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Last file name"
+}
+endObjectProperties
+
+# (Text Monitor)
+object activeXTextDspClass:noedit
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 160
+y 505
+w 530
+h 15
+controlPv "32idcSP1:HDF1:FullFileName_RBV"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+# (Group)
+object activeGroupClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x -2147483624
+y -2147483604
+w 1
+h 1
+
+beginGroup
+
+endGroup
+
+endObjectProperties
+
+# (Group)
+object activeGroupClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x -2147483624
+y -2147483604
+w 1
+h 1
+
+beginGroup
+
+endGroup
+
+endObjectProperties
+
+
+# (Related Display)
+object relatedDisplayClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 508
+y 90
+w 100
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+font "helvetica-medium-r-8.0"
+icon
+numPvs 2
+numDsps 1
+displayFileName {
+ 0 "$(BEAMLINE).edl"
+}
+menuLabel {
+ 0 "Beamline-specific display"
+}
+symbols {
+ 0 "P=$(P),R=$(R),BEAMLINE=$(BEAMLINE)"
+}
+replaceSymbols {
+ 0 1
+}
+endObjectProperties
+
+# (Related Display)
+object relatedDisplayClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 160
+y 90
+w 50
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+font "helvetica-medium-r-8.0"
+icon
+numPvs 2
+numDsps 1
+displayFileName {
+ 0 "tomoScanEPICS_PVs.edl"
+}
+menuLabel {
+ 0 "Epics PV Names"
+}
+symbols {
+ 0 "P=$(P),R=$(R)"
+}
+replaceSymbols {
+ 0 1
+}
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 170
+y 340
+w 100
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)FlatFieldAxis"
+indicatorPv "$(P)$(R)FlatFieldAxis"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 610
+y 317
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)FlatFieldMode"
+indicatorPv "$(P)$(R)FlatFieldMode"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 610
+y 410
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)DarkFieldMode"
+indicatorPv "$(P)$(R)DarkFieldMode"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 525
+y 185
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)ReturnRotation"
+indicatorPv "$(P)$(R)ReturnRotation"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Message Button)
+object activeMessageButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 250
+y 594
+w 120
+h 20
+fgColor rgb 0 0 0
+onColor rgb 0 55296 0
+offColor rgb 0 55296 0
+topShadowColor rgb 65280 65280 65280
+botShadowColor rgb 0 0 0
+controlPv "$(P)$(R)StartScan"
+pressValue "1"
+releaseValue
+onLabel "Start Scan"
+offLabel "Start Scan"
+3d
+useEnumNumeric
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Message Button)
+object activeMessageButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 375
+y 594
+w 120
+h 20
+fgColor rgb 0 0 0
+onColor rgb 64768 0 0
+offColor rgb 64768 0 0
+topShadowColor rgb 65280 65280 65280
+botShadowColor rgb 0 0 0
+controlPv "$(P)$(R)AbortScan"
+pressValue "1"
+releaseValue "0"
+onLabel "Abort Scan"
+offLabel "Abort Scan"
+3d
+useEnumNumeric
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 200
+y 475
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)OverwriteWarning"
+indicatorPv "$(P)$(R)OverwriteWarning"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Message Button)
+object activeMessageButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 565
+y 260
+w 120
+h 20
+fgColor rgb 0 0 0
+onColor rgb 29440 57088 65280
+offColor rgb 29440 57088 65280
+topShadowColor rgb 65280 65280 65280
+botShadowColor rgb 0 0 0
+controlPv "$(P)$(R)MoveSampleIn"
+pressValue "1"
+releaseValue
+onLabel "Move Sample In"
+offLabel "Move Sample In"
+3d
+useEnumNumeric
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Message Button)
+object activeMessageButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 565
+y 285
+w 120
+h 20
+fgColor rgb 0 0 0
+onColor rgb 29440 57088 65280
+offColor rgb 29440 57088 65280
+topShadowColor rgb 65280 65280 65280
+botShadowColor rgb 0 0 0
+controlPv "$(P)$(R)MoveSampleOut"
+pressValue "1"
+releaseValue
+onLabel "Move Sample Out"
+offLabel "Move Sample Out"
+3d
+useEnumNumeric
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 485
+y 340
+w 100
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)DifferentFlatExposure"
+indicatorPv "$(P)$(R)DifferentFlatExposure"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 458
+y 260
+w 100
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)SampleOutAngleEnable"
+indicatorPv "$(P)$(R)SampleOutAngleEnable"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 611
+y 450
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)CollectMicroCTdata"
+indicatorPv "$(P)$(R)CollectMicroCTdata"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
diff --git a/tomoScanApp/op/edl/autoconvert/tomoScan_32ID_otherpvs.edl b/tomoScanApp/op/edl/autoconvert/tomoScan_32ID_otherpvs.edl
index 84693506..0066b137 100644
--- a/tomoScanApp/op/edl/autoconvert/tomoScan_32ID_otherpvs.edl
+++ b/tomoScanApp/op/edl/autoconvert/tomoScan_32ID_otherpvs.edl
@@ -3,10 +3,10 @@ beginScreenProperties
major 4
minor 0
release 1
-x 74
-y 683
+x 429
+y 810
w 640
-h 290
+h 340
font "helvetica-medium-r-18.0"
ctlFont "helvetica-bold-r-10.0"
btnFont "helvetica-medium-r-18.0"
@@ -66,7 +66,7 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
+x 255
y 40
w 380
h 20
@@ -92,7 +92,7 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
+x 255
y 65
w 380
h 20
@@ -118,9 +118,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 89
+x 10
y 65
-w 160
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -138,9 +138,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 119
+x 10
y 40
-w 130
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -158,9 +158,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 85
+x 10
y 115
-w 164
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -178,7 +178,7 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
+x 255
y 115
w 380
h 20
@@ -204,9 +204,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 100
+x 10
y 90
-w 149
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -224,7 +224,7 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
+x 255
y 90
w 380
h 20
@@ -250,9 +250,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 98
+x 10
y 140
-w 151
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -270,9 +270,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 83
+x 10
y 165
-w 166
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -290,7 +290,7 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
+x 255
y 165
w 380
h 20
@@ -316,7 +316,7 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
+x 255
y 140
w 380
h 20
@@ -342,9 +342,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 119
+x 10
y 190
-w 130
+w 240
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -362,7 +362,7 @@ beginObjectProperties
major 4
minor 7
release 0
-x 254
+x 255
y 190
w 380
h 20
@@ -389,7 +389,7 @@ major 4
minor 1
release 1
x 159
-y 268
+y 315
w 90
h 20
font "helvetica-medium-r-14.0"
@@ -408,9 +408,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 87
-y 216
-w 160
+x 119
+y 265
+w 130
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -418,7 +418,7 @@ fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Sample Top X PV"
+ "Scan type"
}
endObjectProperties
@@ -428,9 +428,9 @@ beginObjectProperties
major 4
minor 1
release 1
-x 87
-y 241
-w 160
+x 119
+y 290
+w 130
h 20
font "helvetica-medium-r-14.0"
fontAlign "right"
@@ -438,7 +438,7 @@ fgColor rgb 0 0 0
bgColor index 3
useDisplayBg
value {
- "Sample Top Z PV"
+ "Flip&Stitch"
}
endObjectProperties
@@ -448,11 +448,11 @@ beginObjectProperties
major 4
minor 7
release 0
-x 253
-y 241
+x 255
+y 215
w 380
h 20
-controlPv "$(P)$(R)SampleTopZPVName"
+controlPv "$(P)$(R)TxmOpticsPVPrefix"
format "string"
font "helvetica-medium-r-12.0"
fontAlign "left"
@@ -468,17 +468,37 @@ newPos
objType "controls"
endObjectProperties
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 215
+w 240
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "txmOptics Prefix"
+}
+endObjectProperties
+
# (Text Control)
object activeXTextDspClass
beginObjectProperties
major 4
minor 7
release 0
-x 253
-y 216
+x 255
+y 240
w 380
h 20
-controlPv "$(P)$(R)SampleTopXPVName"
+controlPv "$(P)$(R)ImagePVPrefix"
format "string"
font "helvetica-medium-r-12.0"
fontAlign "left"
@@ -494,6 +514,26 @@ newPos
objType "controls"
endObjectProperties
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 240
+w 240
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Image Prefix"
+}
+endObjectProperties
+
# (Related Display)
object relatedDisplayClass
beginObjectProperties
@@ -501,7 +541,7 @@ major 4
minor 0
release 0
x 254
-y 268
+y 315
w 100
h 20
fgColor rgb 0 0 0
@@ -527,3 +567,43 @@ replaceSymbols {
}
endObjectProperties
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 254
+y 265
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)ScanType"
+indicatorPv "$(P)$(R)ScanType"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 254
+y 290
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)FlipStitch"
+indicatorPv "$(P)$(R)FlipStitch"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
diff --git a/tomoScanApp/op/edl/autoconvert/tomoScan_7BM_optics.edl b/tomoScanApp/op/edl/autoconvert/tomoScan_7BM_optics.edl
index 40be2380..e9381238 100644
--- a/tomoScanApp/op/edl/autoconvert/tomoScan_7BM_optics.edl
+++ b/tomoScanApp/op/edl/autoconvert/tomoScan_7BM_optics.edl
@@ -3,10 +3,10 @@ beginScreenProperties
major 4
minor 0
release 1
-x 13
+x 3
y 64
w 600
-h 200
+h 225
font "helvetica-medium-r-18.0"
ctlFont "helvetica-bold-r-10.0"
btnFont "helvetica-medium-r-18.0"
@@ -60,32 +60,6 @@ value {
}
endObjectProperties
-# (Group)
-object activeGroupClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 30
-y 46
-w 525
-h 145
-
-beginGroup
-
-# (Group)
-object activeGroupClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 30
-y 46
-w 290
-h 145
-
-beginGroup
-
# (Static Text)
object activeXTextClass
beginObjectProperties
@@ -206,24 +180,6 @@ value {
}
endObjectProperties
-endGroup
-
-endObjectProperties
-
-
-# (Group)
-object activeGroupClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 325
-y 46
-w 230
-h 145
-
-beginGroup
-
# (Text Control)
object activeXTextDspClass
beginObjectProperties
@@ -380,64 +336,49 @@ newPos
objType "controls"
endObjectProperties
-endGroup
-
-endObjectProperties
-
-
-endGroup
-
-endObjectProperties
-
-# (Group)
-object activeGroupClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 30
-y 46
-w 525
-h 145
-
-beginGroup
-# (Group)
-object activeGroupClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 30
-y 46
-w 290
-h 145
-
-beginGroup
-
-endGroup
-
-endObjectProperties
-
-# (Group)
-object activeGroupClass
+# (Text Control)
+object activeXTextDspClass
beginObjectProperties
major 4
-minor 0
+minor 7
release 0
x 325
-y 46
+y 196
w 230
-h 145
-
-beginGroup
-
-endGroup
-
+h 20
+controlPv "$(P)$(R)CameraDistance"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
endObjectProperties
-
-endGroup
-
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 120
+y 196
+w 200
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Camera Distance (mm)"
+}
endObjectProperties
-
diff --git a/tomoScanApp/op/edl/autoconvert/tomoScan_7BM_otherpvs.edl b/tomoScanApp/op/edl/autoconvert/tomoScan_7BM_otherpvs.edl
index 1fd76fe7..a7542e60 100644
--- a/tomoScanApp/op/edl/autoconvert/tomoScan_7BM_otherpvs.edl
+++ b/tomoScanApp/op/edl/autoconvert/tomoScan_7BM_otherpvs.edl
@@ -3,10 +3,10 @@ beginScreenProperties
major 4
minor 0
release 1
-x 1238
-y 514
+x 1943
+y 236
w 640
-h 260
+h 350
font "helvetica-medium-r-18.0"
ctlFont "helvetica-bold-r-10.0"
btnFont "helvetica-medium-r-18.0"
@@ -428,3 +428,274 @@ newPos
objType "controls"
endObjectProperties
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 276
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Scan type"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 10
+y 301
+w 130
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Flip&Stitch"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 159
+y 324
+w 90
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "PSO setup"
+}
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 395
+y 276
+w 149
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Y Pixels Per 360 Deg"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 559
+y 276
+w 75
+h 20
+controlPv "$(P)$(R)PixelsYPer360Deg"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 351
+y 301
+w 192
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Helical Misalignment (mrad)"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 559
+y 301
+w 75
+h 20
+controlPv "$(P)$(R)HelicalMisalignment"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Static Text)
+object activeXTextClass
+beginObjectProperties
+major 4
+minor 1
+release 1
+x 19
+y 245
+w 230
+h 20
+font "helvetica-medium-r-14.0"
+fontAlign "right"
+fgColor rgb 0 0 0
+bgColor index 3
+useDisplayBg
+value {
+ "Number of Gain Images"
+}
+endObjectProperties
+
+# (Text Control)
+object activeXTextDspClass
+beginObjectProperties
+major 4
+minor 7
+release 0
+x 254
+y 245
+w 380
+h 20
+controlPv "$(P)$(R)NumGainFields"
+format "string"
+font "helvetica-medium-r-12.0"
+fontAlign "left"
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+editable
+motifWidget
+limitsFromDb
+nullColor rgb 60928 46592 11008
+smartRefresh
+fastUpdate
+newPos
+objType "controls"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 145
+y 276
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)ScanType"
+indicatorPv "$(P)$(R)ScanType"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Menu Button)
+object activeMenuButtonClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 145
+y 301
+w 80
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+inconsistentColor rgb 17920 17920 17920
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+controlPv "$(P)$(R)FlipStitch"
+indicatorPv "$(P)$(R)FlipStitch"
+font "helvetica-medium-r-12.0"
+endObjectProperties
+
+# (Related Display)
+object relatedDisplayClass
+beginObjectProperties
+major 4
+minor 0
+release 0
+x 254
+y 324
+w 100
+h 20
+fgColor rgb 0 0 0
+bgColor rgb 29440 57088 65280
+topShadowColor rgb 55808 55808 55808
+botShadowColor rgb 17920 17920 17920
+font "helvetica-medium-r-12.0"
+icon
+buttonLabel "PSO setup"
+numPvs 2
+numDsps 1
+displayFileName {
+ 0 "tomoScan_pso.edl"
+}
+menuLabel {
+ 0 "PSO setup"
+}
+symbols {
+ 0 "P=$(P),R=$(R)"
+}
+replaceSymbols {
+ 0 1
+}
+endObjectProperties
+
diff --git a/tomoScanApp/op/opi/autoconvert/tomoScan.opi b/tomoScanApp/op/opi/autoconvert/tomoScan.opi
index 97342225..2b165879 100644
--- a/tomoScanApp/op/opi/autoconvert/tomoScan.opi
+++ b/tomoScanApp/op/opi/autoconvert/tomoScan.opi
@@ -14,7 +14,7 @@
5
- 825
+ 925
true
@@ -28,8 +28,8 @@
false
Display
700
- 242
- 64
+ 505
+ 72
false
@@ -460,7 +460,7 @@ $(pv_value)
false
- 70
+ 130
true
@@ -484,7 +484,7 @@ $(pv_value)
Rectangle
690
5
- 370
+ 520
@@ -539,9 +539,9 @@ $(pv_value)
false
true
Rectangle
- 260
- 220
- 375
+ 200
+ 250
+ 525
@@ -574,7 +574,7 @@ $(pv_value)
false
- 105
+ 70
true
@@ -598,7 +598,7 @@ $(pv_value)
Rectangle
690
5
- 445
+ 655
@@ -655,7 +655,64 @@ $(pv_value)
Rectangle
200
250
- 450
+ 661
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 90
+ 305
+ 735
@@ -688,7 +745,7 @@ $(pv_value)
false
- 70
+ 190
true
@@ -712,7 +769,7 @@ $(pv_value)
Rectangle
690
5
- 555
+ 730
@@ -736,22 +793,22 @@ $(pv_value)
- 100.0
+ 0.0
Default
false
-
+
false
- 20
+ 70
true
-
+
0
- 0
+ 1
Rectangle
@@ -764,12 +821,12 @@ $(pv_value)
$(pv_name)
$(pv_value)
- false
+ true
true
Rectangle
- 200
- 250
- 561
+ 690
+ 5
+ 370
@@ -824,9 +881,9 @@ $(pv_value)
false
true
Rectangle
- 90
- 305
- 635
+ 260
+ 220
+ 375
@@ -859,7 +916,7 @@ $(pv_value)
false
- 190
+ 70
true
@@ -883,7 +940,64 @@ $(pv_value)
Rectangle
690
5
- 630
+ 445
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 260
+ 220
+ 450
@@ -1519,7 +1633,7 @@ $(pv_value)
Menu Button
100
170
- 310
+ 340
@@ -1559,7 +1673,7 @@ $(pv_value)
150
false
15
- 310
+ 340
@@ -1619,9 +1733,9 @@ $(pv_value)
false
true
Text Input
- 100
- 575
- 335
+ 70
+ 145
+ 315
@@ -1660,8 +1774,8 @@ $(pv_value)
Label
130
false
- 440
- 335
+ 10
+ 315
@@ -1719,10 +1833,10 @@ $(pv_value)
-
+
20
- 1
+ 2
Label
@@ -1732,38 +1846,44 @@ $(pv_value)
false
- Dark Field Control
+ Collect flat fields
true
1
true
Label
- 180
+ 190
false
- 260
- 375
+ 415
+ 317
-
+
- false
+ true
+ false
+ false
-
+
+ false
- 0
+ 6
1
true
-
+ Default
+ false
-
+
20
- 1
- Label
+
+ Menu Button
+ $(P)$(R)FlatFieldMode
+
true
@@ -1771,17 +1891,15 @@ $(pv_value)
false
- false
- File Control
-
- true
- 1
+ false
+ $(pv_name)
+$(pv_value)
+ false
true
- Label
- 120
- false
- 290
- 450
+ Menu Button
+ 80
+ 610
+ 317
@@ -1812,21 +1930,21 @@ $(pv_value)
false
- # Dark fields
+ Return to start
true
1
true
Label
- 130
+ 150
false
- 10
- 410
+ 495
+ 160
-
+
+ true
false
- false
false
@@ -1835,33 +1953,21 @@ $(pv_value)
- 3
+ 6
1
-
true
-
+ Default
false
- 1
20
- 0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)NumDarkFields
+
+ Menu Button
+ $(P)$(R)ReturnRotation
- false
- 0.0
true
@@ -1869,21 +1975,15 @@ $(pv_value)
false
- 0
- false
- true
- false
- false
-
-
+ false
$(pv_name)
$(pv_value)
false
true
- Text Input
- 70
- 145
- 410
+ Menu Button
+ 80
+ 525
+ 185
@@ -1914,16 +2014,16 @@ $(pv_value)
false
- Dark value
+ # of angles
true
1
true
Label
- 100
+ 110
false
- 226
- 410
+ 245
+ 160
@@ -1960,7 +2060,7 @@ $(pv_value)
false
0
true
- $(P)$(R)DarkFieldValue
+ $(P)$(R)NumAngles
false
0.0
@@ -1983,9 +2083,9 @@ $(pv_value)
false
true
Text Input
- 70
- 331
- 410
+ 100
+ 360
+ 160
@@ -2006,7 +2106,7 @@ $(pv_value)
20
- 2
+ 0
Label
@@ -2016,44 +2116,48 @@ $(pv_value)
false
- Collect flat fields
+ Stop angle
true
1
true
Label
- 190
+ 100
false
- 380
- 310
+ 255
+ 185
-
+
- true
false
+ false
false
- false
+ true
- 6
+ 0
1
true
- Default
+
false
- 20
-
- Menu Button
- $(P)$(R)FlatFieldMode
+ 1
+ 18
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)RotationStop
+ 0.0
true
@@ -2061,22 +2165,35 @@ $(pv_value)
false
- false
+ false
+ ######
$(pv_name)
$(pv_value)
false
+ 1
true
- Menu Button
+ Text Update
100
- 575
- 310
+ false
+ 360
+ 187
-
-
- false
+
+
+
+ $(P)$(R)MoveSampleIn
+ 1
+ 10
+
+
+
+
+ false
+ false
-
+
+ false
@@ -2084,14 +2201,18 @@ $(pv_value)
1
true
-
+ Default
+ false
20
- 0
- Label
+
+ Action Button
+ 0
+ $(P)$(R)MoveSampleIn
+
true
@@ -2099,21 +2220,27 @@ $(pv_value)
false
- false
- Collect dark fields
-
- true
- 1
+
+ Move Sample In
+ false
+ $(pv_name)
+$(pv_value)
true
- Label
- 190
- false
- 415
- 410
+ Action Button
+ 120
+ 565
+ 260
-
-
- true
+
+
+
+ $(P)$(R)MoveSampleOut
+ 1
+ 10
+
+
+
+
false
false
@@ -2123,7 +2250,7 @@ $(pv_value)
- 6
+ 0
1
true
@@ -2134,9 +2261,10 @@ $(pv_value)
20
-
- Menu Button
- $(P)$(R)DarkFieldMode
+
+ Action Button
+ 0
+ $(P)$(R)MoveSampleOut
@@ -2145,15 +2273,16 @@ $(pv_value)
false
- false
+
+ Move Sample Out
+ false
$(pv_name)
$(pv_value)
- false
true
- Menu Button
- 80
- 610
- 410
+ Action Button
+ 120
+ 565
+ 285
@@ -2174,7 +2303,7 @@ $(pv_value)
20
- 0
+ 2
Label
@@ -2184,16 +2313,16 @@ $(pv_value)
false
- Return to start
+ Flat exposure
true
1
true
Label
- 150
+ 130
false
- 495
- 160
+ 350
+ 340
@@ -2220,7 +2349,7 @@ $(pv_value)
20
Menu Button
- $(P)$(R)ReturnRotation
+ $(P)$(R)DifferentFlatExposure
@@ -2235,49 +2364,9 @@ $(pv_value)
false
true
Menu Button
- 80
- 525
- 185
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 0
- Label
-
-
- true
- true
- false
-
-
- false
- # of angles
-
- true
- 1
- true
- Label
- 110
- false
- 245
- 160
+ 100
+ 485
+ 340
@@ -2314,7 +2403,7 @@ $(pv_value)
false
0
true
- $(P)$(R)NumAngles
+ $(P)$(R)FlatExposureTime
false
0.0
@@ -2338,8 +2427,8 @@ $(pv_value)
true
Text Input
100
- 360
- 160
+ 590
+ 340
@@ -2370,18 +2459,18 @@ $(pv_value)
false
- Stop angle
+ X in
true
1
true
Label
- 100
+ 130
false
- 255
- 185
+ 25
+ 260
-
+
false
false
@@ -2389,12 +2478,13 @@ $(pv_value)
- true
+ false
- 0
+ 3
1
+
true
@@ -2404,13 +2494,20 @@ $(pv_value)
1
- 18
+ 20
0
- Text Update
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
0
true
- $(P)$(R)RotationStop
+ $(P)$(R)SampleInX
+ false
0.0
@@ -2419,58 +2516,83 @@ $(pv_value)
false
+ 0
+ false
+ true
false
- ######
+ false
+
+
$(pv_name)
$(pv_value)
false
- 1
true
- Text Update
+ Text Input
100
- false
- 360
- 187
+ 73
+ 260
-
+
+ false
false
+ false
-
+
+ false
- 0
+ 3
1
+
true
+ false
-
+
+ 1
20
- 1
- Label
-
-
- true
- true
- false
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)SampleOutX
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
- false
- Data Collection
-
- true
- 1
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
true
- Label
- 150
- false
- 275
- 561
+ Text Input
+ 100
+ 73
+ 285
@@ -2488,10 +2610,10 @@ $(pv_value)
-
+
20
- 1
+ 0
Label
@@ -2501,129 +2623,16 @@ $(pv_value)
false
- Status
+ X out
true
1
true
Label
- 72
+ 140
false
- 314
- 635
-
-
-
-
- $(P)$(R)StartScan
- 1
- 10
-
-
-
-
- false
- false
-
-
-
- false
-
-
-
- 0
- 1
- true
-
- Default
-
- false
-
-
-
- 20
-
- Action Button
- 0
- $(P)$(R)StartScan
-
-
-
- true
- true
- false
-
-
-
- Start Scan
- false
- $(pv_name)
-$(pv_value)
- true
- Action Button
- 120
- 250
- 595
-
-
-
-
- $(P)$(R)AbortScan
- 1
- 10
-
-
-
-
- $(P)$(R)AbortScan
- 0
- 10
-
-
-
-
- false
- false
-
-
-
- false
-
-
-
- 0
- 1
- true
-
- Default
-
- false
-
-
-
- 20
-
- Action Button
- 0
- $(P)$(R)AbortScan
-
-
-
- true
- true
- false
-
-
-
- Abort Scan
- true
- $(pv_name)
-$(pv_value)
- true
- Action Button
- 120
- 375
- 595
+ 15
+ 285
@@ -2654,16 +2663,16 @@ $(pv_value)
false
- Exposure time
+ Y out
true
1
true
Label
- 130
+ 140
false
- 15
- 595
+ 183
+ 285
@@ -2700,7 +2709,7 @@ $(pv_value)
false
0
true
- $(P)$(R)ExposureTime
+ $(P)$(R)SampleOutY
false
0.0
@@ -2723,40 +2732,48 @@ $(pv_value)
false
true
Text Input
- 70
- 150
- 595
+ 100
+ 245
+ 285
-
+
false
false
false
-
+
false
- 0
+ 3
1
+
true
- true
+ false
-
+
- 4
+ 1
20
0
- Text Update
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
0
true
- $(P)$(R)StartScan
+ $(P)$(R)SampleInY
+ false
0.0
@@ -2765,18 +2782,21 @@ $(pv_value)
false
+ 0
+ false
+ true
false
- ######
+ false
+
+
$(pv_name)
$(pv_value)
false
- 1
true
- Text Update
+ Text Input
100
- false
- 580
- 595
+ 245
+ 260
@@ -2807,16 +2827,16 @@ $(pv_value)
false
- Status
+ Y in
true
1
true
Label
- 60
+ 130
false
- 515
- 595
+ 193
+ 260
@@ -2847,87 +2867,55 @@ $(pv_value)
false
- Python server
+ Angle
true
1
true
Label
- 130
+ 140
false
- 65
- 790
+ 396
+ 284
-
+
+ false
false
+ false
-
+
+ false
- 0
+ 3
1
+
true
+ false
+ 1
20
0
- Label
-
-
- true
- true
- false
-
-
- false
- Scan status
-
- true
- 1
- true
- Label
- 110
- false
- 85
- 665
-
-
-
- false
- false
- false
-
-
-
- true
-
-
-
- 0
- 1
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- Text Update
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
0
true
- $(P)$(R)ScanStatus
+ $(P)$(R)SampleOutAngle
+ false
0.0
@@ -2936,18 +2924,21 @@ $(pv_value)
false
+ 0
+ false
+ true
false
- ######
+ false
+
+
$(pv_name)
$(pv_value)
false
- 1
true
- Text Update
- 400
- false
- 201
- 665
+ Text Input
+ 100
+ 458
+ 284
@@ -2978,7 +2969,7 @@ $(pv_value)
false
- Remaining time
+ Use angle
true
1
@@ -2986,30 +2977,36 @@ $(pv_value)
Label
140
false
- 55
- 765
+ 356
+ 260
-
+
- false
+ true
+ false
+ false
-
+
+ false
- 0
+ 6
1
true
-
+ Default
+ false
20
- 0
- Label
+
+ Menu Button
+ $(P)$(R)SampleOutAngleEnable
+
true
@@ -3017,19 +3014,17 @@ $(pv_value)
false
- false
- Elapsed time
-
- true
- 1
+ false
+ $(pv_name)
+$(pv_value)
+ false
true
- Label
- 120
- false
- 75
- 740
+ Menu Button
+ 100
+ 458
+ 260
-
+
false
false
@@ -3037,12 +3032,13 @@ $(pv_value)
- true
+ false
- 0
+ 3
1
+
true
@@ -3051,14 +3047,21 @@ $(pv_value)
- 4
+ 1
20
0
- Text Update
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
0
true
- $(P)$(R)ElapsedTime
+ $(P)$(R)FlatFieldValue
+ false
0.0
@@ -3067,28 +3070,28 @@ $(pv_value)
false
+ 0
+ false
+ true
false
- ######
+ false
+
+
$(pv_name)
$(pv_value)
false
- 1
true
- Text Update
- 100
- false
- 201
- 740
+ Text Input
+ 70
+ 330
+ 315
-
+
- false
false
- false
-
+
- true
@@ -3098,19 +3101,12 @@ $(pv_value)
- false
- 4
20
0
- Text Update
- 0
- true
- $(P)$(R)RemainingTime
-
- 0.0
+ Label
true
@@ -3118,18 +3114,17 @@ $(pv_value)
false
- false
- ######
- $(pv_name)
-$(pv_value)
- false
+ false
+ Flat value
+
+ true
1
true
- Text Update
+ Label
100
false
- 200
- 765
+ 225
+ 315
@@ -3147,10 +3142,10 @@ $(pv_value)
-
+
20
- 0
+ 1
Label
@@ -3160,26 +3155,23 @@ $(pv_value)
false
- Images collected
+ File Control
true
1
true
Label
- 160
+ 120
false
- 35
- 690
+ 290
+ 525
-
+
- false
false
- false
-
+
- true
@@ -3189,19 +3181,12 @@ $(pv_value)
- false
-
+
- 4
20
- 0
- Text Update
- 0
- true
- $(P)$(R)ImagesCollected
-
- 0.0
+ 1
+ Label
true
@@ -3209,18 +3194,17 @@ $(pv_value)
false
- false
- ######
- $(pv_name)
-$(pv_value)
- false
+ false
+ Data Collection
+
+ true
1
true
- Text Update
- 100
+ Label
+ 150
false
- 201
- 690
+ 275
+ 661
@@ -3238,10 +3222,10 @@ $(pv_value)
-
+
20
- 0
+ 1
Label
@@ -3251,26 +3235,33 @@ $(pv_value)
false
- Images saved
+ Status
true
1
true
Label
- 120
+ 72
false
- 75
- 715
+ 314
+ 735
-
-
+
+
+
+ $(P)$(R)StartScan
+ 1
+ 10
+
+
+
+
false
- false
false
-
+
- true
+ false
@@ -3278,21 +3269,18 @@ $(pv_value)
1
true
-
+ Default
false
- 4
20
- 0
- Text Update
- 0
- true
- $(P)$(R)ImagesSaved
+
+ Action Button
+ 0
+ $(P)$(R)StartScan
- 0.0
true
@@ -3300,26 +3288,38 @@ $(pv_value)
false
- false
- ######
+
+ Start Scan
+ false
$(pv_name)
$(pv_value)
- false
- 1
true
- Text Update
- 100
- false
- 201
- 715
+ Action Button
+ 120
+ 250
+ 695
-
-
+
+
+
+ $(P)$(R)AbortScan
+ 1
+ 10
+
+
+
+
+ $(P)$(R)AbortScan
+ 0
+ 10
+
+
+
+
false
- false
false
-
+
false
@@ -3329,21 +3329,18 @@ $(pv_value)
1
true
-
+ Default
- true
+ false
-
+
- 4
20
- 0
- Text Update
- 0
- true
- $(P)$(R)ServerRunning
+
+ Action Button
+ 0
+ $(P)$(R)AbortScan
- 0.0
true
@@ -3351,18 +3348,16 @@ $(pv_value)
false
- false
- ######
+
+ Abort Scan
+ true
$(pv_name)
$(pv_value)
- false
- 1
true
- Text Update
- 100
- false
- 199
- 790
+ Action Button
+ 120
+ 375
+ 695
@@ -3393,16 +3388,16 @@ $(pv_value)
false
- File directory
+ Exposure time
true
1
true
Label
- 140
+ 130
false
15
- 500
+ 695
@@ -3427,7 +3422,7 @@ $(pv_value)
- 4
+ 1
20
0
false
@@ -3439,7 +3434,7 @@ $(pv_value)
false
0
true
- $(P)$(R)FilePath
+ $(P)$(R)ExposureTime
false
0.0
@@ -3462,9 +3457,60 @@ $(pv_value)
false
true
Text Input
- 530
- 160
- 500
+ 70
+ 150
+ 695
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ true
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)StartScan
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 580
+ 695
@@ -3495,56 +3541,38 @@ $(pv_value)
false
- Base file name
+ Status
true
1
true
Label
- 140
+ 60
false
- 15
- 525
+ 515
+ 695
-
+
- false
false
- false
-
+
- false
- 3
+ 0
1
-
true
- false
- 4
20
0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)FileName
-
- false
- 0.0
+ Label
true
@@ -3552,21 +3580,17 @@ $(pv_value)
false
- 0
- false
- true
- false
- false
-
-
- $(pv_name)
-$(pv_value)
- false
+ false
+ Python server
+
+ true
+ 1
true
- Text Input
- 530
- 160
- 525
+ Label
+ 130
+ false
+ 65
+ 890
@@ -3597,16 +3621,16 @@ $(pv_value)
false
- Exists:
+ Scan status
true
1
true
Label
- 70
+ 110
false
- 570
- 475
+ 85
+ 765
@@ -3614,9 +3638,9 @@ $(pv_value)
false
false
-
+
- false
+ true
@@ -3626,9 +3650,9 @@ $(pv_value)
- true
+ false
-
+
4
20
@@ -3636,7 +3660,7 @@ $(pv_value)
Text Update
0
true
- $(P)$(R)FilePathExists
+ $(P)$(R)ScanStatus
0.0
@@ -3654,10 +3678,10 @@ $(pv_value)
1
true
Text Update
- 40
+ 400
false
- 645
- 475
+ 201
+ 765
@@ -3688,44 +3712,38 @@ $(pv_value)
false
- Overwrite warning:
+ Remaining time
true
1
true
Label
- 180
+ 140
false
- 15
- 475
+ 55
+ 865
-
+
- true
- false
- false
+ false
-
+
- false
- 6
+ 0
1
true
- Default
+
- false
20
-
- Menu Button
- $(P)$(R)OverwriteWarning
-
+ 0
+ Label
true
@@ -3733,32 +3751,27 @@ $(pv_value)
false
- false
- $(pv_name)
-$(pv_value)
- false
+ false
+ Elapsed time
+
+ true
+ 1
true
- Menu Button
- 80
- 200
- 475
+ Label
+ 120
+ false
+ 75
+ 840
-
-
-
- $(P)$(R)MoveSampleIn
- 1
- 10
-
-
-
-
+
+
false
+ false
false
- false
+ true
@@ -3766,18 +3779,21 @@ $(pv_value)
1
true
- Default
+
false
+ 4
20
-
- Action Button
- 0
- $(P)$(R)MoveSampleIn
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ElapsedTime
+ 0.0
true
@@ -3785,33 +3801,28 @@ $(pv_value)
false
-
- Move Sample In
- false
+ false
+ ######
$(pv_name)
$(pv_value)
+ false
+ 1
true
- Action Button
- 120
- 565
- 260
+ Text Update
+ 100
+ false
+ 201
+ 840
-
-
-
- $(P)$(R)MoveSampleOut
- 1
- 10
-
-
-
-
+
+
false
+ false
false
- false
+ true
@@ -3819,18 +3830,21 @@ $(pv_value)
1
true
- Default
+
false
+ 4
20
-
- Action Button
- 0
- $(P)$(R)MoveSampleOut
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)RemainingTime
+ 0.0
true
@@ -3838,16 +3852,18 @@ $(pv_value)
false
-
- Move Sample Out
- false
+ false
+ ######
$(pv_name)
$(pv_value)
+ false
+ 1
true
- Action Button
- 120
- 565
- 285
+ Text Update
+ 100
+ false
+ 200
+ 865
@@ -3868,7 +3884,7 @@ $(pv_value)
20
- 2
+ 0
Label
@@ -3878,62 +3894,18 @@ $(pv_value)
false
- Flat exposure
+ Images collected
true
1
true
Label
- 130
+ 160
false
35
- 335
-
-
-
- true
- false
- false
-
-
-
- false
-
-
-
- 6
- 1
- true
-
- Default
-
- false
-
-
-
- 20
-
- Menu Button
- $(P)$(R)DifferentFlatExposure
-
-
-
- true
- true
- false
-
-
- false
- $(pv_name)
-$(pv_value)
- false
- true
- Menu Button
- 100
- 170
- 335
+ 790
-
+
false
false
@@ -3941,13 +3913,12 @@ $(pv_value)
- false
+ true
- 3
+ 0
1
-
true
@@ -3956,21 +3927,14 @@ $(pv_value)
- 1
+ 4
20
0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
+ Text Update
0
true
- $(P)$(R)FlatExposureTime
+ $(P)$(R)ImagesCollected
- false
0.0
@@ -3979,21 +3943,18 @@ $(pv_value)
false
- 0
- false
- true
false
- false
-
-
+ ######
$(pv_name)
$(pv_value)
false
+ 1
true
- Text Input
+ Text Update
100
- 275
- 335
+ false
+ 201
+ 790
@@ -4024,18 +3985,18 @@ $(pv_value)
false
- X in
+ Images saved
true
1
true
Label
- 130
+ 120
false
- 25
- 260
+ 75
+ 815
-
+
false
false
@@ -4043,13 +4004,12 @@ $(pv_value)
- false
+ true
- 3
+ 0
1
-
true
@@ -4058,21 +4018,14 @@ $(pv_value)
- 1
+ 4
20
0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
+ Text Update
0
true
- $(P)$(R)SampleInX
+ $(P)$(R)ImagesSaved
- false
0.0
@@ -4081,60 +4034,49 @@ $(pv_value)
false
- 0
- false
- true
false
- false
-
-
+ ######
$(pv_name)
$(pv_value)
false
+ 1
true
- Text Input
+ Text Update
100
- 73
- 260
+ false
+ 201
+ 815
-
+
false
false
false
-
+
false
- 3
+ 0
1
-
true
- false
+ true
-
+
- 1
+ 4
20
0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
+ Text Update
0
true
- $(P)$(R)SampleOutX
+ $(P)$(R)ServerRunning
- false
0.0
@@ -4143,21 +4085,18 @@ $(pv_value)
false
- 0
- false
- true
false
- false
-
-
+ ######
$(pv_name)
$(pv_value)
false
+ 1
true
- Text Input
+ Text Update
100
- 73
- 285
+ false
+ 199
+ 890
@@ -4188,16 +4127,588 @@ $(pv_value)
false
- X out
+ File directory
true
1
true
- Label
- 140
- false
- 15
- 285
+ Label
+ 140
+ false
+ 15
+ 575
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)FilePath
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 530
+ 160
+ 575
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Base file name
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 15
+ 600
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)FileName
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 530
+ 160
+ 600
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Exists:
+
+ true
+ 1
+ true
+ Label
+ 70
+ false
+ 570
+ 550
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ true
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)FilePathExists
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 40
+ false
+ 645
+ 550
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Overwrite warning:
+
+ true
+ 1
+ true
+ Label
+ 180
+ false
+ 15
+ 550
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)OverwriteWarning
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 200
+ 550
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Last file name
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 15
+ 625
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 15
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)FullFileName
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 530
+ false
+ 160
+ 628
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 1
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Dark Field Control
+
+ true
+ 1
+ true
+ Label
+ 180
+ false
+ 260
+ 375
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ # Dark fields
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 10
+ 410
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)NumDarkFields
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 70
+ 145
+ 410
@@ -4228,16 +4739,16 @@ $(pv_value)
false
- Y out
+ Dark value
true
1
true
Label
- 140
+ 100
false
- 183
- 285
+ 225
+ 410
@@ -4274,7 +4785,7 @@ $(pv_value)
false
0
true
- $(P)$(R)SampleOutY
+ $(P)$(R)DarkFieldValue
false
0.0
@@ -4297,14 +4808,54 @@ $(pv_value)
false
true
Text Input
- 100
- 245
- 285
+ 70
+ 330
+ 410
-
+
- false
false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Collect dark fields
+
+ true
+ 1
+ true
+ Label
+ 190
+ false
+ 415
+ 410
+
+
+
+ true
+ false
false
@@ -4313,33 +4864,21 @@ $(pv_value)
- 3
+ 6
1
-
true
-
+ Default
false
- 1
20
- 0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)SampleInY
+
+ Menu Button
+ $(P)$(R)DarkFieldMode
- false
- 0.0
true
@@ -4347,21 +4886,15 @@ $(pv_value)
false
- 0
- false
- true
- false
- false
-
-
+ false
$(pv_name)
$(pv_value)
false
true
- Text Input
- 100
- 245
- 260
+ Menu Button
+ 80
+ 610
+ 410
@@ -4379,10 +4912,10 @@ $(pv_value)
-
+
20
- 0
+ 1
Label
@@ -4392,16 +4925,16 @@ $(pv_value)
false
- Y in
+ Shutter Control
true
1
true
Label
- 130
+ 150
false
- 193
- 260
+ 275
+ 450
@@ -4432,21 +4965,21 @@ $(pv_value)
false
- Angle
+ Auto close shutter
true
1
true
Label
- 140
+ 180
false
- 396
- 284
+ 425
+ 485
-
+
+ true
false
- false
false
@@ -4455,33 +4988,21 @@ $(pv_value)
- 3
+ 6
1
-
true
-
+ Default
false
- 1
20
- 0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)SampleOutAngle
+
+ Menu Button
+ $(P)$(R)AutoCloseShutter
- false
- 0.0
true
@@ -4489,28 +5010,39 @@ $(pv_value)
false
- 0
- false
- true
- false
- false
-
-
+ false
$(pv_name)
$(pv_value)
false
true
- Text Input
- 100
- 458
- 284
+ Menu Button
+ 80
+ 610
+ 485
-
-
- false
+
+
+
+ $(P)$(R)OpenShutterCmd
+ 1
+ 10
+
+
+
+
+ $(P)$(R)OpenShutterCmd
+ 0
+ 10
+
+
+
+
+ false
+ false
-
+
+ false
@@ -4518,14 +5050,18 @@ $(pv_value)
1
true
-
+ Default
+ false
20
- 0
- Label
+
+ Action Button
+ 0
+ $(P)$(R)OpenShutterCmd
+
true
@@ -4533,31 +5069,44 @@ $(pv_value)
false
- false
- Use angle
-
- true
- 1
+
+ Open shutter
+ true
+ $(pv_name)
+$(pv_value)
true
- Label
- 140
- false
- 356
- 260
+ Action Button
+ 120
+ 50
+ 485
-
-
- true
+
+
+
+ $(P)$(R)CloseShutterCmd
+ 1
+ 10
+
+
+
+
+ $(P)$(R)CloseShutterCmd
+ 0
+ 10
+
+
+
+
false
false
-
+
false
- 6
+ 0
1
true
@@ -4568,9 +5117,10 @@ $(pv_value)
20
-
- Menu Button
- $(P)$(R)SampleOutAngleEnable
+
+ Action Button
+ 0
+ $(P)$(R)CloseShutterCmd
@@ -4579,14 +5129,15 @@ $(pv_value)
false
- false
+
+ Close shutter
+ true
$(pv_name)
$(pv_value)
- false
true
- Menu Button
- 100
- 458
- 260
+ Action Button
+ 120
+ 200
+ 485
diff --git a/tomoScanApp/op/opi/autoconvert/tomoScanStream.opi b/tomoScanApp/op/opi/autoconvert/tomoScanStream.opi
index 6ce87a13..3fc02452 100644
--- a/tomoScanApp/op/opi/autoconvert/tomoScanStream.opi
+++ b/tomoScanApp/op/opi/autoconvert/tomoScanStream.opi
@@ -14,7 +14,7 @@
5
- 960
+ 1042
true
@@ -28,8 +28,8 @@
false
Display
700
- 402
- 286
+ 3768
+ 365
false
@@ -657,6 +657,63 @@ $(pv_value)
250
450
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 0.0
+
+ Default
+
+ false
+
+
+
+ false
+ 70
+ true
+
+
+
+ 0
+ 1
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ true
+ true
+ Rectangle
+ 690
+ 5
+ 768
+
false
@@ -710,9 +767,66 @@ $(pv_value)
false
true
Rectangle
- 260
- 223
- 560
+ 200
+ 250
+ 774
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 90
+ 305
+ 848
@@ -745,7 +859,7 @@ $(pv_value)
false
- 130
+ 190
true
@@ -769,32 +883,106 @@ $(pv_value)
Rectangle
690
5
- 555
+ 843
-
+
+ false
+ 255
+ true
+ false
-
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 260
+ 223
+ 560
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+ false
0
1
true
- false
+
+
+
+ 0.0
Default
+ false
- 1
- false
-
- true
-
- Grouping Container
+ false
+ 208
+ true
+
+
+
+ 0
+ 1
+ Rectangle
+
+
true
@@ -802,14 +990,14 @@ $(pv_value)
false
- false
-
+ $(pv_name)
+$(pv_value)
true
true
- Grouping Container
- 1
- 4000
- 4000
+ Rectangle
+ 690
+ 5
+ 555
@@ -869,7 +1057,7 @@ $(pv_value)
- 265
+ 1
false
true
@@ -887,1169 +1075,9 @@ $(pv_value)
true
true
Grouping Container
- 690
- 5
- 690
-
-
- false
- 255
- true
- false
-
-
-
-
-
-
- false
-
-
-
- 0
- 1
- true
-
-
-
- 0.0
-
- Default
-
- false
-
-
-
- false
- 70
- true
-
-
-
- 0
- 1
- Rectangle
-
-
-
-
- true
- true
- false
-
-
- $(pv_name)
-$(pv_value)
- true
- true
- Rectangle
- 690
- 0
- 0
-
-
-
- false
- 255
- true
- false
-
-
-
-
-
-
- false
-
-
-
- 0
- 1
- true
-
-
-
- 100.0
-
- Default
-
- false
-
-
-
- false
- 20
- true
-
-
-
- 0
- 0
- Rectangle
-
-
-
-
- true
- true
- false
-
-
- $(pv_name)
-$(pv_value)
- false
- true
- Rectangle
- 200
- 245
- 6
-
-
-
- false
- 255
- true
- false
-
-
-
-
-
-
- false
-
-
-
- 0
- 1
- true
-
-
-
- 100.0
-
- Default
-
- false
-
-
-
- false
- 20
- true
-
-
-
- 0
- 0
- Rectangle
-
-
-
-
- true
- true
- false
-
-
- $(pv_name)
-$(pv_value)
- false
- true
- Rectangle
- 90
- 300
- 80
-
-
-
- false
- 255
- true
- false
-
-
-
-
-
-
- false
-
-
-
- 0
- 1
- true
-
-
-
- 0.0
-
- Default
-
- false
-
-
-
- false
- 190
- true
-
-
-
- 0
- 1
- Rectangle
-
-
-
-
- true
- true
- false
-
-
- $(pv_name)
-$(pv_value)
- true
- true
- Rectangle
- 690
- 0
- 75
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 1
- Label
-
-
- true
- true
- false
-
-
- false
- Data Collection
-
- true
- 1
- true
- Label
- 150
- false
- 270
- 6
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 1
- Label
-
-
- true
- true
- false
-
-
- false
- Status
-
- true
- 1
- true
- Label
- 72
- false
- 309
- 80
-
-
-
-
- $(P)$(R)StartScan
- 1
- 10
-
-
-
-
- false
- false
-
-
-
- false
-
-
-
- 0
- 1
- true
-
- Default
-
- false
-
-
-
- 20
-
- Action Button
- 0
- $(P)$(R)StartScan
-
-
-
- true
- true
- false
-
-
-
- Start Scan
- false
- $(pv_name)
-$(pv_value)
- true
- Action Button
- 120
- 245
- 40
-
-
-
-
- $(P)$(R)AbortScan
- 1
- 10
-
-
-
-
- $(P)$(R)AbortScan
- 0
- 10
-
-
-
-
- false
- false
-
-
-
- false
-
-
-
- 0
- 1
- true
-
- Default
-
- false
-
-
-
- 20
-
- Action Button
- 0
- $(P)$(R)AbortScan
-
-
-
- true
- true
- false
-
-
-
- Abort Scan
- true
- $(pv_name)
-$(pv_value)
- true
- Action Button
- 120
- 370
- 40
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 0
- Label
-
-
- true
- true
- false
-
-
- false
- Exposure time
-
- true
- 1
- true
- Label
- 130
- false
- 10
- 40
-
-
-
- false
- false
- false
-
-
-
- false
-
-
-
- 3
- 1
-
- true
-
-
-
- false
-
-
-
- 1
- 20
- 0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)ExposureTime
-
- false
- 0.0
-
-
- true
- true
- false
-
-
- 0
- false
- true
- false
- false
-
-
- $(pv_name)
-$(pv_value)
- false
- true
- Text Input
- 70
- 145
- 40
-
-
-
- false
- false
- false
-
-
-
- false
-
-
-
- 0
- 1
- true
-
-
-
- true
-
-
-
- 4
- 20
- 0
- Text Update
- 0
- true
- $(P)$(R)StartScan
-
- 0.0
-
-
- true
- true
- false
-
-
- false
- ######
- $(pv_name)
-$(pv_value)
- false
- 1
- true
- Text Update
- 100
- false
- 575
- 40
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 0
- Label
-
-
- true
- true
- false
-
-
- false
- Status
-
- true
- 1
- true
- Label
- 60
- false
- 510
- 40
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 0
- Label
-
-
- true
- true
- false
-
-
- false
- Python server
-
- true
- 1
- true
- Label
- 130
- false
- 60
- 235
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 0
- Label
-
-
- true
- true
- false
-
-
- false
- Scan status
-
- true
- 1
- true
- Label
- 110
- false
- 80
- 110
-
-
-
- false
- false
- false
-
-
-
- true
-
-
-
- 0
- 1
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- Text Update
- 0
- true
- $(P)$(R)ScanStatus
-
- 0.0
-
-
- true
- true
- false
-
-
- false
- ######
- $(pv_name)
-$(pv_value)
- false
- 1
- true
- Text Update
- 400
- false
- 196
- 110
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 0
- Label
-
-
- true
- true
- false
-
-
- false
- Remaining time
-
- true
- 1
- true
- Label
- 140
- false
- 50
- 210
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 0
- Label
-
-
- true
- true
- false
-
-
- false
- Elapsed time
-
- true
- 1
- true
- Label
- 120
- false
- 70
- 185
-
-
-
- false
- false
- false
-
-
-
- true
-
-
-
- 0
- 1
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- Text Update
- 0
- true
- $(P)$(R)ElapsedTime
-
- 0.0
-
-
- true
- true
- false
-
-
- false
- ######
- $(pv_name)
-$(pv_value)
- false
- 1
- true
- Text Update
- 100
- false
- 196
- 185
-
-
-
- false
- false
- false
-
-
-
- true
-
-
-
- 0
- 1
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- Text Update
- 0
- true
- $(P)$(R)RemainingTime
-
- 0.0
-
-
- true
- true
- false
-
-
- false
- ######
- $(pv_name)
-$(pv_value)
- false
- 1
- true
- Text Update
- 100
- false
- 195
- 210
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 0
- Label
-
-
- true
- true
- false
-
-
- false
- Images collected
-
- true
- 1
- true
- Label
- 160
- false
- 30
- 135
-
-
-
- false
- false
- false
-
-
-
- true
-
-
-
- 0
- 1
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- Text Update
- 0
- true
- $(P)$(R)ImagesCollected
-
- 0.0
-
-
- true
- true
- false
-
-
- false
- ######
- $(pv_name)
-$(pv_value)
- false
- 1
- true
- Text Update
- 100
- false
- 196
- 135
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 0
- Label
-
-
- true
- true
- false
-
-
- false
- Images saved
-
- true
- 1
- true
- Label
- 120
- false
- 70
- 160
-
-
-
- false
- false
- false
-
-
-
- true
-
-
-
- 0
- 1
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- Text Update
- 0
- true
- $(P)$(R)ImagesSaved
-
- 0.0
-
-
- true
- true
- false
-
-
- false
- ######
- $(pv_name)
-$(pv_value)
- false
- 1
- true
- Text Update
- 100
- false
- 196
- 160
-
-
-
- false
- false
- false
-
-
-
- false
-
-
-
- 0
- 1
- true
-
-
-
- true
-
-
-
- 4
- 20
- 0
- Text Update
- 0
- true
- $(P)$(R)ServerRunning
-
- 0.0
-
-
- true
- true
- false
-
-
- false
- ######
- $(pv_name)
-$(pv_value)
- false
- 1
- true
- Text Update
- 100
- false
- 194
- 235
-
+ 1
+ 4000
+ 4000
@@ -3518,8 +2546,8 @@ $(pv_value)
Label
190
false
- 380
- 310
+ 34
+ 734
@@ -3558,8 +2586,8 @@ $(pv_value)
Label
190
false
- 415
- 410
+ 379
+ 735
@@ -4482,7 +3510,7 @@ $(pv_value)
false
false
-
+
false
@@ -4519,8 +3547,8 @@ $(pv_value)
true
Action Button
100
- 575
- 310
+ 229
+ 735
@@ -4572,8 +3600,8 @@ $(pv_value)
true
Action Button
80
- 610
- 410
+ 574
+ 735
@@ -4591,10 +3619,10 @@ $(pv_value)
-
+
20
- 2
+ 1
Label
@@ -4604,16 +3632,948 @@ $(pv_value)
false
- # Pre count
+ Data Collection
true
1
true
Label
- 170
+ 150
false
- 20
- 585
+ 275
+ 774
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 1
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Status
+
+ true
+ 1
+ true
+ Label
+ 72
+ false
+ 314
+ 848
+
+
+
+
+ $(P)$(R)StartScan
+ 1
+ 10
+
+
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+ $(P)$(R)StartScan
+
+
+
+ true
+ true
+ false
+
+
+
+ Start Scan
+ false
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 120
+ 250
+ 808
+
+
+
+
+ $(P)$(R)AbortScan
+ 1
+ 10
+
+
+
+
+ $(P)$(R)AbortScan
+ 0
+ 10
+
+
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+ $(P)$(R)AbortScan
+
+
+
+ true
+ true
+ false
+
+
+
+ Abort Scan
+ true
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 120
+ 375
+ 808
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Exposure time
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 15
+ 808
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)ExposureTime
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 70
+ 150
+ 808
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ true
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)StartScan
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 580
+ 808
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Status
+
+ true
+ 1
+ true
+ Label
+ 60
+ false
+ 515
+ 808
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Python server
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 65
+ 1003
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Scan status
+
+ true
+ 1
+ true
+ Label
+ 110
+ false
+ 85
+ 878
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ScanStatus
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 400
+ false
+ 201
+ 878
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Remaining time
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 55
+ 978
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Elapsed time
+
+ true
+ 1
+ true
+ Label
+ 120
+ false
+ 75
+ 953
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ElapsedTime
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 201
+ 953
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)RemainingTime
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 200
+ 978
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Images collected
+
+ true
+ 1
+ true
+ Label
+ 160
+ false
+ 35
+ 903
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ImagesCollected
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 201
+ 903
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Images saved
+
+ true
+ 1
+ true
+ Label
+ 120
+ false
+ 75
+ 928
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ImagesSaved
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 201
+ 928
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ true
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ServerRunning
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 199
+ 1003
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ # Pre count
+
+ true
+ 1
+ true
+ Label
+ 170
+ false
+ -32
+ 625
@@ -4674,8 +4634,8 @@ $(pv_value)
true
Text Input
80
- 200
- 585
+ 148
+ 625
@@ -4725,8 +4685,8 @@ $(pv_value)
Text Update
80
false
- 285
- 585
+ 233
+ 625
@@ -4774,50 +4734,10 @@ $(pv_value)
1
true
Text Update
- 300
- false
- 380
- 585
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 2
- Label
-
-
- true
- true
- false
-
-
- false
- Capture proj
-
- true
- 1
- true
- Label
- 170
+ 130
false
- 20
- 610
+ 319
+ 625
@@ -4832,7 +4752,7 @@ $(pv_value)
false
false
-
+
false
@@ -4848,7 +4768,7 @@ $(pv_value)
- 20
+ 50
Action Button
0
@@ -4862,15 +4782,15 @@ $(pv_value)
- Start
+ Capture
false
$(pv_name)
$(pv_value)
true
Action Button
- 80
- 200
- 610
+ 130
+ 459
+ 625
@@ -4922,8 +4842,8 @@ $(pv_value)
true
Action Button
80
- 285
- 610
+ 596
+ 653
@@ -4962,8 +4882,8 @@ $(pv_value)
Label
90
false
- 370
- 610
+ 54
+ 650
@@ -5024,8 +4944,8 @@ $(pv_value)
true
Text Input
80
- 465
- 610
+ 149
+ 650
@@ -5075,8 +4995,8 @@ $(pv_value)
Text Update
80
false
- 555
- 610
+ 239
+ 650
@@ -5166,8 +5086,8 @@ $(pv_value)
Text Update
275
false
- 200
- 635
+ 148
+ 675
@@ -5206,8 +5126,8 @@ $(pv_value)
Label
170
false
- 20
- 635
+ -32
+ 675
@@ -5247,7 +5167,7 @@ $(pv_value)
80
false
465
- 635
+ 675
@@ -5298,7 +5218,7 @@ $(pv_value)
80
false
555
- 635
+ 675
@@ -5338,7 +5258,7 @@ $(pv_value)
170
false
20
- 660
+ 700
@@ -5382,7 +5302,7 @@ $(pv_value)
Menu Button
80
200
- 660
+ 700
@@ -5433,6 +5353,223 @@ $(pv_value)
300
false
380
- 660
+ 700
+
+
+
+
+ $(P)$(R)StreamSync
+ 1
+ 10
+
+
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+ $(P)$(R)StreamSync
+
+
+
+ true
+ true
+ false
+
+
+
+ Sync
+ false
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 80
+ 608
+ 587
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Sync exposure and rotation step
+
+ true
+ 1
+ true
+ Label
+ 190
+ false
+ 408
+ 586
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Scan type
+
+ true
+ 1
+ true
+ Label
+ 100
+ false
+ 15
+ 586
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)StreamScanType
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 140
+ 131
+ 588
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ (only in continuous mode)
+
+ true
+ 1
+ true
+ Label
+ 190
+ false
+ 380
+ 602
diff --git a/tomoScanApp/op/opi/autoconvert/tomoScanStream_2BM_otherpvs.opi b/tomoScanApp/op/opi/autoconvert/tomoScanStream_2BM_otherpvs.opi
index 206bd3a0..16855d45 100644
--- a/tomoScanApp/op/opi/autoconvert/tomoScanStream_2BM_otherpvs.opi
+++ b/tomoScanApp/op/opi/autoconvert/tomoScanStream_2BM_otherpvs.opi
@@ -14,7 +14,7 @@
5
- 240
+ 290
true
@@ -28,8 +28,8 @@
false
Display
640
- 84
- 691
+ 61
+ 879
false
@@ -879,7 +879,7 @@ $(pv_value)
90
false
159
- 215
+ 265
@@ -933,6 +933,174 @@ $(pv_value)
Action Button
100
254
+ 265
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Scan type
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 119
+ 215
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Flip&Stitch
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 119
+ 240
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)ScanType
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 254
215
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)FlipStitch
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 254
+ 240
+
diff --git a/tomoScanApp/op/opi/autoconvert/tomoScan_2BM.opi b/tomoScanApp/op/opi/autoconvert/tomoScan_2BM.opi
index 31ada6fa..38b03591 100644
--- a/tomoScanApp/op/opi/autoconvert/tomoScan_2BM.opi
+++ b/tomoScanApp/op/opi/autoconvert/tomoScan_2BM.opi
@@ -235,60 +235,6 @@ $(pv_value)
10
84
-
-
-
- $(BEAMLINE)_energy.opi
-
- true
-
- 1
- Energy Information
-
-
- false
- false
-
-
-
- false
-
-
-
- 0
- 1
- true
-
- Default
-
- false
-
-
-
- 30
-
- Action Button
- 0
-
-
-
-
- true
- true
- false
-
-
-
- Energy & Filters
- false
- $(pv_name)
-$(pv_value)
- true
- Action Button
- 280
- 10
- 164
-
@@ -343,60 +289,6 @@ $(pv_value)
10
124
-
-
-
- $(BEAMLINE)_optics.opi
-
- true
-
- 1
- Optics Information
-
-
- false
- false
-
-
-
- false
-
-
-
- 0
- 1
- true
-
- Default
-
- false
-
-
-
- 30
-
- Action Button
- 0
-
-
-
-
- true
- true
- false
-
-
-
- Optics
- false
- $(pv_name)
-$(pv_value)
- true
- Action Button
- 280
- 335
- 44
-
@@ -449,7 +341,7 @@ $(pv_value)
Action Button
280
335
- 84
+ 44
diff --git a/tomoScanApp/op/opi/autoconvert/tomoScan_2BM_otherpvs.opi b/tomoScanApp/op/opi/autoconvert/tomoScan_2BM_otherpvs.opi
index 071055a3..4a52fe4a 100644
--- a/tomoScanApp/op/opi/autoconvert/tomoScan_2BM_otherpvs.opi
+++ b/tomoScanApp/op/opi/autoconvert/tomoScan_2BM_otherpvs.opi
@@ -14,7 +14,7 @@
5
- 240
+ 405
true
@@ -28,8 +28,8 @@
false
Display
640
- 84
- 691
+ 342
+ 927
false
@@ -87,6 +87,596 @@ $(pv_value)
0
5
+
+
+
+
+
+
+
+
+ 0
+ 1
+ true
+ false
+
+ Default
+
+
+
+
+ 70
+ false
+
+ true
+
+ Grouping Container
+
+
+ true
+ true
+ false
+
+
+ false
+
+ true
+ true
+ Grouping Container
+ 630
+ 10
+ 330
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Scan type
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 0
+ 0
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)ScanType
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 135
+ 0
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)FlipStitch
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 135
+ 25
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Flip&Stitch
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 0
+ 25
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ PSO setup
+
+ true
+ 1
+ true
+ Label
+ 90
+ false
+ 150
+ 50
+
+
+
+
+ tomoScan_pso.opi
+
+ true
+
+ 1
+ PSO setup
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+
+
+
+
+ true
+ true
+ false
+
+
+
+ PSO setup
+ false
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 100
+ 245
+ 50
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Y Pixels Per 360 Deg
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 404
+ 0
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)PixelsYPer360Deg
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 75
+ 549
+ 0
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Helical Misalignment (mrad)
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 403
+ 25
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)HelicalMisalignment
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 75
+ 549
+ 25
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Program PSO
+
+ true
+ 1
+ true
+ Label
+ 150
+ false
+ 355
+ 50
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)ProgramPSO
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 120
+ 510
+ 50
+
+
false
@@ -186,8 +776,8 @@ $(pv_value)
true
Text Input
380
- 254
- 40
+ 255
+ 70
@@ -248,8 +838,8 @@ $(pv_value)
true
Text Input
380
- 254
- 65
+ 255
+ 95
@@ -286,10 +876,10 @@ $(pv_value)
1
true
Label
- 160
+ 240
false
- 89
- 65
+ 10
+ 95
@@ -326,10 +916,10 @@ $(pv_value)
1
true
Label
- 130
+ 240
false
- 119
- 40
+ 10
+ 70
@@ -366,10 +956,10 @@ $(pv_value)
1
true
Label
- 160
+ 240
false
- 89
- 115
+ 10
+ 145
@@ -430,8 +1020,8 @@ $(pv_value)
true
Text Input
380
- 254
- 115
+ 255
+ 145
@@ -468,10 +1058,10 @@ $(pv_value)
1
true
Label
- 130
+ 240
false
- 119
- 90
+ 10
+ 120
@@ -532,8 +1122,8 @@ $(pv_value)
true
Text Input
380
- 254
- 90
+ 255
+ 120
@@ -570,10 +1160,10 @@ $(pv_value)
1
true
Label
- 130
+ 240
false
- 119
- 140
+ 10
+ 170
@@ -610,10 +1200,10 @@ $(pv_value)
1
true
Label
- 160
+ 240
false
- 89
- 165
+ 10
+ 195
@@ -674,8 +1264,8 @@ $(pv_value)
true
Text Input
380
- 254
- 165
+ 255
+ 195
@@ -736,8 +1326,8 @@ $(pv_value)
true
Text Input
380
- 254
- 140
+ 255
+ 170
@@ -768,16 +1358,16 @@ $(pv_value)
false
- Shutter status PV
+ Shutter Status PV
true
1
true
Label
- 130
+ 240
false
- 119
- 190
+ 10
+ 45
@@ -838,8 +1428,8 @@ $(pv_value)
true
Text Input
380
- 254
- 190
+ 255
+ 45
@@ -870,29 +1460,21 @@ $(pv_value)
false
- PSO setup
+ mctOptics Prefix
true
1
true
Label
- 90
+ 240
false
- 159
- 215
+ 10
+ 220
-
-
-
- tomoScan_pso.opi
-
- true
-
- 1
- PSO setup
-
-
+
+
false
+ false
false
@@ -901,22 +1483,135 @@ $(pv_value)
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)MctOpticsPVPrefix
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 380
+ 255
+ 220
+
+
+
+ false
+
+
+
+
+
+
0
1
true
- Default
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ PVA plugin prefix
+
+ true
+ 1
+ true
+ Label
+ 240
+ false
+ 10
+ 245
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
false
+ 4
20
-
- Action Button
- 0
-
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)PvaPluginPVPrefix
+ false
+ 0.0
true
@@ -924,15 +1619,224 @@ $(pv_value)
false
+ 0
+ false
+ true
+ false
+ false
- PSO setup
- false
+
$(pv_name)
$(pv_value)
+ false
true
- Action Button
- 100
- 254
- 215
+ Text Input
+ 380
+ 255
+ 245
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ ROI plugin prefix
+
+ true
+ 1
+ true
+ Label
+ 240
+ false
+ 10
+ 270
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)RoiPluginPVPrefix
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 380
+ 255
+ 270
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ CB plugin prefix
+
+ true
+ 1
+ true
+ Label
+ 240
+ false
+ 10
+ 295
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)CbPluginPVPrefix
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 380
+ 255
+ 295
diff --git a/tomoScanApp/op/opi/autoconvert/tomoScan_32ID_main.opi b/tomoScanApp/op/opi/autoconvert/tomoScan_32ID_main.opi
new file mode 100644
index 00000000..7bf81f5f
--- /dev/null
+++ b/tomoScanApp/op/opi/autoconvert/tomoScan_32ID_main.opi
@@ -0,0 +1,4767 @@
+
+
+
+ false
+ -1
+ -1
+
+ false
+
+
+
+ 5.1.0
+
+
+
+ 5
+ 820
+
+ true
+
+ tomoScan_32ID_main
+
+
+ true
+ true
+ false
+ true
+ false
+ Display
+ 699
+ 426
+ 968
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 25
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 700
+ 0
+ 10
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 0.0
+
+ Default
+
+ false
+
+
+
+ false
+ 65
+ true
+
+
+
+ 0
+ 1
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ true
+ true
+ Rectangle
+ 690
+ 7
+ 50
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 120
+ 290
+ 55
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 0.0
+
+ Default
+
+ false
+
+
+
+ false
+ 95
+ true
+
+
+
+ 0
+ 1
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ true
+ true
+ Rectangle
+ 690
+ 5
+ 120
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 150
+ 275
+ 125
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 0.0
+
+ Default
+
+ false
+
+
+
+ false
+ 145
+ true
+
+
+
+ 0
+ 1
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ true
+ true
+ Rectangle
+ 690
+ 5
+ 220
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 260
+ 220
+ 225
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 0.0
+
+ Default
+
+ false
+
+
+
+ false
+ 70
+ true
+
+
+
+ 0
+ 1
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ true
+ true
+ Rectangle
+ 690
+ 5
+ 370
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 260
+ 220
+ 375
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 0.0
+
+ Default
+
+ false
+
+
+
+ false
+ 105
+ true
+
+
+
+ 0
+ 1
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ true
+ true
+ Rectangle
+ 690
+ 5
+ 445
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 200
+ 250
+ 450
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 0.0
+
+ Default
+
+ false
+
+
+
+ false
+ 70
+ true
+
+
+
+ 0
+ 1
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ true
+ true
+ Rectangle
+ 703
+ 5
+ 554
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 200
+ 250
+ 560
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 100.0
+
+ Default
+
+ false
+
+
+
+ false
+ 20
+ true
+
+
+
+ 0
+ 0
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Rectangle
+ 90
+ 305
+ 634
+
+
+
+ false
+ 255
+ true
+ false
+
+
+
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ 0.0
+
+ Default
+
+ false
+
+
+
+ false
+ 185
+ true
+
+
+
+ 0
+ 1
+ Rectangle
+
+
+
+
+ true
+ true
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ true
+ true
+ Rectangle
+ 690
+ 5
+ 629
+
+
+
+
+
+
+
+
+
+ 0
+ 1
+ true
+ false
+
+ Default
+
+
+
+
+ 1
+ false
+
+ true
+
+ Grouping Container
+
+
+ true
+ true
+ false
+
+
+ false
+
+ true
+ true
+ Grouping Container
+ 1
+ 4000
+ 4000
+
+
+
+
+
+
+
+
+
+ 0
+ 1
+ true
+ false
+
+ Default
+
+
+
+
+ 1
+ false
+
+ true
+
+ Grouping Container
+
+
+ true
+ true
+ false
+
+
+ false
+
+ true
+ true
+ Grouping Container
+ 1
+ 4000
+ 4000
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 25
+ 1
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Tomography Data Collection $(P)$(R)
+
+ true
+ 1
+ true
+ Label
+ 700
+ false
+ 0
+ 10
+
+
+
+
+ $(BEAMLINE).opi
+
+ true
+
+ 1
+ Beamline-specific display
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+
+
+
+
+ true
+ true
+ false
+
+
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 100
+ 508
+ 90
+
+
+
+
+ tomoScanEPICS_PVs.opi
+
+ true
+
+ 1
+ Epics PV Names
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+
+
+
+
+ true
+ true
+ false
+
+
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 50
+ 160
+ 90
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Epics PV names
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 15
+ 92
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Beamline-specific display
+
+ true
+ 1
+ true
+ Label
+ 250
+ false
+ 253
+ 91
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 1
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Setup
+
+ true
+ 1
+ true
+ Label
+ 50
+ false
+ 325
+ 55
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Angle step
+
+ true
+ 1
+ true
+ Label
+ 100
+ false
+ 25
+ 185
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Start angle
+
+ true
+ 1
+ true
+ Label
+ 110
+ false
+ 15
+ 160
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)RotationStep
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 100
+ 130
+ 185
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)RotationStart
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 100
+ 130
+ 160
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Rotation
+
+ true
+ 1
+ true
+ Label
+ 80
+ false
+ 303
+ 124
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)FlatFieldAxis
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 100
+ 170
+ 340
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Flat field axis
+
+ true
+ 1
+ true
+ Label
+ 150
+ false
+ 15
+ 340
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)NumFlatFields
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 70
+ 145
+ 315
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ # Flat fields
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 10
+ 315
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 1
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Flat Field Control
+
+ true
+ 1
+ true
+ Label
+ 180
+ false
+ 260
+ 225
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 1
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Dark Field Control
+
+ true
+ 1
+ true
+ Label
+ 180
+ false
+ 260
+ 375
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 1
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ File Control
+
+ true
+ 1
+ true
+ Label
+ 120
+ false
+ 290
+ 450
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ # Dark fields
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 10
+ 410
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)NumDarkFields
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 70
+ 145
+ 410
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Dark value
+
+ true
+ 1
+ true
+ Label
+ 100
+ false
+ 225
+ 410
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)DarkFieldValue
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 70
+ 330
+ 410
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Collect flat fields
+
+ true
+ 1
+ true
+ Label
+ 190
+ false
+ 415
+ 317
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)FlatFieldMode
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 610
+ 317
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Collect dark fields
+
+ true
+ 1
+ true
+ Label
+ 190
+ false
+ 415
+ 410
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)DarkFieldMode
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 610
+ 410
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Return to start
+
+ true
+ 1
+ true
+ Label
+ 150
+ false
+ 495
+ 160
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)ReturnRotation
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 525
+ 185
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ # of angles
+
+ true
+ 1
+ true
+ Label
+ 110
+ false
+ 245
+ 160
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)NumAngles
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 100
+ 360
+ 160
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Stop angle
+
+ true
+ 1
+ true
+ Label
+ 100
+ false
+ 255
+ 185
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 1
+ 18
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)RotationStop
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 360
+ 187
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 1
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Data Collection
+
+ true
+ 1
+ true
+ Label
+ 150
+ false
+ 275
+ 560
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 1
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Status
+
+ true
+ 1
+ true
+ Label
+ 72
+ false
+ 314
+ 634
+
+
+
+
+ $(P)$(R)StartScan
+ 1
+ 10
+
+
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+ $(P)$(R)StartScan
+
+
+
+ true
+ true
+ false
+
+
+
+ Start Scan
+ false
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 120
+ 250
+ 594
+
+
+
+
+ $(P)$(R)AbortScan
+ 1
+ 10
+
+
+
+
+ $(P)$(R)AbortScan
+ 0
+ 10
+
+
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+ $(P)$(R)AbortScan
+
+
+
+ true
+ true
+ false
+
+
+
+ Abort Scan
+ true
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 120
+ 375
+ 594
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Exposure time
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 15
+ 594
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)ExposureTime
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 70
+ 150
+ 594
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ true
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)StartScan
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 580
+ 594
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Status
+
+ true
+ 1
+ true
+ Label
+ 60
+ false
+ 515
+ 594
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Python server
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 65
+ 789
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Scan status
+
+ true
+ 1
+ true
+ Label
+ 110
+ false
+ 85
+ 664
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ScanStatus
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 400
+ false
+ 201
+ 664
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Remaining time
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 55
+ 764
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Elapsed time
+
+ true
+ 1
+ true
+ Label
+ 120
+ false
+ 75
+ 739
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ElapsedTime
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 201
+ 739
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)RemainingTime
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 200
+ 764
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Images collected
+
+ true
+ 1
+ true
+ Label
+ 160
+ false
+ 35
+ 689
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ImagesCollected
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 201
+ 689
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Images saved
+
+ true
+ 1
+ true
+ Label
+ 120
+ false
+ 75
+ 714
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ImagesSaved
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 201
+ 714
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ true
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)ServerRunning
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 100
+ false
+ 199
+ 789
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Base file name
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 15
+ 525
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)FileName
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 530
+ 160
+ 525
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Exists:
+
+ true
+ 1
+ true
+ Label
+ 70
+ false
+ 570
+ 475
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+
+
+ true
+
+
+
+ 4
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(P)$(R)FilePathExists
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 40
+ false
+ 645
+ 475
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Overwrite warning:
+
+ true
+ 1
+ true
+ Label
+ 180
+ false
+ 15
+ 475
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)OverwriteWarning
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 200
+ 475
+
+
+
+
+ $(P)$(R)MoveSampleIn
+ 1
+ 10
+
+
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+ $(P)$(R)MoveSampleIn
+
+
+
+ true
+ true
+ false
+
+
+
+ Move Sample In
+ false
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 120
+ 565
+ 260
+
+
+
+
+ $(P)$(R)MoveSampleOut
+ 1
+ 10
+
+
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+ $(P)$(R)MoveSampleOut
+
+
+
+ true
+ true
+ false
+
+
+
+ Move Sample Out
+ false
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 120
+ 565
+ 285
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Flat exposure
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 350
+ 340
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)DifferentFlatExposure
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 100
+ 485
+ 340
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)FlatExposureTime
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 100
+ 590
+ 340
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Top X in
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 10
+ 260
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Top X out
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 10
+ 285
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Top Z out
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 178
+ 285
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Top Z in
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 178
+ 260
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Angle
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 396
+ 284
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)SampleOutAngle
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 100
+ 458
+ 284
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Use angle
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 356
+ 260
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)SampleOutAngleEnable
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 100
+ 458
+ 260
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)FlatFieldValue
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 70
+ 330
+ 315
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Flat value
+
+ true
+ 1
+ true
+ Label
+ 100
+ false
+ 225
+ 315
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)SampleInX
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 73
+ 101
+ 260
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)SampleOutX
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 73
+ 101
+ 285
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)SampleOutY
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 73
+ 278
+ 285
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 1
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)SampleInY
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 73
+ 278
+ 260
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)CollectMicroCTdata
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 611
+ 450
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 15
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Collect MicroCT
+
+ true
+ 1
+ true
+ Label
+ 150
+ false
+ 471
+ 453
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 0
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Last file name
+
+ true
+ 1
+ true
+ Label
+ 140
+ false
+ 15
+ 500
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+
+
+ false
+
+
+
+ 4
+ 15
+ 0
+ Text Update
+ 0
+ true
+ 32idcSP1:HDF1:FullFileName_RBV
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ false
+ ######
+ $(pv_name)
+$(pv_value)
+ false
+ 1
+ true
+ Text Update
+ 530
+ false
+ 160
+ 505
+
+
diff --git a/tomoScanApp/op/opi/autoconvert/tomoScan_32ID_otherpvs.opi b/tomoScanApp/op/opi/autoconvert/tomoScan_32ID_otherpvs.opi
index efb7de19..ff18b485 100644
--- a/tomoScanApp/op/opi/autoconvert/tomoScan_32ID_otherpvs.opi
+++ b/tomoScanApp/op/opi/autoconvert/tomoScan_32ID_otherpvs.opi
@@ -14,7 +14,7 @@
5
- 290
+ 340
true
@@ -28,8 +28,8 @@
false
Display
640
- 74
- 683
+ 429
+ 810
false
@@ -186,7 +186,7 @@ $(pv_value)
true
Text Input
380
- 254
+ 255
40
@@ -248,7 +248,7 @@ $(pv_value)
true
Text Input
380
- 254
+ 255
65
@@ -286,9 +286,9 @@ $(pv_value)
1
true
Label
- 160
+ 240
false
- 89
+ 10
65
@@ -326,9 +326,9 @@ $(pv_value)
1
true
Label
- 130
+ 240
false
- 119
+ 10
40
@@ -366,9 +366,9 @@ $(pv_value)
1
true
Label
- 160
+ 240
false
- 89
+ 10
115
@@ -430,7 +430,7 @@ $(pv_value)
true
Text Input
380
- 254
+ 255
115
@@ -468,9 +468,9 @@ $(pv_value)
1
true
Label
- 130
+ 240
false
- 119
+ 10
90
@@ -532,7 +532,7 @@ $(pv_value)
true
Text Input
380
- 254
+ 255
90
@@ -570,9 +570,9 @@ $(pv_value)
1
true
Label
- 130
+ 240
false
- 119
+ 10
140
@@ -610,9 +610,9 @@ $(pv_value)
1
true
Label
- 160
+ 240
false
- 89
+ 10
165
@@ -674,7 +674,7 @@ $(pv_value)
true
Text Input
380
- 254
+ 255
165
@@ -736,7 +736,7 @@ $(pv_value)
true
Text Input
380
- 254
+ 255
140
@@ -774,9 +774,9 @@ $(pv_value)
1
true
Label
- 130
+ 240
false
- 119
+ 10
190
@@ -838,7 +838,7 @@ $(pv_value)
true
Text Input
380
- 254
+ 255
190
@@ -879,7 +879,7 @@ $(pv_value)
90
false
159
- 268
+ 315
@@ -933,7 +933,7 @@ $(pv_value)
Action Button
100
254
- 268
+ 315
@@ -964,16 +964,16 @@ $(pv_value)
false
- Sample Top X PV
+ Scan type
true
1
true
Label
- 160
+ 130
false
- 87
- 216
+ 119
+ 265
@@ -1004,16 +1004,104 @@ $(pv_value)
false
- Sample Top Z PV
+ Flip&Stitch
true
1
true
Label
- 160
+ 130
false
- 87
- 241
+ 119
+ 290
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)ScanType
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 254
+ 265
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)FlipStitch
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 254
+ 290
@@ -1050,7 +1138,7 @@ $(pv_value)
false
0
true
- $(P)$(R)SampleTopZPVName
+ $(P)$(R)TxmOpticsPVPrefix
false
0.0
@@ -1074,8 +1162,48 @@ $(pv_value)
true
Text Input
380
- 253
- 241
+ 255
+ 215
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ txmOptics Prefix
+
+ true
+ 1
+ true
+ Label
+ 240
+ false
+ 10
+ 215
@@ -1112,7 +1240,7 @@ $(pv_value)
false
0
true
- $(P)$(R)SampleTopXPVName
+ $(P)$(R)ImagePVPrefix
false
0.0
@@ -1136,7 +1264,47 @@ $(pv_value)
true
Text Input
380
- 253
- 216
+ 255
+ 240
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Image Prefix
+
+ true
+ 1
+ true
+ Label
+ 240
+ false
+ 10
+ 240
diff --git a/tomoScanApp/op/opi/autoconvert/tomoScan_7BM_optics.opi b/tomoScanApp/op/opi/autoconvert/tomoScan_7BM_optics.opi
index 7de111a3..cb34a63f 100644
--- a/tomoScanApp/op/opi/autoconvert/tomoScan_7BM_optics.opi
+++ b/tomoScanApp/op/opi/autoconvert/tomoScan_7BM_optics.opi
@@ -14,7 +14,7 @@
5
- 200
+ 225
true
@@ -28,7 +28,7 @@
false
Display
600
- 13
+ 3
64
@@ -87,10 +87,11 @@ $(pv_value)
0
5
-
+
+ false
-
+
@@ -98,19 +99,55 @@ $(pv_value)
0
1
true
- false
- Default
+
+
+
+
+
+ 30
+ 1
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ $(P)$(R) Optics
+
+ true
+ 1
+ true
+ Label
+ 600
+ false
+ 0
+ 3
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
- 145
- false
-
- true
-
- Grouping Container
+ 20
+ 2
+ Label
true
@@ -119,705 +156,650 @@ $(pv_value)
false
+ Tube length (mm)
true
+ 1
true
- Grouping Container
- 525
- 30
+ Label
+ 160
+ false
+ 160
+ 171
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Scintillator type
+
+ true
+ 1
+ true
+ Label
+ 170
+ false
+ 150
46
-
-
-
-
-
-
-
-
- 0
- 1
- true
- false
-
- Default
-
-
-
-
- 145
- false
-
- true
-
- Grouping Container
-
-
- true
- true
- false
-
-
- false
-
- true
- true
- Grouping Container
- 290
- 0
- 0
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 2
- Label
-
-
- true
- true
- false
-
-
- false
- Tube length (mm)
-
- true
- 1
- true
- Label
- 160
- false
- 130
- 125
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 2
- Label
-
-
- true
- true
- false
-
-
- false
- Scintillator type
-
- true
- 1
- true
- Label
- 170
- false
- 120
- 0
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 2
- Label
-
-
- true
- true
- false
-
-
- false
- Scint. thickness (microns)
-
- true
- 1
- true
- Label
- 260
- false
- 30
- 25
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 2
- Label
-
-
- true
- true
- false
-
-
- false
- Image pixel size (microns)
-
- true
- 1
- true
- Label
- 260
- false
- 30
- 50
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 2
- Label
-
-
- true
- true
- false
-
-
- false
- Detector pixel size (microns)
-
- true
- 1
- true
- Label
- 290
- false
- 0
- 75
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
-
-
-
-
-
- 20
- 2
- Label
-
-
- true
- true
- false
-
-
- false
- Camera objective
-
- true
- 1
- true
- Label
- 160
- false
- 130
- 100
-
-
-
-
-
-
-
-
-
-
- 0
- 1
- true
- false
-
- Default
-
-
-
-
- 145
- false
-
- true
-
- Grouping Container
-
-
- true
- true
- false
-
-
- false
-
- true
- true
- Grouping Container
- 230
- 295
- 0
-
-
- false
- false
- false
-
-
-
- false
-
-
-
- 3
- 1
-
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)ScintillatorThickness
-
- false
- 0.0
-
-
- true
- true
- false
-
-
- 0
- false
- true
- false
- false
-
-
- $(pv_name)
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Scint. thickness (microns)
+
+ true
+ 1
+ true
+ Label
+ 260
+ false
+ 60
+ 71
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Image pixel size (microns)
+
+ true
+ 1
+ true
+ Label
+ 260
+ false
+ 60
+ 96
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Detector pixel size (microns)
+
+ true
+ 1
+ true
+ Label
+ 290
+ false
+ 30
+ 121
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Camera objective
+
+ true
+ 1
+ true
+ Label
+ 160
+ false
+ 160
+ 146
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)ScintillatorThickness
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
$(pv_value)
- false
- true
- Text Input
- 230
- 0
- 25
-
-
-
- false
- false
- false
-
-
-
- false
-
-
-
- 3
- 1
-
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)ScintillatorType
-
- false
- 0.0
-
-
- true
- true
- false
-
-
- 0
- false
- true
- false
- false
-
-
- $(pv_name)
+ false
+ true
+ Text Input
+ 230
+ 325
+ 71
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)ScintillatorType
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
$(pv_value)
- false
- true
- Text Input
- 230
- 0
- 0
-
-
-
- false
- false
- false
-
-
-
- false
-
-
-
- 3
- 1
-
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)DetectorPixelSize
-
- false
- 0.0
-
-
- true
- true
- false
-
-
- 0
- false
- true
- false
- false
-
-
- $(pv_name)
+ false
+ true
+ Text Input
+ 230
+ 325
+ 46
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)DetectorPixelSize
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 230
+ 325
+ 121
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)CameraObjective
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
$(pv_value)
- false
- true
- Text Input
- 230
- 0
- 75
-
-
-
- false
- false
- false
-
-
-
- false
-
-
-
- 3
- 1
-
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)CameraObjective
-
- false
- 0.0
-
-
- true
- true
- false
-
-
- 0
- false
- true
- false
- false
-
-
- $(pv_name)
+ false
+ true
+ Text Input
+ 230
+ 325
+ 146
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)CameraTubeLength
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
$(pv_value)
- false
- true
- Text Input
- 230
- 0
- 100
-
-
-
- false
- false
- false
-
-
-
- false
-
-
-
- 3
- 1
-
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)CameraTubeLength
-
- false
- 0.0
-
-
- true
- true
- false
-
-
- 0
- false
- true
- false
- false
-
-
- $(pv_name)
+ false
+ true
+ Text Input
+ 230
+ 325
+ 171
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)ImagePixelSize
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
$(pv_value)
- false
- true
- Text Input
- 230
- 0
- 125
-
-
-
- false
- false
- false
-
-
-
- false
-
-
-
- 3
- 1
-
- true
-
-
-
- false
-
-
-
- 4
- 20
- 0
- false
- Infinity
- -Infinity
- false
- Text Input
- 0
- false
- 0
- true
- $(P)$(R)ImagePixelSize
-
- false
- 0.0
-
-
- true
- true
- false
-
-
- 0
- false
- true
- false
- false
-
-
- $(pv_name)
+ false
+ true
+ Text Input
+ 230
+ 325
+ 96
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)CameraDistance
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
$(pv_value)
- false
- true
- Text Input
- 230
- 0
- 50
-
-
+ false
+ true
+ Text Input
+ 230
+ 325
+ 196
@@ -832,13 +814,13 @@ $(pv_value)
1
true
-
+
-
+
- 30
- 1
+ 20
+ 2
Label
@@ -848,15 +830,15 @@ $(pv_value)
false
- $(P)$(R) Optics
+ Camera Distance (mm)
true
1
true
Label
- 600
+ 200
false
- 0
- 3
+ 120
+ 196
diff --git a/tomoScanApp/op/opi/autoconvert/tomoScan_7BM_otherpvs.opi b/tomoScanApp/op/opi/autoconvert/tomoScan_7BM_otherpvs.opi
index 469fa9a6..6439af67 100644
--- a/tomoScanApp/op/opi/autoconvert/tomoScan_7BM_otherpvs.opi
+++ b/tomoScanApp/op/opi/autoconvert/tomoScan_7BM_otherpvs.opi
@@ -14,7 +14,7 @@
5
- 260
+ 350
true
@@ -28,8 +28,8 @@
false
Display
640
- 1238
- 514
+ 1943
+ 236
false
@@ -943,4 +943,572 @@ $(pv_value)
254
45
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Scan type
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 10
+ 276
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)ScanType
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 145
+ 276
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+
+
+
+ 6
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Menu Button
+ $(P)$(R)FlipStitch
+
+
+
+ true
+ true
+ false
+
+
+ false
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Menu Button
+ 80
+ 145
+ 301
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Flip&Stitch
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 10
+ 301
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ PSO setup
+
+ true
+ 1
+ true
+ Label
+ 90
+ false
+ 159
+ 324
+
+
+
+
+ tomoScan_pso.opi
+
+ true
+
+ 1
+ PSO setup
+
+
+ false
+ false
+
+
+
+ false
+
+
+
+ 0
+ 1
+ true
+
+ Default
+
+ false
+
+
+
+ 20
+
+ Action Button
+ 0
+
+
+
+
+ true
+ true
+ false
+
+
+
+ PSO setup
+ false
+ $(pv_name)
+$(pv_value)
+ true
+ Action Button
+ 100
+ 254
+ 324
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Y Pixels Per 360 Deg
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 414
+ 276
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)PixelsYPer360Deg
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 75
+ 559
+ 276
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Helical Misalignment (mrad)
+
+ true
+ 1
+ true
+ Label
+ 130
+ false
+ 413
+ 301
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)HelicalMisalignment
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 75
+ 559
+ 301
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Number of Gain Images
+
+ true
+ 1
+ true
+ Label
+ 230
+ false
+ 19
+ 245
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+
+
+ false
+
+
+
+ 4
+ 20
+ 0
+ false
+ Infinity
+ -Infinity
+ false
+ Text Input
+ 0
+ false
+ 0
+ true
+ $(P)$(R)NumGainFields
+
+ false
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+ true
+ false
+ false
+
+
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 380
+ 254
+ 245
+
diff --git a/tomoScanApp/op/ui/autoconvert/tomoScan.ui b/tomoScanApp/op/ui/autoconvert/tomoScan.ui
index 2d37d5c3..3a527616 100644
--- a/tomoScanApp/op/ui/autoconvert/tomoScan.ui
+++ b/tomoScanApp/op/ui/autoconvert/tomoScan.ui
@@ -4,10 +4,10 @@
- 242
- 64
+ 505
+ 72
700
- 825
+ 925
@@ -85,6 +85,16 @@ caChoice > QPushButton {
padding: 1px;
}
+/* when font specified, no font sizing is done any more, font: 10pt; is not bad. You could Enable this when you converted from .adl files
+caRelatedDisplay > QPushButton {
+font: 10pt;
+}
+
+caShellCommand > QPushButton {
+font: 10pt;
+}
+*/
+
caSlider::groove:horizontal {
border: 1px solid #bbb;
background: lightgrey;
@@ -225,7 +235,7 @@ border-radius: 2px;
Beamline-specific display
- $(BEAMLINE).adl
+ $(BEAMLINE).ui
P=$(P), R=$(R), BEAMLINE=$(BEAMLINE)
@@ -264,7 +274,7 @@ border-radius: 2px;
Epics PV Names
- tomoScanEPICS_PVs.adl
+ tomoScanEPICS_PVs.ui
P=$(P), R=$(R)
@@ -772,7 +782,7 @@ border-radius: 2px;
170
- 310
+ 340
100
20
@@ -825,7 +835,7 @@ border-radius: 2px;
15
- 310
+ 340
150
20
@@ -837,9 +847,9 @@ border-radius: 2px;
- 575
- 335
- 100
+ 145
+ 315
+ 70
20
@@ -914,8 +924,8 @@ border-radius: 2px;
- 440
- 335
+ 10
+ 315
130
20
@@ -990,17 +1000,9 @@ border-radius: 2px;
-
-
- caGraphics::Rectangle
-
-
-
- 5
- 370
- 690
- 70
-
+
+
+ QFrame::NoFrame
@@ -1016,190 +1018,118 @@ border-radius: 2px;
0
-
-
- 0
- 0
- 0
-
+
+ Collect flat fields
-
- Solid
+
+ ESimpleLabel::WidthAndHeight
-
-
-
- caGraphics::Rectangle
+
+ Qt::AlignAbsolute|Qt::AlignRight|Qt::AlignVCenter
- 220
- 375
- 260
+ 415
+ 317
+ 190
+ 20
+
+
+
+
-
+
QFrame::NoFrame
- 10
+ 0
0
- 184
+ 0
- 10
+ 0
0
- 184
+ 0
- Dark Field Control
+ Return to start
ESimpleLabel::WidthAndHeight
-
- Qt::AlignAbsolute|Qt::AlignHCenter|Qt::AlignVCenter
-
- 260
- 375
- 180
+ 495
+ 160
+ 150
20
-
-
-
- caGraphics::Rectangle
-
-
-
- 5
- 445
- 690
- 105
-
-
-
-
- 0
- 0
- 0
-
-
-
-
- 0
- 0
- 0
-
-
-
-
- 0
- 0
- 0
-
-
-
- Solid
+
+ Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter
-
-
- caGraphics::Rectangle
-
+
-
-
- QFrame::NoFrame
+
+ $(P)$(R)ReturnRotation
- 10
+ 0
0
- 184
+ 0
-
- 10
- 0
- 184
+
+ 115
+ 223
+ 255
-
- File Control
-
-
- ESimpleLabel::WidthAndHeight
-
-
- Qt::AlignAbsolute|Qt::AlignHCenter|Qt::AlignVCenter
-
-
-
- 290
- 450
- 120
- 20
-
+
+ caMenu::Static
@@ -1221,16 +1151,16 @@ border-radius: 2px;
- # Dark fields
+ # of angles
ESimpleLabel::WidthAndHeight
- 10
- 410
- 130
+ 245
+ 160
+ 110
20
@@ -1241,9 +1171,9 @@ border-radius: 2px;
- 145
- 410
- 70
+ 360
+ 160
+ 100
20
@@ -1251,7 +1181,7 @@ border-radius: 2px;
caLineEdit::WidthAndHeight
- $(P)$(R)NumDarkFields
+ $(P)$(R)NumAngles
@@ -1308,15 +1238,15 @@ border-radius: 2px;
- Dark value
+ Stop angle
ESimpleLabel::WidthAndHeight
- 226
- 410
+ 255
+ 185
100
20
@@ -1325,20 +1255,20 @@ border-radius: 2px;
Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter
-
+
- 331
- 410
- 70
- 20
+ 360
+ 187
+ 100
+ 18
caLineEdit::WidthAndHeight
- $(P)$(R)DarkFieldValue
+ $(P)$(R)RotationStop
@@ -1369,60 +1299,69 @@ border-radius: 2px;
1.0
-
- caLineEdit::Static
+
+ Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter
decimal
+
+ caLineEdit::Static
+
-
-
- QFrame::NoFrame
+
+
+
+ 565
+ 260
+ 120
+ 20
+
-
-
- 0
- 0
- 0
-
+
+ EPushButton::WidthAndHeight
-
-
+
+ $(P)$(R)MoveSampleIn
+
+
+
0
0
0
-
- Collect flat fields
+
+
+ 115
+ 223
+ 255
+
-
- ESimpleLabel::WidthAndHeight
+
+ Move Sample In
-
- Qt::AlignAbsolute|Qt::AlignRight|Qt::AlignVCenter
+
+ 1
-
-
- 380
- 310
- 190
- 20
-
+
+ caMessageButton::Static
-
- Collect dark fields
+ Flat exposure
ESimpleLabel::WidthAndHeight
+
+ Qt::AlignAbsolute|Qt::AlignRight|Qt::AlignVCenter
+
- 415
- 410
- 190
+ 350
+ 340
+ 130
20
-
- Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter
-
-