Sorted KE tweak, scram and zero supplies. Added tweak to main screen along...

Sorted KE tweak, scram and zero supplies. Added tweak to main screen along with a versioning PV that needs to be manually updated.

29idcScientaApp/Db/arrayFxns_settings.req

@@ -8,3 +8,4 @@ $(PHV)sweepStopEnergy
 $(PHV)babySweepSteps
 $(PHV)ROI:width
 $(PHV)ROI:height
+$(P)version

29idcScientaApp/Db/scientaCalcs.db

@@ -515,6 +515,19 @@ record(acalcout, "$(P)compImageSizeCalc") {
   field(NUSE, "2")	
 }
 
+#------------------------------------------------------------------------------
+# Zero Supplies calc
+#------------------------------------------------------------------------------
+
+record(calcout, "$(PHV)ZeroSuppliesCalc")
+{
+	field(DESC, "Invert zero voltages flag for bridge")
+	field(SCAN, "Passive")
+	field(INPA, "$(PHV)ZeroSupplies PP")
+	field(CALC, "!A")
+	field(OUT, "$(PHV)ZeroSupplies PP")
+}
+
 #------------------------------------------------------------------------------
 #	Misc.
 #------------------------------------------------------------------------------

29idcScientaApp/Db/scientaControl.db

@@ -18,6 +18,13 @@ record(busy, "$(PHV)spectraInProgress") {
 	}
 
 
+record(stringin, "$(P)version")
+{
+	field(DESC, "Tag of IOC build")
+	field(VAL, "R-1.0.1")
+	field(PINI, 1)
+}
+
 #------------------------------------------------------------------------------
 # Scienta Mode - calculated based on a set of controls
 # 
@@ -284,7 +291,7 @@ record(ao, "$(PHV)sweepStopEnergy")
 	field(DTYP, "Soft Channel")
 	field(DESC, "Sweep Spectrum stop energy for Scienta")
 	field(SCAN, "Passive")
-	field(PREC, "8")
+	field(PREC, "6")
    	field(EGU, "eV")
 	field(DISV, "1")
 	field(SDIS, "$(PHV)spectraInProgress")
@@ -295,7 +302,7 @@ record(ao, "$(PHV)sweepStopEnergy_RBV")
 	field(DTYP, "Soft Channel")
 	field(DESC, "Sweep Spectrum stop energy for Scienta")
 	field(SCAN, "Passive")
-	field(PREC, "8")
+	field(PREC, "6")
    	field(EGU, "eV")
 	field(DISV, "1")
 	field(SDIS, "$(PHV)spectraInProgress")
@@ -307,7 +314,7 @@ record(ao, "$(PHV)sweepStepEnergy")
 	field(DTYP, "Soft Channel")
 	field(DESC, "Sweep Spectrum step size for Scienta")
 	field(SCAN, "Passive")
-	field(PREC, "8")
+	field(PREC, "6")
    	field(EGU, "eV")
 	field(DISV, "1")
 	field(SDIS, "$(PHV)spectraInProgress")
@@ -489,3 +496,37 @@ record(sseq, "$(P)ExpFramesSeq")
 	field(DISV, "1")
 	field(SDIS, "$(PHV)spectraInProgress")
 }
+
+#------------------------------------------------------------------------------
+# Binding energy and Work function
+#------------------------------------------------------------------------------
+
+record(ai, "$(PHV)BindingEnergy")
+{
+	field(DTYP, "Soft Channel")
+	field(DESC, "Calculated Binding Energy")
+	field(SCAN, "Passive")
+	field(EGU, "eV")
+    field(PREC, "8")
+}
+
+record(calcout, "$(PHV)BindingEnergyCalc") 
+{
+  field(DESC, "Binding Energy Calculation")
+  field(INPA, "29idmono:ENERGY_MON CP")
+  field(INPB, "$(PHV)WorkFunction CP")
+  field(INPC, "$(PHV)KineticEnergy_RBV CP")
+  field(CALC, "A-B-C")
+  field(OUT, "$(PHV)BindingEnergy PP")
+  field(DISV, "1")
+  field(PREC, "8")
+}
+
+record(ai, "$(PHV)WorkFunction")
+{
+	field(DTYP, "Soft Channel")
+	field(DESC, "Work Function")
+	field(SCAN, "Passive")
+	field(EGU, "eV")
+    field(PREC, "8")
+}

29idcScientaApp/Db/scientaLabVIEW.db

@@ -208,6 +208,8 @@ record(ai, "$(PHV)PassEnergy_RBV")
 	field(DTYP, "Soft Channel")
 	field(DESC, "Pass Energy readback for Scienta")
 	field(SCAN, "Passive")
+	field(PREC, "6")
+
 }
 
 #------------------------------------------------------------------------------
@@ -468,6 +470,8 @@ record(ai, "$(PHV)KineticEnergy_RBV")
 	field(DESC, "Kinetic Energy readback for Scienta")
 	field(DTYP, "Soft Channel")
 	field(SCAN, "Passive")
+	field(PREC, "6")
+
 }
 
 
@@ -487,7 +491,7 @@ record(seq, "$(PHV)ZeroSuppliesSeq")
 	field(DESC, "Set zero voltages flag for bridge")
 	field(SCAN, "Passive")
 	field(DO1, "1")
-	field(LNK1, "$(PHV)ZeroSupplies PP")
+	field(LNK1, "$(PHV)ZeroSuppliesCalc.PROC")
 }
 
 
@@ -498,7 +502,7 @@ record(seq, "$(PHV)ScramSeq")
 	field(DO1, "1")
 	field(LNK1, "$(PHV)AbortScans.PROC") 
 	field(DO2, "1")
-	field(LNK2, "$(PHV)ZeroSupplies PP")
+	field(LNK2, "$(PHV)ZeroSuppliesSeq.PROC")
 
 }
 

29idcScientaApp/Db/tweakable.db

+record(ao, "$(P):TWV")
+{
+	field(DESC, "Tweak step")
+	field(SCAN, "Passive")
+	field(DTYP, "Soft Channel")
+	field(PREC, "$(PREC)")
+}
+
+record(calcout, "$(P):TWR")
+{
+	field(DESC, "Reverse tweak")
+	field(SCAN, "Passive")
+	field(INPA, "$(P) PP")
+	field(INPB, "$(P):TWV PP")
+	field(CALC, "A-B")
+	field(OUT, "$(P) PP")
+	field(DTYP, "Soft Channel")
+	field(PREC, "$(PREC)")
+}
+
+record(calcout, "$(P):TWF")
+{
+	field(DESC, "Forward tweak")
+	field(SCAN, "Passive")
+	field(INPA, "$(P) PP")
+	field(INPB, "$(P):TWV PP")
+	field(CALC, "A+B")
+	field(OUT, "$(P) PP")
+	field(DTYP, "Soft Channel")
+	field(PREC, "$(PREC)")
+}

29idcScientaApp/op/ui/29idcScienta.ui

@@ -44,21 +44,6 @@ QPushButton
        <enum>caFrame::Filled</enum>
       </property>
       <layout class="QHBoxLayout" name="horizontalLayout">
-       <property name="spacing">
-        <number>5</number>
-       </property>
-       <property name="leftMargin">
-        <number>10</number>
-       </property>
-       <property name="topMargin">
-        <number>2</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>2</number>
-       </property>
        <item>
         <widget class="caLabel" name="calabel">
          <property name="sizePolicy">
@@ -70,13 +55,16 @@ QPushButton
          <property name="font">
           <font>
            <family>Verdana</family>
-           <pointsize>30</pointsize>
+           <pointsize>21</pointsize>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
-          <string>29idcScienta</string>
+          <string>$(P)</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::RichText</enum>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -100,6 +88,39 @@ QPushButton
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="caLineEdit" name="calineedit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+         <property name="channel" stdset="0">
+          <string notr="true">$(P)version</string>
+         </property>
+         <property name="foreground">
+          <color>
+           <red>228</red>
+           <green>228</green>
+           <blue>228</blue>
+          </color>
+         </property>
+         <property name="background">
+          <color alpha="0">
+           <red>160</red>
+           <green>160</green>
+           <blue>164</blue>
+          </color>
+         </property>
+         <property name="colorMode">
+          <enum>caLineEdit::Static</enum>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </item>
@@ -760,7 +781,7 @@ QPushButton
              <enum>EPushButton::WidthAndHeight</enum>
             </property>
             <property name="channel" stdset="0">
-             <string notr="true">$(PHV)ScramSeq</string>
+             <string notr="true">$(PHV)ScramSeq.PROC</string>
             </property>
             <property name="label">
              <string notr="true">SCRAM</string>
@@ -1116,7 +1137,13 @@ QPushButton
           </item>
           <item>
            <widget class="caFrame" name="caframe_111">
-            <layout class="QVBoxLayout" name="verticalLayout_3" stretch="1,1,1,1,1,1,1">
+            <layout class="QVBoxLayout" name="verticalLayout_3" stretch="1,1,1,4,1">
+             <property name="spacing">
+              <number>2</number>
+             </property>
+             <property name="margin">
+              <number>2</number>
+             </property>
              <item>
               <widget class="caScriptButton" name="cascriptbutton">
                <property name="sizePolicy">
@@ -1150,19 +1177,6 @@ QPushButton
                </property>
               </widget>
              </item>
-             <item>
-              <spacer name="verticalSpacer">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
              <item>
               <widget class="caRelatedDisplay" name="carelateddisplay">
                <property name="sizePolicy">
@@ -1208,19 +1222,6 @@ QPushButton
                </property>
               </widget>
              </item>
-             <item>
-              <spacer name="verticalSpacer_4">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
              <item>
               <widget class="caInclude" name="cainclude">
                <property name="macro">
@@ -1232,17 +1233,39 @@ QPushButton
               </widget>
              </item>
              <item>
-              <spacer name="verticalSpacer_2">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
-               </property>
-              </spacer>
+              <widget class="caFrame" name="caframe">
+               <layout class="QHBoxLayout" name="horizontalLayout_5" stretch="3,1">
+                <property name="spacing">
+                 <number>2</number>
+                </property>
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <widget class="caInclude" name="cainclude_2">
+                  <property name="macro">
+                   <string>P=$(PHV)KineticEnergy</string>
+                  </property>
+                  <property name="filename" stdset="0">
+                   <string notr="true">tweakable.ui</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>71</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </widget>
              </item>
              <item>
               <widget class="caMessageButton" name="camessagebutton">

29idcScientaApp/op/ui/ScientaHV.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>677</width>
-    <height>518</height>
+    <height>609</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -51,7 +51,7 @@
          <property name="font">
           <font>
            <family>Verdana</family>
-           <pointsize>26</pointsize>
+           <pointsize>31</pointsize>
            <weight>75</weight>
            <bold>true</bold>
           </font>
@@ -214,7 +214,7 @@
          </property>
          <property name="font">
           <font>
-           <pointsize>17</pointsize>
+           <pointsize>21</pointsize>
           </font>
          </property>
          <property name="text">
@@ -235,7 +235,7 @@
          </property>
          <property name="font">
           <font>
-           <pointsize>31</pointsize>
+           <pointsize>40</pointsize>
            <weight>75</weight>
            <bold>true</bold>
           </font>

29idcScientaApp/op/ui/tweakable.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="caFrame" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>283</width>
+    <height>157</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="1,1,1,1">
+   <property name="spacing">
+    <number>2</number>
+   </property>
+   <property name="margin">
+    <number>2</number>
+   </property>
+   <item>
+    <widget class="caLabel" name="calabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>$(P)</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="caTextEntry" name="Voltage">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <family>Monospace</family>
+       <pointsize>21</pointsize>
+       <stylestrategy>PreferDefault</stylestrategy>
+      </font>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="channel" stdset="0">
+      <string notr="true">$(P).VAL</string>
+     </property>
+     <property name="background">
+      <color>
+       <red>115</red>
+       <green>223</green>
+       <blue>255</blue>
+      </color>
+     </property>
+     <property name="colorMode">
+      <enum>caLineEdit::Static</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="caFrame" name="caframe">
+     <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,8,1">
+      <property name="margin">
+       <number>2</number>
+      </property>
+      <item>
+       <widget class="caMessageButton" name="Tweak_down">
+        <property name="font">
+         <font>
+          <pointsize>8</pointsize>
+         </font>
+        </property>
+        <property name="fontScaleMode">
+         <enum>EPushButton::WidthAndHeight</enum>
+        </property>
+        <property name="channel" stdset="0">
+         <string notr="true">$(P):TWR.PROC</string>
+        </property>
+        <property name="label">
+         <string>&lt;</string>
+        </property>
+        <property name="foreground">
+         <color>
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </property>
+        <property name="background">
+         <color>
+          <red>200</red>
+          <green>200</green>
+          <blue>255</blue>
+         </color>
+        </property>
+        <property name="pressMessage">
+         <string>1</string>
+        </property>
+        <property name="colorMode">
+         <enum>caMessageButton::Static</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="caTextEntry" name="Step">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="channel" stdset="0">
+         <string notr="true">$(P):TWV.VAL</string>
+        </property>
+        <property name="background">
+         <color>
+          <red>115</red>
+          <green>223</green>
+          <blue>255</blue>
+         </color>
+        </property>
+        <property name="colorMode">
+         <enum>caLineEdit::Static</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="caMessageButton" name="Tweak_up">
+        <property name="font">
+         <font>
+          <pointsize>8</pointsize>
+         </font>
+        </property>
+        <property name="fontScaleMode">
+         <enum>EPushButton::WidthAndHeight</enum>
+        </property>
+        <property name="channel" stdset="0">
+         <string notr="true">$(P):TWF.PROC</string>
+        </property>
+        <property name="label">
+         <string>&gt;</string>
+        </property>
+        <property name="foreground">
+         <color>
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </property>
+        <property name="background">
+         <color>
+          <red>200</red>
+          <green>200</green>
+          <blue>255</blue>
+         </color>
+        </property>
+        <property name="pressMessage">
+         <string>1</string>
+        </property>
+        <property name="colorMode">
+         <enum>caMessageButton::Static</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="caLineEdit" name="calineedit">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="channel" stdset="0">
+      <string notr="true">$(P)_RBV.VAL</string>
+     </property>
+     <property name="foreground">
+      <color>
+       <red>42</red>
+       <green>99</green>
+       <blue>228</blue>
+      </color>
+     </property>
+     <property name="background">
+      <color>
+       <red>200</red>
+       <green>200</green>
+       <blue>200</blue>
+      </color>
+     </property>
+     <property name="colorMode">
+      <enum>caLineEdit::Static</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>caTextEntry</class>
+   <extends>caLineEdit</extends>
+   <header>caTextEntry</header>
+  </customwidget>
+  <customwidget>
+   <class>caMessageButton</class>
+   <extends>QPushButton</extends>
+   <header>caMessageButton</header>
+  </customwidget>
+  <customwidget>
+   <class>caFrame</class>
+   <extends>QFrame</extends>
+   <header>caFrame</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>caLabel</class>
+   <extends>QLabel</extends>
+   <header>caLabel</header>
+  </customwidget>
+  <customwidget>
+   <class>caLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>caLineEdit</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

iocBoot/ioc29idcScienta/scienta.cmd

@@ -18,6 +18,9 @@ dbLoadRecords("$(AUTOSAVE)/asApp/Db/configMenu.db","P=$(HVPREFIX),CONFIG=HVscan"
 #doAfterIocInit("create_manual_set('HVscanMenu.req','P=$(HVPREFIX), CAM=$(CAMPREFIX), SCAM=$(SCAMPREFIX), NDSA=$(NDSAPREFIX), BASE=$(PREFIX), CONFIG=HVscan,CONFIGMENU=1')")
 doAfterIocInit("create_manual_set('HVscanMenu.req','P=$(HVPREFIX), CONFIG=HVscan,CONFIGMENU=1')")
 
+# Set up tweakble PVs
+dbLoadTemplate("substitutions/tweakable.substitutions", "PHV=$(HVPREFIX)")
+
 ## A set of scan parameters for each positioner.  This is a convenience
 # for the user.  It can contain an entry for each scannable thing in the
 # crate.

iocBoot/ioc29idcScienta/substitutions/tweakable.substitutions

+file "$(TOP)/29idcScientaApp/Db/tweakable.db"
+{
+{P="$(PHV)KineticEnergy",PREC=6}
+}

start_caQtDM_29idcScienta

@@ -81,7 +81,7 @@ fi
 
 echo $CAQTDM_DISPLAY_PATH
 
-/net/s100dserv/xorApps/caqtdm-4.3/caQtDM_Binaries/caQtDM -style plastique -noMsg -macro "P=29idcScienta:,PHV=29idcScienta:HV:" ${1:-${DEFAULT_UI_FILE}}
+/net/s100dserv/xorApps/caqtdm-4.3/caQtDM_Binaries/caQtDM -style plastique -noMsg -macro "P=29idcScienta:,PHV=29idcScienta:HV:" ${1:-${DEFAULT_UI_FILE}} &
 #/net/s100dserv/xorApps/caqtdm-devel/caQtDM_Binaries/caQtDM -style plastique -noMsg -macro "P=29idcScienta:,PHV=29idcScienta:HV:" ${1:-${DEFAULT_UI_FILE}}
 #/net/s100dserv/xorApps/caqtdm-4.2.4/caQtDM_Binaries/caQtDM -style plastique -noMsg -macro "P=29idcScienta:,PHV=29idcScienta:HV:" ${1:-${DEFAULT_UI_FILE}}