Skip to content

Commit

Permalink
Merge pull request #1526 from nexusformat/change-area-detector-exampl…
Browse files Browse the repository at this point in the history
…e-attributes

Apply corrections and update EPICS area detector attributes example
  • Loading branch information
prjemian authored Jan 1, 2025
2 parents 54e0735 + 52db975 commit 401201c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions manual/source/examples/epics/attributes-reformatted.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
description="Image counter"/>
<Attribute name="calc1_val"
type="EPICS_PV"
source="prj:userCalc1.VAL"
datatype="DBR_NATIVE"
source="$(P)userCalc1.VAL"
dbrtype="DBR_NATIVE"
description="some calculation result"/>
<Attribute name="calc2_val"
type="EPICS_PV"
source="prj:userCalc2.VAL"
datatype="DBR_NATIVE"
source="$(P)userCalc2.VAL"
dbrtype="DBR_NATIVE"
description="another calculation result"/>
<Attribute name="MaxSizeX"
type="PARAM"
Expand Down
4 changes: 2 additions & 2 deletions manual/source/examples/epics/attributes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
>
<Attribute name="AcquireTime" type="EPICS_PV" source="13SIM1:cam1:AcquireTime" dbrtype="DBR_NATIVE" description="Camera acquire time"/>
<Attribute name="ImageCounter" type="PARAM" source="ARRAY_COUNTER" datatype="INT" description="Image counter"/>
<Attribute name="calc1_val" type="EPICS_PV" source="prj:userCalc1.VAL" datatype="DBR_NATIVE" description="some calculation result"/>
<Attribute name="calc2_val" type="EPICS_PV" source="prj:userCalc2.VAL" datatype="DBR_NATIVE" description="another calculation result"/>
<Attribute name="calc1_val" type="EPICS_PV" source="$(P)userCalc1.VAL" dbrtype="DBR_NATIVE" description="some calculation result"/>
<Attribute name="calc2_val" type="EPICS_PV" source="$(P)userCalc2.VAL" dbrtype="DBR_NATIVE" description="another calculation result"/>
<Attribute name="MaxSizeX" type="PARAM" source="MAX_SIZE_X" datatype="INT" description="Detector X size"/>
<Attribute name="MaxSizeY" type="PARAM" source="MAX_SIZE_Y" datatype="INT" description="Detector Y size"/>
<Attribute name="CameraModel" type="PARAM" source="MODEL" datatype="STRING" description="Camera model"/>
Expand Down

0 comments on commit 401201c

Please sign in to comment.