[med-svn] [dicom3tools] 01/08: Imported Upstream version 1.00~20160402132920
Gert Wollny
gert-guest at moszumanska.debian.org
Thu Apr 14 11:54:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository dicom3tools.
commit 8cf2849075cceb3513929edfad3b796f9f1de1dc
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Thu Apr 14 11:16:41 2016 +0000
Imported Upstream version 1.00~20160402132920
---
CHANGES | 64 ++++++++++++++++++++++++++
VERSION | 2 +-
appsrc/dcfile/dckey.cc | 4 ++
appsrc/dcfile/dctable.cc | 4 ++
appsrc/dcfile/dctopgm8.cc | 78 ++++++++++++++++---------------
appsrc/dcfile/makedcdtchgheader.sh | 1 +
libsrc/src/generic/version.cc | 2 +-
libsrc/standard/condn.tpl | 88 +++++++++++++++++++++++++++++------
libsrc/standard/elmdict/dicom3.tpl | 92 +++++++++++++++++++++++++++++++------
libsrc/standard/elmdict/other.tpl | 37 +++++++++++++++
libsrc/standard/elmdict/siemens.tpl | 3 ++
libsrc/standard/elmdict/toshiba.tpl | 3 +-
libsrc/standard/module/base.tpl | 38 +++++++++------
libsrc/standard/module/ct.tpl | 12 +++--
libsrc/standard/module/mr.tpl | 6 ++-
libsrc/standard/module/pet.tpl | 2 +
libsrc/standard/module/rt.tpl | 47 +++++++++++++++----
libsrc/standard/module/softcopy.tpl | 3 ++
libsrc/standard/module/sr.tpl | 2 +
libsrc/standard/module/us.tpl | 13 +++---
libsrc/standard/module/vl.tpl | 1 +
libsrc/standard/module/xaxrf.tpl | 9 +++-
libsrc/standard/strval/rt.tpl | 16 ++++++-
libsrc/standard/strval/softcopy.tpl | 6 +++
libsrc/standard/strval/xaxrf.tpl | 11 +++++
25 files changed, 438 insertions(+), 106 deletions(-)
diff --git a/CHANGES b/CHANGES
index 4181fc2..4f6fff7 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,67 @@
+160323: libsrc/standard/elmdict/toshiba.tpl: Add Toshiba CT private data element for Injector Elapsed Time
+
+160323: libsrc/standard/elmdict/other.tpl: Add observed Nautilus Medical private data element VRs
+
+160319: libsrc/standard/elmdict/dicom3.tpl: Content Assessment Results data elements (Sup 185)
+
+160217: libsrc/standard/elmdict/dicom3.tpl: Correct inconsistent data element names found making draft 2016a
+
+160210: libsrc/standard/elmdict/dicom3.tpl: Add data elements for settling phases information and Synch pulse for Functional MRI (CP 1476)
+
+160202: libsrc/standard/libsrc/standard/module/base.tpl,xaxrf.tpl,strval/xaxrf.tpl: dciodvfy should allow TOMOSYNTHESIS for FrameType value 4 (000488)
+
+160202: libsrc/standard/module/base.tpl: report when FrameAcquisitionDuration in FrameContentSequence has zero value (000487)
+
+160202: libsrc/standard/elmdict/siemens.tpl: more encountered Siemens mammo tomo private data elements
+
+160119: libsrc/standard/elmdict/dicom3.tpl,module/sr.tpl: Extend Identified Person or Device Macro (CP 1516)
+
+160119: libsrc/standard/elmdict/dicom3.tpl,module/rt.tpl: Add Accessory Code To Trays (CP 1504)
+
+160119: libsrc/standard/elmdict/dicom3.tpl,module/base.tpl: Support of more than 16 bit in point index lists, then Fix CP 1365 setback with Long xxx Index List VR (CP 1365, CP 1499)
+
+160119: libsrc/standard/elmdict/dicom3.tpl: Add data elements for Ion Range and Modulation (CP 1460)
+
+160119: libsrc/standard/condn.tpl,elmdict/dicom3.tpl,module/base.tpl: Add Tracking Identifier and UID to Segmentation Instances (CP 1495)
+
+160118: libsrc/standard/condn.tpl,module/base.tpl: Detect missing date time attributes in Frame Content Sequence predicated on ORIGINAL frame type and not legacy converted SOP Class (000443)
+
+160108: libsrc/standard/condn.tpl,module/ct.tpl: Remove ineffective conditions in CTAcquisitionDetailsMacro and CTTableDynamicsMacro since cannot check string values in sibling functional groups (000485)
+
+160104: libsrc/standard/module/rt.tpl: Clarify RT Image Exposure Attributes in case of MPEG Encoding (CP 1488)
+
+160104: libsrc/standard/module/mr.tpl: Allow multiple items in the MR Receive Coil Sequence (CP 1480)
+
+160104: libsrc/standard/module/rt.tpl: Add Display Origin Coordinates To RT Plan (CP 1487)
+
+160104: libsrc/standard/module/us.tpl: Clarify Enhanced US Volume Image and Frame Type Values 3 and 4 (CP 1463)
+
+160104: libsrc/standard/module/base.tpl,mr.tpl: Add B1rms value to MR Enhanced and MR Objects (CP 1461)
+
+160104: libsrc/standard/module/base.tpl,ct.tpl,mr.tpl,pet.tpl: Add Isocenter Position to MR/PET/Enhanced CT/MR/PET and RT Equipment Correlation to Enhanced CT (CP 1337)
+
+160104: libsrc/standard/condn.tpl,module/base.tpl: Value representation of real world value first and last values mapped (CP 1458)
+
+160104: libsrc/standard/module/rt.tpl: Add Operator Identification Sequence to RT modules (CP 1456)
+
+151230: libsrc/standard/elmdict/other.tpl: Add private data elements for Mayo CT projection data (CT-PD)
+
+151219: libsrc/standard/module/base.tpl,softcopy.tpl,us.tpl,vl.tpl,strval/softcopy.tpl: Add color space attribute (CP 1454)
+
+151219: libsrc/condn.tpl,module/base.tpl: Prohibit circular Dimension Index references (CP 1446)
+
+151219: libsrc/module/softcopy.tpl: Add hanging protocol identification to structured display module (CP 1444)
+
+151219: libsrc/elmdict/dicom3.tpl: Unretire Destination AE (2100,0140) (CP 1441)
+
+151219: libsrc/standard/condn.tpl,module,strval/rt.tpl: Add Support for Ion Therapy Scanning Modes (CP 1432)
+
+151219: libsrc/standard/condn.tpl,module,strval/rt.tpl: Add Beam Effective Dose in RT Fraction Scheme Module (CP 1431)
+
+151217: appsrc/dcfile/dctopgm8.cc: Report error rather than segmentation fault when input file does not contain PixelData (e.g., a presentation state) (000483)
+
+151217: appsrc/dcfile/dckey.cc,dctable.cc: Exit cleanly rather than seg fault if no key supplied on command line (000482)
+
151212: libsrc/standard/condn.tpl,iodcomp/sr.tpl: Add Acquisition Context SR (Sup 187)
151207: libsrc/standard/condn.tpl,iodcomp/sr.tpl: Add Radiopharmaceutical RDSR (Sup 159)
diff --git a/VERSION b/VERSION
index 2fc458f..2937cac 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.00.snapshot.20151213160232
+1.00.snapshot.20160402132920
diff --git a/appsrc/dcfile/dckey.cc b/appsrc/dcfile/dckey.cc
index c8aec80..eba37dd 100644
--- a/appsrc/dcfile/dckey.cc
+++ b/appsrc/dcfile/dckey.cc
@@ -117,6 +117,10 @@ main(int argc,char **argv)
<< endl;
return 1;
}
+
+ if (!keylist) { // (000482) and Debian 715786
+ return 0;
+ }
DicomInputStream din(*(istream *)input_opener,
dicom_input_options.transfersyntaxuid,
diff --git a/appsrc/dcfile/dctable.cc b/appsrc/dcfile/dctable.cc
index ca71218..6e470d7 100644
--- a/appsrc/dcfile/dctable.cc
+++ b/appsrc/dcfile/dctable.cc
@@ -195,6 +195,10 @@ main(int argc,char **argv)
<< endl;
return 1;
}
+
+ if (!keylist) { // (000482) and Debian 715809
+ return 0;
+ }
bool success=true;
TextOutputStream log(cerr);
diff --git a/appsrc/dcfile/dctopgm8.cc b/appsrc/dcfile/dctopgm8.cc
index 9691d0b..22dbc46 100644
--- a/appsrc/dcfile/dctopgm8.cc
+++ b/appsrc/dcfile/dctopgm8.cc
@@ -929,59 +929,63 @@ main(int argc, char *argv[])
if (!vBitsAllocated && vBitsStored)
vBitsAllocated=((vBitsStored-1u)/8u+1u)*8u;
- if (!vBitsAllocated) {
+ if (!vBitsAllocated && aPixelData) {
if (strcmp(aPixelData->getVR(),"OW") == 0)
vBitsAllocated=16;
else
vBitsAllocated=8;
}
- Assert(vBitsAllocated <= 16);
+ if (vBitsAllocated > 16) {
+ success=false;
+ }
if (!vBitsStored) vBitsStored=vBitsAllocated;
if (!vHighBit) vHighBit=vBitsStored-1;
- Uint32 framelengthinwords=length/vNumberOfFrames*8/vBitsAllocated;
+ Uint32 framelengthinwords = (vNumberOfFrames && vBitsAllocated) ? length/vNumberOfFrames*8/vBitsAllocated : 0; // no division by zero for us
- if (!vRows) {
- if (!vColumns) {
- if (!vSamplesPerPixel) {
- vRows=Uint16(sqrt(framelengthinwords));
- vColumns=Uint16(length/vRows);
- vSamplesPerPixel=1;
+ if (framelengthinwords) {
+ if (!vRows) {
+ if (!vColumns) {
+ if (!vSamplesPerPixel) {
+ vRows=Uint16(sqrt(framelengthinwords));
+ vColumns=Uint16(length/vRows);
+ vSamplesPerPixel=1;
+ }
+ else {
+ Uint32 left=framelengthinwords/vSamplesPerPixel;
+ vRows=Uint16(sqrt(left));
+ vColumns=Uint16(left/vRows);
+ }
}
else {
- Uint32 left=framelengthinwords/vSamplesPerPixel;
- vRows=Uint16(sqrt(left));
- vColumns=Uint16(left/vRows);
+ if (!vSamplesPerPixel) {
+ Uint32 left=framelengthinwords/vColumns;
+ vRows=Uint16(sqrt(length));
+ vSamplesPerPixel=1;
+ }
+ else {
+ vRows=Uint16(framelengthinwords/(vColumns*vSamplesPerPixel));
+ }
}
}
else {
- if (!vSamplesPerPixel) {
- Uint32 left=framelengthinwords/vColumns;
- vRows=Uint16(sqrt(length));
- vSamplesPerPixel=1;
- }
- else {
- vRows=Uint16(framelengthinwords/(vColumns*vSamplesPerPixel));
- }
- }
- }
- else {
- if (!vColumns) {
- if (!vSamplesPerPixel) {
- vColumns=Uint16(framelengthinwords/vRows);
- vSamplesPerPixel=1;
+ if (!vColumns) {
+ if (!vSamplesPerPixel) {
+ vColumns=Uint16(framelengthinwords/vRows);
+ vSamplesPerPixel=1;
+ }
+ else {
+ vColumns=Uint16(framelengthinwords/(vRows*vSamplesPerPixel));
+ }
}
else {
- vColumns=Uint16(framelengthinwords/(vRows*vSamplesPerPixel));
- }
- }
- else {
- if (!vSamplesPerPixel) {
- vSamplesPerPixel=Uint16(framelengthinwords/(vRows*vColumns));
+ if (!vSamplesPerPixel) {
+ vSamplesPerPixel=Uint16(framelengthinwords/(vRows*vColumns));
+ }
+ // else we know all three
}
- // else we know all three
}
}
@@ -1026,12 +1030,12 @@ main(int argc, char *argv[])
<< dec << endl;
}
- Assert((Uint32)vRows*vColumns*vSamplesPerPixel <= framelengthinwords);
-
if (!vRows || !vColumns
|| !vPhotometricInterpretation || !vSamplesPerPixel
|| !vBitsAllocated
- || (vSamplesPerPixel > 1 && vPlanarConfiguration == 0xffff)) {
+ || (vSamplesPerPixel > 1 && vPlanarConfiguration == 0xffff)
+ || framelengthinwords == 0
+ || ((Uint32)vRows*vColumns*vSamplesPerPixel > framelengthinwords)) {
log << EMsgDC(MissingMandatoryAttributes) << endl;
success=false;
}
diff --git a/appsrc/dcfile/makedcdtchgheader.sh b/appsrc/dcfile/makedcdtchgheader.sh
index 95baaa9..aaaf3c5 100755
--- a/appsrc/dcfile/makedcdtchgheader.sh
+++ b/appsrc/dcfile/makedcdtchgheader.sh
@@ -7,6 +7,7 @@ echo "// Automatically generated from template - EDITS WILL BE LOST" > "${outfil
echo "// Generated by makedcdtchgheader.sh" >> "${outfile}"
echo "static Tag mapDateTagToTimeTag[] = {" >> "${outfile}"
egrep 'VR="(DA)"' "${dictionary}" \
+ | grep -v SelectorDAValue \
| sed -e 's/^.*Keyword="\([^"]*\).*$/\1/' \
| sed -e 's/Date/Time/' \
| xargs -L 1 -I % grep 'Keyword="%"' "${dictionary}" \
diff --git a/libsrc/src/generic/version.cc b/libsrc/src/generic/version.cc
index 6c69743..1fcb397 100644
--- a/libsrc/src/generic/version.cc
+++ b/libsrc/src/generic/version.cc
@@ -4,4 +4,4 @@
#include "version.h"
-const char* dicom3tools_version_string = "1.00.snapshot.20151213160232";
+const char* dicom3tools_version_string = "1.00.snapshot.20160402132920";
diff --git a/libsrc/standard/condn.tpl b/libsrc/standard/condn.tpl
index f845e44..a6b94ad 100755
--- a/libsrc/standard/condn.tpl
+++ b/libsrc/standard/condn.tpl
@@ -2550,6 +2550,32 @@ Condition="StackIDIsPresent"
Element="StackID" ElementPresent=""
ConditionEnd
+Condition="NeedRealWorldValueFirstValueMapped"
+ Element="PixelData" ElementPresent=""
+ Element="RealWorldValueLUTData" Operator="Or" ElementPresent=""
+ Element="DoubleFloatRealWorldValueFirstValueMapped" Operator="Or" Modifier="Not" ElementPresent=""
+ConditionEnd
+
+Condition="NeedRealWorldValueLastValueMapped"
+ Element="PixelData" ElementPresent=""
+ Element="RealWorldValueLUTData" Operator="Or" ElementPresent=""
+ Element="DoubleFloatRealWorldValueLastValueMapped" Operator="Or" Modifier="Not" ElementPresent=""
+ConditionEnd
+
+Condition="NeedDoubleFloatRealWorldValueFirstValueMapped"
+ Element="RealWorldValueFirstValueMapped" Modifier="Not" ElementPresent=""
+ConditionEnd
+
+Condition="NeedDoubleFloatRealWorldValueLastValueMapped"
+ Element="RealWorldValueLastValueMapped" Modifier="Not" ElementPresent=""
+ConditionEnd
+
+Condition="NeedRealWorldValueSlopeAndIntercept"
+ Element="FloatPixelData" ElementPresent=""
+ Element="DoubleFloatPixelData" Operator="Or" ElementPresent=""
+ Element="RealWorldValueLUTData" Operator="Or" Modifier="Not" ElementPresent=""
+ConditionEnd
+
Condition="RealWorldValueLUTDataNotPresent"
Element="RealWorldValueLUTData" Modifier="Not" ElementPresent=""
ConditionEnd
@@ -2605,6 +2631,17 @@ Condition="ImageTypeValue1OriginalOrMixed"
Element="ImageType" ValueSelector="0" StringValueFromRootAttribute="MIXED"
ConditionEnd
+Condition="ImageTypeValue1OriginalOrMixedAndNotLegacyConverted"
+ Element="SOPClassUID" Modifier="Not" StringConstantFromRootAttribute="LegacyConvertedEnhancedCTImageStorageSOPClassUID"
+ Element="SOPClassUID" Operator="And" Modifier="Not" StringConstantFromRootAttribute="LegacyConvertedEnhancedMRImageStorageSOPClassUID"
+ Element="SOPClassUID" Operator="And" Modifier="Not" StringConstantFromRootAttribute="LegacyConvertedEnhancedPETImageStorageSOPClassUID"
+ (
+ Element="ImageType" ValueSelector="0" StringValueFromRootAttribute="ORIGINAL"
+ Element="ImageType" ValueSelector="0" StringValueFromRootAttribute="MIXED"
+ ) Operator="And"
+}
+ConditionEnd
+
Condition="ImageTypeValue1OriginalOrMixedAndNotLegacyConvertedMR"
Element="SOPClassUID" Modifier="Not" StringConstantFromRootAttribute="LegacyConvertedEnhancedMRImageStorageSOPClassUID"
(
@@ -3583,19 +3620,6 @@ Condition="AcquisitionTypeConstantAngle"
Element="AcquisitionType" StringValue="CONSTANT_ANGLE"
ConditionEnd
-Condition="AcquisitionTypeNotConstantAngle"
- Element="AcquisitionType" Modifier="Not" StringValue="CONSTANT_ANGLE"
-ConditionEnd
-
-Condition="AcquisitionTypeConstantAngleOrSpiral"
- Element="AcquisitionType" StringValue="CONSTANT_ANGLE"
- Element="AcquisitionType" Operator="Or" StringValue="SPIRAL"
-ConditionEnd
-
-Condition="AcquisitionTypeSpiral"
- Element="AcquisitionType" StringValue="SPIRAL"
-ConditionEnd
-
Condition="ConvolutionKernelIsPresent"
Element="ConvolutionKernel" ElementPresent=""
ConditionEnd
@@ -4195,10 +4219,14 @@ Condition="RangeModulatorTypeIsWhlModWeights"
Element="RangeModulatorType" StringValue="WHL_MODWEIGHTS"
ConditionEnd
-Condition="ScanModeIsModulated"
+Condition="ScanModeAboveIsModulatedOrModulatedSpec"
Element="ScanMode" StringValueAbove="MODULATED"
ConditionEnd
+Condition="ScanModeIsModulatedSpec"
+ Element="ScanMode" StringValue="MODULATED"
+ConditionEnd
+
Condition="PlanesInAcquisitionNotUndefined"
Element="ImageType" Modifier="Not" StringValue="UNDEFINED"
ConditionEnd
@@ -5099,7 +5127,14 @@ Condition="DimensionIndexPointerIsNotFunctionalGroup"
Element="DimensionIndexPointer" Operator="And" Modifier="Not" TagValue="0x0018,0x9476" # X-Ray Geometry Sequence
Element="DimensionIndexPointer" Operator="And" Modifier="Not" TagValue="0x0018,0x9412" # XA/XRF Frame Characteristics Sequence
Element="DimensionIndexPointer" Operator="And" Modifier="Not" TagValue="0x0018,0x9504" # X-Ray 3D Frame Type Sequence
+ConditionEnd
+Condition="DimensionIndexPointerIsFrameContentSequence"
+ Element="DimensionIndexPointer" TagValue="0x0020,0x9111"
+ConditionEnd
+
+Condition="DimensionIndexPointerIsDimensionIndexValues"
+ Element="DimensionIndexPointer" TagValue="0x0020,0x9157"
ConditionEnd
Condition="CardiacSignalSourcePresentAndCardiacSynchronizationTechniqueIsNone"
@@ -6579,3 +6614,28 @@ Condition="XRayFilterMacroOKInSharedFunctionalGroupSequence"
Element="XRayFilterSequence" Modifier="Not" ElementPresentInPathFromRoot="PerFrameFunctionalGroupsSequence"
Element="XRayFilterSequence" Operator="And" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
ConditionEnd
+
+Condition="AlternateBeamDosePresent"
+ Element="AlternateBeamDose" ElementPresent=""
+ConditionEnd
+
+# do not have construct to directly compare two values, but there are only two possible values
+Condition="AlternateBeamDoseTypeSameValueAsBeamDoseType"
+ (
+ Element="AlternateBeamDose" StringValue="PHYSICAL"
+ Element="BeamDoseType" Operator="And" StringValue="PHYSICAL"
+ ) Operator="Or"
+ (
+ Element="AlternateBeamDose" StringValue="EFFECTIVE"
+ Element="BeamDoseType" Operator="And" StringValue="EFFECTIVE"
+ ) Operator="Or"
+ConditionEnd
+
+Condition="TrackingIDIsPresent"
+ Element="TrackingID" ElementPresent=""
+ConditionEnd
+
+Condition="TrackingUIDIsPresent"
+ Element="TrackingUID" ElementPresent=""
+ConditionEnd
+
diff --git a/libsrc/standard/elmdict/dicom3.tpl b/libsrc/standard/elmdict/dicom3.tpl
index f0da0a4..58eeeae 100644
--- a/libsrc/standard/elmdict/dicom3.tpl
+++ b/libsrc/standard/elmdict/dicom3.tpl
@@ -112,6 +112,7 @@
(0008,0052) VERS="3" VR="CS" VM="1" Keyword="QueryRetrieveLevel" Name="Query/Retrieve Level"
(0008,0053) VERS="3" VR="CS" VM="1" Keyword="QueryRetrieveView" Name="Query/Retrieve View"
(0008,0054) VERS="3" VR="AE" VM="1-n" Keyword="RetrieveAETitle" Name="Retrieve AE Title"
+(0008,0055) VERS="3" VR="AE" VM="1" Keyword="StationAETitle" Name="Station AE Title"
(0008,0056) VERS="3" VR="CS" VM="1" Keyword="InstanceAvailability" Name="Instance Availability"
(0008,0058) VERS="3" VR="UI" VM="1-n" Keyword="FailedSOPInstanceUIDList" Name="Failed SOP Instance UID List"
(0008,0060) VERS="3" VR="CS" VM="1" Keyword="Modality" Name="Modality"
@@ -533,6 +534,8 @@
(0018,1251) VERS="3" VR="SH" VM="1" Keyword="TransmitCoilName" Name="Transmit Coil Name"
(0018,1260) VERS="3" VR="SH" VM="1" Keyword="PlateType" Name="Plate Type"
(0018,1261) VERS="3" VR="LO" VM="1" Keyword="PhosphorType" Name="Phosphor Type"
+(0018,1271) VERS="3" VR="FD" VM="1" Keyword="WaterEquivalentDiameter" Name="Water Equivalent Diameter"
+(0018,1272) VERS="3" VR="SQ" VM="1" Keyword="WaterEquivalentDiameterCalculationMethodCodeSequence" Name="Water Equivalent Diameter Calculation Method Code Sequence"
(0018,1300) VERS="3" VR="DS" VM="1" Keyword="ScanVelocity" Name="Scan Velocity"
(0018,1301) VERS="3" VR="CS" VM="1-n" Keyword="WholeBodyTechnique" Name="Whole Body Technique"
(0018,1302) VERS="3" VR="IS" VM="1" Keyword="ScanLength" Name="Scan Length"
@@ -1024,13 +1027,17 @@
(0018,9557) VERS="3" VR="FD" VM="3" Keyword="DetectorActiveAreaTLHCPosition" Name="Detector Active Area TLHC Position"
(0018,9558) VERS="3" VR="FD" VM="6" Keyword="DetectorActiveAreaOrientation" Name="Detector Active Area Orientation"
(0018,9559) VERS="3" VR="CS" VM="1" Keyword="PositionerPrimaryAngleDirection" Name="Positioner Primary Angle Direction"
-(0018,9601) VERS="3" VR="SQ" VM="1" Keyword="DiffusionBMatrixSequence" Name="Diffusion b-matrix Sequence"
-(0018,9602) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueXX" Name="Diffusion b-value XX"
-(0018,9603) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueXY" Name="Diffusion b-value XY"
-(0018,9604) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueXZ" Name="Diffusion b-value XZ"
-(0018,9605) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueYY" Name="Diffusion b-value YY"
-(0018,9606) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueYZ" Name="Diffusion b-value YZ"
-(0018,9607) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueZZ" Name="Diffusion b-value ZZ"
+(0018,9601) VERS="3" VR="SQ" VM="1" Keyword="DiffusionBMatrixSequence" Name="Diffusion b-matrix Sequence"
+(0018,9602) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueXX" Name="Diffusion b-value XX"
+(0018,9603) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueXY" Name="Diffusion b-value XY"
+(0018,9604) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueXZ" Name="Diffusion b-value XZ"
+(0018,9605) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueYY" Name="Diffusion b-value YY"
+(0018,9606) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueYZ" Name="Diffusion b-value YZ"
+(0018,9607) VERS="3" VR="FD" VM="1" Keyword="DiffusionBValueZZ" Name="Diffusion b-value ZZ"
+(0018,9621) VERS="3" VR="SQ" VM="1" Keyword="FunctionalMRSequence" Name="Functional MR Sequence"
+(0018,9622) VERS="3" VR="CS" VM="1" Keyword="FunctionalSettlingPhaseFramesPresent" Name="Functional Settling Phase Frames Present"
+(0018,9623) VERS="3" VR="DT" VM="1" Keyword="FunctionalSyncPulse" Name="Functional Sync Pulse"
+(0018,9624) VERS="3" VR="CS" VM="1" Keyword="SettlingPhaseFrame" Name="Settling Phase Frame"
(0018,9701) VERS="3" VR="DT" VM="1" Keyword="DecayCorrectionDateTime" Name="Decay Correction DateTime"
(0018,9715) VERS="3" VR="FD" VM="1" Keyword="StartDensityThreshold" Name="Start Density Threshold"
(0018,9716) VERS="3" VR="FD" VM="1" Keyword="StartRelativeDensityDifferenceThreshold" Name="Start Relative Density Difference Threshold"
@@ -2387,6 +2394,8 @@
(0062,0010) VERS="3" VR="CS" VM="1" Keyword="SegmentationFractionalType" Name="Segmentation Fractional Type"
(0062,0011) VERS="3" VR="SQ" VM="1" Keyword="SegmentedPropertyTypeModifierCodeSequence" Name="Segmented Property Type Modifier Code Sequence"
(0062,0012) VERS="3" VR="SQ" VM="1" Keyword="UsedSegmentsSequence" Name="Used Segments Sequence"
+(0062,0020) VERS="3" VR="UT" VM="1" Keyword="TrackingID" Name="Tracking ID"
+(0062,0021) VERS="3" VR="UI" VM="1" Keyword="TrackingUID" Name="Tracking UID"
(0064,0002) VERS="3" VR="SQ" VM="1" Keyword="DeformableRegistrationSequence" Name="Deformable Registration Sequence"
(0064,0003) VERS="3" VR="UI" VM="1" Keyword="SourceFrameOfReferenceUID" Name="Source Frame of Reference UID"
(0064,0005) VERS="3" VR="SQ" VM="1" Keyword="DeformableRegistrationGridSequence" Name="Deformable Registration Grid Sequence"
@@ -2421,13 +2430,13 @@
(0066,001F) VERS="3" VR="US" VM="1" Keyword="VectorDimensionality" Name="Vector Dimensionality"
(0066,0020) VERS="3" VR="FL" VM="1-n" Keyword="VectorAccuracy" Name="Vector Accuracy"
(0066,0021) VERS="3" VR="OF" VM="1" Keyword="VectorCoordinateData" Name="Vector Coordinate Data"
-(0066,0023) VERS="3" VR="OW" VM="1" Keyword="TrianglePointIndexList" Name="Triangle Point Index List"
-(0066,0024) VERS="3" VR="OW" VM="1" Keyword="EdgePointIndexList" Name="Edge Point Index List"
-(0066,0025) VERS="3" VR="OW" VM="1" Keyword="VertexPointIndexList" Name="Vertex Point Index List"
+(0066,0023) VERS="RET" VR="OW" VM="1" Keyword="TrianglePointIndexList" Name="Triangle Point Index List"
+(0066,0024) VERS="RET" VR="OW" VM="1" Keyword="EdgePointIndexList" Name="Edge Point Index List"
+(0066,0025) VERS="RET" VR="OW" VM="1" Keyword="VertexPointIndexList" Name="Vertex Point Index List"
(0066,0026) VERS="3" VR="SQ" VM="1" Keyword="TriangleStripSequence" Name="Triangle Strip Sequence"
(0066,0027) VERS="3" VR="SQ" VM="1" Keyword="TriangleFanSequence" Name="Triangle Fan Sequence"
(0066,0028) VERS="3" VR="SQ" VM="1" Keyword="LineSequence" Name="Line Sequence"
-(0066,0029) VERS="3" VR="OW" VM="1" Keyword="PrimitivePointIndexList" Name="Primitive Point Index List"
+(0066,0029) VERS="RET" VR="OW" VM="1" Keyword="PrimitivePointIndexList" Name="Primitive Point Index List"
(0066,002A) VERS="3" VR="UL" VM="1" Keyword="SurfaceCount" Name="Surface Count"
(0066,002B) VERS="3" VR="SQ" VM="1" Keyword="ReferencedSurfaceSequence" Name="Referenced Surface Sequence"
(0066,002C) VERS="3" VR="UL" VM="1" Keyword="ReferencedSurfaceNumber" Name="Referenced Surface Number"
@@ -2442,6 +2451,10 @@
(0066,0036) VERS="3" VR="LO" VM="1" Keyword="AlgorithmName" Name="Algorithm Name"
(0066,0037) VERS="3" VR="FL" VM="1" Keyword="RecommendedPointRadius" Name="Recommended Point Radius"
(0066,0038) VERS="3" VR="FL" VM="1" Keyword="RecommendedLineThickness" Name="Recommended Line Thickness"
+(0066,0040) VERS="3" VR="OL" VM="1" Keyword="LongPrimitivePointIndexList" Name="Long Primitive Point Index List"
+(0066,0041) VERS="3" VR="OL" VM="1" Keyword="LongTrianglePointIndexList" Name="Long Triangle Point Index List"
+(0066,0042) VERS="3" VR="OL" VM="1" Keyword="LongEdgePointIndexList" Name="Long Edge Point Index List"
+(0066,0043) VERS="3" VR="OL" VM="1" Keyword="LongVertexPointIndexList" Name="Long Vertex Point Index List"
(0066,0101) VERS="3" VR="SQ" VM="1" Keyword="TrackSetSequence" Name="Track Set Sequence"
(0066,0102) VERS="3" VR="SQ" VM="1" Keyword="TrackSequence" Name="Track Sequence"
(0066,0103) VERS="3" VR="OW" VM="1" Keyword="RecommendedDisplayCIELabValueList" Name="Recommended Display CIELab Value List"
@@ -2650,8 +2663,8 @@
(0070,1302) VERS="3" VR="CS" VM="1" Keyword="VolumeCroppingMethod" Name="Volume Cropping Method"
(0070,1303) VERS="3" VR="FD" VM="6" Keyword="BoundingBoxCrop" Name="Bounding Box Crop"
(0070,1304) VERS="3" VR="SQ" VM="1" Keyword="ObliqueCroppingPlaneSequence" Name="Oblique Cropping Plane Sequence"
-(0070,1305) VERS="3" VR="FD" VM="4" Keyword="ObliqueCroppingPlane" Name="Oblique Cropping Plane"
-(0070,1306) VERS="3" VR="FD" VM="3" Keyword="ObliqueCroppingPlaneNormal" Name="Oblique Cropping Plane Normal"
+(0070,1305) VERS="3" VR="FD" VM="4" Keyword="Plane" Name="Plane"
+(0070,1306) VERS="3" VR="FD" VM="3" Keyword="PlaneNormal" Name="Plane Normal"
(0070,1309) VERS="3" VR="US" VM="1" Keyword="CroppingSpecificationNumber" Name="Cropping Specification Number"
(0070,1501) VERS="3" VR="CS" VM="1" Keyword="MultiPlanarReconstructionStyle" Name="Multi-Planar Reconstruction Style"
(0070,1502) VERS="3" VR="CS" VM="1" Keyword="MPRThicknessType" Name="MPR Thickness Type"
@@ -2707,17 +2720,30 @@
(0072,0052) VERS="3" VR="AT" VM="1-n" Keyword="SelectorSequencePointer" Name="Selector Sequence Pointer"
(0072,0054) VERS="3" VR="LO" VM="1-n" Keyword="SelectorSequencePointerPrivateCreator" Name="Selector Sequence Pointer Private Creator"
(0072,0056) VERS="3" VR="LO" VM="1" Keyword="SelectorAttributePrivateCreator" Name="Selector Attribute Private Creator"
+(0072,005E) VERS="3" VR="AE" VM="1-n" Keyword="SelectorAEValue" Name="Selector AE Value"
+(0072,005F) VERS="3" VR="AS" VM="1-n" Keyword="SelectorASValue" Name="Selector AS Value"
(0072,0060) VERS="3" VR="AT" VM="1-n" Keyword="SelectorATValue" Name="Selector AT Value"
+(0072,0061) VERS="3" VR="DA" VM="1-n" Keyword="SelectorDAValue" Name="Selector DA Value"
(0072,0062) VERS="3" VR="CS" VM="1-n" Keyword="SelectorCSValue" Name="Selector CS Value"
+(0072,0063) VERS="3" VR="DT" VM="1" Keyword="SelectorDTValue" Name="Selector DT Value"
(0072,0064) VERS="3" VR="IS" VM="1-n" Keyword="SelectorISValue" Name="Selector IS Value"
+(0072,0065) VERS="3" VR="OB" VM="1" Keyword="SelectorOBValue" Name="Selector OB Value"
(0072,0066) VERS="3" VR="LO" VM="1-n" Keyword="SelectorLOValue" Name="Selector LO Value"
+(0072,0067) VERS="3" VR="OF" VM="1" Keyword="SelectorOFValue" Name="Selector OF Value"
(0072,0068) VERS="3" VR="LT" VM="1" Keyword="SelectorLTValue" Name="Selector LT Value"
+(0072,0069) VERS="3" VR="OW" VM="1" Keyword="SelectorOWValue" Name="Selector OW Value"
(0072,006A) VERS="3" VR="PN" VM="1-n" Keyword="SelectorPNValue" Name="Selector PN Value"
+(0072,006B) VERS="3" VR="TM" VM="1-n" Keyword="SelectorTMValue" Name="Selector TM Value"
(0072,006C) VERS="3" VR="SH" VM="1-n" Keyword="SelectorSHValue" Name="Selector SH Value"
+(0072,006D) VERS="3" VR="UN" VM="1" Keyword="SelectorUNValue" Name="Selector UN Value"
(0072,006E) VERS="3" VR="ST" VM="1" Keyword="SelectorSTValue" Name="Selector ST Value"
+(0072,006F) VERS="3" VR="UC" VM="1-n" Keyword="SelectorUCValue" Name="Selector UC Value"
(0072,0070) VERS="3" VR="UT" VM="1" Keyword="SelectorUTValue" Name="Selector UT Value"
+(0072,0071) VERS="3" VR="UR" VM="1" Keyword="SelectorURValue" Name="Selector UR Value"
(0072,0072) VERS="3" VR="DS" VM="1-n" Keyword="SelectorDSValue" Name="Selector DS Value"
+(0072,0073) VERS="3" VR="OD" VM="1" Keyword="SelectorODValue" Name="Selector OD Value"
(0072,0074) VERS="3" VR="FD" VM="1-n" Keyword="SelectorFDValue" Name="Selector FD Value"
+(0072,0075) VERS="3" VR="OL" VM="1" Keyword="SelectorOLValue" Name="Selector OL Value"
(0072,0076) VERS="3" VR="FL" VM="1-n" Keyword="SelectorFLValue" Name="Selector FL Value"
(0072,0078) VERS="3" VR="UL" VM="1-n" Keyword="SelectorULValue" Name="Selector UL Value"
(0072,007A) VERS="3" VR="US" VM="1-n" Keyword="SelectorUSValue" Name="Selector US Value"
@@ -2915,6 +2941,29 @@
(0080,0011) VERS="3" VR="OF" VM="1-n" Keyword="VValueData" Name="V Value Data"
(0080,0012) VERS="3" VR="SQ" VM="1" Keyword="ReferencedTextureSequence" Name="Referenced Texture Sequence"
(0080,0013) VERS="3" VR="SQ" VM="1" Keyword="ReferencedSurfaceDataSequence" Name="Referenced Surface Data Sequence"
+(0082,0001) VERS="3" VR="CS" VM="1" Keyword="AssessmentSummary" Name="Assessment Summary"
+(0082,0003) VERS="3" VR="UT" VM="1" Keyword="AssessmentSummaryDescription" Name="Assessment Summary Description"
+(0082,0004) VERS="3" VR="SQ" VM="1" Keyword="AssessedSOPInstanceSequence" Name="Assessed SOP Instance Sequence"
+(0082,0005) VERS="3" VR="SQ" VM="1" Keyword="ReferencedComparisonSOPInstanceSequence" Name="Referenced Comparison SOP Instance Sequence"
+(0082,0006) VERS="3" VR="UL" VM="1" Keyword="NumberOfAssessmentObservations" Name="Number of Assessment Observations"
+(0082,0007) VERS="3" VR="SQ" VM="1" Keyword="AssessmentObservationsSequence" Name="Assessment Observations Sequence"
+(0082,0008) VERS="3" VR="CS" VM="1" Keyword="ObservationSignificance" Name="Observation Significance"
+(0082,000A) VERS="3" VR="UT" VM="1" Keyword="ObservationDescription" Name="Observation Description"
+(0082,000C) VERS="3" VR="SQ" VM="1" Keyword="StructuredContraintObservationSequence" Name="Structured Constraint Observation Sequence"
+(0082,0010) VERS="3" VR="SQ" VM="1" Keyword="AssessedAttributeValueSequence" Name="Assessed Attribute Value Sequence"
+(0082,0016) VERS="3" VR="LO" VM="1" Keyword="AssessmentSetID" Name="Assessment Set ID"
+(0082,0017) VERS="3" VR="SQ" VM="1" Keyword="AssessmentRequesterSequence" Name="Assessment Requester Sequence"
+(0082,0018) VERS="3" VR="LO" VM="1" Keyword="SelectorAttributeName" Name="Selector Attribute Name"
+(0082,0019) VERS="3" VR="LO" VM="1" Keyword="SelectorAttributeKeyword" Name="Selector Attribute Keyword"
+(0082,0021) VERS="3" VR="SQ" VM="1" Keyword="AssessmentTypeCodeSequence" Name="Assessment Type Code Sequence"
+(0082,0022) VERS="3" VR="SQ" VM="1" Keyword="ObservationBasisCodeSequence" Name="Observation Basis Code Sequence"
+(0082,0023) VERS="3" VR="LO" VM="1" Keyword="AssessmentLabel" Name="Assessment Label"
+(0082,0032) VERS="3" VR="CS" VM="1" Keyword="ConstraintType" Name="Constraint Type"
+(0082,0033) VERS="3" VR="UT" VM="1" Keyword="SpecificationSelectionGuidance" Name="Specification Selection Guidance"
+(0082,0034) VERS="3" VR="SQ" VM="1" Keyword="ConstraintValueSequence" Name="Constraint Value Sequence"
+(0082,0035) VERS="3" VR="SQ" VM="1" Keyword="RecommendedDefaultValueSequence" Name="Recommended Default Value Sequence"
+(0082,0036) VERS="3" VR="CS" VM="1" Keyword="ConstraintViolationSignificance" Name="Constraint Violation Significance "
+(0082,0037) VERS="3" VR="UT" VM="1" Keyword="ConstraintViolationCondition" Name="Constraint Violation Condition"
(0088,0130) VERS="3" VR="SH" VM="1" Keyword="StorageMediaFileSetID" Name="Storage Media File-set ID"
(0088,0140) VERS="3" VR="UI" VM="1" Keyword="StorageMediaFileSetUID" Name="Storage Media File-set UID"
(0088,0200) VERS="3" VR="SQ" VM="1" Keyword="IconImageSequence" Name="Icon Image Sequence"
@@ -3038,7 +3087,7 @@
(2100,0040) VERS="3" VR="DA" VM="1" Keyword="CreationDate" Name="Creation Date"
(2100,0050) VERS="3" VR="TM" VM="1" Keyword="CreationTime" Name="Creation Time"
(2100,0070) VERS="3" VR="AE" VM="1" Keyword="Originator" Name="Originator"
-(2100,0140) VERS="RET" VR="AE" VM="1" Keyword="DestinationAE" Name="Destination AE"
+(2100,0140) VERS="3" VR="AE" VM="1" Keyword="DestinationAE" Name="Destination AE"
(2100,0160) VERS="3" VR="SH" VM="1" Keyword="OwnerID" Name="OwnerID"
(2100,0170) VERS="3" VR="IS" VM="1" Keyword="NumberOfFilms" Name="Number of Films"
(2100,0500) VERS="RET" VR="SQ" VM="1" Keyword="ReferencedPrintJobSequencePullStoredPrint" Name="Referenced Print Job Sequence (Pull Stored Print)"
@@ -3438,7 +3487,7 @@
(300A,012C) VERS="3" VR="DS" VM="3" Keyword="IsocenterPosition" Name="Isocenter Position"
(300A,012E) VERS="3" VR="DS" VM="3" Keyword="SurfaceEntryPoint" Name="Surface Entry Point"
(300A,0130) VERS="3" VR="DS" VM="1" Keyword="SourceToSurfaceDistance" Name="Source to Surface Distance"
-(300A,0131) VERS="3" VR="FL" VM="1" Keyword="AverageBeamDosePointSourceToExternalContourSurfaceDistance" Name="Average Beam Dose Point Source to External Contour Surface Distance"
+(300A,0131) VERS="3" VR="FL" VM="1" Keyword="AverageBeamDosePointSourceToExternalContourDistance" Name="Average Beam Dose Point Source to External Contour Distance"
(300A,0132) VERS="3" VR="FL" VM="1" Keyword="SourceToExternalContourDistance" Name="Source to External Contour Distance"
(300A,0133) VERS="3" VR="FL" VM="3" Keyword="ExternalContourEntryPoint" Name="External Contour Entry Point"
(300A,0134) VERS="3" VR="DS" VM="1" Keyword="CumulativeMetersetWeight" Name="Cumulative Meterset Weight"
@@ -3585,6 +3634,7 @@
(300A,0350) VERS="3" VR="CS" VM="1" Keyword="PatientSupportType" Name="Patient Support Type"
(300A,0352) VERS="3" VR="SH" VM="1" Keyword="PatientSupportID" Name="Patient Support ID"
(300A,0354) VERS="3" VR="LO" VM="1" Keyword="PatientSupportAccessoryCode" Name="Patient Support Accessory Code"
+(300A,0355) VERS="3" VR="LO" VM="1" Keyword="TrayAccessoryCode" Name="Tray Accessory Code"
(300A,0356) VERS="3" VR="FL" VM="1" Keyword="FixationLightAzimuthalAngle" Name="Fixation Light Azimuthal Angle"
(300A,0358) VERS="3" VR="FL" VM="1" Keyword="FixationLightPolarAngle" Name="Fixation Light Polar Angle"
(300A,035A) VERS="3" VR="FL" VM="1" Keyword="MetersetRate" Name="Meterset Rate"
@@ -3638,6 +3688,18 @@
(300A,0451) VERS="3" VR="CS" VM="1" Keyword="DeviceMotionExecutionMode" Name="Device Motion Execution Mode"
(300A,0452) VERS="3" VR="CS" VM="1" Keyword="DeviceMotionObservationMode" Name="Device Motion Observation Mode"
(300A,0453) VERS="3" VR="SQ" VM="1" Keyword="DeviceMotionParameterCodeSequence" Name="Device Motion Parameter Code Sequence"
+(300A,0501) VERS="3" VR="FL" VM="1" Keyword="DistalDepthFraction" Name="Distal Depth Fraction"
+(300A,0502) VERS="3" VR="FL" VM="1" Keyword="DistalDepth" Name="Distal Depth"
+(300A,0503) VERS="3" VR="FL" VM="2" Keyword="NominalRangeModulatioFractions" Name="Nominal Range Modulation Fractions"
+(300A,0504) VERS="3" VR="FL" VM="2" Keyword="NominalRangeModulatedRegionDepths" Name="Nominal Range Modulated Region Depths"
+(300A,0505) VERS="3" VR="SQ" VM="1" Keyword="DepthDoseParametersSequence" Name="Depth Dose Parameters Sequence"
+(300A,0506) VERS="3" VR="SQ" VM="1" Keyword="DeliveredDepthDoseParametersSequence" Name="Delivered Depth Dose Parameters Sequence"
+(300A,0507) VERS="3" VR="FL" VM="1" Keyword="DeliveredDistalDepthFraction" Name="Delivered Distal Depth Fraction"
+(300A,0508) VERS="3" VR="FL" VM="1" Keyword="DeliveredDistalDepth" Name="Delivered Distal Depth"
+(300A,0509) VERS="3" VR="FL" VM="2" Keyword="DeliveredNominalRangeModulationFractions" Name="Delivered Nominal Range Modulation Fractions"
+(300A,0510) VERS="3" VR="FL" VM="2" Keyword="DeliveredNominalRangeModulatedRegionDepths" Name="Delivered Nominal Range Modulated Region Depths"
+(300A,0511) VERS="3" VR="CS" VM="1" Keyword="DeliveredReferenceDoseDefinition" Name="Delivered Reference Dose Definition"
+(300A,0512) VERS="3" VR="CS" VM="1" Keyword="ReferenceDoseDefinition" Name="Reference Dose Definition"
(300C,0002) VERS="3" VR="SQ" VM="1" Keyword="ReferencedRTPlanSequence" Name="Referenced RT Plan Sequence"
(300C,0004) VERS="3" VR="SQ" VM="1" Keyword="ReferencedBeamSequence" Name="Referenced Beam Sequence"
(300C,0006) VERS="3" VR="IS" VM="1" Keyword="ReferencedBeamNumber" Name="Referenced Beam Number"
diff --git a/libsrc/standard/elmdict/other.tpl b/libsrc/standard/elmdict/other.tpl
index e3fed1c..9314a10 100755
--- a/libsrc/standard/elmdict/other.tpl
+++ b/libsrc/standard/elmdict/other.tpl
@@ -2076,3 +2076,40 @@
(0073,0010) VERS="BLB" VR="SQ" VM="1" Owner="Brainlab-S23-ProjectiveFusion" Keyword="ProjectiveRegistrationSequence" Name="Projective Registration Sequence"
+(7029,0010) VERS="CTPD" VR="US" VM="1" Owner="CT IMG ACQUISITION" Keyword="NumberofDetectorRows" Name="NumberofDetectorRows"
+(7029,0011) VERS="CTPD" VR="US" VM="1" Owner="CT IMG ACQUISITION" Keyword="NumberofDetectorColumns" Name="NumberofDetectorColumns"
+(7029,0002) VERS="CTPD" VR="FL" VM="1" Owner="CT IMG ACQUISITION" Keyword="DetectorElementTransverseSpacing" Name="DetectorElementTransverseSpacing"
+(7029,0006) VERS="CTPD" VR="FL" VM="1" Owner="CT IMG ACQUISITION" Keyword="DetectorElementAxialSpacing" Name="DetectorElementAxialSpacing"
+(7029,000B) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="DetectorShape" Name="DetectorShape"
+(7031,0001) VERS="CTPD" VR="FL" VM="1" Owner="CT IMG ACQUISITION" Keyword="DetectorFocalCenterAngularPosition" Name="DetectorFocalCenterAngularPosition"
+(7031,0002) VERS="CTPD" VR="FL" VM="1" Owner="CT IMG ACQUISITION" Keyword="DetectorFocalCenterAxialPosition" Name="DetectorFocalCenterAxialPosition"
+(7031,0003) VERS="CTPD" VR="FL" VM="1" Owner="CT IMG ACQUISITION" Keyword="DetectorFocalCenterRadialDistance" Name="DetectorFocalCenterRadialDistance"
+(7031,0031) VERS="CTPD" VR="FL" VM="1" Owner="CT IMG ACQUISITION" Keyword="ConstantRadialDistance" Name="ConstantRadialDistance"
+(7031,0033) VERS="CTPD" VR="FL" VM="1-n" Owner="CT IMG ACQUISITION" Keyword="DetectorCentralElement" Name="DetectorCentralElement"
+(7033,000B) VERS="CTPD" VR="FL" VM="1" Owner="CT IMG ACQUISITION" Keyword="SourceAxialPositionShift" Name="SourceAxialPositionShift"
+(7033,000C) VERS="CTPD" VR="FL" VM="1" Owner="CT IMG ACQUISITION" Keyword="SourceAngularPositionShift" Name="SourceAngularPositionShift"
+(7033,000D) VERS="CTPD" VR="FL" VM="1" Owner="CT IMG ACQUISITION" Keyword="SourceRadialDistanceShift" Name="SourceRadialDistanceShift"
+(7033,000E) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="FlyingFocalSpotMode" Name="FlyingFocalSpotMode"
+(7033,0013) VERS="CTPD" VR="US" VM="1" Owner="CT IMG ACQUISITION" Keyword="NumberofSourceAngularSteps" Name="NumberofSourceAngularSteps"
+(7033,0061) VERS="CTPD" VR="US" VM="1" Owner="CT IMG ACQUISITION" Keyword="NumberofSources" Name="NumberofSources"
+(7033,0063) VERS="CTPD" VR="US" VM="1" Owner="CT IMG ACQUISITION" Keyword="SourceIndex" Name="SourceIndex"
+(7033,0065) VERS="CTPD" VR="FL" VM="1-n" Owner="CT IMG ACQUISITION" Keyword="PhotonStatistics" Name="PhotonStatistics"
+(7037,0009) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="TypeofProjectionData" Name="TypeofProjectionData"
+(7037,000A) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="TypeofProjectionGeometry" Name="TypeofProjectionGeometry"
+(7039,0003) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="BeamHardeningCorrectionFlag" Name="BeamHardeningCorrectionFlag"
+(7039,0004) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="GainCorrectionFlag" Name="GainCorrectionFlag"
+(7039,0005) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="DarkFieldCorrectionFlag" Name="DarkFieldCorrectionFlag"
+(7039,0006) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="FlatFieldCorrectionFlag" Name="FlatFieldCorrectionFlag"
+(7039,0007) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="BadPixelCorrectionFlag" Name="BadPixelCorrectionFlag"
+(7039,0008) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="ScatterCorrectionFlag" Name="ScatterCorrectionFlag"
+(7039,0009) VERS="CTPD" VR="CS" VM="1" Owner="CT IMG ACQUISITION" Keyword="LogFlag" Name="LogFlag"
+(7041,0003) VERS="CTPD" VR="US" VM="1" Owner="CT IMG ACQUISITION" Keyword="NumberofLesions" Name="NumberofLesions"
+(7041,0004) VERS="CTPD" VR="ST" VM="1" Owner="CT IMG ACQUISITION" Keyword="LesionPathologyArray" Name="LesionPathologyArray"
+(7041,0005) VERS="CTPD" VR="FL" VM="1-n" Owner="CT IMG ACQUISITION" Keyword="LesionAngularPositionArray" Name="LesionAngularPositionArray"
+(7041,0006) VERS="CTPD" VR="FL" VM="1-n" Owner="CT IMG ACQUISITION" Keyword="LesionAxialPositionArray" Name="LesionAxialPositionArray"
+(7041,0007) VERS="CTPD" VR="FL" VM="1-n" Owner="CT IMG ACQUISITION" Keyword="LesionRadialDistanceArray" Name="LesionRadialDistanceArray"
+
+(0857,0000) VERS="NAUT" VR="LO" VM="1" Owner="Nautilus Medical" Keyword="?" Name="?"
+(0857,0001) VERS="NAUT" VR="LO" VM="1" Owner="Nautilus Medical" Keyword="?" Name="?"
+(0857,0002) VERS="NAUT" VR="LO" VM="1" Owner="Nautilus Medical" Keyword="?" Name="?"
+
diff --git a/libsrc/standard/elmdict/siemens.tpl b/libsrc/standard/elmdict/siemens.tpl
index fdf43f3..ce5316a 100755
--- a/libsrc/standard/elmdict/siemens.tpl
+++ b/libsrc/standard/elmdict/siemens.tpl
@@ -1896,6 +1896,9 @@
(0051,0010) VERS="SSPI" VR="LO" VM="1-n" Owner="SIEMENS CM VA0 CMS" Keyword="ImageText" Name="Image Text"
(0051,0010) VERS="SSPI" VR="DS" VM="1" Owner="SIEMENS MED SP DXMG WH AWS 1" Keyword="?" Name="?"
+(0051,0020) VERS="SSPI" VR="DS" VM="1-n" Owner="SIEMENS MED SP DXMG WH AWS 1" Keyword="?" Name="?"
+(0051,0021) VERS="SSPI" VR="LO" VM="1" Owner="SIEMENS MED SP DXMG WH AWS 1" Keyword="?" Name="?"
+(0051,0032) VERS="SSPI" VR="DS" VM="3" Owner="SIEMENS MED SP DXMG WH AWS 1" Keyword="?" Name="?"
(0051,0037) VERS="SSPI" VR="DS" VM="6" Owner="SIEMENS MED SP DXMG WH AWS 1" Keyword="?" Name="?"
(0051,0050) VERS="SSPI" VR="UI" VM="1" Owner="SIEMENS MED SP DXMG WH AWS 1" Keyword="?" Name="?"
(0051,0060) VERS="SSPI" VR="DS" VM="1" Owner="SIEMENS MED SP DXMG WH AWS 1" Keyword="PrimaryPositionerScanArc" Name="Primary Positioner Scan Arc"
diff --git a/libsrc/standard/elmdict/toshiba.tpl b/libsrc/standard/elmdict/toshiba.tpl
index d95bd84..99f7537 100755
--- a/libsrc/standard/elmdict/toshiba.tpl
+++ b/libsrc/standard/elmdict/toshiba.tpl
@@ -115,7 +115,8 @@
(7005,006b) VERS="TSH" VR="DS" VM="3" Owner="TOSHIBA_MEC_CT3" Keyword="ImagePositionOf4DVolumeTopEquipment" Name="Image Position of 4D-Volume Top (Equipment)"
(7005,006c) VERS="TSH" VR="UI" VM="1" Owner="TOSHIBA_MEC_CT3" Keyword="SOPInstanceUIDOf4DVolume" Name="SOP Instance UID of 4D-Volume"
(7005,006d) VERS="TSH" VR="UI" VM="1" Owner="TOSHIBA_MEC_CT3" Keyword="SeriesInstanceUIDOf4DVolume" Name="Series Instance UID of 4D-Volume"
-(7005,00F1) VERS="TSH" VR="CS" VM="1" Owner="TOSHIBA_MEC_CT3" Keyword="ProtectMarkForImageCurveOrPrivateRecord" Name="Protect Mark for Image, Curve or Private Record"
+(7005,0079) VERS="TSH" VR="SH" VM="1" Owner="TOSHIBA_MEC_CT3" Keyword="InjectorElapsedTime" Name="Injector Elapsed Time"
+(7005,00F1) VERS="TSH" VR="CS" VM="1" Owner="TOSHIBA_MEC_CT3" Keyword="ProtectMarkForImageCurveOrPrivateRecord" Name="Protect Mark for Image, Curve or Private Record"
(7005,00F1) VERS="TSH" VR="CS" VM="1" Owner="TOSHIBA_MEC_CT3" Keyword="ProtectMarkForSeriesRecord" Name="Protect Mark for Series Record"
(7005,00F1) VERS="TSH" VR="CS" VM="1" Owner="TOSHIBA_MEC_CT3" Keyword="ProtectMarkForStudyRecord" Name="Protect Mark for Study Record"
diff --git a/libsrc/standard/module/base.tpl b/libsrc/standard/module/base.tpl
index e98fd82..400f2a2 100755
--- a/libsrc/standard/module/base.tpl
+++ b/libsrc/standard/module/base.tpl
@@ -23,6 +23,7 @@ DefineMacro="IconImageSequenceMacro"
Name="GreenPaletteColorLookupTableData" Type="1C" Condition="PhotometricInterpretationNeedsPalette"
Name="BluePaletteColorLookupTableData" Type="1C" Condition="PhotometricInterpretationNeedsPalette"
Name="ICCProfile" Type="3"
+ Name="ColorSpace" Type="3"
MacroEnd
DefineMacro="BasicCodeSequenceMacro"
@@ -784,6 +785,7 @@ DefineMacro="ImagePixelMacro" InformationEntity="Instance"
Name="GreenPaletteColorLookupTableData" Type="1C" Condition="ImagePixelMacroNeedsPaletteDescriptorAndNotSegmentedLegallyPresentInPaletteColorModule"
Name="BluePaletteColorLookupTableData" Type="1C" Condition="ImagePixelMacroNeedsPaletteDescriptorAndNotSegmentedLegallyPresentInPaletteColorModule"
Name="ICCProfile" Type="3"
+ Name="ColorSpace" Type="3"
MacroEnd
Module="FloatingPointImagePixel"
@@ -953,9 +955,9 @@ MacroEnd
DefineMacro="FrameContentMacro" InformationEntity="FunctionalGroup"
Sequence="FrameContentSequence" Type="1" VM="1"
Name="FrameAcquisitionNumber" Type="3"
- Name="FrameReferenceDateTime" Type="1C" NoCondition="" mbpo="true" # (../../[SharedFunctionalGroupsSequence or PerFrameFunctionalGroupsSequence item for this frame]MRImageFrameTypeMacro/FrameType is ORIGINAL) and not legacy CT, MR or PET ... too hard :(
- Name="FrameAcquisitionDateTime" Type="1C" NoCondition="" mbpo="true" # (../../[SharedFunctionalGroupsSequence or PerFrameFunctionalGroupsSequence item for this frame]MRImageFrameTypeMacro/FrameType is ORIGINAL) and not legacy CT, MR or PET ... too hard :(
- Name="FrameAcquisitionDuration" Type="1C" NoCondition="" mbpo="true" # (../../[SharedFunctionalGroupsSequence or PerFrameFunctionalGroupsSequence item for this frame]MRImageFrameTypeMacro/FrameType is ORIGINAL) and not legacy CT, MR or PET ... too hard :(
+ Name="FrameReferenceDateTime" Type="1C" Condition="ImageTypeValue1OriginalOrMixedAndNotLegacyConverted" mbpo="true" # approximates (../../[SharedFunctionalGroupsSequence or PerFrameFunctionalGroupsSequence item for this frame]MRImageFrameTypeMacro/FrameType is ORIGINAL) and not legacy CT, MR or PET ... too hard :(
+ Name="FrameAcquisitionDateTime" Type="1C" Condition="ImageTypeValue1OriginalOrMixedAndNotLegacyConverted" mbpo="true" # approximates (../../[SharedFunctionalGroupsSequence or PerFrameFunctionalGroupsSequence item for this frame]MRImageFrameTypeMacro/FrameType is ORIGINAL) and not legacy CT, MR or PET ... too hard :(
+ Name="FrameAcquisitionDuration" Type="1C" Condition="ImageTypeValue1OriginalOrMixedAndNotLegacyConverted" mbpo="true" NotZeroWarning="" # approximates (../../[SharedFunctionalGroupsSequence or PerFrameFunctionalGroupsSequence item for this frame]MRImageFrameTypeMacro/FrameType is ORIGINAL) and not legacy CT, MR or PET ... too hard :(
Name="CardiacCyclePosition" Type="3" StringDefinedTerms="CardiacCyclePosition"
Name="RespiratoryCyclePosition" Type="3" StringDefinedTerms="RespiratoryCyclePosition"
Name="DimensionIndexValues" Type="1C" Condition="DimensionIndexSequencePresent"
@@ -1054,10 +1056,12 @@ DefineMacro="RealWorldValueMappingMacro" InformationEntity="FunctionalGroup"
MacroEnd
DefineMacro="RealWorldValueMappingItemMacro" InformationEntity="FunctionalGroup"
- Name="RealWorldValueFirstValueMapped" Type="1"
- Name="RealWorldValueLastValueMapped" Type="1"
- Name="RealWorldValueIntercept" Type="1C" Condition="RealWorldValueLUTDataNotPresent"
- Name="RealWorldValueSlope" Type="1C" Condition="RealWorldValueLUTDataNotPresent"
+ Name="RealWorldValueFirstValueMapped" Type="1C" Condition="NeedRealWorldValueFirstValueMapped"
+ Name="RealWorldValueLastValueMapped" Type="1C" Condition="NeedRealWorldValueLastValueMapped"
+ Name="DoubleFloatRealWorldValueFirstValueMapped" Type="1C" Condition="NeedDoubleFloatRealWorldValueFirstValueMapped"
+ Name="DoubleFloatRealWorldValueLastValueMapped" Type="1C" Condition="NeedDoubleFloatRealWorldValueLastValueMapped"
+ Name="RealWorldValueIntercept" Type="1C" Condition="NeedRealWorldValueSlopeAndIntercept"
+ Name="RealWorldValueSlope" Type="1C" Condition="NeedRealWorldValueSlopeAndIntercept"
Name="RealWorldValueLUTData" Type="1C" Condition="RealWorldValueInterceptNotPresent"
Name="LUTExplanation" Type="1"
Name="LUTLabel" Type="1"
@@ -1146,6 +1150,8 @@ Module="MultiFrameDimension"
Name="DimensionOrganizationType" Type="3" StringDefinedTerms="DimensionOrganizationType"
Sequence="DimensionIndexSequence" Type="1" VM="1-n"
Name="DimensionIndexPointer" Type="1"
+ Verify="DimensionIndexPointer" Condition="DimensionIndexPointerIsFrameContentSequence" ThenErrorMessage="May not be FrameContentSequence"
+ Verify="DimensionIndexPointer" Condition="DimensionIndexPointerIsDimensionIndexValues" ThenErrorMessage="May not be DimensionIndexValues"
Name="DimensionIndexPrivateCreator" Type="1C" NoCondition="" # too hard to check
Name="FunctionalGroupPointer" Type="1C" Condition="DimensionIndexPointerIsNotFunctionalGroup"
Name="FunctionalGroupPrivateCreator" Type="1C" NoCondition="" # too hard to check
@@ -1398,6 +1404,8 @@ Module="MRImage"
Name="TemporalResolution" Type="3"
InvokeMacro="GeneralAnatomyOptionalMacro"
InvokeMacro="OptionalViewAndSliceProgressionDirectionMacro"
+ Name="IsocenterPosition" Type="3"
+ Name="B1rms" Type="3"
ModuleEnd
Module="NMPETPatientOrientation"
@@ -2188,6 +2196,8 @@ DefineMacro="SegmentDescriptionMacro" InformationEntity="Instance"
InvokeMacro="CodeSequenceMacro" BaselineContextID="244"
SequenceEnd
SequenceEnd
+ Name="TrackingID" Type="1C" Condition="TrackingUIDIsPresent"
+ Name="TrackingUID" Type="1C" Condition="TrackingIDIsPresent"
MacroEnd
DefineMacro="SegmentationMacro" InformationEntity="FunctionalGroup"
@@ -2234,20 +2244,20 @@ DefineMacro="VectorsMacro" InformationEntity="Surface"
MacroEnd
DefineMacro="SurfaceMeshPrimitivesMacro" InformationEntity="Surface"
- Name="VertexPointIndexList" Type="2"
- Name="EdgePointIndexList" Type="2" # should check OW has 2n values :(
- Name="TrianglePointIndexList" Type="2" # should check OW has 3n values :(
+ Name="LongVertexPointIndexList" Type="2"
+ Name="LongEdgePointIndexList" Type="2" # should check has 2n values :(
+ Name="LongTrianglePointIndexList" Type="2" # should check has 3n values :(
Sequence="TriangleStripSequence" Type="2" VM="0-n"
- Name="PrimitivePointIndexList" Type="1"
+ Name="LongPrimitivePointIndexList" Type="1"
SequenceEnd
Sequence="TriangleFanSequence" Type="2" VM="0-n"
- Name="PrimitivePointIndexList" Type="1"
+ Name="LongPrimitivePointIndexList" Type="1"
SequenceEnd
Sequence="LineSequence" Type="2" VM="0-n"
- Name="PrimitivePointIndexList" Type="1"
+ Name="LongPrimitivePointIndexList" Type="1"
SequenceEnd
Sequence="FacetSequence" Type="2" VM="0-n"
- Name="PrimitivePointIndexList" Type="1"
+ Name="LongPrimitivePointIndexList" Type="1"
SequenceEnd
MacroEnd
diff --git a/libsrc/standard/module/ct.tpl b/libsrc/standard/module/ct.tpl
index e519eda..fbb3336 100644
--- a/libsrc/standard/module/ct.tpl
+++ b/libsrc/standard/module/ct.tpl
@@ -58,6 +58,8 @@ Module="EnhancedCTImage"
InvokeMacro="IconImageSequenceMacro"
SequenceEnd
InvokeMacro="OptionalViewAndSliceProgressionDirectionMacro"
+ Name="IsocenterPosition" Type="3"
+ InvokeMacro="RTEquipmentCorrelationMacro"
ModuleEnd
DefineMacro="CTImageFrameTypeMacro" InformationEntity="FunctionalGroup"
@@ -82,8 +84,8 @@ MacroEnd
DefineMacro="CTAcquisitionDetailsMacro" InformationEntity="FunctionalGroup"
Sequence="CTAcquisitionDetailsSequence" Type="1" VM="1"
- Name="RotationDirection" Type="1C" StringEnumValues="RotationDirection" Condition="AcquisitionTypeNotConstantAngle" # and ORIGINAL mbpo
- Name="RevolutionTime" Type="1C" Condition="AcquisitionTypeNotConstantAngle" NotZeroWarning="" # and ORIGINAL mbpo
+ Name="RotationDirection" Type="1C" StringEnumValues="RotationDirection" NoCondition="" # :( cannot check since in sibling functional groups: Frame Type Value 1 of this frame is ORIGINAL and AcquisitionType not CONSTANT_ANGLE; mbpo only if DERIVED and same AcquisitionType
+ Name="RevolutionTime" Type="1C" NoCondition="" NotZeroWarning="" # :( cannot check since in sibling functional groups: Frame Type Value 1 of this frame is ORIGINAL and AcquisitionType not CONSTANT_ANGLE; mbpo only if DERIVED and same AcquisitionType
Name="SingleCollimationWidth" Type="1C" Condition="Always" NotZeroWarning="" # ORIGINAL mbpo
Name="TotalCollimationWidth" Type="1C" Condition="Always" NotZeroWarning="" # ORIGINAL mbpo
Name="TableHeight" Type="1C" Condition="Always" # ORIGINAL mbpo
@@ -94,9 +96,9 @@ MacroEnd
DefineMacro="CTTableDynamicsMacro" InformationEntity="FunctionalGroup"
Sequence="CTTableDynamicsSequence" Type="1" VM="1"
- Name="TableSpeed" Type="1C" Condition="AcquisitionTypeConstantAngleOrSpiral" NotZeroWarning="" # and ORIGINAL mbpo
- Name="TableFeedPerRotation" Type="1C" Condition="AcquisitionTypeSpiral" NotZeroWarning="" # and ORIGINAL mbpo
- Name="SpiralPitchFactor" Type="1C" Condition="AcquisitionTypeSpiral" NotZeroWarning="" # and ORIGINAL mbpo
+ Name="TableSpeed" Type="1C" NoCondition="" NotZeroWarning="" # :( cannot check since in sibling functional groups: Frame Type Value 1 of this frame is ORIGINAL and AcquisitionType SPIRAL or CONSTANT_ANGLE; mbpo only if DERIVED and same AcquisitionType
+ Name="TableFeedPerRotation" Type="1C" NoCondition="" NotZeroWarning="" # :( cannot check since in sibling functional groups: Frame Type Value 1 of this frame is ORIGINAL and AcquisitionType SPIRAL or CONSTANT_ANGLE; mbpo only if DERIVED and same AcquisitionType
+ Name="SpiralPitchFactor" Type="1C" NoCondition="" NotZeroWarning="" # :( cannot check since in sibling functional groups: Frame Type Value 1 of this frame is ORIGINAL and AcquisitionType SPIRAL or CONSTANT_ANGLE; mbpo only if DERIVED and same AcquisitionType
SequenceEnd
MacroEnd
diff --git a/libsrc/standard/module/mr.tpl b/libsrc/standard/module/mr.tpl
index 6196837..18ed548 100755
--- a/libsrc/standard/module/mr.tpl
+++ b/libsrc/standard/module/mr.tpl
@@ -121,7 +121,7 @@ DefineMacro="MRImagingModifierMacro" InformationEntity="FunctionalGroup"
MacroEnd
DefineMacro="MRReceiveCoilMacro" InformationEntity="FunctionalGroup"
- Sequence="MRReceiveCoilSequence" Type="1" VM="1"
+ Sequence="MRReceiveCoilSequence" Type="1" VM="1-n"
Name="ReceiveCoilName" Type="1"
Name="ReceiveCoilManufacturerName" Type="2"
Name="ReceiveCoilType" Type="1" StringDefinedTerms="ReceiveCoilType"
@@ -244,7 +244,9 @@ DefineMacro="MRImageAndSpectroscopyInstanceMacro" InformationEntity="Image"
Name="MagneticFieldStrength" Type="1C" NotZeroWarning="" Condition="ImageTypeValue1OriginalOrMixedAndNotLegacyConvertedMR" mbpo="true"
Name="ApplicableSafetyStandardAgency" Type="1C" StringDefinedTerms="ApplicableSafetyStandardAgency" Condition="NotLegacyConvertedMR" mbpo="true"
Name="ApplicableSafetyStandardDescription" Type="3"
- Name="ImageComments" Type="3"
+ Name="ImageComments" Type="3"
+ Name="IsocenterPosition" Type="3"
+ Name="B1rms" Type="3"
MacroEnd
Module="MultiFrameFunctionalGroupsForEnhancedMRImage"
diff --git a/libsrc/standard/module/pet.tpl b/libsrc/standard/module/pet.tpl
index a478288..d1103d9 100755
--- a/libsrc/standard/module/pet.tpl
+++ b/libsrc/standard/module/pet.tpl
@@ -118,6 +118,7 @@ Module="PETImage"
Name="DeadTimeFactor" Type="3"
InvokeMacro="GeneralAnatomyOptionalMacro"
InvokeMacro="OptionalViewAndSliceProgressionDirectionMacro"
+ Name="IsocenterPosition" Type="3"
ModuleEnd
Module="MultiFrameFunctionalGroupsForEnhancedPETImage"
@@ -372,6 +373,7 @@ Module="EnhancedPETAcquisition"
Name="TableMotion" Type="1" StringEnumValues="TableMotion"
Name="TimeOfFlightInformationUsed" Type="1" StringEnumValues="TrueFalseFull"
InvokeMacro="MandatoryViewAndSliceProgressionDirectionMacro"
+ Name="IsocenterPosition" Type="3"
ModuleEnd
Module="EnhancedPETImage"
diff --git a/libsrc/standard/module/rt.tpl b/libsrc/standard/module/rt.tpl
index d072be4..fcea560 100755
--- a/libsrc/standard/module/rt.tpl
+++ b/libsrc/standard/module/rt.tpl
@@ -22,6 +22,9 @@ Module="RTSeries"
InvokeMacro="CodeSequenceMacro"
SequenceEnd
Name="OperatorsName" Type="2"
+ Sequence="OperatorIdentificationSequence" Type="3" VM="1-n"
+ InvokeMacro="PersonIdentificationMacro"
+ SequenceEnd
Sequence="ReferencedPerformedProcedureStepSequence" Type="3" VM="1-n"
InvokeMacro="SOPInstanceReferenceMacro"
SequenceEnd
@@ -102,6 +105,8 @@ Module="RTImage"
Name="NumberOfBlocks" Type="1"
Sequence="BlockSequence" Type="2C" VM="0-n" Condition="NumberOfBlocksNotZero"
Name="BlockTrayID" Type="3"
+ Name="TrayAccessoryCode" Type="3"
+ Name="AccessoryCode" Type="3"
Name="SourceToBlockTrayDistance" Type="2"
Name="BlockType" Type="1" StringEnumValues="BlockType"
Name="BlockDivergence" Type="2" StringEnumValues="BlockDivergence"
@@ -131,6 +136,9 @@ Module="RTImage"
Name="TableTopLateralPosition" Type="3"
Name="IsocenterPosition" Type="3"
Name="PatientPosition" Type="1C" Condition="IsocenterPositionIsPresent"
+ Name="ExposureTime" Type="3"
+ Name="ExposureTimeInms" Type="3"
+ Name="MetersetExposure" Type="3"
ModuleEnd
Module="RTDose"
@@ -315,6 +323,7 @@ Module="RTGeneralPlan"
Name="RTPlanRelationship" Type="1" StringDefinedTerms="RTPlanRelationship"
Verify="RTPlanRelationship" Condition="PlanIntentIsVerification" StringDefinedTerms="RTPlanRelationshipVerifiedPlan"
SequenceEnd
+ Name="FrameOfReferenceToDisplayedCoordinateSystemTransformationMatrix" Type="3"
ModuleEnd
Module="RTPrescription"
@@ -442,6 +451,11 @@ Module="RTFractionScheme"
Name="ReferencedBeamNumber" Type="1"
Name="BeamDoseSpecificationPoint" Type="3"
Name="BeamDose" Type="3"
+ Name="BeamDoseType" Type="1C" Condition="AlternateBeamDosePresent" StringEnumValues="BeamDoseType" mbpo="true"
+ Verify="BeamDoseType" Condition="AlternateBeamDoseTypeSameValueAsBeamDoseType" ThenErrorMessage="A different value than AlternateBeamDoseType is required"
+ Name="AlternateBeamDose" Type="3"
+ Name="AlternateBeamDoseType" Type="1C" Condition="AlternateBeamDosePresent" StringEnumValues="BeamDoseType"
+ Verify="AlternateBeamDoseType" Condition="AlternateBeamDoseTypeSameValueAsBeamDoseType" ThenErrorMessage="A different value than BeamDoseType is required"
Sequence="BeamDoseVerificationControlPointSequence" Type="3" VM="2-n"
Name="CumulativeMetersetWeight" Type="1"
Name="ReferencedControlPointIndex" Type="1C" NoCondition="" # Required if the Referenced Cumulative Meterset corresponds to a Control Point in the Control Point Sequence:(
@@ -530,6 +544,8 @@ Module="RTBeams"
Name="MaterialID" Type="2"
Name="CompensatorID" Type="3"
Name="AccessoryCode" Type="3"
+ Name="CompensatorTrayID" Type="3"
+ Name="TrayAccessoryCode" Type="3"
Name="SourceToCompensatorTrayDistance" Type="2"
Name="CompensatorDivergence" Type="3" StringEnumValues="CompensatorDivergence"
Name="CompensatorMountingPosition" Type="3" StringEnumValues="CompensatorMountingPosition"
@@ -552,6 +568,7 @@ Module="RTBeams"
Name="TotalBlockTrayFactor" Type="3"
Sequence="BlockSequence" Type="1C" VM="1-n" Condition="NumberOfBlocksNotZero"
Name="BlockTrayID" Type="3"
+ Name="TrayAccessoryCode" Type="3"
Name="AccessoryCode" Type="3"
Name="SourceToBlockTrayDistance" Type="2"
Name="BlockType" Type="1" StringEnumValues="BlockType"
@@ -829,6 +846,8 @@ Module="RTBeamsSessionRecord"
Name="CompensatorType" Type="2" StringDefinedTerms="CompensatorType"
Name="CompensatorID" Type="3"
Name="AccessoryCode" Type="3"
+ Name="CompensatorTrayID" Type="3"
+ Name="TrayAccessoryCode" Type="3"
SequenceEnd
Name="NumberOfBoli" Type="2"
Sequence="ReferencedBolusSequence" Type="3" VM="1-n"
@@ -838,6 +857,7 @@ Module="RTBeamsSessionRecord"
Name="NumberOfBlocks" Type="2"
Sequence="RecordedBlockSequence" Type="3" VM="1-n"
Name="BlockTrayID" Type="3"
+ Name="TrayAccessoryCode" Type="3"
Name="AccessoryCode" Type="3"
Name="ReferencedBlockNumber" Type="3"
Name="BlockName" Type="2"
@@ -916,6 +936,9 @@ Module="RTBeamsSessionRecord"
Name="ParameterSequencePointer" Type="3"
Name="ParameterItemIndex" Type="3"
Name="OperatorsName" Type="2"
+ Sequence="OperatorIdentificationSequence" Type="3" VM="1"
+ InvokeMacro="PersonIdentificationMacro"
+ SequenceEnd
Name="OverrideReason" Type="3"
SequenceEnd
SequenceEnd
@@ -1024,6 +1047,9 @@ Module="RTBrachySessionRecord"
Sequence="OverrideSequence" Type="3" VM="1-n"
Name="OverrideParameterPointer" Type="2"
Name="OperatorsName" Type="2"
+ Sequence="OperatorIdentificationSequence" Type="3" VM="1"
+ InvokeMacro="PersonIdentificationMacro"
+ SequenceEnd
Name="OverrideReason" Type="3"
SequenceEnd
SequenceEnd
@@ -1091,6 +1117,7 @@ Module="RTIonBeams"
Name="RadiationAtomicNumber" Type="1C" Condition="RadiationTypeIsIon"
Name="RadiationChargeState" Type="1C" Condition="RadiationTypeIsIon"
Name="ScanMode" Type="1" StringDefinedTerms="IonScanMode"
+ Name="ModulatedScanModeType" Type="1C" Condition="ScanModeIsModulatedSpec" StringDefinedTerms="ModulatedScanModeType"
Name="TreatmentMachineName" Type="2"
Name="Manufacturer" Type="3"
Name="InstitutionName" Type="3"
@@ -1260,10 +1287,10 @@ Module="RTIonBeams"
Name="GantryPitchRotationDirection" Type="3" StringEnumValues="RotationDirectionWithNone"
Name="BeamLimitingDeviceAngle" Type="1C" NoCondition=""
Name="BeamLimitingDeviceRotationDirection" Type="1C" NoCondition="" StringEnumValues="RotationDirectionWithNone"
- Name="ScanSpotPositionMap" Type="1C" Condition="ScanModeIsModulated"
- Name="ScanSpotMetersetWeights" Type="1C" Condition="ScanModeIsModulated"
+ Name="ScanSpotPositionMap" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
+ Name="ScanSpotMetersetWeights" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
Name="ScanningSpotSize" Type="3"
- Name="NumberOfPaintings" Type="1C" Condition="ScanModeIsModulated"
+ Name="NumberOfPaintings" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
Name="PatientSupportAngle" Type="1C" NoCondition=""
Name="PatientSupportRotationDirection" Type="1C" NoCondition="" StringEnumValues="RotationDirectionWithNone"
Name="TableTopPitchAngle" Type="2C" NoCondition=""
@@ -1295,6 +1322,7 @@ Module="RTIonBeamsSessionRecord"
Name="RadiationAtomicNumber" Type="1C" Condition="RadiationTypeIsIon"
Name="RadiationChargeState" Type="1C" Condition="RadiationTypeIsIon"
Name="ScanMode" Type="1" StringDefinedTerms="IonScanMode"
+ Name="ModulatedScanModeType" Type="1C" Condition="ScanModeIsModulatedSpec" StringDefinedTerms="ModulatedScanModeType"
Name="ReferencedToleranceTableNumber" Type="3"
Sequence="BeamLimitingDeviceLeafPairsSequence" Type="3" VM="1-n"
Name="RTBeamLimitingDeviceType" Type="1" StringEnumValues="RTBeamLimitingDeviceType"
@@ -1429,12 +1457,12 @@ Module="RTIonBeamsSessionRecord"
Name="GantryPitchRotationDirection" Type="3" StringEnumValues="RotationDirectionWithNone"
Name="BeamLimitingDeviceAngle" Type="1C" NoCondition=""
Name="BeamLimitingDeviceRotationDirection" Type="1C" NoCondition="" StringEnumValues="RotationDirectionWithNone"
- Name="ScanSpotTuneID" Type="1C" Condition="ScanModeIsModulated"
- Name="NumberOfScanSpotPositions" Type="1C" Condition="ScanModeIsModulated"
- Name="ScanSpotPositionMap" Type="1C" Condition="ScanModeIsModulated"
- Name="ScanSpotMetersetsDelivered" Type="1C" Condition="ScanModeIsModulated"
+ Name="ScanSpotTuneID" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
+ Name="NumberOfScanSpotPositions" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
+ Name="ScanSpotPositionMap" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
+ Name="ScanSpotMetersetsDelivered" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
Name="ScanningSpotSize" Type="3"
- Name="NumberOfPaintings" Type="1C" Condition="ScanModeIsModulated"
+ Name="NumberOfPaintings" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
Name="PatientSupportAngle" Type="1C" NoCondition=""
Name="PatientSupportRotationDirection" Type="1C" NoCondition="" StringEnumValues="RotationDirectionWithNone"
Name="TableTopPitchAngle" Type="2C" NoCondition=""
@@ -1457,6 +1485,9 @@ Module="RTIonBeamsSessionRecord"
Name="OverrideParameterPointer" Type="1"
Name="ParameterItemIndex" Type="1"
Name="OperatorsName" Type="2"
+ Sequence="OperatorIdentificationSequence" Type="3" VM="1"
+ InvokeMacro="PersonIdentificationMacro"
+ SequenceEnd
Name="OverrideReason" Type="3"
SequenceEnd
SequenceEnd
diff --git a/libsrc/standard/module/softcopy.tpl b/libsrc/standard/module/softcopy.tpl
index 45e077d..31cc17e 100755
--- a/libsrc/standard/module/softcopy.tpl
+++ b/libsrc/standard/module/softcopy.tpl
@@ -146,6 +146,7 @@ ModuleEnd
Module="ICCProfile"
Name="ICCProfile" Type="1"
+ Name="ColorSpace" Type="3"
ModuleEnd
DefineMacro="HangingProtocolSelectorAttributeContextMacro"
@@ -330,6 +331,8 @@ Module="StructuredDisplay"
SequenceEnd
Name="StructuredDisplayBackgroundCIELabValue" Type="3"
Name="EmptyImageBoxCIELabValue" Type="3"
+ Name="HangingProtocolName" Type="3"
+ Name="HangingProtocolCreator" Type="3"
ModuleEnd
Module="StructuredDisplayImageBox"
diff --git a/libsrc/standard/module/sr.tpl b/libsrc/standard/module/sr.tpl
index e43f262..e675a9e 100755
--- a/libsrc/standard/module/sr.tpl
+++ b/libsrc/standard/module/sr.tpl
@@ -39,10 +39,12 @@ DefineMacro="IdentifiedPersonOrDeviceMacro"
Name="DeviceUID" Type="1C" Condition="ObserverTypeIsDevice"
Name="Manufacturer" Type="1C" Condition="ObserverTypeIsDevice"
Name="ManufacturerModelName" Type="1C" Condition="ObserverTypeIsDevice"
+ Name="StationAETitle" Type="3"
Name="InstitutionName" Type="2"
Sequence="InstitutionCodeSequence" Type="2" VM="0-1"
InvokeMacro="CodeSequenceMacro"
SequenceEnd
+ Name="InstitutionalDepartmentName" Type="3"
MacroEnd
DefineMacro="NumericMeasurementMacro"
diff --git a/libsrc/standard/module/us.tpl b/libsrc/standard/module/us.tpl
index 9546972..041a1b5 100644
--- a/libsrc/standard/module/us.tpl
+++ b/libsrc/standard/module/us.tpl
@@ -37,6 +37,7 @@ Module="EnhancedPaletteColorLookupTable"
Name="AlphaPaletteColorLookupTableData" Type="1C" Condition="RGBLUTTransferFunctionIsTable"
SequenceEnd
Name="ICCProfile" Type="1C" Condition="AnyDataPathAssignmentIsOtherThanPrimaryPValues"
+ Name="ColorSpace" Type="3"
ModuleEnd
DefineMacro="PlanePositionVolumeMacro" InformationEntity="FunctionalGroup"
@@ -94,11 +95,11 @@ Module="UltrasoundFrameOfReference"
ModuleEnd
Module="EnhancedUSImage"
- Name="ImageType" Type="1" VM="2-n"
+ Name="ImageType" Type="1" VM="4-n"
Verify="ImageType" ValueSelector="0" StringEnumValues="CommonEnhancedImageType1"
Verify="ImageType" ValueSelector="1" StringEnumValues="CommonEnhancedImageAndFrameType2"
- Verify="ImageType" ValueSelector="2" StringEnumValues="EmptyValue"
- Verify="ImageType" ValueSelector="3" StringEnumValues="EmptyValue"
+ Verify="ImageType" ValueSelector="2" StringDefinedTerms="CommonEnhancedImageAndFrameType3"
+ Verify="ImageType" ValueSelector="3" StringDefinedTerms="CommonEnhancedImageType4"
Name="SamplesPerPixel" Type="1" BinaryEnumValues="SamplesPerPixelIsOne"
Name="PhotometricInterpretation" Type="1" StringEnumValues="PhotometricInterpretationMonochrome2"
Name="BitsAllocated" Type="1" BinaryEnumValues="BitsAre8Or16"
@@ -195,11 +196,11 @@ ModuleEnd
DefineMacro="USImageDescriptionMacro" InformationEntity="FunctionalGroup"
Sequence="USImageDescriptionSequence" Type="1" VM="1"
- Name="FrameType" Type="1" VM="2-n"
+ Name="FrameType" Type="1" VM="4-n"
Verify="FrameType" ValueSelector="0" StringEnumValues="CommonEnhancedFrameType1"
Verify="FrameType" ValueSelector="1" StringEnumValues="CommonEnhancedImageAndFrameType2"
- Verify="FrameType" ValueSelector="2" StringEnumValues="EmptyValue"
- Verify="FrameType" ValueSelector="3" StringEnumValues="EmptyValue"
+ Verify="FrameType" ValueSelector="2" StringEnumValues="CommonEnhancedImageAndFrameType3"
+ Verify="FrameType" ValueSelector="3" StringEnumValues="CommonEnhancedFrameType4"
Name="VolumetricProperties" Type="1" StringEnumValues="CommonCTMRVolumetricPropertiesImageLevel"
Name="VolumeBasedCalculationTechnique" Type="1" StringDefinedTerms="CommonCTMRVolumeBasedCalculationTechniqueImageLevel"
SequenceEnd
diff --git a/libsrc/standard/module/vl.tpl b/libsrc/standard/module/vl.tpl
index 63d5e43..09d8527 100755
--- a/libsrc/standard/module/vl.tpl
+++ b/libsrc/standard/module/vl.tpl
@@ -387,6 +387,7 @@ Module="OpticalPath"
InvokeMacro="PaletteColorLookupTableMacro"
SequenceEnd
Name="ICCProfile" Type="1C" Condition="NeedICCProfileInOpticalPathSequence"
+ Name="ColorSpace" Type="3"
SequenceEnd
ModuleEnd
diff --git a/libsrc/standard/module/xaxrf.tpl b/libsrc/standard/module/xaxrf.tpl
index e379378..d29f405 100755
--- a/libsrc/standard/module/xaxrf.tpl
+++ b/libsrc/standard/module/xaxrf.tpl
@@ -615,6 +615,13 @@ DefineMacro="CommonCTMRImageDescriptionImageLevelMacroForXRay3DImage" Informatio
Name="VolumeBasedCalculationTechnique" Type="1" StringDefinedTerms="XRay3DImageVolumeBasedCalculationTechniqueImageLevel"
MacroEnd
+DefineMacro="CommonCTMRImageDescriptionFrameLevelMacroForXRay3DImage" InformationEntity="Image"
+ Name="PixelPresentation" Type="1" StringEnumValues="CommonCTMRPixelPresentationFrameLevel"
+ Verify="PixelPresentation" Condition="EnhancedMRColorImageInstance" StringEnumValues="PixelPresentationTrueColor"
+ Name="VolumetricProperties" Type="1" StringEnumValues="CommonCTMRVolumetricPropertiesFrameLevel"
+ Name="VolumeBasedCalculationTechnique" Type="1" StringDefinedTerms="XRay3DImageVolumeBasedCalculationTechniqueFrameLevel"
+MacroEnd
+
Module="XRay3DImage"
Name="ImageType" Type="1" VM="4"
Verify="ImageType" ValueSelector="0" StringEnumValues="CommonEnhancedImageType1"
@@ -770,7 +777,7 @@ DefineMacro="XRay3DFrameTypeMacro"
Verify="FrameType" Condition="NotBreastTomosynthesisInstance" ValueSelector="3" StringEnumValues="XRay3DImageAndFrameType4"
Verify="FrameType" Condition="BreastTomosynthesisInstance" ValueSelector="3" StringEnumValues="BreastTomoImageAndFrameType4"
Verify="FrameType" Condition="BreastTomosynthesisInstance" ValueSelector="4" StringEnumValues="BreastTomoImageAndFrameType5"
- InvokeMacro="CommonCTMRImageDescriptionFrameLevelMacro"
+ InvokeMacro="CommonCTMRImageDescriptionFrameLevelMacroForXRay3DImage"
Name="ReconstructionIndex" Type="1C" Condition="XRay3DReconstructionSequenceIsPresent"
SequenceEnd
MacroEnd
diff --git a/libsrc/standard/strval/rt.tpl b/libsrc/standard/strval/rt.tpl
index 8502471..21657c1 100755
--- a/libsrc/standard/strval/rt.tpl
+++ b/libsrc/standard/strval/rt.tpl
@@ -274,7 +274,15 @@ StringValues="IonRadiationType" {
StringValues="IonScanMode" {
NONE,
UNIFORM,
- MODULATED
+ MODULATED,
+ MODULATED_SPEC
+}
+
+StringValues="ModulatedScanModeType" {
+ STATIONARY,
+ LEAPING,
+ LINEAR,
+ MIXED
}
StringValues="TreatmentDeliveryType" {
@@ -560,3 +568,9 @@ StringValues="SpatialTransformOfDose" {
NON_RIGID
}
+StringValues="BeamDoseType" {
+ PHYSICAL,
+ EFFECTIVE
+}
+
+
diff --git a/libsrc/standard/strval/softcopy.tpl b/libsrc/standard/strval/softcopy.tpl
index d172d6e..3e497d2 100755
--- a/libsrc/standard/strval/softcopy.tpl
+++ b/libsrc/standard/strval/softcopy.tpl
@@ -230,4 +230,10 @@ StringValues="PixelOriginInterpretation" {
VOLUME
}
+StringValues="ColorSpace" {
+ SRGB,
+ ADOBERGB,
+ ROMMRGB
+}
+
diff --git a/libsrc/standard/strval/xaxrf.tpl b/libsrc/standard/strval/xaxrf.tpl
index ca14a2d..401bf0c 100755
--- a/libsrc/standard/strval/xaxrf.tpl
+++ b/libsrc/standard/strval/xaxrf.tpl
@@ -268,4 +268,15 @@ StringValues="XRay3DImageVolumeBasedCalculationTechniqueImageLevel" {
TOMOSYNTHESIS
}
+StringValues="XRay3DImageVolumeBasedCalculationTechniqueFrameLevel" {
+ MAX_IP,
+ MIN_IP,
+ VOLUME_RENDER,
+ SURFACE_RENDER,
+ MPR,
+ CURVED_MPR,
+ NONE,
+ TOMOSYNTHESIS
+}
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dicom3tools.git
More information about the debian-med-commit
mailing list