Skip to content
Snippets Groups Projects
Commit a13e0942 authored by 25-ID Staff Account's avatar 25-ID Staff Account
Browse files

Updateding db, req files for new DCM support

parent 5e3f8ed2
No related branches found
No related tags found
No related merge requests found
12/06/2022 - 15:34:51 - fedorov
......@@ -90,8 +90,10 @@ record(sseq, "$(P)eScan:StartSeq")
field(SCAN, "Passive")
field(DO1, "1")
field(LNK1, "$(P)eScan:Start PP")
field(DO2, "2")
field(LNK2, "$(P)$(SCAN).EXSC CA")
field(DO2, "0")
field(LNK2, "$(MONO_PREFIX)ID_tracking PP")
field(DO3, "2")
field(LNK3, "$(P)$(SCAN).EXSC CA")
field(DISV, "1")
field(SDIS, "$(P)eScan:PreventScan.RVAL")
}
......@@ -290,7 +292,7 @@ record(ao,"$(P)eScan:E_to_k_factor") {
#
#record(calcout, "$(P)eScan:SettingsCalc2") {
# field(DESC, "Raises settings loaded flag")
# field(INPA, "$(P)$(BRANCH):ID_offset CP CP")
# field(INPA, "$(MONO_PREFIX)ID_offset CP CP")
# field(INPB, "$(P)eScan:E_to_k_factor CP")
# field(CALC, "1")
# field(OUT, "$(P)eScan:SettingsLoaded PP")
......@@ -477,6 +479,7 @@ record(dfanout, "$(P)eScan:setSizes")
# Mono Energy Array Calcs
#
########################################################################
# TODO: Document Mono energy calc
record(acalcout, "$(P)eScan:region_1_eSteps")
{
......@@ -579,14 +582,16 @@ record(acalcout, "$(P)eScan:Load_eSteps")
# ID Energy Array Calcs
#
########################################################################
# TODO: Document ID energy calc
record(acalcout, "$(P)eScan:IDenergyStepsACO")
{
field(DESC, "Calc ID Energy")
field(DTYP, "Soft Channel")
field(INPA, "$(P)$(BRANCH):ID_offset CP")
field(INPA, "$(MONO_PREFIX)ID_offset CP")
field(INPB, "$(MONO_PREFIX)ID_minStep CP")
field(INPC, "$(MONO_PREFIX)ID_stepping CP")
field(INAA, "$(P)eScan:monoEnergies CP")
field(CALC, "BB := A; AA+BB")
field(CALC, "D:=AA; BB:=ARR(A); BB + (C ? FLOOR((AA-ARR(D))/B)*B+D : AA)")
field(OUT, "$(P)eScan:IDEnergies PP")
field(SIZE, "NUSE")
field(DISV, "1")
......@@ -600,7 +605,7 @@ record(acalcout, "$(P)eScan:Load_IDeSteps")
field(DESC, "Load ID Energy into Scan record")
field(DTYP, "Soft Channel")
field(INAA, "$(P)eScan:IDEnergies")
field(CALC, "AA")
field(CALC, "AA/1000")
field(OUT, "$(P)$(SCAN).P3PA PP")
field(SIZE, "NUSE")
field(DISV, "1")
......
......@@ -12,4 +12,6 @@ $(P)eScan:region_3_intTime0
$(P)eScan:region_3_intTime_W
$(P)eScan:E_to_k_factor
$(P)eScan:configName
$(P)$(BRANCH):ID_offset
$(P)$(BRANCH):ID_minStep
$(P)$(BRANCH):ID_stepping
record(ao,"$(P)$(BRANCH):ID_offset") {
record(ao,"$(P)ID_offset") {
field(DESC,"ID offset relative to Mono")
field(PREC, "6")
field(EGU, "eV")
}
record(ao,"$(P)ID_minStep") {
field(DESC,"Minimum steps size for ID")
field(PREC, "6")
field(EGU, "eV")
}
# When mono energy changes, ID energy will be updated if tracking is on
record(bo,"$(P)$(BRANCH):ID_tracking") {
record(bo,"$(P)ID_tracking") {
field(DESC,"ID tracking Mono energy")
field(ZNAM,"Off")
field(ONAM,"On")
}
record(calcout, "$(P)$(BRANCH):IDcalc") {
record(bo,"$(P)ID_stepping") {
field(DESC,"Take bigger, less frequent steps")
field(ZNAM,"Off")
field(ONAM,"On")
}
record(calcout, "$(P)IDcalc") {
field(DESC, "ID energy calced from Mono Energy")
field(INPA, "$(P)$(MONOE) CP")
field(INPB, "$(P)$(BRANCH)ID_offset CP")
field(CALC, "A + B")
field(OUT, "$(IDENERGY)")
field(SDIS, "$(P)$(BRANCH)ID_tracking")
field(INPB, "$(P)ID_offset CP")
field(CALC, "(A + B)/1000")
field(OUT, "$(IDENERGY) PP")
field(SDIS, "$(P)ID_tracking CP")
field(DISV, "0")
}
$(P)$(BRANCH):ID_offset
$(P)$(BRANCH):ID_minStep
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1495</width>
<height>640</height>
<height>664</height>
</rect>
</property>
<property name="font">
......@@ -112,12 +112,12 @@
<x>10</x>
<y>520</y>
<width>961</width>
<height>81</height>
<height>105</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="2,3,2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,1">
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,1,1">
<property name="margin">
<number>5</number>
</property>
......@@ -152,7 +152,7 @@
<string>CalcRecord_full.ui;CalcRecord_full.ui;yyCalcoutRecord_full.ui;yyCalcoutRecord_full.ui;yyCalcoutRecord_full.ui;yyCalcoutRecord_full.ui</string>
</property>
<property name="args">
<string>P=25idc:, C=eScan:region_3_k0;P=25idc:, C=eScan:region_3_Ef;P=25idc:, C=eScan:region_1_nSteps;P=25idc:, C=eScan:region_2_nSteps;P=25idc:, C=eScan:region_3_nSteps;P=25idc:, C=eScan:nSteps</string>
<string>P=$(P), C=eScan:region_3_k0;P=$(P), C=eScan:region_3_Ef;P=$(P), C=eScan:region_1_nSteps;P=$(P), C=eScan:region_2_nSteps;P=$(P), C=eScan:region_3_nSteps;P=$(P), C=eScan:nSteps</string>
</property>
<property name="stackingMode" stdset="0">
<enum>caRowColMenu::Menu</enum>
......@@ -185,7 +185,7 @@
<string>yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui;yyArrayCalc_full.ui</string>
</property>
<property name="args">
<string>P=25idc:, C=eScan:region_1_eSteps;P=25idc:, C=eScan:region_2_eSteps;P=25idc:, C=eScan:region_3_kSteps;P=25idc:, C=eScan:region_3_eSteps;P=25idc:, C=eScan:energyStepsACO;P=25idc:, C=eScan:Load_eSteps;P=25idc:, C=eScan:IDenergyStepsACO;P=25idc:, C=eScan:Load_IDeSteps;P=25idc:, C=eScan:region_1_intT;P=25idc:, C=eScan:region_2_intT;P=25idc:, C=eScan:region_3_intT;P=25idc:, C=eScan:intTimesACO;P=25idc:, C=eScan:Load_intTimes</string>
<string>P=$(P), C=eScan:region_1_eSteps;P=$(P), C=eScan:region_2_eSteps;P=$(P), C=eScan:region_3_kSteps;P=$(P), C=eScan:region_3_eSteps;P=$(P), C=eScan:energyStepsACO;P=$(P), C=eScan:Load_eSteps;P=$(P), C=eScan:IDenergyStepsACO;P=$(P), C=eScan:Load_IDeSteps;P=$(P), C=eScan:region_1_intT;P=$(P), C=eScan:region_2_intT;P=$(P), C=eScan:region_3_intT;P=$(P) C=eScan:intTimesACO;P=$(P), C=eScan:Load_intTimes</string>
</property>
<property name="stackingMode" stdset="0">
<enum>caRowColMenu::Menu</enum>
......@@ -194,6 +194,19 @@
</item>
</layout>
</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>
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="1,1">
<property name="margin">
......@@ -258,7 +271,7 @@
<string>yySseq_full.ui;yySseq_full.ui;yySseq_full.ui</string>
</property>
<property name="args">
<string>P=25idc:, S=eScan:LoadSeq;P=25idc:, S=eScan:StartSeq;P=25idc:, S=eScan:RaiseFlag</string>
<string>P=$(P):, S=eScan:LoadSeq;P=$(P), S=eScan:StartSeq;P=$(P), S=eScan:RaiseFlag</string>
</property>
<property name="stackingMode" stdset="0">
<enum>caRowColMenu::Menu</enum>
......@@ -270,19 +283,31 @@
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout" stretch="1,2">
<property name="margin">
<layout class="QVBoxLayout" name="verticalLayout" stretch="2,3,2,3">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>5</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="caLabel" name="calabel_15">
<property name="font">
<font>
<pointsize>12</pointsize>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Mono/ID Tracking</string>
<string>Mono Tracking</string>
</property>
<property name="scaledContents">
<bool>true</bool>
......@@ -294,9 +319,18 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,1,1">
<property name="margin">
<property name="leftMargin">
<number>5</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="caLabel" name="calabel_3">
<property name="text">
......@@ -313,7 +347,7 @@
</sizepolicy>
</property>
<property name="channel" stdset="0">
<string notr="true">$(P)$(BRANCH):ID_offset</string>
<string notr="true">$(MONOPREFIX)ID_offset</string>
</property>
<property name="background">
<color>
......@@ -328,9 +362,86 @@
</widget>
</item>
<item>
<widget class="caMenu" name="camenu">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="caLabel" name="calabel_21">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string> ID Stepping</string>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="1,1,1">
<property name="leftMargin">
<number>5</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="caLabel" name="calabel_20">
<property name="text">
<string>Stepping (eV)</string>
</property>
</widget>
</item>
<item>
<widget class="caTextEntry" name="catextentry_15">
<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)$(BRANCH):ID_tracking</string>
<string notr="true">$(MONOPREFIX)ID_minStep</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="caMenu" name="camenu_2">
<property name="channel" stdset="0">
<string notr="true">$(MONOPREFIX)ID_stepping</string>
</property>
<property name="colorMode">
<enum>caMenu::Static</enum>
......@@ -349,19 +460,19 @@
</layout>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2" rowstretch="1,1" columnstretch="1,0,1">
<layout class="QGridLayout" name="gridLayout_2" rowstretch="1,1,1" columnstretch="1,0,1">
<property name="margin">
<number>5</number>
</property>
<item row="1" column="0">
<item row="2" column="0">
<widget class="caLabel" name="calabel_18">
<property name="font">
<font>
<pointsize>15</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string>ID Energy (eV)</string>
<string>ID Energy (keV)</string>
</property>
</widget>
</item>
......@@ -386,7 +497,7 @@
</sizepolicy>
</property>
<property name="channel" stdset="0">
<string notr="true">$(MONOE)</string>
<string notr="true">$(MONOPREFIX)$(MONOE)</string>
</property>
<property name="foreground">
<color>
......@@ -407,7 +518,7 @@
</property>
</widget>
</item>
<item row="1" column="2">
<item row="2" column="2">
<widget class="caLineEdit" name="calineedit_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
......@@ -437,6 +548,19 @@
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
......@@ -731,7 +855,7 @@
</rect>
</property>
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
......@@ -863,7 +987,7 @@
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Scan Arrays 1</string>
<string>P1A</string>
</attribute>
<widget class="caCartesianPlot" name="cacartesianplot_2">
<property name="geometry">
......@@ -884,7 +1008,7 @@
<number>3</number>
</property>
<property name="Title" stdset="0">
<string notr="true">Scan Energies</string>
<string notr="true">Scan Record Mono Energies</string>
</property>
<property name="TitleX">
<string notr="true">Step</string>
......@@ -903,7 +1027,7 @@
</color>
</property>
<property name="channels_2" stdset="0">
<string>;$(P)$(SCAN).P3PA</string>
<string/>
</property>
<property name="color_2">
<color>
......@@ -936,7 +1060,7 @@
</widget>
<widget class="QWidget" name="tab_4">
<attribute name="title">
<string>Scan Arrays 2</string>
<string>P2A</string>
</attribute>
<widget class="caCartesianPlot" name="cacartesianplot_4">
<property name="geometry">
......@@ -977,6 +1101,79 @@
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_7">
<attribute name="title">
<string>P3A</string>
</attribute>
<widget class="caCartesianPlot" name="cacartesianplot_5">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>439</width>
<height>409</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="lineWidth">
<number>3</number>
</property>
<property name="Title" stdset="0">
<string notr="true">Scan Record ID Energies</string>
</property>
<property name="TitleX">
<string notr="true">Step</string>
</property>
<property name="TitleY">
<string notr="true">Energy (keV)</string>
</property>
<property name="channels_1" stdset="0">
<string>;$(P)$(SCAN).P3PA</string>
</property>
<property name="color_1">
<color>
<red>0</red>
<green>0</green>
<blue>255</blue>
</color>
</property>
<property name="channels_2" stdset="0">
<string/>
</property>
<property name="color_2">
<color>
<red>255</red>
<green>0</green>
<blue>255</blue>
</color>
</property>
<property name="color_4">
<color>
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</property>
<property name="color_6">
<color>
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</property>
<property name="countNumOrChannel" stdset="0">
<string notr="true">$(P)$(SCAN).NPTS</string>
</property>
<property name="LegendEnabled">
<bool>true</bool>
</property>
</widget>
</widget>
</widget>
<widget class="QTabWidget" name="tabWidget_2">
<property name="geometry">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment