Removed KB pseudo motors (moved to VME)

4dae0d4d · Service Account for Max Wyman · 1398d0e4 · 4dae0d4d · 4dae0d4d · 4dae0d4d
Commit 4dae0d4d authored Oct 24, 2022 by Service Account for Max Wyman
--- a/25iddApp/op/ui/25idd.ui
+++ b/25iddApp/op/ui/25idd.ui
@@ -170,7 +170,7 @@ QTabBar::tab:selected
 QWidget[Fill=&quot;True&quot;] { background: rgba(0,0,0,0); }</string>
         </property>
         <property name="currentIndex">
-          <number>0</number>
+          <number>1</number>
         </property>
         <widget class="QWidget" name="tab">
          <property name="Fill" stdset="0">
@@ -912,30 +912,6 @@ QWidget[Fill=&quot;True&quot;] { background: rgba(0,0,0,0); }</string>
             </property>
            </widget>
           </item>
-           <item row="3" column="3">
-            <widget class="caRelatedDisplay" name="carelateddisplay_52">
-             <property name="label">
-              <string notr="true">-</string>
-             </property>
-             <property name="foreground">
-              <color>
-               <red>228</red>
-               <green>228</green>
-               <blue>228</blue>
-              </color>
-             </property>
-             <property name="background">
-              <color>
-               <red>53</red>
-               <green>132</green>
-               <blue>0</blue>
-              </color>
-             </property>
-             <property name="stackingMode" stdset="0">
-              <enum>caRowColMenu::Menu</enum>
-             </property>
-            </widget>
-           </item>
           <item row="1" column="1">
            <widget class="caRelatedDisplay" name="carelateddisplay_44">
             <property name="label">
@@ -1561,6 +1537,39 @@ QWidget[Fill=&quot;True&quot;] { background: rgba(0,0,0,0); }</string>
             </property>
            </widget>
           </item>
+           <item row="3" column="3">
+            <widget class="caRelatedDisplay" name="carelateddisplay_58">
+             <property name="label">
+              <string notr="true">-</string>
+             </property>
+             <property name="foreground">
+              <color>
+               <red>228</red>
+               <green>228</green>
+               <blue>228</blue>
+              </color>
+             </property>
+             <property name="background">
+              <color>
+               <red>53</red>
+               <green>132</green>
+               <blue>0</blue>
+              </color>
+             </property>
+             <property name="labels">
+              <string>1</string>
+             </property>
+             <property name="files">
+              <string>1</string>
+             </property>
+             <property name="args">
+              <string>1</string>
+             </property>
+             <property name="stackingMode" stdset="0">
+              <enum>caRowColMenu::Menu</enum>
+             </property>
+            </widget>
+           </item>
          </layout>
         </widget>
         <widget class="QWidget" name="tab_4">
@@ -4196,7 +4205,7 @@ QWidget[Fill=&quot;True&quot;] { background: rgba(0,0,0,0); }</string>
            </widget>
           </item>
           <item row="3" column="4">
-            <widget class="caRelatedDisplay" name="carelateddisplay_8">
+            <widget class="caRelatedDisplay" name="carelateddisplay_22">
             <property name="label">
              <string notr="true">-Energy Scan</string>
             </property>
@@ -4215,13 +4224,13 @@ QWidget[Fill=&quot;True&quot;] { background: rgba(0,0,0,0); }</string>
              </color>
             </property>
             <property name="labels">
-              <string>Lerix Energy Scan</string>
+              <string>D Hutch</string>
             </property>
             <property name="files">
              <string>energyScanMain.ui</string>
             </property>
             <property name="args">
-              <string>P=25idd:, SCAN=scan1, MONOE=25idd:XIREL:Energy, BRANCH=LERIX,IDENERGY=25idd:ID:Energy</string>
+              <string>P=25idd:, SCAN=scan1, MONOE=25idb:DCM:Lerix:Energy.RBV, BRANCH=LERIX,IDENERGY=ID25us:Energy</string>
             </property>
             <property name="stackingMode" stdset="0">
              <enum>caRowColMenu::Menu</enum>

--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -17,7 +17,7 @@
 # Set CHECK_RELEASE to NO to disable checking completely.
 # Set CHECK_RELEASE to WARN to perform consistency checking but
 #   continue building anyway if conflicts are found.
-CHECK_RELEASE = YES
+CHECK_RELEASE = NO

 # Set this when you only want to compile this application
 #   for a subset of the cross-compiled target architectures

--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -38,6 +38,7 @@ ETOOLS = $(LOCAL_SUPPORT)/energyTools-R1-0
 #FLY = $(SUPPORT)/../nonSynAppsSupport/fly-0-0

 #MOTOR_ACSMOTION=$(SUPPORT)/motorAcsMotion-R2-0
+MOTOR_AEROTECH=$(LOCAL_SUPPORT)/motorAerotech-DB

 # For a local, custom configuration; copy $(SUPPORT)/configure/RELEASE
 # to this directory as the file MASTER_RELEASE, edit the file, comment out

--- a/iocBoot/ioc25idd/autosave/scan1_energyScan_01.cfg
+++ b/iocBoot/ioc25idd/autosave/scan1_energyScan_01.cfg
+# autosave R5.3	Automatically generated - DO NOT MODIFY - 221014-140948
+25idd:scan1Menu:currName energyScan_01
+25idd:scan1Menu:currDesc 
+25idd:scan4.ATIME 0
+25idd:scan4.COPYTO 0
+25idd:scan4.FLNK 
+25idd:scan4.NPTS 10
+25idd:scan4.ACQT 0
+25idd:scan4.ACQM 0
+25idd:scan4.PASM 0
+25idd:scan4.BSPV 
+25idd:scan4.BSCD 1
+25idd:scan4.BSWAIT 0
+25idd:scan4.ASPV 
+25idd:scan4.ASCD 1
+25idd:scan4.ASWAIT 0
+25idd:scan4.T1PV 25idd:scan3.EXSC
+25idd:scan4.T1CD 1
+25idd:scan4.T2PV 
+25idd:scan4.T2CD 1
+25idd:scan4.T3PV 
+25idd:scan4.T3CD 1
+25idd:scan4.T4PV 
+25idd:scan4.T4CD 1
+25idd:scan4.P1PV 
+25idd:scan4.R1PV 
+25idd:scan4.P1SM 0
+25idd:scan4.P1SP 0
+25idd:scan4.P1EP 0
+25idd:scan4.P1AR 0
+25idd:scan4.P2PV 
+25idd:scan4.R2PV 
+25idd:scan4.P2SM 0
+25idd:scan4.P2SP 0
+25idd:scan4.P2EP 0
+25idd:scan4.P2AR 0
+25idd:scan4.P3PV 
+25idd:scan4.R3PV 
+25idd:scan4.P3SM 0
+25idd:scan4.P3SP 0
+25idd:scan4.P3EP 0
+25idd:scan4.P3AR 0
+25idd:scan4.P4PV 
+25idd:scan4.R4PV 
+25idd:scan4.P4SM 0
+25idd:scan4.P4SP 0
+25idd:scan4.P4EP 0
+25idd:scan4.P4AR 0
+25idd:scan4.PDLY 0
+25idd:scan4.DDLY 0
+25idd:scan4.REFD 1
+25idd:scan4.AWCT 0
+25idd:scan4.A1PV 
+25idd:scan4.A1CD 1
+25idd:scan4.D01PV 
+25idd:scan4.D02PV 
+25idd:scan4.D03PV 
+25idd:scan4.D04PV 
+25idd:scan4.D05PV 
+25idd:scan4.D06PV 
+25idd:scan4.D07PV 
+25idd:scan4.D08PV 
+25idd:scan4.D09PV 
+25idd:scan4.D10PV 
+25idd:scan4.D11PV 
+25idd:scan4.D12PV 
+25idd:scan4.D13PV 
+25idd:scan4.D14PV 
+25idd:scan4.D15PV 
+25idd:scan4.D16PV 
+25idd:scan4.D17PV 
+25idd:scan4.D18PV 
+25idd:scan4.D19PV 
+25idd:scan4.D20PV 
+25idd:scan4.D21PV 
+25idd:scan4.D22PV 
+25idd:scan4.D23PV 
+25idd:scan4.D24PV 
+25idd:scan4.D25PV 
+25idd:scan4.D26PV 
+25idd:scan4.D27PV 
+25idd:scan4.D28PV 
+25idd:scan4.D29PV 
+25idd:scan4.D30PV 
+25idd:scan4.D31PV 
+25idd:scan4.D32PV 
+25idd:scan4.D33PV 
+25idd:scan4.D34PV 
+25idd:scan4.D35PV 
+25idd:scan4.D36PV 
+25idd:scan4.D37PV 
+25idd:scan4.D38PV 
+25idd:scan4.D39PV 
+25idd:scan4.D40PV 
+25idd:scan4.D41PV 
+25idd:scan4.D42PV 
+25idd:scan4.D43PV 
+25idd:scan4.D44PV 
+25idd:scan4.D45PV 
+25idd:scan4.D46PV 
+25idd:scan4.D47PV 
+25idd:scan4.D48PV 
+25idd:scan4.D49PV 
+25idd:scan4.D50PV 
+25idd:scan4.D51PV 
+25idd:scan4.D52PV 
+25idd:scan4.D53PV 
+25idd:scan4.D54PV 
+25idd:scan4.D55PV 
+25idd:scan4.D56PV 
+25idd:scan4.D57PV 
+25idd:scan4.D58PV 
+25idd:scan4.D59PV 
+25idd:scan4.D60PV 
+25idd:scan4.D61PV 
+25idd:scan4.D62PV 
+25idd:scan4.D63PV 
+25idd:scan4.D64PV 
+25idd:scan4.D65PV 
+25idd:scan4.D66PV 
+25idd:scan4.D67PV 
+25idd:scan4.D68PV 
+25idd:scan4.D69PV 
+25idd:scan4.D70PV 
+25idd:scan3.ATIME 0
+25idd:scan3.COPYTO 0
+25idd:scan3.FLNK 
+25idd:scan3.NPTS 10
+25idd:scan3.ACQT 0
+25idd:scan3.ACQM 0
+25idd:scan3.PASM 0
+25idd:scan3.BSPV 
+25idd:scan3.BSCD 1
+25idd:scan3.BSWAIT 0
+25idd:scan3.ASPV 
+25idd:scan3.ASCD 1
+25idd:scan3.ASWAIT 0
+25idd:scan3.T1PV 25idd:scan2.EXSC
+25idd:scan3.T1CD 1
+25idd:scan3.T2PV 
+25idd:scan3.T2CD 1
+25idd:scan3.T3PV 
+25idd:scan3.T3CD 1
+25idd:scan3.T4PV 
+25idd:scan3.T4CD 1
+25idd:scan3.P1PV 
+25idd:scan3.R1PV 
+25idd:scan3.P1SM 0
+25idd:scan3.P1SP 0
+25idd:scan3.P1EP 0
+25idd:scan3.P1AR 0
+25idd:scan3.P2PV 
+25idd:scan3.R2PV 
+25idd:scan3.P2SM 0
+25idd:scan3.P2SP 0
+25idd:scan3.P2EP 0
+25idd:scan3.P2AR 0
+25idd:scan3.P3PV 
+25idd:scan3.R3PV 
+25idd:scan3.P3SM 0
+25idd:scan3.P3SP 0
+25idd:scan3.P3EP 0
+25idd:scan3.P3AR 0
+25idd:scan3.P4PV 
+25idd:scan3.R4PV 
+25idd:scan3.P4SM 0
+25idd:scan3.P4SP 0
+25idd:scan3.P4EP 0
+25idd:scan3.P4AR 0
+25idd:scan3.PDLY 0
+25idd:scan3.DDLY 0
+25idd:scan3.REFD 1
+25idd:scan3.AWCT 0
+25idd:scan3.A1PV 
+25idd:scan3.A1CD 1
+25idd:scan3.D01PV 
+25idd:scan3.D02PV 
+25idd:scan3.D03PV 
+25idd:scan3.D04PV 
+25idd:scan3.D05PV 
+25idd:scan3.D06PV 
+25idd:scan3.D07PV 
+25idd:scan3.D08PV 
+25idd:scan3.D09PV 
+25idd:scan3.D10PV 
+25idd:scan3.D11PV 
+25idd:scan3.D12PV 
+25idd:scan3.D13PV 
+25idd:scan3.D14PV 
+25idd:scan3.D15PV 
+25idd:scan3.D16PV 
+25idd:scan3.D17PV 
+25idd:scan3.D18PV 
+25idd:scan3.D19PV 
+25idd:scan3.D20PV 
+25idd:scan3.D21PV 
+25idd:scan3.D22PV 
+25idd:scan3.D23PV 
+25idd:scan3.D24PV 
+25idd:scan3.D25PV 
+25idd:scan3.D26PV 
+25idd:scan3.D27PV 
+25idd:scan3.D28PV 
+25idd:scan3.D29PV 
+25idd:scan3.D30PV 
+25idd:scan3.D31PV 
+25idd:scan3.D32PV 
+25idd:scan3.D33PV 
+25idd:scan3.D34PV 
+25idd:scan3.D35PV 
+25idd:scan3.D36PV 
+25idd:scan3.D37PV 
+25idd:scan3.D38PV 
+25idd:scan3.D39PV 
+25idd:scan3.D40PV 
+25idd:scan3.D41PV 
+25idd:scan3.D42PV 
+25idd:scan3.D43PV 
+25idd:scan3.D44PV 
+25idd:scan3.D45PV 
+25idd:scan3.D46PV 
+25idd:scan3.D47PV 
+25idd:scan3.D48PV 
+25idd:scan3.D49PV 
+25idd:scan3.D50PV 
+25idd:scan3.D51PV 
+25idd:scan3.D52PV 
+25idd:scan3.D53PV 
+25idd:scan3.D54PV 
+25idd:scan3.D55PV 
+25idd:scan3.D56PV 
+25idd:scan3.D57PV 
+25idd:scan3.D58PV 
+25idd:scan3.D59PV 
+25idd:scan3.D60PV 
+25idd:scan3.D61PV 
+25idd:scan3.D62PV 
+25idd:scan3.D63PV 
+25idd:scan3.D64PV 
+25idd:scan3.D65PV 
+25idd:scan3.D66PV 
+25idd:scan3.D67PV 
+25idd:scan3.D68PV 
+25idd:scan3.D69PV 
+25idd:scan3.D70PV 
+25idd:scan2.ATIME 0
+25idd:scan2.COPYTO 0
+25idd:scan2.FLNK 
+25idd:scan2.NPTS 10
+25idd:scan2.ACQT 0
+25idd:scan2.ACQM 0
+25idd:scan2.PASM 0
+25idd:scan2.BSPV 
+25idd:scan2.BSCD 1
+25idd:scan2.BSWAIT 0
+25idd:scan2.ASPV 
+25idd:scan2.ASCD 1
+25idd:scan2.ASWAIT 0
+25idd:scan2.T1PV 25idd:scan1.EXSC
+25idd:scan2.T1CD 1
+25idd:scan2.T2PV 
+25idd:scan2.T2CD 1
+25idd:scan2.T3PV 
+25idd:scan2.T3CD 1
+25idd:scan2.T4PV 
+25idd:scan2.T4CD 1
+25idd:scan2.P1PV 
+25idd:scan2.R1PV 
+25idd:scan2.P1SM 0
+25idd:scan2.P1SP 0
+25idd:scan2.P1EP 0
+25idd:scan2.P1AR 0
+25idd:scan2.P2PV 
+25idd:scan2.R2PV 
+25idd:scan2.P2SM 0
+25idd:scan2.P2SP 0
+25idd:scan2.P2EP 0
+25idd:scan2.P2AR 0
+25idd:scan2.P3PV 
+25idd:scan2.R3PV 
+25idd:scan2.P3SM 0
+25idd:scan2.P3SP 0
+25idd:scan2.P3EP 0
+25idd:scan2.P3AR 0
+25idd:scan2.P4PV 
+25idd:scan2.R4PV 
+25idd:scan2.P4SM 0
+25idd:scan2.P4SP 0
+25idd:scan2.P4EP 0
+25idd:scan2.P4AR 0
+25idd:scan2.PDLY 0
+25idd:scan2.DDLY 0
+25idd:scan2.REFD 1
+25idd:scan2.AWCT 0
+25idd:scan2.A1PV 
+25idd:scan2.A1CD 1
+25idd:scan2.D01PV 
+25idd:scan2.D02PV 
+25idd:scan2.D03PV 
+25idd:scan2.D04PV 
+25idd:scan2.D05PV 
+25idd:scan2.D06PV 
+25idd:scan2.D07PV 
+25idd:scan2.D08PV 
+25idd:scan2.D09PV 
+25idd:scan2.D10PV 
+25idd:scan2.D11PV 
+25idd:scan2.D12PV 
+25idd:scan2.D13PV 
+25idd:scan2.D14PV 
+25idd:scan2.D15PV 
+25idd:scan2.D16PV 
+25idd:scan2.D17PV 
+25idd:scan2.D18PV 
+25idd:scan2.D19PV 
+25idd:scan2.D20PV 
+25idd:scan2.D21PV 
+25idd:scan2.D22PV 
+25idd:scan2.D23PV 
+25idd:scan2.D24PV 
+25idd:scan2.D25PV 
+25idd:scan2.D26PV 
+25idd:scan2.D27PV 
+25idd:scan2.D28PV 
+25idd:scan2.D29PV 
+25idd:scan2.D30PV 
+25idd:scan2.D31PV 
+25idd:scan2.D32PV 
+25idd:scan2.D33PV 
+25idd:scan2.D34PV 
+25idd:scan2.D35PV 
+25idd:scan2.D36PV 
+25idd:scan2.D37PV 
+25idd:scan2.D38PV 
+25idd:scan2.D39PV 
+25idd:scan2.D40PV 
+25idd:scan2.D41PV 
+25idd:scan2.D42PV 
+25idd:scan2.D43PV 
+25idd:scan2.D44PV 
+25idd:scan2.D45PV 
+25idd:scan2.D46PV 
+25idd:scan2.D47PV 
+25idd:scan2.D48PV 
+25idd:scan2.D49PV 
+25idd:scan2.D50PV 
+25idd:scan2.D51PV 
+25idd:scan2.D52PV 
+25idd:scan2.D53PV 
+25idd:scan2.D54PV 
+25idd:scan2.D55PV 
+25idd:scan2.D56PV 
+25idd:scan2.D57PV 
+25idd:scan2.D58PV 
+25idd:scan2.D59PV 
+25idd:scan2.D60PV 
+25idd:scan2.D61PV 
+25idd:scan2.D62PV 
+25idd:scan2.D63PV 
+25idd:scan2.D64PV 
+25idd:scan2.D65PV 
+25idd:scan2.D66PV 
+25idd:scan2.D67PV 
+25idd:scan2.D68PV 
+25idd:scan2.D69PV 
+25idd:scan2.D70PV 
+25idd:scan1.ATIME 0
+25idd:scan1.COPYTO 0
+25idd:scan1.FLNK 
+25idd:scan1.NPTS 139
+25idd:scan1.ACQT 0
+25idd:scan1.ACQM 0
+25idd:scan1.PASM 2
+25idd:scan1.BSPV 
+25idd:scan1.BSCD 1
+25idd:scan1.BSWAIT 0
+25idd:scan1.ASPV 
+25idd:scan1.ASCD 1
+25idd:scan1.ASWAIT 0
+25idd:scan1.T1PV 25iddVME:3820:scaler1.CNT
+25idd:scan1.T1CD 1
+25idd:scan1.T2PV 
+25idd:scan1.T2CD 1
+25idd:scan1.T3PV 
+25idd:scan1.T3CD 1
+25idd:scan1.T4PV 
+25idd:scan1.T4CD 1
+25idd:scan1.P1PV 25idb:DCM:Lerix:Energy.VAL
+25idd:scan1.R1PV 25idb:DCM:Lerix:Energy.RBV
+25idd:scan1.P1SM 0
+25idd:scan1.P1SP -3000
+25idd:scan1.P1EP 3000
+25idd:scan1.P1AR 1
+25idd:scan1.P2PV 25iddVME:3820:scaler1.TP
+25idd:scan1.R2PV 25iddVME:3820:scaler1.TP
+25idd:scan1.P2SM 0
+25idd:scan1.P2SP 0
+25idd:scan1.P2EP 0
+25idd:scan1.P2AR 0
+25idd:scan1.P3PV ID25us:ScanEnergy
+25idd:scan1.R3PV ID25us:ScanEnergy
+25idd:scan1.P3SM 0
+25idd:scan1.P3SP 0
+25idd:scan1.P3EP 0
+25idd:scan1.P3AR 0
+25idd:scan1.P4PV 
+25idd:scan1.R4PV 
+25idd:scan1.P4SM 0
+25idd:scan1.P4SP 0
+25idd:scan1.P4EP 0
+25idd:scan1.P4AR 0
+25idd:scan1.PDLY 0.1
+25idd:scan1.DDLY 0.1
+25idd:scan1.REFD 1
+25idd:scan1.AWCT 0
+25idd:scan1.A1PV 
+25idd:scan1.A1CD 1
+25idd:scan1.D01PV 25iddVME:3820:scaler1.S2
+25idd:scan1.D02PV 25iddVME:3820:scaler1.S5
+25idd:scan1.D03PV 25ida:userCalc1.VAL
+25idd:scan1.D04PV 
+25idd:scan1.D05PV 
+25idd:scan1.D06PV 
+25idd:scan1.D07PV 
+25idd:scan1.D08PV 
+25idd:scan1.D09PV 
+25idd:scan1.D10PV 
+25idd:scan1.D11PV 
+25idd:scan1.D12PV 
+25idd:scan1.D13PV 
+25idd:scan1.D14PV 
+25idd:scan1.D15PV 
+25idd:scan1.D16PV 
+25idd:scan1.D17PV 
+25idd:scan1.D18PV 
+25idd:scan1.D19PV 
+25idd:scan1.D20PV 
+25idd:scan1.D21PV 
+25idd:scan1.D22PV 
+25idd:scan1.D23PV 
+25idd:scan1.D24PV 
+25idd:scan1.D25PV 
+25idd:scan1.D26PV 
+25idd:scan1.D27PV 
+25idd:scan1.D28PV 
+25idd:scan1.D29PV 
+25idd:scan1.D30PV 
+25idd:scan1.D31PV 
+25idd:scan1.D32PV 
+25idd:scan1.D33PV 
+25idd:scan1.D34PV 
+25idd:scan1.D35PV 
+25idd:scan1.D36PV 
+25idd:scan1.D37PV 
+25idd:scan1.D38PV 
+25idd:scan1.D39PV 
+25idd:scan1.D40PV 
+25idd:scan1.D41PV 
+25idd:scan1.D42PV 
+25idd:scan1.D43PV 
+25idd:scan1.D44PV 
+25idd:scan1.D45PV 
+25idd:scan1.D46PV 
+25idd:scan1.D47PV 
+25idd:scan1.D48PV 
+25idd:scan1.D49PV 
+25idd:scan1.D50PV 
+25idd:scan1.D51PV 
+25idd:scan1.D52PV 
+25idd:scan1.D53PV 
+25idd:scan1.D54PV 
+25idd:scan1.D55PV 
+25idd:scan1.D56PV 
+25idd:scan1.D57PV 
+25idd:scan1.D58PV 
+25idd:scan1.D59PV 
+25idd:scan1.D60PV 
+25idd:scan1.D61PV 
+25idd:scan1.D62PV 
+25idd:scan1.D63PV 
+25idd:scan1.D64PV 
+25idd:scan1.D65PV 
+25idd:scan1.D66PV 
+25idd:scan1.D67PV 
+25idd:scan1.D68PV 
+25idd:scan1.D69PV 
+25idd:scan1.D70PV 
+25idd:scanH.ATIME 0
+25idd:scanH.COPYTO 0
+25idd:scanH.FLNK 
+25idd:scanH.NPTS 10
+25idd:scanH.ACQT 1
+25idd:scanH.ACQM 0
+25idd:scanH.PASM 0
+25idd:scanH.BSPV 
+25idd:scanH.BSCD 1
+25idd:scanH.BSWAIT 0
+25idd:scanH.ASPV 
+25idd:scanH.ASCD 1
+25idd:scanH.ASWAIT 0
+25idd:scanH.T1PV 
+25idd:scanH.T1CD 1
+25idd:scanH.T2PV 
+25idd:scanH.T2CD 1
+25idd:scanH.T3PV 
+25idd:scanH.T3CD 1
+25idd:scanH.T4PV 
+25idd:scanH.T4CD 1
+25idd:scanH.P1PV 
+25idd:scanH.R1PV 
+25idd:scanH.P1SM 0
+25idd:scanH.P1SP 0