From 728c8acbeaa949a0485b586a8a020745a9bb0364 Mon Sep 17 00:00:00 2001 From: Darcy Mason Date: Tue, 29 Mar 2022 12:43:47 -0400 Subject: [PATCH] Prep 2.3 (#1620) * Prep v2.3, dicom to 2022a * Update release note for 2022a --- doc/release_notes/v2.3.0.rst | 1 + pydicom/_dicom_dict.py | 20 +++++++++++++++++++- pydicom/_uid_dict.py | 2 ++ pydicom/_version.py | 4 ++-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/doc/release_notes/v2.3.0.rst b/doc/release_notes/v2.3.0.rst index 0a36f9aa6b..411ce31e9f 100644 --- a/doc/release_notes/v2.3.0.rst +++ b/doc/release_notes/v2.3.0.rst @@ -32,6 +32,7 @@ Enhancements * Replacement of ``UN`` VR with ``SQ`` VR for undefined length data elements (introduced in 2.2.2), can now be configured via :attr:`~pydicom.config.settings.infer_sq_for_un_vr` +* Updated dictionaries to DICOM 2022a Fixes ----- diff --git a/pydicom/_dicom_dict.py b/pydicom/_dicom_dict.py index a77610ed85..14688af216 100644 --- a/pydicom/_dicom_dict.py +++ b/pydicom/_dicom_dict.py @@ -904,6 +904,7 @@ 0x00181200: ('DA', '1-n', "Date of Last Calibration", '', 'DateOfLastCalibration'), # noqa 0x00181201: ('TM', '1-n', "Time of Last Calibration", '', 'TimeOfLastCalibration'), # noqa 0x00181202: ('DT', '1', "DateTime of Last Calibration", '', 'DateTimeOfLastCalibration'), # noqa + 0x00181203: ('DT', '1', "Calibration DateTime", '', 'CalibrationDateTime'), # noqa 0x00181210: ('SH', '1-n', "Convolution Kernel", '', 'ConvolutionKernel'), # noqa 0x00181240: ('IS', '1-n', "Upper/Lower Pixel Values", 'Retired', 'UpperLowerPixelValues'), # noqa 0x00181242: ('IS', '1', "Actual Frame Duration", '', 'ActualFrameDuration'), # noqa @@ -2243,6 +2244,7 @@ 0x00321055: ('CS', '1', "Study Component Status ID", 'Retired', 'StudyComponentStatusID'), # noqa 0x00321060: ('LO', '1', "Requested Procedure Description", '', 'RequestedProcedureDescription'), # noqa 0x00321064: ('SQ', '1', "Requested Procedure Code Sequence", '', 'RequestedProcedureCodeSequence'), # noqa + 0x00321065: ('SQ', '1', "Requested Laterality Code Sequence", '', 'RequestedLateralityCodeSequence'), # noqa 0x00321066: ('UT', '1', "Reason for Visit", '', 'ReasonForVisit'), # noqa 0x00321067: ('SQ', '1', "Reason for Visit Code Sequence", '', 'ReasonForVisitCodeSequence'), # noqa 0x00321070: ('LO', '1', "Requested Contrast Agent", '', 'RequestedContrastAgent'), # noqa @@ -3914,6 +3916,7 @@ 0x300800B0: ('SQ', '1', "Recorded Wedge Sequence", '', 'RecordedWedgeSequence'), # noqa 0x300800C0: ('SQ', '1', "Recorded Compensator Sequence", '', 'RecordedCompensatorSequence'), # noqa 0x300800D0: ('SQ', '1', "Recorded Block Sequence", '', 'RecordedBlockSequence'), # noqa + 0x300800D1: ('SQ', '1', "Recorded Block Slab Sequence", '', 'RecordedBlockSlabSequence'), # noqa 0x300800E0: ('SQ', '1', "Treatment Summary Measured Dose Reference Sequence", '', 'TreatmentSummaryMeasuredDoseReferenceSequence'), # noqa 0x300800F0: ('SQ', '1', "Recorded Snout Sequence", '', 'RecordedSnoutSequence'), # noqa 0x300800F2: ('SQ', '1', "Recorded Range Shifter Sequence", '', 'RecordedRangeShifterSequence'), # noqa @@ -3960,7 +3963,7 @@ 0x300A0007: ('TM', '1', "RT Plan Time", '', 'RTPlanTime'), # noqa 0x300A0009: ('LO', '1-n', "Treatment Protocols", '', 'TreatmentProtocols'), # noqa 0x300A000A: ('CS', '1', "Plan Intent", '', 'PlanIntent'), # noqa - 0x300A000B: ('LO', '1-n', "Treatment Sites", '', 'TreatmentSites'), # noqa + 0x300A000B: ('LO', '1-n', "Treatment Sites", 'Retired', 'TreatmentSites'), # noqa 0x300A000C: ('CS', '1', "RT Plan Geometry", '', 'RTPlanGeometry'), # noqa 0x300A000E: ('ST', '1', "Prescription Description", '', 'PrescriptionDescription'), # noqa 0x300A0010: ('SQ', '1', "Dose Reference Sequence", '', 'DoseReferenceSequence'), # noqa @@ -4597,6 +4600,21 @@ 0x300C0111: ('SQ', '1', "Omitted Beam Task Sequence", '', 'OmittedBeamTaskSequence'), # noqa 0x300C0112: ('CS', '1', "Reason for Omission", '', 'ReasonForOmission'), # noqa 0x300C0113: ('LO', '1', "Reason for Omission Description", '', 'ReasonForOmissionDescription'), # noqa + 0x300C0114: ('SQ', '1', "Prescription Overview Sequence", '', 'PrescriptionOverviewSequence'), # noqa + 0x300C0115: ('FL', '1', "Total Prescription Dose", '', 'TotalPrescriptionDose'), # noqa + 0x300C0116: ('SQ', '1', "Plan Overview Sequence", '', 'PlanOverviewSequence'), # noqa + 0x300C0117: ('US', '1', "Plan Overview Index", '', 'PlanOverviewIndex'), # noqa + 0x300C0118: ('US', '1', "Referenced Plan Overview Index", '', 'ReferencedPlanOverviewIndex'), # noqa + 0x300C0119: ('US', '1', "Number of Fractions Included", '', 'NumberOfFractionsIncluded'), # noqa + 0x300C0120: ('SQ', '1', "Dose Calibration Conditions Sequence", '', 'DoseCalibrationConditionsSequence'), # noqa + 0x300C0121: ('FD', '1', "Absorbed Dose to Meterset Ratio", '', 'AbsorbedDoseToMetersetRatio'), # noqa + 0x300C0122: ('FD', '2', "Delineated Radiation Field Size", '', 'DelineatedRadiationFieldSize'), # noqa + 0x300C0123: ('CS', '1', "Dose Calibration Conditions Verified Flag", '', 'DoseCalibrationConditionsVerifiedFlag'), # noqa + 0x300C0124: ('FD', '1', "Calibration Reference Point Depth", '', 'CalibrationReferencePointDepth'), # noqa + 0x300C0125: ('SQ', '1', "Gating Beam Hold Transition Sequence", '', 'GatingBeamHoldTransitionSequence'), # noqa + 0x300C0126: ('CS', '1', "Beam Hold Transition", '', 'BeamHoldTransition'), # noqa + 0x300C0127: ('DT', '1', "Beam Hold Transition DateTime", '', 'BeamHoldTransitionDateTime'), # noqa + 0x300C0128: ('SQ', '1', "Beam Hold Originating Device Sequence", '', 'BeamHoldOriginatingDeviceSequence'), # noqa 0x300E0002: ('CS', '1', "Approval Status", '', 'ApprovalStatus'), # noqa 0x300E0004: ('DA', '1', "Review Date", '', 'ReviewDate'), # noqa 0x300E0005: ('TM', '1', "Review Time", '', 'ReviewTime'), # noqa diff --git a/pydicom/_uid_dict.py b/pydicom/_uid_dict.py index b5bf00a006..449317716e 100644 --- a/pydicom/_uid_dict.py +++ b/pydicom/_uid_dict.py @@ -81,6 +81,8 @@ '1.2.840.10008.2.16.14': ('Radiomics Ontology', 'Coding Scheme', '', '', 'RO'), # noqa '1.2.840.10008.2.16.15': ('RadElement', 'Coding Scheme', '', '', 'RADELEMENT'), # noqa '1.2.840.10008.2.16.16': ('ICD-11', 'Coding Scheme', '', '', 'I11'), # noqa + '1.2.840.10008.2.16.17': ('Unified numbering system (UNS) for metals and alloys', 'Coding Scheme', '', '', 'UNS'), # noqa + '1.2.840.10008.2.16.18': ('Research Resource Identification', 'Coding Scheme', '', '', 'RRID'), # noqa '1.2.840.10008.3.1.1.1': ('DICOM Application Context Name', 'Application Context Name', '', '', 'DICOMApplicationContext'), # noqa '1.2.840.10008.3.1.2.1.1': ('Detached Patient Management SOP Class', 'SOP Class', '', 'Retired', 'DetachedPatientManagement'), # noqa '1.2.840.10008.3.1.2.1.4': ('Detached Patient Management Meta SOP Class', 'Meta SOP Class', '', 'Retired', 'DetachedPatientManagementMeta'), # noqa diff --git a/pydicom/_version.py b/pydicom/_version.py index 5bef8bb8f5..38e53533f4 100644 --- a/pydicom/_version.py +++ b/pydicom/_version.py @@ -3,7 +3,7 @@ from typing import cast, Match -__version__: str = '2.3.0.dev0' +__version__: str = '2.3.0' result = cast(Match[str], re.match(r'(\d+\.\d+\.\d+).*', __version__)) __version_info__ = tuple(result.group(1).split('.')) @@ -11,4 +11,4 @@ # DICOM Standard version used for: # _dicom_dict.py, _uid_dict.py and uid.py -__dicom_version__: str = '2021e' +__dicom_version__: str = '2022a'