Skip to content

Commit

Permalink
Updated data dictionary for DICOM 2024e.
Browse files Browse the repository at this point in the history
Updated data dictionary for the latest edition of the DICOM standard.
  • Loading branch information
jriesmeier committed Nov 16, 2024
1 parent f93cf77 commit 7d2ae1d
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 9 deletions.
14 changes: 11 additions & 3 deletions dcmdata/data/dicom.dic
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
# DICONDE (Digital Imaging and Communication in Nondestructive Evaluation) and
# DICOS (Digital Imaging and Communications in Security) standard.
#
# Generated automatically from DICOM PS 3.6-2024d and PS 3.7-2024d.
# File created on 2024-10-08 09:45:09 by J. Riesmeier on thinkpad2.
# Generated automatically from DICOM PS 3.6-2024e and PS 3.7-2024e.
# File created on 2024-11-16 10:17:21 by J. Riesmeier on thinkpad2.
#
# In addition, the data dictionary entries from the following final text
# supplements and correction items (CP) have been incorporated:
Expand Down Expand Up @@ -279,6 +279,7 @@
(0008,114A) SQ ReferencedInstanceSequence 1 DICOM
(0008,114B) SQ ReferencedRealWorldValueMappingInstanceSequence 1 DICOM
(0008,114C) SQ ReferencedSegmentationSequence 1 DICOM
(0008,114D) SQ ReferencedSurfaceSegmentationSequence 1 DICOM
(0008,1150) UI ReferencedSOPClassUID 1 DICOM
(0008,1155) UI ReferencedSOPInstanceUID 1 DICOM
(0008,1156) SQ DefinitionSourceSequence 1 DICOM
Expand Down Expand Up @@ -1966,12 +1967,16 @@
(0022,1618) SQ ScanPatternTypeCodeSequence 1 DICOM
(0022,1620) SQ ReferencedSurfaceMeshIdentificationSequence 1 DICOM
(0022,1622) CS OphthalmicVolumetricPropertiesFlag 1 DICOM
(0022,1623) FL OphthalmicAnatomicReferencePointFrameCoordinate 1 DICOM
(0022,1624) FL OphthalmicAnatomicReferencePointXCoordinate 1 DICOM
(0022,1626) FL OphthalmicAnatomicReferencePointYCoordinate 1 DICOM
(0022,1627) SQ OphthalmicEnFaceVolumeDescriptorSequence 1 DICOM
(0022,1628) SQ OphthalmicEnFaceImageQualityRatingSequence 1 DICOM
(0022,1629) CS OphthalmicEnFaceVolumeDescriptorScope 1 DICOM
(0022,1630) DS QualityThreshold 1 DICOM
(0022,1632) SQ OphthalmicAnatomicReferencePointSequence 1 DICOM
(0022,1633) CS OphthalmicAnatomicReferencePointLocalizationType 1 DICOM
(0022,1634) IS PrimaryAnatomicStructureItemIndex 1 DICOM
(0022,1640) SQ OCTBscanAnalysisAcquisitionParametersSequence 1 DICOM
(0022,1642) UL NumberOfBscansPerFrame 1 DICOM
(0022,1643) FL BscanSlabThickness 1 DICOM
Expand Down Expand Up @@ -3728,7 +3733,9 @@
(3004,000A) CS DoseSummationType 1 DICOM
(3004,000C) DS GridFrameOffsetVector 2-n DICOM
(3004,000E) DS DoseGridScaling 1 DICOM
(3004,0012) DS DoseValue 1 DICOM
(3004,0014) CS TissueHeterogeneityCorrection 1-3 DICOM
(3004,0016) SQ RecommendedIsodoseLevelSequence 1 DICOM
(3004,0040) DS DVHNormalizationPoint 3 DICOM
(3004,0042) DS DVHNormalizationDoseValue 1 DICOM
(3004,0050) SQ DVHSequence 1 DICOM
Expand Down Expand Up @@ -4189,6 +4196,7 @@
(300A,02E8) FL CompensatorMillingToolDiameter 1 DICOM
(300A,02EA) SQ IonRangeCompensatorSequence 1 DICOM
(300A,02EB) LT CompensatorDescription 1 DICOM
(300A,02EC) CS CompensatorSurfaceRepresentationFlag 1 DICOM
(300A,0302) IS RadiationMassNumber 1 DICOM
(300A,0304) IS RadiationAtomicNumber 1 DICOM
(300A,0306) SS RadiationChargeState 1 DICOM
Expand Down Expand Up @@ -5212,7 +5220,6 @@
(2130,0060) SQ RETIRED_ImageOverlayBoxContentSequence 1 DICOM/retired
(2130,0080) SQ RETIRED_PresentationLUTContentSequence 1 DICOM/retired
(3004,0010) SQ RETIRED_RTDoseROISequence 1 DICOM/retired
(3004,0012) DS RETIRED_DoseValue 1 DICOM/retired
(3006,0044) DS RETIRED_ContourSlabThickness 1 DICOM/retired
(3006,0045) DS RETIRED_ContourOffsetVector 3 DICOM/retired
(3006,0049) IS RETIRED_AttachedContours 1-n DICOM/retired
Expand Down Expand Up @@ -5319,6 +5326,7 @@
(7F00-7FFF,0020) OW RETIRED_VariableCoefficientsSDVN 1 DICOM/retired
(7F00-7FFF,0030) OW RETIRED_VariableCoefficientsSDHN 1 DICOM/retired
(7F00-7FFF,0040) OW RETIRED_VariableCoefficientsSDDN 1 DICOM/retired
(7F00-7FFF,0040) OW RETIRED_VariableCoefficientsSDDN 1 DICOM/retired
#
#---------------------------------------------------------------------------
#
Expand Down
15 changes: 11 additions & 4 deletions dcmdata/include/dcmtk/dcmdata/dcdeftag.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
**
** User: joergr
** Host: thinkpad2
** Date: 2024-10-08 09:47:28
** Date: 2024-11-16 10:42:04
** Prog: /home/joergr/Source/dcmtk-full/public/dcmdata/libsrc/mkdeftag
**
** From: ../data/dicom.dic
Expand All @@ -17,12 +17,12 @@

#include "dcmtk/dcmdata/dctagkey.h"

#define DCM_DICT_DEFTAG_BUILD_DATE "2024-10-08 09:47:28"
#define DCM_DICT_DEFTAG_BUILD_DATE "2024-11-16 10:42:04"


/*
** Fixed Tags in ascending (gggg,eeee) order.
** Number of entries: 5199
** Number of entries: 5206
** Tags with a repeating component (repeating tags) are listed later.
*/
#define DCM_CommandGroupLength DcmTagKey(0x0000, 0x0000)
Expand Down Expand Up @@ -296,6 +296,7 @@
#define DCM_ReferencedInstanceSequence DcmTagKey(0x0008, 0x114a)
#define DCM_ReferencedRealWorldValueMappingInstanceSequence DcmTagKey(0x0008, 0x114b)
#define DCM_ReferencedSegmentationSequence DcmTagKey(0x0008, 0x114c)
#define DCM_ReferencedSurfaceSegmentationSequence DcmTagKey(0x0008, 0x114d)
#define DCM_ReferencedSOPClassUID DcmTagKey(0x0008, 0x1150)
#define DCM_ReferencedSOPInstanceUID DcmTagKey(0x0008, 0x1155)
#define DCM_DefinitionSourceSequence DcmTagKey(0x0008, 0x1156)
Expand Down Expand Up @@ -2070,12 +2071,16 @@
#define DCM_ScanPatternTypeCodeSequence DcmTagKey(0x0022, 0x1618)
#define DCM_ReferencedSurfaceMeshIdentificationSequence DcmTagKey(0x0022, 0x1620)
#define DCM_OphthalmicVolumetricPropertiesFlag DcmTagKey(0x0022, 0x1622)
#define DCM_OphthalmicAnatomicReferencePointFrameCoordinate DcmTagKey(0x0022, 0x1623)
#define DCM_OphthalmicAnatomicReferencePointXCoordinate DcmTagKey(0x0022, 0x1624)
#define DCM_OphthalmicAnatomicReferencePointYCoordinate DcmTagKey(0x0022, 0x1626)
#define DCM_OphthalmicEnFaceVolumeDescriptorSequence DcmTagKey(0x0022, 0x1627)
#define DCM_OphthalmicEnFaceImageQualityRatingSequence DcmTagKey(0x0022, 0x1628)
#define DCM_OphthalmicEnFaceVolumeDescriptorScope DcmTagKey(0x0022, 0x1629)
#define DCM_QualityThreshold DcmTagKey(0x0022, 0x1630)
#define DCM_OphthalmicAnatomicReferencePointSequence DcmTagKey(0x0022, 0x1632)
#define DCM_OphthalmicAnatomicReferencePointLocalizationType DcmTagKey(0x0022, 0x1633)
#define DCM_PrimaryAnatomicStructureItemIndex DcmTagKey(0x0022, 0x1634)
#define DCM_OCTBscanAnalysisAcquisitionParametersSequence DcmTagKey(0x0022, 0x1640)
#define DCM_NumberOfBscansPerFrame DcmTagKey(0x0022, 0x1642)
#define DCM_BscanSlabThickness DcmTagKey(0x0022, 0x1643)
Expand Down Expand Up @@ -4089,8 +4094,9 @@
#define DCM_GridFrameOffsetVector DcmTagKey(0x3004, 0x000c)
#define DCM_DoseGridScaling DcmTagKey(0x3004, 0x000e)
#define DCM_RETIRED_RTDoseROISequence DcmTagKey(0x3004, 0x0010)
#define DCM_RETIRED_DoseValue DcmTagKey(0x3004, 0x0012)
#define DCM_DoseValue DcmTagKey(0x3004, 0x0012)
#define DCM_TissueHeterogeneityCorrection DcmTagKey(0x3004, 0x0014)
#define DCM_RecommendedIsodoseLevelSequence DcmTagKey(0x3004, 0x0016)
#define DCM_DVHNormalizationPoint DcmTagKey(0x3004, 0x0040)
#define DCM_DVHNormalizationDoseValue DcmTagKey(0x3004, 0x0042)
#define DCM_DVHSequence DcmTagKey(0x3004, 0x0050)
Expand Down Expand Up @@ -4566,6 +4572,7 @@
#define DCM_CompensatorMillingToolDiameter DcmTagKey(0x300a, 0x02e8)
#define DCM_IonRangeCompensatorSequence DcmTagKey(0x300a, 0x02ea)
#define DCM_CompensatorDescription DcmTagKey(0x300a, 0x02eb)
#define DCM_CompensatorSurfaceRepresentationFlag DcmTagKey(0x300a, 0x02ec)
#define DCM_RadiationMassNumber DcmTagKey(0x300a, 0x0302)
#define DCM_RadiationAtomicNumber DcmTagKey(0x300a, 0x0304)
#define DCM_RadiationChargeState DcmTagKey(0x300a, 0x0306)
Expand Down
32 changes: 30 additions & 2 deletions dcmdata/libsrc/dcdictbi.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
**
** User: joergr
** Host: thinkpad2
** Date: 2024-10-08 09:48:02
** Date: 2024-11-16 10:42:05
** Prog: /home/joergr/Source/dcmtk-full/public/dcmdata/libsrc/mkdictbi
**
** From: ../data/dicom.dic
Expand Down Expand Up @@ -1160,6 +1160,10 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_SQ, "ReferencedSegmentationSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0008, 0x114d, 0x0008, 0x114d,
EVR_SQ, "ReferencedSurfaceSegmentationSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0008, 0x1150, 0x0008, 0x1150,
EVR_UI, "ReferencedSOPClassUID", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
Expand Down Expand Up @@ -15010,6 +15014,10 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_CS, "OphthalmicVolumetricPropertiesFlag", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0022, 0x1623, 0x0022, 0x1623,
EVR_FL, "OphthalmicAnatomicReferencePointFrameCoordinate", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0022, 0x1624, 0x0022, 0x1624,
EVR_FL, "OphthalmicAnatomicReferencePointXCoordinate", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
Expand All @@ -15034,6 +15042,18 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_DS, "QualityThreshold", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0022, 0x1632, 0x0022, 0x1632,
EVR_SQ, "OphthalmicAnatomicReferencePointSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0022, 0x1633, 0x0022, 0x1633,
EVR_CS, "OphthalmicAnatomicReferencePointLocalizationType", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0022, 0x1634, 0x0022, 0x1634,
EVR_IS, "PrimaryAnatomicStructureItemIndex", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0022, 0x1640, 0x0022, 0x1640,
EVR_SQ, "OCTBscanAnalysisAcquisitionParametersSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
Expand Down Expand Up @@ -27353,13 +27373,17 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x3004, 0x0012, 0x3004, 0x0012,
EVR_DS, "RETIRED_DoseValue", 1, 1, "DICOM/retired",
EVR_DS, "DoseValue", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x3004, 0x0014, 0x3004, 0x0014,
EVR_CS, "TissueHeterogeneityCorrection", 1, 3, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x3004, 0x0016, 0x3004, 0x0016,
EVR_SQ, "RecommendedIsodoseLevelSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x3004, 0x0040, 0x3004, 0x0040,
EVR_DS, "DVHNormalizationPoint", 3, 3, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
Expand Down Expand Up @@ -29260,6 +29284,10 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_LT, "CompensatorDescription", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x02ec, 0x300a, 0x02ec,
EVR_CS, "CompensatorSurfaceRepresentationFlag", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0302, 0x300a, 0x0302,
EVR_IS, "RadiationMassNumber", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
Expand Down

0 comments on commit 7d2ae1d

Please sign in to comment.