search

APS-USAXS / usaxs-bluesky-ended-2023

Bluesky instrument for USAXS
0 stars 0 forks source link

Correct PVs renaming #145

Closed jilavsky closed 5 years ago

jilavsky commented 5 years ago

USAXS plan for March includes renaming some PVs from ugly "USAXS_Pin" to more reasonable "SAXS" and "WAXS". This will need to be propagated to spec and qtdm, and also to BS. List will be provided when available.

prjemian commented 5 years ago

@jilavsky (@kmpeters)

For starters on this, here is the list of PVs in LAX with pin in their name:

usaxs@usaxscontrol .../iocBoot/ioc9idcLAX $ grep -i pin dbl-all.txt | sort
9idcLAX:ci94:tempIn
9idcLAX:USAXS_Pin:AcquireTime
9idcLAX:USAXS_Pin:ax_in
9idcLAX:USAXS_Pin:ax_limit_offset
9idcLAX:USAXS_Pin:ax_out
9idcLAX:USAXS_Pin:BeamCenterX
9idcLAX:USAXS_Pin:BeamCenterX:NXdetector
9idcLAX:USAXS_Pin:BeamCenterY
9idcLAX:USAXS_Pin:BeamCenterY:NXdetector
9idcLAX:USAXS_Pin:CalibrationConstant
9idcLAX:USAXS_Pin:DetectorTiltX
9idcLAX:USAXS_Pin:DetectorTiltY
9idcLAX:USAXS_Pin:directory
9idcLAX:USAXS_Pin:Distance
9idcLAX:USAXS_Pin:dx_in
9idcLAX:USAXS_Pin:dx_limit_offset
9idcLAX:USAXS_Pin:dx_out
9idcLAX:USAXS_Pin:EmptyFileName
9idcLAX:USAXS_Pin:EndExposureTime
9idcLAX:USAXS_Pin:Exp_Al_Filter
9idcLAX:USAXS_Pin:Exp_Ti_Filter
9idcLAX:USAXS_Pin:I0
9idcLAX:USAXS_Pin:NumImages
9idcLAX:USAXS_Pin:Pin_hgslit_ap
9idcLAX:USAXS_Pin:Pin_hslit_ap
9idcLAX:USAXS_Pin:PinPixSizeX
9idcLAX:USAXS_Pin:PinPixSizeY
9idcLAX:USAXS_Pin:Pin_TrI0
9idcLAX:USAXS_Pin:Pin_TrI0gain
9idcLAX:USAXS_Pin:Pin_TrPD
9idcLAX:USAXS_Pin:Pin_TrPDgain
9idcLAX:USAXS_Pin:Pin_vgslit_ap
9idcLAX:USAXS_Pin:Pin_vslit_ap
9idcLAX:USAXS_Pin:Pin_y_in
9idcLAX:USAXS_Pin:Pin_y_limit_offset
9idcLAX:USAXS_Pin:Pin_y_out
9idcLAX:USAXS_Pin:Pin_z_in
9idcLAX:USAXS_Pin:Pin_z_limit_offset
9idcLAX:USAXS_Pin:Pin_z_out
9idcLAX:USAXS_Pin:sampleTitle
9idcLAX:USAXS_Pin:StartExposureTime
9idcLAX:USAXS_Pin:state
9idcLAX:USAXS_Pin:timeStamp
9idcLAX:USAXS_Pin:USAXS_hgslit_ap
9idcLAX:USAXS_Pin:USAXS_hslit_ap
9idcLAX:USAXS_Pin:USAXSSAXSMode
9idcLAX:USAXS_Pin:USAXS_vgslit_ap
9idcLAX:USAXS_Pin:USAXS_vslit_ap
9idcLAX:USAXS_Pin:userDir
9idcLAX:USAXS_Pin:userName
9idcLAX:USAXS_Pin:waxs_x_in
9idcLAX:USAXS_Pin:waxs_x_limit_offset
9idcLAX:USAXS_Pin:waxs_x_out
9idcLAX:USAXS:TR_MeasurePinTrans
9idcLAX:USAXS:TR_pinCounts
9idcLAX:USAXS:TR_pinGain
9idcLAX:USAXS_WAXS:PinPixSizeX
9idcLAX:USAXS_WAXS:PinPixSizeY

Need strong suggestions for renaming here

jilavsky commented 5 years ago

This was discussed in e-mail on February 26th. Important parts are here:

String replacements :

USAXSPin -> SAXS Pin... -> SAXS_... USAXS_WAXS -> WAXS

Following PVs need to be added (I can do it if needed, but al least check that syntax is OK):

grecord(bo, "9idcLAX:USAXS:UseSpecificTuneLocation") { field(DESC, "Use specific preUSAXStune location?") field(ZNAM, "no") field(ONAM, "yes") }

grecord(ao, "9idcLAX:USAXS:preUSAXStuneSX") { field(DESC, "Specific preUSAXStune sx value") field(EGU, "mm") } grecord(ao, "9idcLAX:USAXS:preUSAXStuneSY") { field(DESC, "Specific preUSAXStune sy value") field(EGU, "mm") }

Pete requested change related to BlueSky, is this going to break anything elsewhere? Can you do it, not sure about syntax here...

9idcLAX:USAXS:userDir should be waveform

prjemian commented 5 years ago

The change in userDir is issue #151

@jkirchman should be aware of these changes, as well

prjemian commented 5 years ago

Re previous comment, these are the current PVs that match:

USAXS_Pin

``` jemian@otz .../9idcLAXApp/Db $ grep USAXS_Pin ../../iocBoot/ioc9idcLAX/dbl-all.txt 9idcLAX:USAXS_Pin:AcquireTime 9idcLAX:USAXS_Pin:BeamCenterX 9idcLAX:USAXS_Pin:BeamCenterY 9idcLAX:USAXS_Pin:CalibrationConstant 9idcLAX:USAXS_Pin:DetectorTiltX 9idcLAX:USAXS_Pin:DetectorTiltY 9idcLAX:USAXS_Pin:Distance 9idcLAX:USAXS_Pin:Exp_Al_Filter 9idcLAX:USAXS_Pin:Exp_Ti_Filter 9idcLAX:USAXS_Pin:I0 9idcLAX:USAXS_Pin:NumImages 9idcLAX:USAXS_Pin:PinPixSizeX 9idcLAX:USAXS_Pin:PinPixSizeY 9idcLAX:USAXS_Pin:Pin_TrI0 9idcLAX:USAXS_Pin:Pin_TrI0gain 9idcLAX:USAXS_Pin:Pin_TrPD 9idcLAX:USAXS_Pin:Pin_TrPDgain 9idcLAX:USAXS_Pin:Pin_hgslit_ap 9idcLAX:USAXS_Pin:Pin_hslit_ap 9idcLAX:USAXS_Pin:Pin_vgslit_ap 9idcLAX:USAXS_Pin:Pin_vslit_ap 9idcLAX:USAXS_Pin:Pin_y_in 9idcLAX:USAXS_Pin:Pin_y_limit_offset 9idcLAX:USAXS_Pin:Pin_y_out 9idcLAX:USAXS_Pin:Pin_z_in 9idcLAX:USAXS_Pin:Pin_z_limit_offset 9idcLAX:USAXS_Pin:Pin_z_out 9idcLAX:USAXS_Pin:USAXS_hgslit_ap 9idcLAX:USAXS_Pin:USAXS_hslit_ap 9idcLAX:USAXS_Pin:USAXS_vgslit_ap 9idcLAX:USAXS_Pin:USAXS_vslit_ap 9idcLAX:USAXS_Pin:ax_in 9idcLAX:USAXS_Pin:ax_limit_offset 9idcLAX:USAXS_Pin:ax_out 9idcLAX:USAXS_Pin:dx_in 9idcLAX:USAXS_Pin:dx_limit_offset 9idcLAX:USAXS_Pin:dx_out 9idcLAX:USAXS_Pin:waxs_x_in 9idcLAX:USAXS_Pin:waxs_x_limit_offset 9idcLAX:USAXS_Pin:waxs_x_out 9idcLAX:USAXS_Pin:BeamCenterX:NXdetector 9idcLAX:USAXS_Pin:BeamCenterY:NXdetector 9idcLAX:USAXS_Pin:USAXSSAXSMode 9idcLAX:USAXS_Pin:EmptyFileName 9idcLAX:USAXS_Pin:EndExposureTime 9idcLAX:USAXS_Pin:StartExposureTime 9idcLAX:USAXS_Pin:sampleTitle 9idcLAX:USAXS_Pin:state 9idcLAX:USAXS_Pin:timeStamp 9idcLAX:USAXS_Pin:userName 9idcLAX:USAXS_Pin:directory 9idcLAX:USAXS_Pin:userDir ```

Pin_

``` jemian@otz .../9idcLAXApp/Db $ grep Pin_ ../../iocBoot/ioc9idcLAX/dbl-all.txt 9idcLAX:USAXS_Pin:Pin_TrI0 9idcLAX:USAXS_Pin:Pin_TrI0gain 9idcLAX:USAXS_Pin:Pin_TrPD 9idcLAX:USAXS_Pin:Pin_TrPDgain 9idcLAX:USAXS_Pin:Pin_hgslit_ap 9idcLAX:USAXS_Pin:Pin_hslit_ap 9idcLAX:USAXS_Pin:Pin_vgslit_ap 9idcLAX:USAXS_Pin:Pin_vslit_ap 9idcLAX:USAXS_Pin:Pin_y_in 9idcLAX:USAXS_Pin:Pin_y_limit_offset 9idcLAX:USAXS_Pin:Pin_y_out 9idcLAX:USAXS_Pin:Pin_z_in 9idcLAX:USAXS_Pin:Pin_z_limit_offset 9idcLAX:USAXS_Pin:Pin_z_out ```

USAXS_WAXS

``` jemian@otz .../9idcLAXApp/Db $ grep USAXS_WAXS ../../iocBoot/ioc9idcLAX/dbl-all.txt 9idcLAX:USAXS_WAXS:AcquireTime 9idcLAX:USAXS_WAXS:BeamCenterX 9idcLAX:USAXS_WAXS:BeamCenterY 9idcLAX:USAXS_WAXS:CalibrationConstant 9idcLAX:USAXS_WAXS:DetectorTiltX 9idcLAX:USAXS_WAXS:DetectorTiltY 9idcLAX:USAXS_WAXS:Distance 9idcLAX:USAXS_WAXS:Exp_Al_Filter 9idcLAX:USAXS_WAXS:Exp_Ti_Filter 9idcLAX:USAXS_WAXS:I0 9idcLAX:USAXS_WAXS:NumImages 9idcLAX:USAXS_WAXS:PinPixSizeX 9idcLAX:USAXS_WAXS:PinPixSizeY 9idcLAX:USAXS_WAXS:BeamCenterX:NXdetector 9idcLAX:USAXS_WAXS:BeamCenterY:NXdetector 9idcLAX:USAXS_WAXS:EmptyFileName 9idcLAX:USAXS_WAXS:EndExposureTime 9idcLAX:USAXS_WAXS:StartExposureTime 9idcLAX:USAXS_WAXS:sampleTitle 9idcLAX:USAXS_WAXS:directory ```

prjemian commented 5 years ago

@jilavsky : These are the proposed name changes. Should we create aliases (attn: @kmpeters, that needs your help) back to the old names? Adding alises might be best so close to upcoming operations period.

existing PV new PV
9idcLAX:USAXS_Pin:AcquireTime 9idcLAX:SAXS:AcquireTime
9idcLAX:USAXS_Pin:BeamCenterX 9idcLAX:SAXS:BeamCenterX
9idcLAX:USAXS_Pin:BeamCenterY 9idcLAX:SAXS:BeamCenterY
9idcLAX:USAXS_Pin:CalibrationConstant 9idcLAX:SAXS:CalibrationConstant
9idcLAX:USAXS_Pin:DetectorTiltX 9idcLAX:SAXS:DetectorTiltX
9idcLAX:USAXS_Pin:DetectorTiltY 9idcLAX:SAXS:DetectorTiltY
9idcLAX:USAXS_Pin:Distance 9idcLAX:SAXS:Distance
9idcLAX:USAXS_Pin:Exp_Al_Filter 9idcLAX:SAXS:Exp_Al_Filter
9idcLAX:USAXS_Pin:Exp_Ti_Filter 9idcLAX:SAXS:Exp_Ti_Filter
9idcLAX:USAXS_Pin:I0 9idcLAX:SAXS:I0
9idcLAX:USAXS_Pin:NumImages 9idcLAX:SAXS:NumImages
9idcLAX:USAXS_Pin:PinPixSizeX 9idcLAX:SAXS:PinPixSizeX
9idcLAX:USAXS_Pin:PinPixSizeY 9idcLAX:SAXS:PinPixSizeY
9idcLAX:USAXS_Pin:Pin_TrI0 9idcLAX:SAXS:Pin_TrI0
9idcLAX:USAXS_Pin:Pin_TrI0gain 9idcLAX:SAXS:Pin_TrI0gain
9idcLAX:USAXS_Pin:Pin_TrPD 9idcLAX:SAXS:Pin_TrPD
9idcLAX:USAXS_Pin:Pin_TrPDgain 9idcLAX:SAXS:Pin_TrPDgain
9idcLAX:USAXS_Pin:Pin_hgslit_ap 9idcLAX:SAXS:Pin_hgslit_ap
9idcLAX:USAXS_Pin:Pin_hslit_ap 9idcLAX:SAXS:Pin_hslit_ap
9idcLAX:USAXS_Pin:Pin_vgslit_ap 9idcLAX:SAXS:Pin_vgslit_ap
9idcLAX:USAXS_Pin:Pin_vslit_ap 9idcLAX:SAXS:Pin_vslit_ap
9idcLAX:USAXS_Pin:Pin_y_in 9idcLAX:SAXS:Pin_y_in
9idcLAX:USAXS_Pin:Pin_y_limit_offset 9idcLAX:SAXS:Pin_y_limit_offset
9idcLAX:USAXS_Pin:Pin_y_out 9idcLAX:SAXS:Pin_y_out
9idcLAX:USAXS_Pin:Pin_z_in 9idcLAX:SAXS:Pin_z_in
9idcLAX:USAXS_Pin:Pin_z_limit_offset 9idcLAX:SAXS:Pin_z_limit_offset
9idcLAX:USAXS_Pin:Pin_z_out 9idcLAX:SAXS:Pin_z_out
9idcLAX:USAXS_Pin:USAXS_hgslit_ap 9idcLAX:SAXS:USAXS_hgslit_ap
9idcLAX:USAXS_Pin:USAXS_hslit_ap 9idcLAX:SAXS:USAXS_hslit_ap
9idcLAX:USAXS_Pin:USAXS_vgslit_ap 9idcLAX:SAXS:USAXS_vgslit_ap
9idcLAX:USAXS_Pin:USAXS_vslit_ap 9idcLAX:SAXS:USAXS_vslit_ap
9idcLAX:USAXS_Pin:ax_in 9idcLAX:SAXS:ax_in
9idcLAX:USAXS_Pin:ax_limit_offset 9idcLAX:SAXS:ax_limit_offset
9idcLAX:USAXS_Pin:ax_out 9idcLAX:SAXS:ax_out
9idcLAX:USAXS_Pin:dx_in 9idcLAX:SAXS:dx_in
9idcLAX:USAXS_Pin:dx_limit_offset 9idcLAX:SAXS:dx_limit_offset
9idcLAX:USAXS_Pin:dx_out 9idcLAX:SAXS:dx_out
9idcLAX:USAXS_Pin:waxs_x_in 9idcLAX:SAXS:waxs_x_in
9idcLAX:USAXS_Pin:waxs_x_limit_offset 9idcLAX:SAXS:waxs_x_limit_offset
9idcLAX:USAXS_Pin:waxs_x_out 9idcLAX:SAXS:waxs_x_out
9idcLAX:USAXS_Pin:BeamCenterX:NXdetector 9idcLAX:SAXS:BeamCenterX:NXdetector
9idcLAX:USAXS_Pin:BeamCenterY:NXdetector 9idcLAX:SAXS:BeamCenterY:NXdetector
9idcLAX:USAXS_Pin:USAXSSAXSMode 9idcLAX:SAXS:USAXSSAXSMode
9idcLAX:USAXS_Pin:EmptyFileName 9idcLAX:SAXS:EmptyFileName
9idcLAX:USAXS_Pin:EndExposureTime 9idcLAX:SAXS:EndExposureTime
9idcLAX:USAXS_Pin:StartExposureTime 9idcLAX:SAXS:StartExposureTime
9idcLAX:USAXS_Pin:sampleTitle 9idcLAX:SAXS:sampleTitle
9idcLAX:USAXS_Pin:state 9idcLAX:SAXS:state
9idcLAX:USAXS_Pin:timeStamp 9idcLAX:SAXS:timeStamp
9idcLAX:USAXS_Pin:userName 9idcLAX:SAXS:userName
9idcLAX:USAXS_Pin:directory 9idcLAX:SAXS:directory
9idcLAX:USAXS_Pin:userDir 9idcLAX:SAXS:userDir
9idcLAX:USAXS_Pin:Pin_TrI0 9idcLAX:SAXS:TrI0
9idcLAX:USAXS_Pin:Pin_TrI0gain 9idcLAX:SAXS:TrI0gain
9idcLAX:USAXS_Pin:Pin_TrPD 9idcLAX:SAXS:TrPD
9idcLAX:USAXS_Pin:Pin_TrPDgain 9idcLAX:SAXS:TrPDgain
9idcLAX:USAXS_Pin:Pin_hgslit_ap 9idcLAX:SAXS:hgslit_ap
9idcLAX:USAXS_Pin:Pin_hslit_ap 9idcLAX:SAXS:hslit_ap
9idcLAX:USAXS_Pin:Pin_vgslit_ap 9idcLAX:SAXS:vgslit_ap
9idcLAX:USAXS_Pin:Pin_vslit_ap 9idcLAX:SAXS:vslit_ap
9idcLAX:USAXS_Pin:Pin_y_in 9idcLAX:SAXS:y_in
9idcLAX:USAXS_Pin:Pin_y_limit_offset 9idcLAX:SAXS:y_limit_offset
9idcLAX:USAXS_Pin:Pin_y_out 9idcLAX:SAXS:y_out
9idcLAX:USAXS_Pin:Pin_z_in 9idcLAX:SAXS:z_in
9idcLAX:USAXS_Pin:Pin_z_limit_offset 9idcLAX:SAXS:z_limit_offset
9idcLAX:USAXS_Pin:Pin_z_out 9idcLAX:SAXS:z_out
9idcLAX:USAXS_WAXS:AcquireTime 9idcLAX:WAXS::AcquireTime
9idcLAX:USAXS_WAXS:BeamCenterX 9idcLAX:WAXS::BeamCenterX
9idcLAX:USAXS_WAXS:BeamCenterY 9idcLAX:WAXS::BeamCenterY
9idcLAX:USAXS_WAXS:CalibrationConstant 9idcLAX:WAXS::CalibrationConstant
9idcLAX:USAXS_WAXS:DetectorTiltX 9idcLAX:WAXS::DetectorTiltX
9idcLAX:USAXS_WAXS:DetectorTiltY 9idcLAX:WAXS::DetectorTiltY
9idcLAX:USAXS_WAXS:Distance 9idcLAX:WAXS::Distance
9idcLAX:USAXS_WAXS:Exp_Al_Filter 9idcLAX:WAXS::Exp_Al_Filter
9idcLAX:USAXS_WAXS:Exp_Ti_Filter 9idcLAX:WAXS::Exp_Ti_Filter
9idcLAX:USAXS_WAXS:I0 9idcLAX:WAXS::I0
9idcLAX:USAXS_WAXS:NumImages 9idcLAX:WAXS::NumImages
9idcLAX:USAXS_WAXS:PinPixSizeX 9idcLAX:WAXS::PinPixSizeX
9idcLAX:USAXS_WAXS:PinPixSizeY 9idcLAX:WAXS::PinPixSizeY
9idcLAX:USAXS_WAXS:BeamCenterX:NXdetector 9idcLAX:WAXS::BeamCenterX:NXdetector
9idcLAX:USAXS_WAXS:BeamCenterY:NXdetector 9idcLAX:WAXS::BeamCenterY:NXdetector
9idcLAX:USAXS_WAXS:EmptyFileName 9idcLAX:WAXS::EmptyFileName
9idcLAX:USAXS_WAXS:EndExposureTime 9idcLAX:WAXS::EndExposureTime
9idcLAX:USAXS_WAXS:StartExposureTime 9idcLAX:WAXS::StartExposureTime
9idcLAX:USAXS_WAXS:sampleTitle 9idcLAX:WAXS::sampleTitle
9idcLAX:USAXS_WAXS:directory 9idcLAX:WAXS::directory
prjemian commented 5 years ago

Caught the WAXS:: error

prjemian commented 5 years ago

Best to create a script that can make these changes. The script can be further adapted to change other client software such as SPEC, caQtDM, livedata pages, Bluesky, ...

prjemian commented 5 years ago

spreadsheet with PV renames

USAXS-PV-renames.xlsx

prjemian commented 5 years ago

@jilavsky Look! Look! Look! Do you agree with these proposed PV name changes? (I'll make aliases in a separate file back to the old names.)

usaxs@usaxscontrol .../9idcLAXApp/Db $ python ./rename_201903.py | tee changes.txt

reading:LAXterms.db

(LAXterms.db,45):
--- grecord(ao,        "9idcLAX:USAXS_Pin:BeamCenterX")
+++ grecord(ao,        "9idcLAX:SAXS:BeamCenterX")

(LAXterms.db,49):
---     field(FLNK, "9idcLAX:USAXS_Pin:BeamCenterX:NXdetector")
+++     field(FLNK, "9idcLAX:SAXS:BeamCenterX:NXdetector")

(LAXterms.db,51):
--- grecord(ao,        "9idcLAX:USAXS_Pin:PinPixSizeX")
+++ grecord(ao,        "9idcLAX:SAXS:PinPixSizeX")

(LAXterms.db,55):
---     field(FLNK, "9idcLAX:USAXS_Pin:BeamCenterX:NXdetector")
+++     field(FLNK, "9idcLAX:SAXS:BeamCenterX:NXdetector")

(LAXterms.db,57):
--- grecord(ao,        "9idcLAX:USAXS_Pin:DetectorTiltX")
+++ grecord(ao,        "9idcLAX:SAXS:DetectorTiltX")

(LAXterms.db,62):
--- grecord(ao,        "9idcLAX:USAXS_Pin:DetectorTiltY")
+++ grecord(ao,        "9idcLAX:SAXS:DetectorTiltY")

(LAXterms.db,67):
--- record(calcout, "9idcLAX:USAXS_Pin:BeamCenterX:NXdetector")
+++ record(calcout, "9idcLAX:SAXS:BeamCenterX:NXdetector")

(LAXterms.db,72):
---     field(INPA, "9idcLAX:USAXS_Pin:BeamCenterX")
+++     field(INPA, "9idcLAX:SAXS:BeamCenterX")

(LAXterms.db,73):
---     field(INPB, "9idcLAX:USAXS_Pin:PinPixSizeX")
+++     field(INPB, "9idcLAX:SAXS:PinPixSizeX")

(LAXterms.db,77):
--- grecord(ao, "9idcLAX:USAXS_Pin:BeamCenterY")
+++ grecord(ao, "9idcLAX:SAXS:BeamCenterY")

(LAXterms.db,81):
---     field(FLNK, "9idcLAX:USAXS_Pin:BeamCenterY:NXdetector")
+++     field(FLNK, "9idcLAX:SAXS:BeamCenterY:NXdetector")

(LAXterms.db,83):
--- grecord(ao,        "9idcLAX:USAXS_Pin:PinPixSizeY")
+++ grecord(ao,        "9idcLAX:SAXS:PinPixSizeY")

(LAXterms.db,87):
---     field(FLNK, "9idcLAX:USAXS_Pin:BeamCenterY:NXdetector")
+++     field(FLNK, "9idcLAX:SAXS:BeamCenterY:NXdetector")

(LAXterms.db,89):
--- record(calcout, "9idcLAX:USAXS_Pin:BeamCenterY:NXdetector")
+++ record(calcout, "9idcLAX:SAXS:BeamCenterY:NXdetector")

(LAXterms.db,94):
---     field(INPA, "9idcLAX:USAXS_Pin:BeamCenterY")
+++     field(INPA, "9idcLAX:SAXS:BeamCenterY")

(LAXterms.db,95):
---     field(INPB, "9idcLAX:USAXS_Pin:PinPixSizeY")
+++     field(INPB, "9idcLAX:SAXS:PinPixSizeY")

(LAXterms.db,99):
--- grecord(ao,     "9idcLAX:USAXS_Pin:Distance")
+++ grecord(ao,     "9idcLAX:SAXS:Distance")

(LAXterms.db,105):
--- record(stringout, "9idcLAX:USAXS_Pin:StartExposureTime")
+++ record(stringout, "9idcLAX:SAXS:StartExposureTime")

(LAXterms.db,110):
--- grecord(stringout, "9idcLAX:USAXS_Pin:EndExposureTime")
+++ grecord(stringout, "9idcLAX:SAXS:EndExposureTime")

(LAXterms.db,115):
--- grecord(stringout, "9idcLAX:USAXS_Pin:EmptyFileName")
+++ grecord(stringout, "9idcLAX:SAXS:EmptyFileName")

(LAXterms.db,120):
--- grecord(ao,     "9idcLAX:USAXS_Pin:I0")
+++ grecord(ao,     "9idcLAX:SAXS:I0")

(LAXterms.db,127):
--- grecord(ao,        "9idcLAX:USAXS_WAXS:BeamCenterX")
+++ grecord(ao,        "9idcLAX:WAXS:BeamCenterX")

(LAXterms.db,131):
---     field(FLNK, "9idcLAX:USAXS_WAXS:BeamCenterX:NXdetector")
+++     field(FLNK, "9idcLAX:WAXS:BeamCenterX:NXdetector")

(LAXterms.db,133):
--- grecord(ao,        "9idcLAX:USAXS_WAXS:PinPixSizeX")
+++ grecord(ao,        "9idcLAX:WAXS:PinPixSizeX")

(LAXterms.db,137):
---     field(FLNK, "9idcLAX:USAXS_WAXS:BeamCenterX:NXdetector")
+++     field(FLNK, "9idcLAX:WAXS:BeamCenterX:NXdetector")

(LAXterms.db,139):
--- grecord(ao,        "9idcLAX:USAXS_WAXS:DetectorTiltX")
+++ grecord(ao,        "9idcLAX:WAXS:DetectorTiltX")

(LAXterms.db,144):
--- grecord(ao,        "9idcLAX:USAXS_WAXS:DetectorTiltY")
+++ grecord(ao,        "9idcLAX:WAXS:DetectorTiltY")

(LAXterms.db,149):
--- record(calcout, "9idcLAX:USAXS_WAXS:BeamCenterX:NXdetector")
+++ record(calcout, "9idcLAX:WAXS:BeamCenterX:NXdetector")

(LAXterms.db,154):
---     field(INPA, "9idcLAX:USAXS_WAXS:BeamCenterX")
+++     field(INPA, "9idcLAX:WAXS:BeamCenterX")

(LAXterms.db,155):
---     field(INPB, "9idcLAX:USAXS_WAXS:PinPixSizeX")
+++     field(INPB, "9idcLAX:WAXS:PinPixSizeX")

(LAXterms.db,159):
--- grecord(ao, "9idcLAX:USAXS_WAXS:BeamCenterY")
+++ grecord(ao, "9idcLAX:WAXS:BeamCenterY")

(LAXterms.db,163):
---     field(FLNK, "9idcLAX:USAXS_WAXS:BeamCenterY:NXdetector")
+++     field(FLNK, "9idcLAX:WAXS:BeamCenterY:NXdetector")

(LAXterms.db,165):
--- grecord(ao,        "9idcLAX:USAXS_WAXS:PinPixSizeY")
+++ grecord(ao,        "9idcLAX:WAXS:PinPixSizeY")

(LAXterms.db,169):
---     field(FLNK, "9idcLAX:USAXS_WAXS:BeamCenterY:NXdetector")
+++     field(FLNK, "9idcLAX:WAXS:BeamCenterY:NXdetector")

(LAXterms.db,171):
--- record(calcout, "9idcLAX:USAXS_WAXS:BeamCenterY:NXdetector")
+++ record(calcout, "9idcLAX:WAXS:BeamCenterY:NXdetector")

(LAXterms.db,176):
---     field(INPA, "9idcLAX:USAXS_WAXS:BeamCenterY")
+++     field(INPA, "9idcLAX:WAXS:BeamCenterY")

(LAXterms.db,177):
---     field(INPB, "9idcLAX:USAXS_WAXS:PinPixSizeY")
+++     field(INPB, "9idcLAX:WAXS:PinPixSizeY")

(LAXterms.db,181):
--- grecord(ao,     "9idcLAX:USAXS_WAXS:Distance")
+++ grecord(ao,     "9idcLAX:WAXS:Distance")

(LAXterms.db,187):
--- record(stringout, "9idcLAX:USAXS_WAXS:StartExposureTime")
+++ record(stringout, "9idcLAX:WAXS:StartExposureTime")

(LAXterms.db,192):
--- grecord(stringout, "9idcLAX:USAXS_WAXS:EndExposureTime")
+++ grecord(stringout, "9idcLAX:WAXS:EndExposureTime")

(LAXterms.db,197):
--- grecord(stringout, "9idcLAX:USAXS_WAXS:EmptyFileName")
+++ grecord(stringout, "9idcLAX:WAXS:EmptyFileName")

(LAXterms.db,202):
--- grecord(ao,     "9idcLAX:USAXS_WAXS:I0")
+++ grecord(ao,     "9idcLAX:WAXS:I0")
wrote:LAXterms.db.new

reading:LAXterms_settings.req

(LAXterms_settings.req,28):
--- 9idcLAX:USAXS_Pin:BeamCenterX.VAL
+++ 9idcLAX:SAXS:BeamCenterX.VAL

(LAXterms_settings.req,29):
--- 9idcLAX:USAXS_Pin:BeamCenterX.DESC
+++ 9idcLAX:SAXS:BeamCenterX.DESC

(LAXterms_settings.req,30):
--- 9idcLAX:USAXS_Pin:BeamCenterX.EGU
+++ 9idcLAX:SAXS:BeamCenterX.EGU

(LAXterms_settings.req,32):
--- 9idcLAX:USAXS_Pin:BeamCenterY.VAL
+++ 9idcLAX:SAXS:BeamCenterY.VAL

(LAXterms_settings.req,33):
--- 9idcLAX:USAXS_Pin:BeamCenterY.DESC
+++ 9idcLAX:SAXS:BeamCenterY.DESC

(LAXterms_settings.req,34):
--- 9idcLAX:USAXS_Pin:BeamCenterY.EGU
+++ 9idcLAX:SAXS:BeamCenterY.EGU

(LAXterms_settings.req,36):
--- 9idcLAX:USAXS_Pin:DetectorTiltX.VAL
+++ 9idcLAX:SAXS:DetectorTiltX.VAL

(LAXterms_settings.req,37):
--- 9idcLAX:USAXS_Pin:DetectorTiltX.DESC
+++ 9idcLAX:SAXS:DetectorTiltX.DESC

(LAXterms_settings.req,38):
--- 9idcLAX:USAXS_Pin:DetectorTiltX.EGU
+++ 9idcLAX:SAXS:DetectorTiltX.EGU

(LAXterms_settings.req,40):
--- 9idcLAX:USAXS_Pin:DetectorTiltY.VAL
+++ 9idcLAX:SAXS:DetectorTiltY.VAL

(LAXterms_settings.req,41):
--- 9idcLAX:USAXS_Pin:DetectorTiltY.DESC
+++ 9idcLAX:SAXS:DetectorTiltY.DESC

(LAXterms_settings.req,42):
--- 9idcLAX:USAXS_Pin:DetectorTiltY.EGU
+++ 9idcLAX:SAXS:DetectorTiltY.EGU

(LAXterms_settings.req,44):
--- 9idcLAX:USAXS_Pin:Distance.VAL
+++ 9idcLAX:SAXS:Distance.VAL

(LAXterms_settings.req,45):
--- 9idcLAX:USAXS_Pin:Distance.DESC
+++ 9idcLAX:SAXS:Distance.DESC

(LAXterms_settings.req,46):
--- 9idcLAX:USAXS_Pin:Distance.EGU
+++ 9idcLAX:SAXS:Distance.EGU

(LAXterms_settings.req,48):
--- 9idcLAX:USAXS_Pin:PinPixSizeX.VAL
+++ 9idcLAX:SAXS:PinPixSizeX.VAL

(LAXterms_settings.req,49):
--- 9idcLAX:USAXS_Pin:PinPixSizeX.DESC
+++ 9idcLAX:SAXS:PinPixSizeX.DESC

(LAXterms_settings.req,50):
--- 9idcLAX:USAXS_Pin:PinPixSizeX.EGU
+++ 9idcLAX:SAXS:PinPixSizeX.EGU

(LAXterms_settings.req,52):
--- 9idcLAX:USAXS_Pin:PinPixSizeY.VAL
+++ 9idcLAX:SAXS:PinPixSizeY.VAL

(LAXterms_settings.req,53):
--- 9idcLAX:USAXS_Pin:PinPixSizeY.DESC
+++ 9idcLAX:SAXS:PinPixSizeY.DESC

(LAXterms_settings.req,54):
--- 9idcLAX:USAXS_Pin:PinPixSizeY.EGU
+++ 9idcLAX:SAXS:PinPixSizeY.EGU

(LAXterms_settings.req,56):
--- 9idcLAX:USAXS_Pin:StartExposureTime.VAL
+++ 9idcLAX:SAXS:StartExposureTime.VAL

(LAXterms_settings.req,57):
--- 9idcLAX:USAXS_Pin:StartExposureTime.DESC
+++ 9idcLAX:SAXS:StartExposureTime.DESC

(LAXterms_settings.req,59):
--- 9idcLAX:USAXS_Pin:EndExposureTime.VAL
+++ 9idcLAX:SAXS:EndExposureTime.VAL

(LAXterms_settings.req,60):
--- 9idcLAX:USAXS_Pin:EndExposureTime.DESC
+++ 9idcLAX:SAXS:EndExposureTime.DESC

(LAXterms_settings.req,62):
--- 9idcLAX:USAXS_Pin:EmptyFileName.VAL
+++ 9idcLAX:SAXS:EmptyFileName.VAL

(LAXterms_settings.req,63):
--- 9idcLAX:USAXS_Pin:EmptyFileName.DESC
+++ 9idcLAX:SAXS:EmptyFileName.DESC

(LAXterms_settings.req,65):
--- 9idcLAX:USAXS_Pin:Pin_TrPD
+++ 9idcLAX:SAXS:SAXS_TrPD

(LAXterms_settings.req,66):
--- 9idcLAX:USAXS_Pin:Pin_TrI0
+++ 9idcLAX:SAXS:SAXS_TrI0

(LAXterms_settings.req,67):
--- 9idcLAX:USAXS_Pin:Pin_TrPDgain
+++ 9idcLAX:SAXS:SAXS_TrPDgain

(LAXterms_settings.req,68):
--- 9idcLAX:USAXS_Pin:Pin_TrI0gain
+++ 9idcLAX:SAXS:SAXS_TrI0gain

(LAXterms_settings.req,70):
--- 9idcLAX:USAXS_WAXS:BeamCenterX.VAL
+++ 9idcLAX:WAXS:BeamCenterX.VAL

(LAXterms_settings.req,71):
--- 9idcLAX:USAXS_WAXS:BeamCenterX.DESC
+++ 9idcLAX:WAXS:BeamCenterX.DESC

(LAXterms_settings.req,72):
--- 9idcLAX:USAXS_WAXS:BeamCenterX.EGU
+++ 9idcLAX:WAXS:BeamCenterX.EGU

(LAXterms_settings.req,74):
--- 9idcLAX:USAXS_WAXS:BeamCenterY.VAL
+++ 9idcLAX:WAXS:BeamCenterY.VAL

(LAXterms_settings.req,75):
--- 9idcLAX:USAXS_WAXS:BeamCenterY.DESC
+++ 9idcLAX:WAXS:BeamCenterY.DESC

(LAXterms_settings.req,76):
--- 9idcLAX:USAXS_WAXS:BeamCenterY.EGU
+++ 9idcLAX:WAXS:BeamCenterY.EGU

(LAXterms_settings.req,78):
--- 9idcLAX:USAXS_WAXS:DetectorTiltX.VAL
+++ 9idcLAX:WAXS:DetectorTiltX.VAL

(LAXterms_settings.req,79):
--- 9idcLAX:USAXS_WAXS:DetectorTiltX.DESC
+++ 9idcLAX:WAXS:DetectorTiltX.DESC

(LAXterms_settings.req,80):
--- 9idcLAX:USAXS_WAXS:DetectorTiltX.EGU
+++ 9idcLAX:WAXS:DetectorTiltX.EGU

(LAXterms_settings.req,82):
--- 9idcLAX:USAXS_WAXS:DetectorTiltY.VAL
+++ 9idcLAX:WAXS:DetectorTiltY.VAL

(LAXterms_settings.req,83):
--- 9idcLAX:USAXS_WAXS:DetectorTiltY.DESC
+++ 9idcLAX:WAXS:DetectorTiltY.DESC

(LAXterms_settings.req,84):
--- 9idcLAX:USAXS_WAXS:DetectorTiltY.EGU
+++ 9idcLAX:WAXS:DetectorTiltY.EGU

(LAXterms_settings.req,86):
--- 9idcLAX:USAXS_WAXS:Distance.VAL
+++ 9idcLAX:WAXS:Distance.VAL

(LAXterms_settings.req,87):
--- 9idcLAX:USAXS_WAXS:Distance.DESC
+++ 9idcLAX:WAXS:Distance.DESC

(LAXterms_settings.req,88):
--- 9idcLAX:USAXS_WAXS:Distance.EGU
+++ 9idcLAX:WAXS:Distance.EGU

(LAXterms_settings.req,90):
--- 9idcLAX:USAXS_WAXS:PinPixSizeX.VAL
+++ 9idcLAX:WAXS:PinPixSizeX.VAL

(LAXterms_settings.req,91):
--- 9idcLAX:USAXS_WAXS:PinPixSizeX.DESC
+++ 9idcLAX:WAXS:PinPixSizeX.DESC

(LAXterms_settings.req,92):
--- 9idcLAX:USAXS_WAXS:PinPixSizeX.EGU
+++ 9idcLAX:WAXS:PinPixSizeX.EGU

(LAXterms_settings.req,94):
--- 9idcLAX:USAXS_WAXS:PinPixSizeY.VAL
+++ 9idcLAX:WAXS:PinPixSizeY.VAL

(LAXterms_settings.req,95):
--- 9idcLAX:USAXS_WAXS:PinPixSizeY.DESC
+++ 9idcLAX:WAXS:PinPixSizeY.DESC

(LAXterms_settings.req,96):
--- 9idcLAX:USAXS_WAXS:PinPixSizeY.EGU
+++ 9idcLAX:WAXS:PinPixSizeY.EGU

(LAXterms_settings.req,98):
--- 9idcLAX:USAXS_WAXS:StartExposureTime.VAL
+++ 9idcLAX:WAXS:StartExposureTime.VAL

(LAXterms_settings.req,99):
--- 9idcLAX:USAXS_WAXS:StartExposureTime.DESC
+++ 9idcLAX:WAXS:StartExposureTime.DESC

(LAXterms_settings.req,101):
--- 9idcLAX:USAXS_WAXS:EndExposureTime.VAL
+++ 9idcLAX:WAXS:EndExposureTime.VAL

(LAXterms_settings.req,102):
--- 9idcLAX:USAXS_WAXS:EndExposureTime.DESC
+++ 9idcLAX:WAXS:EndExposureTime.DESC

(LAXterms_settings.req,104):
--- 9idcLAX:USAXS_WAXS:EmptyFileName.VAL
+++ 9idcLAX:WAXS:EmptyFileName.VAL

(LAXterms_settings.req,105):
--- 9idcLAX:USAXS_WAXS:EmptyFileName.DESC
+++ 9idcLAX:WAXS:EmptyFileName.DESC

(LAXterms_settings.req,107):
--- 9idcLAX:USAXS_WAXS:Exp_Al_Filter.VAL
+++ 9idcLAX:WAXS:Exp_Al_Filter.VAL

(LAXterms_settings.req,108):
--- 9idcLAX:USAXS_WAXS:Exp_Ti_Filter.VAL
+++ 9idcLAX:WAXS:Exp_Ti_Filter.VAL

(LAXterms_settings.req,110):
--- 9idcLAX:USAXS_WAXS:sampleTitle.VAL
+++ 9idcLAX:WAXS:sampleTitle.VAL

(LAXterms_settings.req,111):
--- 9idcLAX:USAXS_WAXS:directory.VAL
+++ 9idcLAX:WAXS:directory.VAL

(LAXterms_settings.req,113):
--- 9idcLAX:USAXS_WAXS:AcquireTime.VAL
+++ 9idcLAX:WAXS:AcquireTime.VAL

(LAXterms_settings.req,114):
--- 9idcLAX:USAXS_WAXS:NumImages.VAL
+++ 9idcLAX:WAXS:NumImages.VAL
wrote:LAXterms_settings.req.new

reading:USAXSterms.db
wrote:USAXSterms.db.new

reading:USAXS_Pinterms.db

(USAXS_Pinterms.db,1):
--- # USAXS_Pinterms.db
+++ # SAXSterms.db

(USAXS_Pinterms.db,5):
--- grecord(ao,        "9idcLAX:USAXS_Pin:AcquireTime")
+++ grecord(ao,        "9idcLAX:SAXS:AcquireTime")

(USAXS_Pinterms.db,6):
--- grecord(longout,   "9idcLAX:USAXS_Pin:NumImages")
+++ grecord(longout,   "9idcLAX:SAXS:NumImages")

(USAXS_Pinterms.db,8):
--- grecord(ao,        "9idcLAX:USAXS_Pin:waxs_x_out")
+++ grecord(ao,        "9idcLAX:SAXS:waxs_x_out")

(USAXS_Pinterms.db,9):
--- grecord(ao,        "9idcLAX:USAXS_Pin:waxs_x_in")
+++ grecord(ao,        "9idcLAX:SAXS:waxs_x_in")

(USAXS_Pinterms.db,10):
--- grecord(ao,        "9idcLAX:USAXS_Pin:waxs_x_limit_offset")
+++ grecord(ao,        "9idcLAX:SAXS:waxs_x_limit_offset")

(USAXS_Pinterms.db,12):
--- grecord(ao,        "9idcLAX:USAXS_Pin:ax_out")
+++ grecord(ao,        "9idcLAX:SAXS:ax_out")

(USAXS_Pinterms.db,13):
--- grecord(ao,        "9idcLAX:USAXS_Pin:ax_in")
+++ grecord(ao,        "9idcLAX:SAXS:ax_in")

(USAXS_Pinterms.db,14):
--- grecord(ao,        "9idcLAX:USAXS_Pin:ax_limit_offset")
+++ grecord(ao,        "9idcLAX:SAXS:ax_limit_offset")

(USAXS_Pinterms.db,16):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_z_out")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_z_out")

(USAXS_Pinterms.db,17):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_z_in")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_z_in")

(USAXS_Pinterms.db,18):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_z_limit_offset")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_z_limit_offset")

(USAXS_Pinterms.db,20):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_y_out")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_y_out")

(USAXS_Pinterms.db,21):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_y_in")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_y_in")

(USAXS_Pinterms.db,22):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_y_limit_offset")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_y_limit_offset")

(USAXS_Pinterms.db,24):
--- grecord(ao,        "9idcLAX:USAXS_Pin:dx_out")
+++ grecord(ao,        "9idcLAX:SAXS:dx_out")

(USAXS_Pinterms.db,25):
--- grecord(ao,        "9idcLAX:USAXS_Pin:dx_in")
+++ grecord(ao,        "9idcLAX:SAXS:dx_in")

(USAXS_Pinterms.db,26):
--- grecord(ao,        "9idcLAX:USAXS_Pin:dx_limit_offset")
+++ grecord(ao,        "9idcLAX:SAXS:dx_limit_offset")

(USAXS_Pinterms.db,28):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_hslit_ap")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_hslit_ap")

(USAXS_Pinterms.db,29):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_vslit_ap")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_vslit_ap")

(USAXS_Pinterms.db,30):
--- grecord(ao,        "9idcLAX:USAXS_Pin:USAXS_vslit_ap")
+++ grecord(ao,        "9idcLAX:SAXS:USAXS_vslit_ap")

(USAXS_Pinterms.db,31):
--- grecord(ao,        "9idcLAX:USAXS_Pin:USAXS_hslit_ap")
+++ grecord(ao,        "9idcLAX:SAXS:USAXS_hslit_ap")

(USAXS_Pinterms.db,33):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_hgslit_ap")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_hgslit_ap")

(USAXS_Pinterms.db,34):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_vgslit_ap")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_vgslit_ap")

(USAXS_Pinterms.db,35):
--- grecord(ao,        "9idcLAX:USAXS_Pin:USAXS_vgslit_ap")
+++ grecord(ao,        "9idcLAX:SAXS:USAXS_vgslit_ap")

(USAXS_Pinterms.db,36):
--- grecord(ao,        "9idcLAX:USAXS_Pin:USAXS_hgslit_ap")
+++ grecord(ao,        "9idcLAX:SAXS:USAXS_hgslit_ap")

(USAXS_Pinterms.db,38):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Exp_Al_Filter")
+++ grecord(ao,        "9idcLAX:SAXS:Exp_Al_Filter")

(USAXS_Pinterms.db,39):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Exp_Ti_Filter")
+++ grecord(ao,        "9idcLAX:SAXS:Exp_Ti_Filter")

(USAXS_Pinterms.db,41):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_TrPD")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_TrPD")

(USAXS_Pinterms.db,42):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_TrI0")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_TrI0")

(USAXS_Pinterms.db,43):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_TrPDgain")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_TrPDgain")

(USAXS_Pinterms.db,44):
--- grecord(ao,        "9idcLAX:USAXS_Pin:Pin_TrI0gain")
+++ grecord(ao,        "9idcLAX:SAXS:SAXS_TrI0gain")

(USAXS_Pinterms.db,46):
--- # grecord(ao,        "9idcLAX:USAXS_Pin:USAXSSAXSMode")
+++ # grecord(ao,        "9idcLAX:SAXS:USAXSSAXSMode")

(USAXS_Pinterms.db,48):
--- grecord(mbbo,      "9idcLAX:USAXS_Pin:USAXSSAXSMode")
+++ grecord(mbbo,      "9idcLAX:SAXS:USAXSSAXSMode")

(USAXS_Pinterms.db,60):
--- grecord(stringout, "9idcLAX:USAXS_Pin:sampleTitle")
+++ grecord(stringout, "9idcLAX:SAXS:sampleTitle")

(USAXS_Pinterms.db,61):
--- grecord(waveform,  "9idcLAX:USAXS_Pin:directory")
+++ grecord(waveform,  "9idcLAX:SAXS:directory")

(USAXS_Pinterms.db,68):
--- grecord(stringout, "9idcLAX:USAXS_Pin:state")
+++ grecord(stringout, "9idcLAX:SAXS:state")

(USAXS_Pinterms.db,69):
--- grecord(stringout, "9idcLAX:USAXS_Pin:timeStamp")
+++ grecord(stringout, "9idcLAX:SAXS:timeStamp")

(USAXS_Pinterms.db,70):
--- #grecord(stringout, "9idcLAX:USAXS_Pin:userDir")
+++ #grecord(stringout, "9idcLAX:SAXS:userDir")

(USAXS_Pinterms.db,71):
--- grecord(waveform,  "9idcLAX:USAXS_Pin:userDir") {
+++ grecord(waveform,  "9idcLAX:SAXS:userDir") {

(USAXS_Pinterms.db,76):
--- grecord(stringout, "9idcLAX:USAXS_Pin:userName")
+++ grecord(stringout, "9idcLAX:SAXS:userName")

(USAXS_Pinterms.db,78):
--- grecord(ao,        "9idcLAX:USAXS_WAXS:Exp_Al_Filter")
+++ grecord(ao,        "9idcLAX:WAXS:Exp_Al_Filter")

(USAXS_Pinterms.db,79):
--- grecord(ao,        "9idcLAX:USAXS_WAXS:Exp_Ti_Filter")
+++ grecord(ao,        "9idcLAX:WAXS:Exp_Ti_Filter")

(USAXS_Pinterms.db,81):
--- grecord(stringout, "9idcLAX:USAXS_WAXS:sampleTitle")
+++ grecord(stringout, "9idcLAX:WAXS:sampleTitle")

(USAXS_Pinterms.db,82):
--- grecord(waveform, "9idcLAX:USAXS_WAXS:directory")
+++ grecord(waveform, "9idcLAX:WAXS:directory")

(USAXS_Pinterms.db,88):
--- grecord(ao,        "9idcLAX:USAXS_WAXS:AcquireTime")
+++ grecord(ao,        "9idcLAX:WAXS:AcquireTime")

(USAXS_Pinterms.db,89):
--- grecord(longout,   "9idcLAX:USAXS_WAXS:NumImages")
+++ grecord(longout,   "9idcLAX:WAXS:NumImages")

(USAXS_Pinterms.db,91):
--- grecord(ao,        "9idcLAX:USAXS_Pin:CalibrationConstant")
+++ grecord(ao,        "9idcLAX:SAXS:CalibrationConstant")

(USAXS_Pinterms.db,92):
--- grecord(ao,        "9idcLAX:USAXS_WAXS:CalibrationConstant")
+++ grecord(ao,        "9idcLAX:WAXS:CalibrationConstant")
wrote:USAXS_Pinterms.db.new

The code is simple:

#!/usr/bin/env python

"""
cleanup some PV names

USAXS_Pin -> SAXS
Pin_... -> SAXS_...
USAXS_WAXS -> WAXS
"""

from collections import OrderedDict

replacements = OrderedDict()
replacements["USAXS_Pin"] = "SAXS"
replacements["Pin_"] = "SAXS_"
replacements["USAXS_WAXS"] = "WAXS"
#replacements["SAXS:SAXS"] = "SAXS"

files = """
LAXterms.db
LAXterms_settings.req
USAXSterms.db
USAXS_Pinterms.db
"""

for fname in files.strip().split():
    with open(fname, "r") as fin:
        print("")
        print("reading:{}".format(fname))
        fname_out = fname + ".new"
        with open(fname_out, "w") as fout:
            for line_count, text in enumerate(fin.readlines()):
                line_count += 1
                in_text = text
                for k, v in replacements.items():
                    text = text.replace(k, v)
                fout.write(text)
                if in_text != text:
                    msg = "\n({},{}):".format(fname, line_count)
                    msg += "\n{} {}".format("---", in_text.rstrip())
                    msg += "\n{} {}".format("+++", text.rstrip())
                    print(msg)
    print("wrote:{}".format(fname_out))
prjemian commented 5 years ago

locate here:

usaxs@usaxscontrol .../9idcLAXApp/Db $ pwd
/net/s9dserv/xorApps/epics/synApps_5_7/ioc/9idcLAX/9idcLAXApp/Db
jilavsky commented 5 years ago

This should be changed: (USAXS_Pinterms.db,8): --- grecord(ao, "9idcLAX:USAXS_Pin:waxs_x_out") +++ grecord(ao, "9idcLAX:SAXS:waxs_x_out")

9idcLAX:WAXS:WAXS_x_out"

(USAXS_Pinterms.db,9): --- grecord(ao, "9idcLAX:USAXS_Pin:waxs_x_in") +++ grecord(ao, "9idcLAX:SAXS:waxs_x_in")

9idcLAX:WAXS:WAXS_x_in

(USAXS_Pinterms.db,10): --- grecord(ao, "9idcLAX:USAXS_Pin:waxs_x_limit_offset") +++ grecord(ao, "9idcLAX:SAXS:waxs_x_limit_offset") 9idcLAX:WAXS:WAXS_x_limit_offset

Do NOT change SAXS:SAXS, that makes sense.

prjemian commented 5 years ago

revised python code to rename and also create PV aliases:

#!/usr/bin/env python

"""
cleanup some PV names

USAXS_Pin -> SAXS
Pin_... -> SAXS_...
USAXS_WAXS -> WAXS
"""

from collections import OrderedDict

replacements = OrderedDict()
replacements["USAXS_Pin"] = "SAXS"
replacements["Pin_"] = "SAXS_"
replacements["USAXS_WAXS"] = "WAXS"
replacements["SAXS:waxs_"] = "SAXS:WAXS_"

files = """
LAXterms.db
LAXterms_settings.req
USAXSterms.db
USAXS_Pinterms.db
"""

aliases = []

for fname in files.strip().split():
    with open(fname, "r") as fin:
        print("")
        print("reading:{}".format(fname))
        fname_out = fname + ".new"
        with open(fname_out, "w") as fout:
            for line_count, text in enumerate(fin.readlines()):
                line_count += 1
                in_text = text
                for k, v in replacements.items():
                    text = text.replace(k, v)
                fout.write(text)
                if in_text != text:
                    msg = "\n({},{}):".format(fname, line_count)
                    msg += "\n{} {}".format("---", in_text.rstrip())
                    msg += "\n{} {}".format("+++", text.rstrip())
                    if fname.endswith(".db"):
                        if in_text.find("record(") >= 0:
                            old_pv = in_text.split('"')[1]
                            new_pv = text.split('"')[1]
                            alias = 'alias("{}", "{}")'.format(new_pv, old_pv)
                            aliases.append(alias + "\n")
                            msg += '\n{} {}'.format("+++", alias)
                    print(msg)
    print("wrote:{}".format(fname_out))

if len(aliases) > 0:
    with open("aliases_201903.db", "w") as f:
        f.write("# aliases to PVs which changed names, per GitHub issue\n")
        f.write("# see: https://github.com/APS-USAXS/ipython-usaxs/issues/145\n")
        f.write("\n")
        map(f.write, aliases)
prjemian commented 5 years ago

IOC was rebooted today with new PV names and aliases to old PV names, correct function verified in caQtDM, inspected autosave/auto_settings.sav file and that looked OK

Client programs should refer to the /9idcLAXApp/Db/aliases_201903.db` for the complete list of PV name changes.