Skip to content

Commit 1b9aa31

Browse files
jwlodekjwlodek
committed
Remove duplicated parameters
1 parent 3a42857 commit 1b9aa31

File tree

5 files changed

+16
-110
lines changed

5 files changed

+16
-110
lines changed

‎xspdApp/Db/ADXSPD.template‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -395,25 +395,6 @@ record(ai, "$(P)$(R)FramesQueued_RBV"){
395395
field(SCAN, "I/O Intr")
396396
}
397397

398-
record(bo, "$(P)$(R)GenerateFF"){
399-
field(DESC, "Generate flatfield")
400-
field(DTYP, "asynInt32")
401-
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))XSPD_GEN_FLATFIELD")
402-
field(ZNAM, "Abort")
403-
field(ONAM, "Generate")
404-
field(VAL, "0")
405-
field(PINI, "NO")
406-
}
407-
408-
record(bo, "$(P)$(R)ResetDetector"){
409-
field(DESC, "Reset detector")
410-
field(DTYP, "asynInt32")
411-
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))XSPD_RESET_DETECTOR")
412-
field(ZNAM, "Abort")
413-
field(ONAM, "Reset")
414-
field(VAL, "0")
415-
field(PINI, "NO")
416-
}
417398

418399
record(mbbo, "$(P)$(R)BitDepth"){
419400
field(DESC, "Bit depth")

‎xspdApp/op/bob/ADXSPD.bob‎

Lines changed: 13 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -843,76 +843,6 @@
843843
<y>580</y>
844844
<width>150</width>
845845
<height>20</height>
846-
<text>Generate flatfield</text>
847-
<foreground_color>
848-
<color red="0" blue="0" green="0" alpha="255"/>
849-
</foreground_color>
850-
<background_color>
851-
<color red="187" blue="187" green="187" alpha="255"/>
852-
</background_color>
853-
<font>
854-
<font family="Liberation Sans" size="16" style="REGULAR"/>
855-
</font>
856-
<horizontal_alignment>0</horizontal_alignment>
857-
<name>Label_20</name>
858-
</widget>
859-
<widget type="choice" version="2.0.0">
860-
<x>170</x>
861-
<y>580</y>
862-
<width>150</width>
863-
<height>20</height>
864-
<pv_name>$(P)$(R)GenerateFF</pv_name>
865-
<foreground_color>
866-
<color red="0" blue="0" green="0" alpha="255"/>
867-
</foreground_color>
868-
<background_color>
869-
<color red="115" blue="255" green="223" alpha="255"/>
870-
</background_color>
871-
<font>
872-
<font family="Liberation Sans" size="16" style="REGULAR"/>
873-
</font>
874-
<name>ChoiceButton_8</name>
875-
</widget>
876-
<widget type="label" version="2.0.0">
877-
<x>10</x>
878-
<y>610</y>
879-
<width>150</width>
880-
<height>20</height>
881-
<text>Reset detector</text>
882-
<foreground_color>
883-
<color red="0" blue="0" green="0" alpha="255"/>
884-
</foreground_color>
885-
<background_color>
886-
<color red="187" blue="187" green="187" alpha="255"/>
887-
</background_color>
888-
<font>
889-
<font family="Liberation Sans" size="16" style="REGULAR"/>
890-
</font>
891-
<horizontal_alignment>0</horizontal_alignment>
892-
<name>Label_21</name>
893-
</widget>
894-
<widget type="choice" version="2.0.0">
895-
<x>170</x>
896-
<y>610</y>
897-
<width>150</width>
898-
<height>20</height>
899-
<pv_name>$(P)$(R)ResetDetector</pv_name>
900-
<foreground_color>
901-
<color red="0" blue="0" green="0" alpha="255"/>
902-
</foreground_color>
903-
<background_color>
904-
<color red="115" blue="255" green="223" alpha="255"/>
905-
</background_color>
906-
<font>
907-
<font family="Liberation Sans" size="16" style="REGULAR"/>
908-
</font>
909-
<name>ChoiceButton_9</name>
910-
</widget>
911-
<widget type="label" version="2.0.0">
912-
<x>10</x>
913-
<y>640</y>
914-
<width>150</width>
915-
<height>20</height>
916846
<text>Bit depth</text>
917847
<foreground_color>
918848
<color red="0" blue="0" green="0" alpha="255"/>
@@ -924,11 +854,11 @@
924854
<font family="Liberation Sans" size="16" style="REGULAR"/>
925855
</font>
926856
<horizontal_alignment>0</horizontal_alignment>
927-
<name>Label_22</name>
857+
<name>Label_20</name>
928858
</widget>
929859
<widget type="combo" version="2.0.0">
930860
<x>170</x>
931-
<y>640</y>
861+
<y>580</y>
932862
<width>150</width>
933863
<height>20</height>
934864
<pv_name>$(P)$(R)BitDepth</pv_name>
@@ -945,7 +875,7 @@
945875
</widget>
946876
<widget type="textupdate" version="2.0.0">
947877
<x>330</x>
948-
<y>640</y>
878+
<y>580</y>
949879
<width>150</width>
950880
<height>20</height>
951881
<pv_name>$(P)$(R)BitDepth_RBV</pv_name>
@@ -962,7 +892,7 @@
962892
</widget>
963893
<widget type="label" version="2.0.0">
964894
<x>10</x>
965-
<y>670</y>
895+
<y>610</y>
966896
<width>150</width>
967897
<height>20</height>
968898
<text>Count rate correction enable</text>
@@ -976,11 +906,11 @@
976906
<font family="Liberation Sans" size="16" style="REGULAR"/>
977907
</font>
978908
<horizontal_alignment>0</horizontal_alignment>
979-
<name>Label_23</name>
909+
<name>Label_21</name>
980910
</widget>
981911
<widget type="choice" version="2.0.0">
982912
<x>170</x>
983-
<y>670</y>
913+
<y>610</y>
984914
<width>150</width>
985915
<height>20</height>
986916
<pv_name>$(P)$(R)CountrateCorrection</pv_name>
@@ -993,11 +923,11 @@
993923
<font>
994924
<font family="Liberation Sans" size="16" style="REGULAR"/>
995925
</font>
996-
<name>ChoiceButton_10</name>
926+
<name>ChoiceButton_8</name>
997927
</widget>
998928
<widget type="led" version="2.0.0">
999929
<x>330</x>
1000-
<y>670</y>
930+
<y>610</y>
1001931
<width>20</width>
1002932
<height>20</height>
1003933
<pv_name>$(P)$(R)CountrateCorrection_RBV</pv_name>
@@ -1011,7 +941,7 @@
1011941
</widget>
1012942
<widget type="label" version="2.0.0">
1013943
<x>10</x>
1014-
<y>700</y>
944+
<y>640</y>
1015945
<width>150</width>
1016946
<height>20</height>
1017947
<text>Status update interval in s</text>
@@ -1025,11 +955,11 @@
1025955
<font family="Liberation Sans" size="16" style="REGULAR"/>
1026956
</font>
1027957
<horizontal_alignment>0</horizontal_alignment>
1028-
<name>Label_24</name>
958+
<name>Label_22</name>
1029959
</widget>
1030960
<widget type="textentry" version="2.0.0">
1031961
<x>170</x>
1032-
<y>700</y>
962+
<y>640</y>
1033963
<width>150</width>
1034964
<height>20</height>
1035965
<pv_name>$(P)$(R)StatusInterval</pv_name>
@@ -1046,7 +976,7 @@
1046976
</widget>
1047977
<widget type="textupdate" version="2.0.0">
1048978
<x>330</x>
1049-
<y>700</y>
979+
<y>640</y>
1050980
<width>150</width>
1051981
<height>20</height>
1052982
<pv_name>$(P)$(R)StatusInterval_RBV</pv_name>
@@ -1064,6 +994,6 @@
1064994
<background_color>
1065995
<color red="187" blue="187" green="187" alpha="255"/>
1066996
</background_color>
1067-
<height>740</height>
997+
<height>680</height>
1068998
<width>490</width>
1069999
</display>

‎xspdApp/src/ADXSPD.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ asynStatus ADXSPD::writeInt32(asynUser* pasynUser, epicsInt32 value) {
574574
setIntegerParam(ADImageMode, ADImageSingle);
575575
else
576576
setIntegerParam(ADImageMode, ADImageMultiple);
577-
} else if (function < ADXSPD_FIRST_PARAM) {
577+
} else if (function < ADXSPD_FIRST_PARAM && function != ADTriggerMode) {
578578
status = ADDriver::writeInt32(pasynUser, value);
579579
} else {
580580
try {
@@ -845,7 +845,8 @@ ADXSPD::~ADXSPD() {
845845
delete this->pDetector;
846846
delete this->pApi;
847847

848-
this->shutdownPortDriver();
848+
// This seems to intermittently segfault, leave commented for now.
849+
// this->shutdownPortDriver();
849850

850851
INFO("Done.");
851852
}

‎xspdApp/src/ADXSPDParamDefs.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ void ADXSPD::createAllParams() {
2424
createParam(ADXSPD_LowThresholdString, asynParamFloat64, &ADXSPD_LowThreshold);
2525
createParam(ADXSPD_HighThresholdString, asynParamFloat64, &ADXSPD_HighThreshold);
2626
createParam(ADXSPD_FramesQueuedString, asynParamInt32, &ADXSPD_FramesQueued);
27-
createParam(ADXSPD_GenFlatfieldString, asynParamInt32, &ADXSPD_GenFlatfield);
28-
createParam(ADXSPD_ResetDetectorString, asynParamInt32, &ADXSPD_ResetDetector);
2927
createParam(ADXSPD_BitDepthString, asynParamInt32, &ADXSPD_BitDepth);
3028
createParam(ADXSPD_CrCorrString, asynParamInt32, &ADXSPD_CrCorr);
3129
createParam(ADXSPD_StatusIntervalString, asynParamFloat64, &ADXSPD_StatusInterval);

‎xspdApp/src/ADXSPDParamDefs.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
#define ADXSPD_LowThresholdString "XSPD_LOW_THRESHOLD"
2626
#define ADXSPD_HighThresholdString "XSPD_HIGH_THRESHOLD"
2727
#define ADXSPD_FramesQueuedString "XSPD_FRAMES_QUEUED"
28-
#define ADXSPD_GenFlatfieldString "XSPD_GEN_FLATFIELD"
29-
#define ADXSPD_ResetDetectorString "XSPD_RESET_DETECTOR"
3028
#define ADXSPD_BitDepthString "XSPD_BIT_DEPTH"
3129
#define ADXSPD_CrCorrString "XSPD_CR_CORR"
3230
#define ADXSPD_StatusIntervalString "XSPD_STATUS_INTERVAL"
@@ -52,8 +50,6 @@ int ADXSPD_RoiRows;
5250
int ADXSPD_LowThreshold;
5351
int ADXSPD_HighThreshold;
5452
int ADXSPD_FramesQueued;
55-
int ADXSPD_GenFlatfield;
56-
int ADXSPD_ResetDetector;
5753
int ADXSPD_BitDepth;
5854
int ADXSPD_CrCorr;
5955
int ADXSPD_StatusInterval;

0 commit comments

Comments
 (0)