rtp-connect 1.4 → 1.5

data/CHANGELOG.rdoc

@@ -1,9 +1,35 @@
+= 1.5
+
+=== 24th October, 2013
+
+* Added support for the Simulation Field record.
+* Bumped required Ruby version to 1.9.3.
+* More robust CSV implementation:
+  * Properly handle attributes containing a double-quote character.
+  * Improved handling of invalid CSV RTP files.
+  * Ensure that we don't produce invalid CSV with records containing attributes with the double-quote character.
+* Plan#to_dcm improvements:
+  * Exclude CT & 2DkV fields on export.
+  * Properly handle the case of a missing Site Setup in the RTP file.
+  * Improve handling of logging in the DICOM module.
+  * Added logic for deciding whether the plan's machine actually has an X jaw.
+  * Ensure that a correct number of fields and control points are specified.
+  * Added support for more MLC types:
+    * Siemens 58 & 82 leaf
+    * Varian 120 leaf
+  * Added options for specifying undeterminable machine information such as:
+    * Manufacturer
+    * Manufacturer's Model Name
+    * Device Serial Number
+
+
 = 1.4
 
 === 10th April, 2013
 
 * Support an extended ascii character set (ISO8859-1 encoding) for record values and file read/write.
 
+
 = 1.3
 
 === 12th October, 2012

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rtp-connect (1.4)
+    rtp-connect (1.5)
 
 GEM
   remote: http://www.rubygems.org/
@@ -26,10 +26,10 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  bundler (~> 1.2)
+  bundler (~> 1.3)
   dicom (~> 0.9.5)
-  mocha (~> 0.12)
-  rake (~> 0.9.2)
-  rspec (~> 2.11)
+  mocha (~> 0.13)
+  rake (~> 0.9.6)
+  rspec (~> 2.13)
   rtp-connect!
-  yard (~> 0.8.2)
+  yard (~> 0.8.5)

data/README.rdoc

@@ -13,7 +13,7 @@ external dependencies.
 
 == REQUIREMENTS
 
-* Ruby 1.9.2 (or higher)
+* Ruby 1.9.3 (or higher)
 
 
 == BASIC USAGE
@@ -92,6 +92,7 @@ Example:
 * Plan definition [PLAN_DEF]
 * Prescription site [RX_DEF]
 * Site setup [SITE_SETUP_DEF]
+* Simulation field [SIM_DEF]
 * Treatment field [FIELD_DEF]
 * Extended treatment field [EXTENDED_FIELD_DEF]
 * Control point record [CONTROL_PT_DEF]
@@ -99,7 +100,6 @@ Example:
 
 === Unsupported records
 
-* Simulation field [SIM_DEF]
 * Extended plan definition [EXTENDED_PLAN_DEF]
 * Document based treatment field [PDF_FIELD_DEF]
 * Multileaf collimator [MLC_DEF]

data/lib/rtp-connect.rb

@@ -9,6 +9,7 @@ require_relative 'rtp-connect/plan'
 require_relative 'rtp-connect/plan_to_dcm'
 require_relative 'rtp-connect/prescription'
 require_relative 'rtp-connect/site_setup'
+require_relative 'rtp-connect/simulation_field'
 require_relative 'rtp-connect/field'
 require_relative 'rtp-connect/extended_field'
 require_relative 'rtp-connect/control_point'

data/lib/rtp-connect/methods.rb

@@ -6,6 +6,39 @@ module RTP
     # Module methods:
     #++
 
+    # Gives an array of MLC leaf position boundaries for a given type of MLC,
+    # specified by its number of leaves at one side.
+    #
+    # @param [Fixnum] nr_leaves the number of leaves (in one leaf bank)
+    # @return [Array<Fixnum>] the leaf boundary positions
+    # @raise [ArgumentError] if an unsupported MLC (nr of leaves) is given
+    #
+    def leaf_boundaries(nr_leaves)
+      case nr_leaves
+      when 29
+        [-200, -135, -125, -115, -105, -95, -85, -75, -65, -55, -45, -35, -25,
+          -15, -5, 5, 15, 25, 35, 45, 55, 65, 75, 85, 95, 105, 115, 125, 135, 200
+        ]
+      when 40
+        Array.new(nr_leaves) {|i| (i * 400 / nr_leaves.to_f - 200).to_i}
+      when 41
+        [-200, -195, -185, -175, -165, -155, -145, -135, -125, -115,
+          -105, -95, -85, -75, -65, -55, -45, -35, -25, -15, -5, 5, 15, 25, 35, 45,
+          55, 65, 75, 85, 95, 105, 115, 125, 135, 145, 155, 165, 175, 185, 195, 200
+        ]
+      when 60
+        [-200, -190, -180, -170, -160, -150, -140, -130, -120, -110,
+          -100, -95, -90, -85, -80, -75, -70, -65, -60, -55, -50, -45, -40, -35, -30,
+          -25, -20, -15, -10, -5, 0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65,
+          70, 75, 80, 85, 90, 95, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200
+        ]
+      when 80
+        Array.new(nr_leaves) {|i| (i * 400 / nr_leaves.to_f - 200).to_i}
+      else
+        raise ArgumentError, "Unsupported number of leaves: #{nr_leaves}"
+      end
+    end
+
     # Computes the CRC checksum of the given line and verifies that
     # this value corresponds with the checksum given at the end of the line.
     #

data/lib/rtp-connect/plan.rb

@@ -623,6 +623,15 @@ module RTP
       @current_parent = f
     end
 
+    # Creates a simulation field record from the given string.
+    #
+    # @param [String] string a string line containing a simulation field definition
+    #
+    def simulation_field(string)
+      sf = SimulationField.load(string, @current_parent)
+      @current_parent = sf
+    end
+
   end
 
 end

data/lib/rtp-connect/plan_to_dcm.rb

@@ -9,14 +9,19 @@ module RTP
     #   Electron beams or dynamic photon beams may give an invalid DICOM file.
     #   Also note that, due to limitations in the RTP file format, some original
     #   values can not be recreated, like e.g. Study UID or Series UID.
+    # @param [Hash] options the options to use for creating the DICOM object
+    # @option options [String] :manufacturer the value used for the manufacturer tag (0008,0070) in the beam sequence
+    # @option options [String] :model the value used for the manufacturer's model name tag (0008,1090) in the beam sequence
+    # @option options [String] :serial_number the value used for the device serial number tag (0018,1000) in the beam sequence
     # @return [DICOM::DObject] the converted DICOM object
     #
-    def to_dcm
+    def to_dcm(options={})
       #
       # FIXME: This method is rather big, with a few sections of somewhat similar, repeating code.
       # Refactoring and simplifying it at some stage might be a good idea.
       #
       require 'dicom'
+      original_level = DICOM.logger.level
       DICOM.logger.level = Logger::FATAL
       p = @prescriptions.first
       # If no prescription is present, we are not going to be able to make a valid DICOM object:
@@ -162,11 +167,8 @@ module RTP
         num_frac = '0'
       end
       DICOM::Element.new('300A,0078', num_frac, :parent => fg_item)
-      # Number of Beams:
-      num_beams = p ? p.fields.length : 0
-      DICOM::Element.new('300A,0080', "#{num_beams}", :parent => fg_item)
       # Number of Brachy Application Setups:
-      DICOM::Element.new('300A,00A0', "0", :parent => fg_item)
+      DICOM::Element.new('300A,00A0', '0', :parent => fg_item)
       # Referenced Beam Sequence (items created for each beam below):
       rb_seq = DICOM::Sequence.new('300C,0004', :parent => fg_item)
       #
@@ -177,330 +179,360 @@ module RTP
         # If no fields are present, we are not going to be able to make a valid DICOM object:
         logger.error("No Field Record present. Unable to build a valid RTPLAN DICOM object.") unless p.fields.length > 0
         p.fields.each_with_index do |field, i|
-          # If this is an electron beam, a warning should be printed, as these are less reliably converted:
-          logger.warn("This is not a photon beam (#{field.modality}). Beware that DICOM conversion of Electron beams are experimental, and other modalities are unsupported.") if field.modality != 'Xrays'
-          # Beam number and name:
-          beam_number = field.extended_field ? field.extended_field.original_beam_number : (i + 1).to_s
-          beam_name = field.extended_field ? field.extended_field.original_beam_name : field.field_name
-          # Ref Beam Item:
-          rb_item = DICOM::Item.new(:parent => rb_seq)
-          # Beam Dose (convert from cGy to Gy):
-          field_dose = field.field_dose.empty? ? '' : (field.field_dose.to_f * 0.01).round(4).to_s
-          DICOM::Element.new('300A,0084', field_dose, :parent => rb_item)
-          # Beam Meterset:
-          DICOM::Element.new('300A,0086', field.field_monitor_units, :parent => rb_item)
-          # Referenced Beam Number:
-          DICOM::Element.new('300C,0006', beam_number, :parent => rb_item)
-          # Beam Item:
-          b_item = DICOM::Item.new(:parent => b_seq)
-          # Treatment Machine Name (max 16 characters):
-          DICOM::Element.new('300A,00B2', field.treatment_machine[0..15], :parent => b_item)
-          # Primary Dosimeter Unit:
-          DICOM::Element.new('300A,00B3', 'MU', :parent => b_item)
-          # Source-Axis Distance (convert to mm):
-          DICOM::Element.new('300A,00B4', "#{field.sad.to_f * 10}", :parent => b_item)
-          # Beam Number:
-          DICOM::Element.new('300A,00C0', beam_number, :parent => b_item)
-          # Beam Name:
-          DICOM::Element.new('300A,00C2', beam_name, :parent => b_item)
-          # Beam Description:
-          DICOM::Element.new('300A,00C3', field.field_note, :parent => b_item)
-          # Beam Type:
-          beam_type = case field.treatment_type
-            when 'Static' then 'STATIC'
-            when 'StepNShoot' then 'STATIC'
-            else logger.error("The beam type (treatment type) #{field.treatment_type} is not yet supported.")
-          end
-          DICOM::Element.new('300A,00C4', beam_type, :parent => b_item)
-          # Radiation Type:
-          rad_type = case field.modality
-            when 'Elect' then 'ELECTRON'
-            when 'Xrays' then 'PHOTON'
-            else logger.error("The radiation type (modality) #{field.modality} is not yet supported.")
-          end
-          DICOM::Element.new('300A,00C6', rad_type, :parent => b_item)
-          # Treatment Delivery Type:
-          DICOM::Element.new('300A,00CE', 'TREATMENT', :parent => b_item)
-          # Number of Wedges:
-          DICOM::Element.new('300A,00D0', (field.wedge.empty? ? '0' : '1'), :parent => b_item)
-          # Number of Compensators:
-          DICOM::Element.new('300A,00E0', (field.compensator.empty? ? '0' : '1'), :parent => b_item)
-          # Number of Boli:
-          DICOM::Element.new('300A,00ED', (field.bolus.empty? ? '0' : '1'), :parent => b_item)
-          # Number of Blocks:
-          DICOM::Element.new('300A,00F0', (field.block.empty? ? '0' : '1'), :parent => b_item)
-          # Final Cumulative Meterset Weight:
-          DICOM::Element.new('300A,010E', field.field_monitor_units, :parent => b_item)
-          # Number of Control Points:
-          DICOM::Element.new('300A,0110', "#{field.control_points.length}", :parent => b_item)
-          # Referenced Patient Setup Number:
-          DICOM::Element.new('300C,006A', '1', :parent => b_item)
-          #
-          # Beam Limiting Device Sequence:
-          #
-          bl_seq = DICOM::Sequence.new('300A,00B6', :parent => b_item)
-          # Always create one ASYMX and one ASYMY item:
-          bl_item_x = DICOM::Item.new(:parent => bl_seq)
-          bl_item_y = DICOM::Item.new(:parent => bl_seq)
-          # RT Beam Limiting Device Type:
-          DICOM::Element.new('300A,00B8', "ASYMX", :parent => bl_item_x)
-          DICOM::Element.new('300A,00B8', "ASYMY", :parent => bl_item_y)
-          # Number of Leaf/Jaw Pairs:
-          DICOM::Element.new('300A,00BC', "1", :parent => bl_item_x)
-          DICOM::Element.new('300A,00BC', "1", :parent => bl_item_y)
-          # MLCX item is only created if leaves are defined:
-          # (NB: The RTP file doesn't specify leaf position boundaries, so for now we estimate these positions
-          # based on the (even) number of leaves and the assumptions of a 200 mm position of the outer leaf)
-          # FIXME: In the future, the MLCX leaf position boundary should be configurable - i.e. an option argument of to_dcm().
-          if field.control_points.length > 0
-            bl_item_mlcx = DICOM::Item.new(:parent => bl_seq)
-            DICOM::Element.new('300A,00B8', "MLCX", :parent => bl_item_mlcx)
-            num_leaves = field.control_points.first.mlc_leaves.to_i
-            logger.warn("Support for odd number of leaves (#{num_leaves}) is not implemented yet. Leaf Position Boundaries tag will be incorrect.") if num_leaves.odd?
-            logger.warn("Untested number of leaves encountered: #{num_leaves} Leaf Position Boundaries tag may be incorrect.") if num_leaves.even? && ![40, 80].include?(num_leaves)
-            DICOM::Element.new('300A,00BC', num_leaves.to_s, :parent => bl_item_mlcx)
-            pos_boundaries = Array.new(num_leaves) {|i| i * 400 / num_leaves.to_f - 200}
-            DICOM::Element.new('300A,00BE', "#{pos_boundaries.join("\\")}", :parent => bl_item_mlcx)
-          end
-          #
-          # Block Sequence (if any):
-          # FIXME: It seems that the Block Sequence (300A,00F4) may be
-          # difficult (impossible?) to reconstruct based on the RTP file's
-          # information, and thus it is skipped altogether.
-          #
-          #
-          # Applicator Sequence (if any):
-          #
-          unless field.e_applicator.empty?
-            app_seq = DICOM::Sequence.new('300A,0107', :parent => b_item)
-            app_item = DICOM::Item.new(:parent => app_seq)
-            # Applicator ID:
-            DICOM::Element.new('300A,0108', field.e_field_def_aperture, :parent => app_item)
-            # Applicator Type:
-            DICOM::Element.new('300A,0109', "ELECTRON_#{field.e_applicator.upcase}", :parent => app_item)
-            # Applicator Description:
-            DICOM::Element.new('300A,010A', "Appl. #{field.e_field_def_aperture}", :parent => app_item)
-          end
-          #
-          # Control Point Sequence:
-          #
-          # A field may have 0 (no MLC), 1 (conventional beam with MLC) or 2n (IMRT) control points.
-          # The DICOM file shall always contain 2n control points (minimum 2).
-          #
-          cp_seq = DICOM::Sequence.new('300A,0111', :parent => b_item)
-          if field.control_points.length < 2
-            # When we have 0 or 1 control point, use settings from field, and insert MLC settings if present:
-            # First CP:
-            cp_item = DICOM::Item.new(:parent => cp_seq)
-            # Control Point Index:
-            DICOM::Element.new('300A,0112', "0", :parent => cp_item)
-            # Nominal Beam Energy:
-            DICOM::Element.new('300A,0114', "#{field.energy.to_f}", :parent => cp_item)
-            # Dose Rate Set:
-            DICOM::Element.new('300A,0115', field.doserate, :parent => cp_item)
-            # Gantry Angle:
-            DICOM::Element.new('300A,011E', field.gantry_angle, :parent => cp_item)
-            # Gantry Rotation Direction:
-            DICOM::Element.new('300A,011F', (field.arc_direction.empty? ? 'NONE' : field.arc_direction), :parent => cp_item)
-            # Beam Limiting Device Angle:
-            DICOM::Element.new('300A,0120', field.collimator_angle, :parent => cp_item)
-            # Beam Limiting Device Rotation Direction:
-            DICOM::Element.new('300A,0121', 'NONE', :parent => cp_item)
-            # Patient Support Angle:
-            DICOM::Element.new('300A,0122', field.couch_pedestal, :parent => cp_item)
-            # Patient Support Rotation Direction:
-            DICOM::Element.new('300A,0123', 'NONE', :parent => cp_item)
-            # Table Top Eccentric Angle:
-            DICOM::Element.new('300A,0125', field.couch_angle, :parent => cp_item)
-            # Table Top Eccentric Rotation Direction:
-            DICOM::Element.new('300A,0126', 'NONE', :parent => cp_item)
-            # Table Top Vertical Position:
-            couch_vert = field.couch_vertical.empty? ? '' : (field.couch_vertical.to_f * 10).to_s
-            DICOM::Element.new('300A,0128', couch_vert, :parent => cp_item)
-            # Table Top Longitudinal Position:
-            couch_long = field.couch_longitudinal.empty? ? '' : (field.couch_longitudinal.to_f * 10).to_s
-            DICOM::Element.new('300A,0129', couch_long, :parent => cp_item)
-            # Table Top Lateral Position:
-            couch_lat = field.couch_lateral.empty? ? '' : (field.couch_lateral.to_f * 10).to_s
-            DICOM::Element.new('300A,012A', couch_lat, :parent => cp_item)
-            # Isocenter Position (x\y\z):
-            DICOM::Element.new('300A,012C', "#{(p.site_setup.iso_pos_x.to_f * 10).round(2)}\\#{(p.site_setup.iso_pos_y.to_f * 10).round(2)}\\#{(p.site_setup.iso_pos_z.to_f * 10).round(2)}", :parent => cp_item)
-            # Source to Surface Distance:
-            DICOM::Element.new('300A,0130', "#{field.ssd.to_f * 10}", :parent => cp_item)
-            # Cumulative Meterset Weight:
-            DICOM::Element.new('300A,0134', "0.0", :parent => cp_item)
-            # Beam Limiting Device Position Sequence:
-            dp_seq = DICOM::Sequence.new('300A,011A', :parent => cp_item)
-            # Always create one ASYMX and one ASYMY item:
-            dp_item_x = DICOM::Item.new(:parent => dp_seq)
-            dp_item_y = DICOM::Item.new(:parent => dp_seq)
+          # Fields with modality 'Unspecified' (e.g. CT or 2dkV) must be skipped:
+          unless field.modality == 'Unspecified'
+            # If this is an electron beam, a warning should be printed, as these are less reliably converted:
+            logger.warn("This is not a photon beam (#{field.modality}). Beware that DICOM conversion of Electron beams are experimental, and other modalities are unsupported.") if field.modality != 'Xrays'
+            # Beam number and name:
+            beam_number = field.extended_field ? field.extended_field.original_beam_number : (i + 1).to_s
+            beam_name = field.extended_field ? field.extended_field.original_beam_name : field.field_name
+            # Ref Beam Item:
+            rb_item = DICOM::Item.new(:parent => rb_seq)
+            # Beam Dose (convert from cGy to Gy):
+            field_dose = field.field_dose.empty? ? '' : (field.field_dose.to_f * 0.01).round(4).to_s
+            DICOM::Element.new('300A,0084', field_dose, :parent => rb_item)
+            # Beam Meterset:
+            DICOM::Element.new('300A,0086', field.field_monitor_units, :parent => rb_item)
+            # Referenced Beam Number:
+            DICOM::Element.new('300C,0006', beam_number, :parent => rb_item)
+            # Beam Item:
+            b_item = DICOM::Item.new(:parent => b_seq)
+            # Optional method values:
+            # Manufacturer:
+            DICOM::Element.new('0008,0070', options[:manufacturer], :parent => b_item) if options[:manufacturer]
+            # Manufacturer's Model Name:
+            DICOM::Element.new('0008,1090', options[:model], :parent => b_item) if options[:model]
+            # Device Serial Number:
+            DICOM::Element.new('0018,1000', options[:serial_number], :parent => b_item) if options[:serial_number]
+            # Treatment Machine Name (max 16 characters):
+            DICOM::Element.new('300A,00B2', field.treatment_machine[0..15], :parent => b_item)
+            # Primary Dosimeter Unit:
+            DICOM::Element.new('300A,00B3', 'MU', :parent => b_item)
+            # Source-Axis Distance (convert to mm):
+            DICOM::Element.new('300A,00B4', "#{field.sad.to_f * 10}", :parent => b_item)
+            # Beam Number:
+            DICOM::Element.new('300A,00C0', beam_number, :parent => b_item)
+            # Beam Name:
+            DICOM::Element.new('300A,00C2', beam_name, :parent => b_item)
+            # Beam Description:
+            DICOM::Element.new('300A,00C3', field.field_note, :parent => b_item)
+            # Beam Type:
+            beam_type = case field.treatment_type
+              when 'Static' then 'STATIC'
+              when 'StepNShoot' then 'STATIC'
+              else logger.error("The beam type (treatment type) #{field.treatment_type} is not yet supported.")
+            end
+            DICOM::Element.new('300A,00C4', beam_type, :parent => b_item)
+            # Radiation Type:
+            rad_type = case field.modality
+              when 'Elect' then 'ELECTRON'
+              when 'Xrays' then 'PHOTON'
+              else logger.error("The radiation type (modality) #{field.modality} is not yet supported.")
+            end
+            DICOM::Element.new('300A,00C6', rad_type, :parent => b_item)
+            # Treatment Delivery Type:
+            DICOM::Element.new('300A,00CE', 'TREATMENT', :parent => b_item)
+            # Number of Wedges:
+            DICOM::Element.new('300A,00D0', (field.wedge.empty? ? '0' : '1'), :parent => b_item)
+            # Number of Compensators:
+            DICOM::Element.new('300A,00E0', (field.compensator.empty? ? '0' : '1'), :parent => b_item)
+            # Number of Boli:
+            DICOM::Element.new('300A,00ED', (field.bolus.empty? ? '0' : '1'), :parent => b_item)
+            # Number of Blocks:
+            DICOM::Element.new('300A,00F0', (field.block.empty? ? '0' : '1'), :parent => b_item)
+            # Final Cumulative Meterset Weight:
+            DICOM::Element.new('300A,010E', field.field_monitor_units, :parent => b_item)
+            # Referenced Patient Setup Number:
+            DICOM::Element.new('300C,006A', '1', :parent => b_item)
+            #
+            # Beam Limiting Device Sequence:
+            #
+            bl_seq = DICOM::Sequence.new('300A,00B6', :parent => b_item)
+            # Always create one ASYMY item:
+            bl_item_y = DICOM::Item.new(:parent => bl_seq)
             # RT Beam Limiting Device Type:
-            DICOM::Element.new('300A,00B8', "ASYMX", :parent => dp_item_x)
-            DICOM::Element.new('300A,00B8', "ASYMY", :parent => dp_item_y)
-            # Leaf/Jaw Positions:
-            DICOM::Element.new('300A,011C', "#{field.collimator_x1.to_f * 10}\\#{field.collimator_x2.to_f * 10}", :parent => dp_item_x)
-            DICOM::Element.new('300A,011C', "#{field.collimator_y1.to_f * 10}\\#{field.collimator_y2.to_f * 10}", :parent => dp_item_y)
-            # MLCX:
+            DICOM::Element.new('300A,00B8', "ASYMY", :parent => bl_item_y)
+            # Number of Leaf/Jaw Pairs:
+            DICOM::Element.new('300A,00BC', "1", :parent => bl_item_y)
+            # The ASYMX item ('backup jaws') only exsists on some models:
+            if ['SYM', 'ASY'].include?(field.field_x_mode.upcase)
+              bl_item_x = DICOM::Item.new(:parent => bl_seq)
+              DICOM::Element.new('300A,00B8', "ASYMX", :parent => bl_item_x)
+              DICOM::Element.new('300A,00BC', "1", :parent => bl_item_x)
+            end
+            # MLCX item is only created if leaves are defined:
+            # (NB: The RTP file doesn't specify leaf position boundaries, so we
+            # have to set these based on a set of known MLC types, their number
+            # of leaves, and their leaf boundary positions.)
             if field.control_points.length > 0
-              dp_item_mlcx = DICOM::Item.new(:parent => dp_seq)
-              # RT Beam Limiting Device Type:
-              DICOM::Element.new('300A,00B8', "MLCX", :parent => dp_item_mlcx)
-              # Leaf/Jaw Positions:
-              pos_a = field.control_points.first.mlc_lp_a.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
-              pos_b = field.control_points.first.mlc_lp_b.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
-              leaf_pos = "#{pos_a.join("\\")}\\#{pos_b.join("\\")}"
-              DICOM::Element.new('300A,011C', leaf_pos, :parent => dp_item_mlcx)
+              bl_item_mlcx = DICOM::Item.new(:parent => bl_seq)
+              DICOM::Element.new('300A,00B8', "MLCX", :parent => bl_item_mlcx)
+              num_leaves = field.control_points.first.mlc_leaves.to_i
+              DICOM::Element.new('300A,00BC', num_leaves.to_s, :parent => bl_item_mlcx)
+              DICOM::Element.new('300A,00BE', "#{RTP.leaf_boundaries(num_leaves).join("\\")}", :parent => bl_item_mlcx)
+            end
+            #
+            # Block Sequence (if any):
+            # FIXME: It seems that the Block Sequence (300A,00F4) may be
+            # difficult (impossible?) to reconstruct based on the RTP file's
+            # information, and thus it is skipped altogether.
+            #
+            #
+            # Applicator Sequence (if any):
+            #
+            unless field.e_applicator.empty?
+              app_seq = DICOM::Sequence.new('300A,0107', :parent => b_item)
+              app_item = DICOM::Item.new(:parent => app_seq)
+              # Applicator ID:
+              DICOM::Element.new('300A,0108', field.e_field_def_aperture, :parent => app_item)
+              # Applicator Type:
+              DICOM::Element.new('300A,0109', "ELECTRON_#{field.e_applicator.upcase}", :parent => app_item)
+              # Applicator Description:
+              DICOM::Element.new('300A,010A', "Appl. #{field.e_field_def_aperture}", :parent => app_item)
             end
-            # Referenced Dose Reference Sequence:
-            rd_seq = DICOM::Sequence.new('300C,0050', :parent => cp_item)
-            rd_item = DICOM::Item.new(:parent => rd_seq)
-            # Cumulative Dose Reference Coeffecient:
-            DICOM::Element.new('300A,010C', '', :parent => rd_item)
-            # Referenced Dose Reference Number:
-            DICOM::Element.new('300C,0051', '1', :parent => rd_item)
-            # Second CP:
-            cp_item = DICOM::Item.new(:parent => cp_seq)
-            # Control Point Index:
-            DICOM::Element.new('300A,0112', "1", :parent => cp_item)
-            # Cumulative Meterset Weight:
-            DICOM::Element.new('300A,0134', field.field_monitor_units, :parent => cp_item)
-          else
-            # When we have multiple (2n) control points, iterate and pick settings from the CPs:
-            field.control_points.each_slice(2) do |cp1, cp2|
-              cp_item1 = DICOM::Item.new(:parent => cp_seq)
-              cp_item2 = DICOM::Item.new(:parent => cp_seq)
-              # First control point:
+            #
+            # Control Point Sequence:
+            #
+            # A field may have 0 (no MLC), 1 (conventional beam with MLC) or 2n (IMRT) control points.
+            # The DICOM file shall always contain 2n control points (minimum 2).
+            #
+            cp_seq = DICOM::Sequence.new('300A,0111', :parent => b_item)
+            if field.control_points.length < 2
+              # When we have 0 or 1 control point, use settings from field, and insert MLC settings if present:
+              # First CP:
+              cp_item = DICOM::Item.new(:parent => cp_seq)
               # Control Point Index:
-              DICOM::Element.new('300A,0112', "#{cp1.index}", :parent => cp_item1)
+              DICOM::Element.new('300A,0112', "0", :parent => cp_item)
               # Nominal Beam Energy:
-              DICOM::Element.new('300A,0114', "#{cp1.energy.to_f}", :parent => cp_item1)
+              DICOM::Element.new('300A,0114', "#{field.energy.to_f}", :parent => cp_item)
               # Dose Rate Set:
-              DICOM::Element.new('300A,0115', cp1.doserate, :parent => cp_item1)
+              DICOM::Element.new('300A,0115', field.doserate, :parent => cp_item)
               # Gantry Angle:
-              DICOM::Element.new('300A,011E', cp1.gantry_angle, :parent => cp_item1)
+              DICOM::Element.new('300A,011E', field.gantry_angle, :parent => cp_item)
               # Gantry Rotation Direction:
-              DICOM::Element.new('300A,011F', (cp1.gantry_dir.empty? ? 'NONE' : cp1.gantry_dir), :parent => cp_item1)
+              DICOM::Element.new('300A,011F', (field.arc_direction.empty? ? 'NONE' : field.arc_direction), :parent => cp_item)
               # Beam Limiting Device Angle:
-              DICOM::Element.new('300A,0120', cp1.collimator_angle, :parent => cp_item1)
+              DICOM::Element.new('300A,0120', field.collimator_angle, :parent => cp_item)
               # Beam Limiting Device Rotation Direction:
-              DICOM::Element.new('300A,0121', (cp1.collimator_dir.empty? ? 'NONE' : cp1.collimator_dir), :parent => cp_item1)
+              DICOM::Element.new('300A,0121', 'NONE', :parent => cp_item)
               # Patient Support Angle:
-              DICOM::Element.new('300A,0122', cp1.couch_pedestal, :parent => cp_item1)
+              DICOM::Element.new('300A,0122', field.couch_pedestal, :parent => cp_item)
               # Patient Support Rotation Direction:
-              DICOM::Element.new('300A,0123', (cp1.couch_ped_dir.empty? ? 'NONE' : cp1.couch_ped_dir), :parent => cp_item1)
+              DICOM::Element.new('300A,0123', 'NONE', :parent => cp_item)
               # Table Top Eccentric Angle:
-              DICOM::Element.new('300A,0125', cp1.couch_angle, :parent => cp_item1)
+              DICOM::Element.new('300A,0125', field.couch_angle, :parent => cp_item)
               # Table Top Eccentric Rotation Direction:
-              DICOM::Element.new('300A,0126', (cp1.couch_dir.empty? ? 'NONE' : cp1.couch_dir), :parent => cp_item1)
+              DICOM::Element.new('300A,0126', 'NONE', :parent => cp_item)
               # Table Top Vertical Position:
-              couch_vert = cp1.couch_vertical.empty? ? '' : (cp1.couch_vertical.to_f * 10).to_s
-              DICOM::Element.new('300A,0128', couch_vert, :parent => cp_item1)
+              couch_vert = field.couch_vertical.empty? ? '' : (field.couch_vertical.to_f * 10).to_s
+              DICOM::Element.new('300A,0128', couch_vert, :parent => cp_item)
               # Table Top Longitudinal Position:
-              couch_long = cp1.couch_longitudinal.empty? ? '' : (cp1.couch_longitudinal.to_f * 10).to_s
-              DICOM::Element.new('300A,0129', couch_long, :parent => cp_item1)
+              couch_long = field.couch_longitudinal.empty? ? '' : (field.couch_longitudinal.to_f * 10).to_s
+              DICOM::Element.new('300A,0129', couch_long, :parent => cp_item)
               # Table Top Lateral Position:
-              couch_lat = cp1.couch_lateral.empty? ? '' : (cp1.couch_lateral.to_f * 10).to_s
-              DICOM::Element.new('300A,012A', couch_lat, :parent => cp_item1)
+              couch_lat = field.couch_lateral.empty? ? '' : (field.couch_lateral.to_f * 10).to_s
+              DICOM::Element.new('300A,012A', couch_lat, :parent => cp_item)
               # Isocenter Position (x\y\z):
-              DICOM::Element.new('300A,012C', "#{(p.site_setup.iso_pos_x.to_f * 10).round(2)}\\#{(p.site_setup.iso_pos_y.to_f * 10).round(2)}\\#{(p.site_setup.iso_pos_z.to_f * 10).round(2)}", :parent => cp_item1)
+              if p.site_setup
+                DICOM::Element.new('300A,012C', "#{(p.site_setup.iso_pos_x.to_f * 10).round(2)}\\#{(p.site_setup.iso_pos_y.to_f * 10).round(2)}\\#{(p.site_setup.iso_pos_z.to_f * 10).round(2)}", :parent => cp_item)
+              else
+                logger.warn("No Site Setup record exists for this plan. Unable to provide an isosenter position.")
+                DICOM::Element.new('300A,012C', '', :parent => cp_item)
+              end
               # Source to Surface Distance:
-              DICOM::Element.new('300A,0130', "#{cp1.ssd.to_f * 10}", :parent => cp_item1)
+              DICOM::Element.new('300A,0130', "#{field.ssd.to_f * 10}", :parent => cp_item)
               # Cumulative Meterset Weight:
-              mu_weight = (cp1.monitor_units.to_f * field.field_monitor_units.to_f).round(4)
-              DICOM::Element.new('300A,0134', "#{mu_weight}", :parent => cp_item1)
+              DICOM::Element.new('300A,0134', "0.0", :parent => cp_item)
               # Beam Limiting Device Position Sequence:
-              dp_seq = DICOM::Sequence.new('300A,011A', :parent => cp_item1)
-              # Always create one ASYMX and one ASYMY item:
-              dp_item_x = DICOM::Item.new(:parent => dp_seq)
+              dp_seq = DICOM::Sequence.new('300A,011A', :parent => cp_item)
+              # Always create one ASYMY item:
               dp_item_y = DICOM::Item.new(:parent => dp_seq)
               # RT Beam Limiting Device Type:
-              DICOM::Element.new('300A,00B8', "ASYMX", :parent => dp_item_x)
               DICOM::Element.new('300A,00B8', "ASYMY", :parent => dp_item_y)
               # Leaf/Jaw Positions:
-              DICOM::Element.new('300A,011C', "#{field.collimator_x1.to_f * 10}\\#{field.collimator_x2.to_f * 10}", :parent => dp_item_x)
               DICOM::Element.new('300A,011C', "#{field.collimator_y1.to_f * 10}\\#{field.collimator_y2.to_f * 10}", :parent => dp_item_y)
+              # The ASYMX item ('backup jaws') only exsists on some models:
+              if ['SYM', 'ASY'].include?(field.field_x_mode.upcase)
+                dp_item_x = DICOM::Item.new(:parent => dp_seq)
+                DICOM::Element.new('300A,00B8', "ASYMX", :parent => dp_item_x)
+                DICOM::Element.new('300A,011C', "#{field.collimator_x1.to_f * 10}\\#{field.collimator_x2.to_f * 10}", :parent => dp_item_x)
+              end
               # MLCX:
-              dp_item_mlcx = DICOM::Item.new(:parent => dp_seq)
-              # RT Beam Limiting Device Type:
-              DICOM::Element.new('300A,00B8', "MLCX", :parent => dp_item_mlcx)
-              # Leaf/Jaw Positions:
-              pos_a = cp1.mlc_lp_a.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
-              pos_b = cp1.mlc_lp_b.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
-              leaf_pos = "#{pos_a.join("\\")}\\#{pos_b.join("\\")}"
-              DICOM::Element.new('300A,011C', leaf_pos, :parent => dp_item_mlcx)
+              if field.control_points.length > 0
+                dp_item_mlcx = DICOM::Item.new(:parent => dp_seq)
+                # RT Beam Limiting Device Type:
+                DICOM::Element.new('300A,00B8', "MLCX", :parent => dp_item_mlcx)
+                # Leaf/Jaw Positions:
+                pos_a = field.control_points.first.mlc_lp_a.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
+                pos_b = field.control_points.first.mlc_lp_b.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
+                leaf_pos = "#{pos_a.join("\\")}\\#{pos_b.join("\\")}"
+                DICOM::Element.new('300A,011C', leaf_pos, :parent => dp_item_mlcx)
+              end
               # Referenced Dose Reference Sequence:
-              rd_seq = DICOM::Sequence.new('300C,0050', :parent => cp_item1)
+              rd_seq = DICOM::Sequence.new('300C,0050', :parent => cp_item)
               rd_item = DICOM::Item.new(:parent => rd_seq)
               # Cumulative Dose Reference Coeffecient:
               DICOM::Element.new('300A,010C', '', :parent => rd_item)
               # Referenced Dose Reference Number:
               DICOM::Element.new('300C,0051', '1', :parent => rd_item)
-              # Second control point:
-              # Always include index and cumulative weight:
-              DICOM::Element.new('300A,0112', "#{cp2.index}", :parent => cp_item2)
-              mu_weight = (cp2.monitor_units.to_f * field.field_monitor_units.to_f).round(4)
-              DICOM::Element.new('300A,0134', "#{mu_weight}", :parent => cp_item2)
-              # The other parameters are only included if they have changed from the previous control point:
-              # Nominal Beam Energy:
-              DICOM::Element.new('300A,0114', "#{cp2.energy.to_f}", :parent => cp_item2) if cp2.energy != cp1.energy
-              # Dose Rate Set:
-              DICOM::Element.new('300A,0115', cp1.doserate, :parent => cp_item2) if cp2.doserate != cp1.doserate
-              # Gantry Angle:
-              DICOM::Element.new('300A,011E', cp2.gantry_angle, :parent => cp_item2) if cp2.gantry_angle != cp1.gantry_angle
-              # Gantry Rotation Direction:
-              DICOM::Element.new('300A,011F', (cp2.gantry_dir.empty? ? 'NONE' : cp2.gantry_dir), :parent => cp_item2) if cp2.gantry_dir != cp1.gantry_dir
-              # Beam Limiting Device Angle:
-              DICOM::Element.new('300A,0120', cp2.collimator_angle, :parent => cp_item2) if cp2.collimator_angle != cp1.collimator_angle
-              # Beam Limiting Device Rotation Direction:
-              DICOM::Element.new('300A,0121', (cp2.collimator_dir.empty? ? 'NONE' : cp2.collimator_dir), :parent => cp_item2) if cp2.collimator_dir != cp1.collimator_dir
-              # Patient Support Angle:
-              DICOM::Element.new('300A,0122', cp2.couch_pedestal, :parent => cp_item2) if cp2.couch_pedestal != cp1.couch_pedestal
-              # Patient Support Rotation Direction:
-              DICOM::Element.new('300A,0123', (cp2.couch_ped_dir.empty? ? 'NONE' : cp2.couch_ped_dir), :parent => cp_item2) if cp2.couch_ped_dir != cp1.couch_ped_dir
-              # Table Top Eccentric Angle:
-              DICOM::Element.new('300A,0125', cp2.couch_angle, :parent => cp_item2) if cp2.couch_angle != cp1.couch_angle
-              # Table Top Eccentric Rotation Direction:
-              DICOM::Element.new('300A,0126', (cp2.couch_dir.empty? ? 'NONE' : cp2.couch_dir), :parent => cp_item2) if cp2.couch_dir != cp1.couch_dir
-              # Table Top Vertical Position:
-              couch_vert = cp2.couch_vertical.empty? ? '' : (cp2.couch_vertical.to_f * 10).to_s
-              DICOM::Element.new('300A,0128', couch_vert, :parent => cp_item2) if cp2.couch_vertical != cp1.couch_vertical
-              # Table Top Longitudinal Position:
-              couch_long = cp2.couch_longitudinal.empty? ? '' : (cp2.couch_longitudinal.to_f * 10).to_s
-              DICOM::Element.new('300A,0129', couch_long, :parent => cp_item2) if cp2.couch_longitudinal != cp1.couch_longitudinal
-              # Table Top Lateral Position:
-              couch_lat = cp2.couch_lateral.empty? ? '' : (cp2.couch_lateral.to_f * 10).to_s
-              DICOM::Element.new('300A,012A', couch_lat, :parent => cp_item2) if cp2.couch_lateral != cp1.couch_lateral
-              # Source to Surface Distance:
-              DICOM::Element.new('300A,0130', "#{cp2.ssd.to_f * 10}", :parent => cp_item2) if cp2.ssd != cp1.ssd
-              # Beam Limiting Device Position Sequence:
-              dp_seq = DICOM::Sequence.new('300A,011A', :parent => cp_item2)
-              # ASYMX:
-              if cp2.collimator_x1 != cp1.collimator_x1
-                dp_item_x = DICOM::Item.new(:parent => dp_seq)
-                DICOM::Element.new('300A,00B8', "ASYMX", :parent => dp_item_x)
-                DICOM::Element.new('300A,011C', "#{field.collimator_x1.to_f * 10}\\#{field.collimator_x2.to_f * 10}", :parent => dp_item_x)
-              end
-              # ASYMY:
-              if cp2.collimator_y1 != cp1.collimator_y1
+              # Second CP:
+              cp_item = DICOM::Item.new(:parent => cp_seq)
+              # Control Point Index:
+              DICOM::Element.new('300A,0112', "1", :parent => cp_item)
+              # Cumulative Meterset Weight:
+              DICOM::Element.new('300A,0134', field.field_monitor_units, :parent => cp_item)
+            else
+              # When we have multiple (2n) control points, iterate and pick settings from the CPs:
+              field.control_points.each_slice(2) do |cp1, cp2|
+                cp_item1 = DICOM::Item.new(:parent => cp_seq)
+                cp_item2 = DICOM::Item.new(:parent => cp_seq)
+                # First control point:
+                # Control Point Index:
+                DICOM::Element.new('300A,0112', "#{cp1.index}", :parent => cp_item1)
+                # Nominal Beam Energy:
+                DICOM::Element.new('300A,0114', "#{cp1.energy.to_f}", :parent => cp_item1)
+                # Dose Rate Set:
+                DICOM::Element.new('300A,0115', cp1.doserate, :parent => cp_item1)
+                # Gantry Angle:
+                DICOM::Element.new('300A,011E', cp1.gantry_angle, :parent => cp_item1)
+                # Gantry Rotation Direction:
+                DICOM::Element.new('300A,011F', (cp1.gantry_dir.empty? ? 'NONE' : cp1.gantry_dir), :parent => cp_item1)
+                # Beam Limiting Device Angle:
+                DICOM::Element.new('300A,0120', cp1.collimator_angle, :parent => cp_item1)
+                # Beam Limiting Device Rotation Direction:
+                DICOM::Element.new('300A,0121', (cp1.collimator_dir.empty? ? 'NONE' : cp1.collimator_dir), :parent => cp_item1)
+                # Patient Support Angle:
+                DICOM::Element.new('300A,0122', cp1.couch_pedestal, :parent => cp_item1)
+                # Patient Support Rotation Direction:
+                DICOM::Element.new('300A,0123', (cp1.couch_ped_dir.empty? ? 'NONE' : cp1.couch_ped_dir), :parent => cp_item1)
+                # Table Top Eccentric Angle:
+                DICOM::Element.new('300A,0125', cp1.couch_angle, :parent => cp_item1)
+                # Table Top Eccentric Rotation Direction:
+                DICOM::Element.new('300A,0126', (cp1.couch_dir.empty? ? 'NONE' : cp1.couch_dir), :parent => cp_item1)
+                # Table Top Vertical Position:
+                couch_vert = cp1.couch_vertical.empty? ? '' : (cp1.couch_vertical.to_f * 10).to_s
+                DICOM::Element.new('300A,0128', couch_vert, :parent => cp_item1)
+                # Table Top Longitudinal Position:
+                couch_long = cp1.couch_longitudinal.empty? ? '' : (cp1.couch_longitudinal.to_f * 10).to_s
+                DICOM::Element.new('300A,0129', couch_long, :parent => cp_item1)
+                # Table Top Lateral Position:
+                couch_lat = cp1.couch_lateral.empty? ? '' : (cp1.couch_lateral.to_f * 10).to_s
+                DICOM::Element.new('300A,012A', couch_lat, :parent => cp_item1)
+                # Isocenter Position (x\y\z):
+                if p.site_setup
+                  DICOM::Element.new('300A,012C', "#{(p.site_setup.iso_pos_x.to_f * 10).round(2)}\\#{(p.site_setup.iso_pos_y.to_f * 10).round(2)}\\#{(p.site_setup.iso_pos_z.to_f * 10).round(2)}", :parent => cp_item1)
+                else
+                  logger.warn("No Site Setup record exists for this plan. Unable to provide an isosenter position.")
+                  DICOM::Element.new('300A,012C', '', :parent => cp_item1)
+                end
+                # Source to Surface Distance:
+                DICOM::Element.new('300A,0130', "#{cp1.ssd.to_f * 10}", :parent => cp_item1)
+                # Cumulative Meterset Weight:
+                mu_weight = (cp1.monitor_units.to_f * field.field_monitor_units.to_f).round(4)
+                DICOM::Element.new('300A,0134', "#{mu_weight}", :parent => cp_item1)
+                # Beam Limiting Device Position Sequence:
+                dp_seq = DICOM::Sequence.new('300A,011A', :parent => cp_item1)
+                # Always create one ASYMY item:
                 dp_item_y = DICOM::Item.new(:parent => dp_seq)
+                # RT Beam Limiting Device Type:
                 DICOM::Element.new('300A,00B8', "ASYMY", :parent => dp_item_y)
+                # Leaf/Jaw Positions:
                 DICOM::Element.new('300A,011C', "#{field.collimator_y1.to_f * 10}\\#{field.collimator_y2.to_f * 10}", :parent => dp_item_y)
-              end
-              # MLCX:
-              if cp2.mlc_lp_a != cp1.mlc_lp_a or cp2.mlc_lp_b != cp1.mlc_lp_b
+                # The ASYMX item ('backup jaws') only exsists on some models:
+                if ['SYM', 'ASY'].include?(field.field_x_mode.upcase)
+                  dp_item_x = DICOM::Item.new(:parent => dp_seq)
+                  DICOM::Element.new('300A,00B8', "ASYMX", :parent => dp_item_x)
+                  DICOM::Element.new('300A,011C', "#{field.collimator_x1.to_f * 10}\\#{field.collimator_x2.to_f * 10}", :parent => dp_item_x)
+                end
+                # MLCX:
                 dp_item_mlcx = DICOM::Item.new(:parent => dp_seq)
                 # RT Beam Limiting Device Type:
                 DICOM::Element.new('300A,00B8', "MLCX", :parent => dp_item_mlcx)
                 # Leaf/Jaw Positions:
-                pos_a = cp2.mlc_lp_a.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
-                pos_b = cp2.mlc_lp_b.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
+                pos_a = cp1.mlc_lp_a.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
+                pos_b = cp1.mlc_lp_b.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
                 leaf_pos = "#{pos_a.join("\\")}\\#{pos_b.join("\\")}"
                 DICOM::Element.new('300A,011C', leaf_pos, :parent => dp_item_mlcx)
+                # Referenced Dose Reference Sequence:
+                rd_seq = DICOM::Sequence.new('300C,0050', :parent => cp_item1)
+                rd_item = DICOM::Item.new(:parent => rd_seq)
+                # Cumulative Dose Reference Coeffecient:
+                DICOM::Element.new('300A,010C', '', :parent => rd_item)
+                # Referenced Dose Reference Number:
+                DICOM::Element.new('300C,0051', '1', :parent => rd_item)
+                # Second control point:
+                # Always include index and cumulative weight:
+                DICOM::Element.new('300A,0112', "#{cp2.index}", :parent => cp_item2)
+                mu_weight = (cp2.monitor_units.to_f * field.field_monitor_units.to_f).round(4)
+                DICOM::Element.new('300A,0134', "#{mu_weight}", :parent => cp_item2)
+                # The other parameters are only included if they have changed from the previous control point:
+                # Nominal Beam Energy:
+                DICOM::Element.new('300A,0114', "#{cp2.energy.to_f}", :parent => cp_item2) if cp2.energy != cp1.energy
+                # Dose Rate Set:
+                DICOM::Element.new('300A,0115', cp1.doserate, :parent => cp_item2) if cp2.doserate != cp1.doserate
+                # Gantry Angle:
+                DICOM::Element.new('300A,011E', cp2.gantry_angle, :parent => cp_item2) if cp2.gantry_angle != cp1.gantry_angle
+                # Gantry Rotation Direction:
+                DICOM::Element.new('300A,011F', (cp2.gantry_dir.empty? ? 'NONE' : cp2.gantry_dir), :parent => cp_item2) if cp2.gantry_dir != cp1.gantry_dir
+                # Beam Limiting Device Angle:
+                DICOM::Element.new('300A,0120', cp2.collimator_angle, :parent => cp_item2) if cp2.collimator_angle != cp1.collimator_angle
+                # Beam Limiting Device Rotation Direction:
+                DICOM::Element.new('300A,0121', (cp2.collimator_dir.empty? ? 'NONE' : cp2.collimator_dir), :parent => cp_item2) if cp2.collimator_dir != cp1.collimator_dir
+                # Patient Support Angle:
+                DICOM::Element.new('300A,0122', cp2.couch_pedestal, :parent => cp_item2) if cp2.couch_pedestal != cp1.couch_pedestal
+                # Patient Support Rotation Direction:
+                DICOM::Element.new('300A,0123', (cp2.couch_ped_dir.empty? ? 'NONE' : cp2.couch_ped_dir), :parent => cp_item2) if cp2.couch_ped_dir != cp1.couch_ped_dir
+                # Table Top Eccentric Angle:
+                DICOM::Element.new('300A,0125', cp2.couch_angle, :parent => cp_item2) if cp2.couch_angle != cp1.couch_angle
+                # Table Top Eccentric Rotation Direction:
+                DICOM::Element.new('300A,0126', (cp2.couch_dir.empty? ? 'NONE' : cp2.couch_dir), :parent => cp_item2) if cp2.couch_dir != cp1.couch_dir
+                # Table Top Vertical Position:
+                couch_vert = cp2.couch_vertical.empty? ? '' : (cp2.couch_vertical.to_f * 10).to_s
+                DICOM::Element.new('300A,0128', couch_vert, :parent => cp_item2) if cp2.couch_vertical != cp1.couch_vertical
+                # Table Top Longitudinal Position:
+                couch_long = cp2.couch_longitudinal.empty? ? '' : (cp2.couch_longitudinal.to_f * 10).to_s
+                DICOM::Element.new('300A,0129', couch_long, :parent => cp_item2) if cp2.couch_longitudinal != cp1.couch_longitudinal
+                # Table Top Lateral Position:
+                couch_lat = cp2.couch_lateral.empty? ? '' : (cp2.couch_lateral.to_f * 10).to_s
+                DICOM::Element.new('300A,012A', couch_lat, :parent => cp_item2) if cp2.couch_lateral != cp1.couch_lateral
+                # Source to Surface Distance:
+                DICOM::Element.new('300A,0130', "#{cp2.ssd.to_f * 10}", :parent => cp_item2) if cp2.ssd != cp1.ssd
+                # Beam Limiting Device Position Sequence:
+                dp_seq = DICOM::Sequence.new('300A,011A', :parent => cp_item2)
+                # ASYMX:
+                if cp2.collimator_x1 != cp1.collimator_x1
+                  dp_item_x = DICOM::Item.new(:parent => dp_seq)
+                  DICOM::Element.new('300A,00B8', "ASYMX", :parent => dp_item_x)
+                  DICOM::Element.new('300A,011C', "#{field.collimator_x1.to_f * 10}\\#{field.collimator_x2.to_f * 10}", :parent => dp_item_x)
+                end
+                # ASYMY:
+                if cp2.collimator_y1 != cp1.collimator_y1
+                  dp_item_y = DICOM::Item.new(:parent => dp_seq)
+                  DICOM::Element.new('300A,00B8', "ASYMY", :parent => dp_item_y)
+                  DICOM::Element.new('300A,011C', "#{field.collimator_y1.to_f * 10}\\#{field.collimator_y2.to_f * 10}", :parent => dp_item_y)
+                end
+                # MLCX:
+                if cp2.mlc_lp_a != cp1.mlc_lp_a or cp2.mlc_lp_b != cp1.mlc_lp_b
+                  dp_item_mlcx = DICOM::Item.new(:parent => dp_seq)
+                  # RT Beam Limiting Device Type:
+                  DICOM::Element.new('300A,00B8', "MLCX", :parent => dp_item_mlcx)
+                  # Leaf/Jaw Positions:
+                  pos_a = cp2.mlc_lp_a.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
+                  pos_b = cp2.mlc_lp_b.collect{|p| (p.to_f * 10).round(2) unless p.empty?}.compact
+                  leaf_pos = "#{pos_a.join("\\")}\\#{pos_b.join("\\")}"
+                  DICOM::Element.new('300A,011C', leaf_pos, :parent => dp_item_mlcx)
+                end
               end
             end
+            # Number of Control Points:
+            DICOM::Element.new('300A,0110', b_item['300A,0111'].items.length, :parent => b_item)
           end
         end
+        # Number of Beams:
+        DICOM::Element.new('300A,0080', fg_item['300C,0004'].items.length, :parent => fg_item)
       end
+      # Restore the DICOM logger:
+      DICOM.logger.level = original_level
       return dcm
     end