rtp-connect 1.6 → 1.7

data/lib/rtp-connect/methods.rb

@@ -16,37 +16,52 @@ module RTP
     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
-        ]
+        leaf_boundaries_odd(29)
       when 40
-        Array.new(nr_leaves+1) {|i| (i * 400 / nr_leaves.to_f - 200).to_i}
+        leaf_boundaries_even(40)
       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
-        ]
+        leaf_boundaries_odd(41)
       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
-        ]
+        Array.new(10) {|i| (i * 10 - 200).to_i}
+          .concat(Array.new(41) {|i| (i * 5 - 100).to_i})
+          .concat(Array.new(10) {|i| (i * 10 + 110).to_i})
       when 80
-        Array.new(nr_leaves+1) {|i| (i * 400 / nr_leaves.to_f - 200).to_i}
+        leaf_boundaries_even(80)
       else
         raise ArgumentError, "Unsupported number of leaves: #{nr_leaves}"
       end
     end
 
+    # Gives an array of MLC leaf position boundaries for ordinary even numbered
+    # multi leaf collimators.
+    #
+    # @param [Fixnum] nr_leaves the number of leaves (in one leaf bank)
+    # @return [Array<Fixnum>] the leaf boundary positions
+    #
+    def leaf_boundaries_even(nr_leaves)
+      Array.new(nr_leaves+1) {|i| (i * 400 / nr_leaves.to_f - 200).to_i}
+    end
+
+    # Gives an array of MLC leaf position boundaries for ordinary odd numbered
+    # multi leaf collimators.
+    #
+    # @param [Fixnum] nr_leaves the number of leaves (in one leaf bank)
+    # @return [Array<Fixnum>] the leaf boundary positions
+    #
+    def leaf_boundaries_odd(nr_leaves)
+      Array.new(nr_leaves-1) {|i| (10 * (i - (0.5 * nr_leaves - 1))).to_i}.unshift(-200).push(200)
+    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.
     #
     # @param [String] line a single line string from an RTPConnect ascii file
+    # @param [Hash] options the options to use for verifying the RTP record
+    # @option options [Boolean] :ignore_crc if true, the verification method will return true even if the checksum is invalid
     # @return [Boolean] true
     # @raise [ArgumentError] if an invalid line/record is given or the string contains an invalid checksum
     #
-    def verify(line)
+    def verify(line, options={})
       last_comma_pos = line.rindex(',')
       raise ArgumentError, "Invalid line encountered; No comma present in the string: #{line}" unless last_comma_pos
       string_to_check = line[0..last_comma_pos]
@@ -54,7 +69,7 @@ module RTP
       raise ArgumentError, "Invalid line encountered; Valid checksum missing at end of string: #{string_remaining}" unless string_remaining.length >= 3
       checksum_extracted = string_remaining.value.to_i
       checksum_computed = string_to_check.checksum
-      raise ArgumentError, "Invalid line encountered: Specified checskum #{checksum_extracted} deviates from the computed checksum #{checksum_computed}." if checksum_extracted != checksum_computed
+      raise ArgumentError, "Invalid line encountered: Specified checksum #{checksum_extracted} deviates from the computed checksum #{checksum_computed}." if checksum_extracted != checksum_computed && !options[:ignore_crc]
       return true
     end
 

data/lib/rtp-connect/plan.rb

@@ -1,4 +1,4 @@
-#    Copyright 2011-2013 Christoffer Lervag
+#    Copyright 2011-2014 Christoffer Lervag
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -63,70 +63,48 @@ module RTP
     # @note This method does not perform crc verification on the given string.
     #   If such verification is desired, use methods ::parse or ::read instead.
     # @param [#to_s] string the plan definition record string line
+    # @param [Hash] options the options to use for loading the plan definition string
+    # @option options [Boolean] :repair if true, a record containing invalid CSV will be attempted fixed and loaded
     # @return [Plan] the created Plan instance
     # @raise [ArgumentError] if given a string containing an invalid number of elements
     #
-    def self.load(string)
-      # Get the quote-less values:
-      values = string.to_s.values
-      low_limit = 10
-      high_limit = 28
-      raise ArgumentError, "Invalid argument 'string': Expected at least #{low_limit} elements, got #{values.length}." if values.length < low_limit
-      RTP.logger.warn "The number of elements (#{values.length}) for this Plan record exceeds the known number of data items for this record (#{high_limit}). This may indicate an invalid record or that the RTP format has recently been expanded with new items." if values.length > high_limit
+    def self.load(string, options={})
       rtp = self.new
-      # Assign the values to attributes:
-      rtp.keyword = values[0]
-      rtp.patient_id = values[1]
-      rtp.patient_last_name = values[2]
-      rtp.patient_first_name = values[3]
-      rtp.patient_middle_initial = values[4]
-      rtp.plan_id = values[5]
-      rtp.plan_date = values[6]
-      rtp.plan_time = values[7]
-      rtp.course_id = values[8]
-      rtp.diagnosis = values[9]
-      rtp.md_last_name = values[10]
-      rtp.md_first_name = values[11]
-      rtp.md_middle_initial = values[12]
-      rtp.md_approve_last_name = values[13]
-      rtp.md_approve_first_name = values[14]
-      rtp.md_approve_middle_initial = values[15]
-      rtp.phy_approve_last_name = values[16]
-      rtp.phy_approve_first_name = values[17]
-      rtp.phy_approve_middle_initial = values[18]
-      rtp.author_last_name = values[19]
-      rtp.author_first_name = values[20]
-      rtp.author_middle_initial = values[21]
-      rtp.rtp_mfg = values[22]
-      rtp.rtp_model = values[23]
-      rtp.rtp_version = values[24]
-      rtp.rtp_if_protocol = values[25]
-      rtp.rtp_if_version = values[26]
-      rtp.crc = values[-1]
-      return rtp
+      rtp.load(string, options)
     end
 
     # Creates a Plan instance by parsing an RTPConnect string.
     #
     # @param [#to_s] string an RTPConnect ascii string (with single or multiple lines/records)
+    # @param [Hash] options the options to use for parsing the RTP string
+    # @option options [Boolean] :ignore_crc if true, the RTP records will be successfully loaded even if their checksums are invalid
+    # @option options [Boolean] :repair if true, any RTP records containing invalid CSV will be attempted fixed and loaded
+    # @option options [Boolean] :skip_unknown if true, unknown records will be skipped, and record instances will be built from the remaining recognized string records
     # @return [Plan] the created Plan instance
     # @raise [ArgumentError] if given an invalid string record
     #
-    def self.parse(string)
+    def self.parse(string, options={})
       lines = string.to_s.split("\r\n")
       # Create the Plan object:
       line = lines.first
-      RTP::verify(line)
-      rtp = self.load(line)
+      RTP::verify(line, options)
+      rtp = self.load(line, options)
       lines[1..-1].each do |line|
         # Validate, determine type, and process the line accordingly to
         # build the hierarchy of records:
-        RTP::verify(line)
-        values = line.values
+        RTP::verify(line, options)
+        values = line.values(options[:repair])
         keyword = values.first
         method = RTP::PARSE_METHOD[keyword]
-        raise ArgumentError, "Unknown keyword #{keyword} extracted from string." unless method
-        rtp.send(method, line)
+        if method
+          rtp.send(method, line)
+        else
+          if options[:skip_unknown]
+            logger.warn("Skipped unknown record definition: #{keyword}")
+          else
+            raise ArgumentError, "Unknown keyword #{keyword} extracted from string."
+          end
+        end
       end
       return rtp
     end
@@ -134,10 +112,14 @@ module RTP
     # Creates an Plan instance by reading and parsing an RTPConnect file.
     #
     # @param [String] file a string which specifies the path of the RTPConnect file to be loaded
+    # @param [Hash] options the options to use for reading the RTP file
+    # @option options [Boolean] :ignore_crc if true, the RTP records will be successfully loaded even if their checksums are invalid
+    # @option options [Boolean] :repair if true, any RTP records containing invalid CSV will be attempted fixed and loaded
+    # @option options [Boolean] :skip_unknown if true, unknown records will be skipped, and record instances will be built from the remaining recognized string records
     # @return [Plan] the created Plan instance
     # @raise [ArgumentError] if given an invalid file or the file given contains an invalid record
     #
-    def self.read(file)
+    def self.read(file, options={})
       raise ArgumentError, "Invalid argument 'file'. Expected String, got #{file.class}." unless file.is_a?(String)
       # Read the file content:
       str = nil
@@ -160,7 +142,7 @@ module RTP
       end
       # Parse the file contents and create the RTP::Connect object:
       if str
-        rtp = self.parse(str)
+        rtp = self.parse(str, options)
       else
         raise "An RTP::Plan object could not be created from the specified file. Check the log for more details."
       end
@@ -170,13 +152,45 @@ module RTP
     # Creates a new Plan.
     #
     def initialize
+      super('PLAN_DEF', 10, 28)
       @current_parent = self
       # Child records:
+      @extended_plan = nil
       @prescriptions = Array.new
       @dose_trackings = Array.new
       # No parent (by definition) for the Plan record:
       @parent = nil
-      @keyword = 'PLAN_DEF'
+      @attributes = [
+        # Required:
+        :keyword,
+        :patient_id,
+        :patient_last_name,
+        :patient_first_name,
+        :patient_middle_initial,
+        :plan_id,
+        :plan_date,
+        :plan_time,
+        :course_id,
+        # Optional:
+        :diagnosis,
+        :md_last_name,
+        :md_first_name,
+        :md_middle_initial,
+        :md_approve_last_name,
+        :md_approve_first_name,
+        :md_approve_middle_initial,
+        :phy_approve_last_name,
+        :phy_approve_first_name,
+        :phy_approve_middle_initial,
+        :author_last_name,
+        :author_first_name,
+        :author_middle_initial,
+        :rtp_mfg,
+        :rtp_model,
+        :rtp_version,
+        :rtp_if_protocol,
+        :rtp_if_version
+      ]
     end
 
     # Checks for equality.
@@ -203,6 +217,14 @@ module RTP
       @dose_trackings << child.to_dose_tracking
     end
 
+    # Adds an extended plan record to this instance.
+    #
+    # @param [ExtendedPlan] child an ExtendedPlan instance which is to be associated with self
+    #
+    def add_extended_plan(child)
+      @extended_plan = child.to_extended_plan
+    end
+
     # Adds a prescription site record to this instance.
     #
     # @param [Prescription] child a Prescription instance which is to be associated with self
@@ -216,7 +238,7 @@ module RTP
     # @return [Array<Prescription, DoseTracking>] a sorted array of self's child records
     #
     def children
-      return [@prescriptions, @dose_trackings].flatten.compact
+      return [@extended_plan, @prescriptions, @dose_trackings].flatten.compact
     end
 
     # Computes a hash code for this object.
@@ -229,43 +251,6 @@ module RTP
       state.hash
     end
 
-    # Collects the values (attributes) of this instance.
-    #
-    # @note The CRC is not considered part of the actual values and is excluded.
-    # @return [Array<String>] an array of attributes (in the same order as they appear in the RTP string)
-    #
-    def values
-      return [
-        @keyword,
-        @patient_id,
-        @patient_last_name,
-        @patient_first_name,
-        @patient_middle_initial,
-        @plan_id,
-        @plan_date,
-        @plan_time,
-        @course_id,
-        @diagnosis,
-        @md_last_name,
-        @md_first_name,
-        @md_middle_initial,
-        @md_approve_last_name,
-        @md_approve_first_name,
-        @md_approve_middle_initial,
-        @phy_approve_last_name,
-        @phy_approve_first_name,
-        @phy_approve_middle_initial,
-        @author_last_name,
-        @author_first_name,
-        @author_middle_initial,
-        @rtp_mfg,
-        @rtp_model,
-        @rtp_version,
-        @rtp_if_protocol,
-        @rtp_if_version
-      ]
-    end
-
     # Returns self.
     #
     # @return [Plan] self
@@ -308,18 +293,6 @@ module RTP
       f.close
     end
 
-    # Sets the keyword attribute.
-    #
-    # @note Since only a specific string is accepted, this is more of an argument check than a traditional setter method
-    # @param [#to_s] value the new attribute value
-    # @raise [ArgumentError] if given an unexpected keyword
-    #
-    def keyword=(value)
-      value = value.to_s.upcase
-      raise ArgumentError, "Invalid keyword. Expected 'PLAN_DEF', got #{value}." unless value == "PLAN_DEF"
-      @keyword = value
-    end
-
     # Sets the patient_id attribute.
     #
     # @param [nil, #to_s] value the new attribute value
@@ -548,6 +521,15 @@ module RTP
       @current_parent = dt
     end
 
+    # Creates an extended plan record from the given string.
+    #
+    # @param [String] string a string line containing an extended plan definition
+    #
+    def extended_plan(string)
+      ep = ExtendedPlan.load(string, @current_parent)
+      @current_parent = ep
+    end
+
     # Creates an extended treatment field record from the given string.
     #
     # @param [String] string a string line containing an extended treatment field definition

data/lib/rtp-connect/plan_to_dcm.rb

@@ -2,6 +2,14 @@ module RTP
 
   class Plan < Record
 
+    attr_accessor :current_gantry
+    attr_accessor :current_collimator
+    attr_accessor :current_couch_angle
+    attr_accessor :current_couch_pedestal
+    attr_accessor :current_couch_lateral
+    attr_accessor :current_couch_longitudinal
+    attr_accessor :current_couch_vertical
+
     # Converts the Plan (and child) records to a
     # DICOM::DObject of modality RTPLAN.
     #
@@ -13,6 +21,7 @@ module RTP
     # @option options [Boolean] :dose_ref if set, Dose Reference & Referenced Dose Reference sequences will be included in the generated DICOM file
     # @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 [Symbol] :scale if set, relevant device parameters are converted from native readout format to IEC1217 (supported values are :elekta & :varian)
     # @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
     #
@@ -323,7 +332,11 @@ module RTP
               # Cumulative Meterset Weight:
               DICOM::Element.new('300A,0134', '0', :parent => cp_item)
               # Beam Limiting Device Position Sequence:
-              create_beam_limiting_device_positions(cp_item, field.control_points.first)
+              if field.control_points.length > 0
+                create_beam_limiting_device_positions(cp_item, field.control_points.first, options)
+              else
+                create_beam_limiting_device_positions_from_field(cp_item, field, options)
+              end
               # Referenced Dose Reference Sequence:
               create_referenced_dose_reference(cp_item) if options[:dose_ref]
               # Second CP:
@@ -355,93 +368,39 @@ module RTP
     private
 
 
-    # Adds Collimator Angle elements to a Control Point Item.
+    # Adds an angular type value to a Control Point Item, by creating the
+    # necessary DICOM elements.
     # Note that the element is only added if there is no 'current' attribute
     # defined, or the given value is different form the current attribute.
     #
-    # @param [String, NilClass] value1 the collimator angle attribute
-    # @param [String, NilClass] value2 the collimator rotation direction attribute
-    # @param [DICOM::Item] item the DICOM control point item in which to create an element
-    #
-    def add_collimator(value1, value2, item)
-      if !@current_collimator || value1 != @current_collimator
-        @current_collimator = value1
-        DICOM::Element.new('300A,0120', value1, :parent => item)
-        DICOM::Element.new('300A,0121', (value2.empty? ? 'NONE' : value2), :parent => item)
+    # @param [DICOM::Item] item the DICOM control point item in which to create the elements
+    # @param [String] angle_tag the DICOM tag of the angle element
+    # @param [String] direction_tag the DICOM tag of the direction element
+    # @param [String, NilClass] angle the collimator angle attribute
+    # @param [String, NilClass] direction the collimator rotation direction attribute
+    # @param [Symbol] current_angle the instance variable that keeps track of the current value of this attribute
+    #
+    def add_angle(item, angle_tag, direction_tag, angle, direction, current_angle)
+      if !self.send(current_angle) || angle != self.send(current_angle)
+        self.send("#{current_angle}=", angle)
+        DICOM::Element.new(angle_tag, angle, :parent => item)
+        DICOM::Element.new(direction_tag, (direction.empty? ? 'NONE' : direction), :parent => item)
       end
     end
 
-    # Adds Table Top Eccentric Angle elements to a Control Point Item.
+    # Adds a Table Top Position element to a Control Point Item.
     # Note that the element is only added if there is no 'current' attribute
     # defined, or the given value is different form the current attribute.
     #
-    # @param [String, NilClass] value1 the table top eccentric angle attribute
-    # @param [String, NilClass] value2 the table top eccentric rotation direction attribute
-    # @param [DICOM::Item] item the DICOM control point item in which to create an element
+    # @param [DICOM::Item] item the DICOM control point item in which to create the element
+    # @param [String] tag the DICOM tag of the couch position element
+    # @param [String, NilClass] value the couch position
+    # @param [Symbol] current the instance variable that keeps track of the current value of this attribute
     #
-    def add_couch_angle(value1, value2, item)
-      if !@current_couch_angle || value1 != @current_couch_angle
-        @current_couch_angle = value1
-        DICOM::Element.new('300A,0125', value1, :parent => item)
-        DICOM::Element.new('300A,0126', (value2.empty? ? 'NONE' : value2), :parent => item)
-      end
-    end
-
-    # Adds a Table Top Lateral Position element to a Control Point Item.
-    # Note that the element is only added if there is no 'current' attribute
-    # defined, or the given value is different form the current attribute.
-    #
-    # @param [String, NilClass] value the couch lateral attribute
-    # @param [DICOM::Item] item the DICOM control point item in which to create an element
-    #
-    def add_couch_lateral(value, item)
-      if !@current_couch_lateral || value != @current_couch_lateral
-        @current_couch_lateral = value
-        DICOM::Element.new('300A,012A', (value.empty? ? '' : value.to_f * 10), :parent => item)
-      end
-    end
-
-    # Adds a Table Top Longitudinal Position element to a Control Point Item.
-    # Note that the element is only added if there is no 'current' attribute
-    # defined, or the given value is different form the current attribute.
-    #
-    # @param [String, NilClass] value the couch longitudinal attribute
-    # @param [DICOM::Item] item the DICOM control point item in which to create an element
-    #
-    def add_couch_longitudinal(value, item)
-      if !@current_couch_longitudinal || value != @current_couch_longitudinal
-        @current_couch_longitudinal = value
-        DICOM::Element.new('300A,0129', (value.empty? ? '' : value.to_f * 10), :parent => item)
-      end
-    end
-
-    # Adds Patient Support Angle elements to a Control Point Item.
-    # Note that the element is only added if there is no 'current' attribute
-    # defined, or the given value is different form the current attribute.
-    #
-    # @param [String, NilClass] value1 the patient support angle attribute
-    # @param [String, NilClass] value2 the patient support rotation direction attribute
-    # @param [DICOM::Item] item the DICOM control point item in which to create an element
-    #
-    def add_couch_pedestal(value1, value2, item)
-      if !@current_couch_pedestal || value1 != @current_couch_pedestal
-        @current_couch_pedestal = value1
-        DICOM::Element.new('300A,0122', value1, :parent => item)
-        DICOM::Element.new('300A,0123', (value2.empty? ? 'NONE' : value2), :parent => item)
-      end
-    end
-
-    # Adds a Table Top Vertical Position element to a Control Point Item.
-    # Note that the element is only added if there is no 'current' attribute
-    # defined, or the given value is different form the current attribute.
-    #
-    # @param [String, NilClass] value the couch vertical attribute
-    # @param [DICOM::Item] item the DICOM control point item in which to create an element
-    #
-    def add_couch_vertical(value, item)
-      if !@current_couch_vertical || value != @current_couch_vertical
-        @current_couch_vertical = value
-        DICOM::Element.new('300A,0128', (value.empty? ? '' : value.to_f * 10), :parent => item)
+    def add_couch_position(item, tag, value, current)
+      if !self.send(current) || value != self.send(current)
+        self.send("#{current}=", value)
+        DICOM::Element.new(tag, (value.empty? ? '' : value.to_f * 10), :parent => item)
       end
     end
 
@@ -473,22 +432,6 @@ module RTP
       end
     end
 
-    # Adds Gantry Angle elements to a Control Point Item.
-    # Note that the element is only added if there is no 'current' attribute
-    # defined, or the given value is different form the current attribute.
-    #
-    # @param [String, NilClass] value1 the gantry angle attribute
-    # @param [String, NilClass] value2 the gantry rotation direction attribute
-    # @param [DICOM::Item] item the DICOM control point item in which to create an element
-    #
-    def add_gantry(value1, value2, item)
-      if !@current_gantry || value1 != @current_gantry
-        @current_gantry = value1
-        DICOM::Element.new('300A,011E', value1, :parent => item)
-        DICOM::Element.new('300A,011F', (value2.empty? ? 'NONE' : value2), :parent => item)
-      end
-    end
-
     # Adds an Isosenter element to a Control Point Item.
     # Note that the element is only added if there is a Site Setup record present,
     # and it contains a real (non-empty) value. Also, the element is only added if there
@@ -542,7 +485,7 @@ module RTP
       # Control Point Index:
       DICOM::Element.new('300A,0112', "#{cp.index}", :parent => cp_item)
       # Beam Limiting Device Position Sequence:
-      create_beam_limiting_device_positions(cp_item, cp)
+      create_beam_limiting_device_positions(cp_item, cp, options)
       # Source to Surface Distance:
       add_ssd(cp.ssd, cp_item)
       # Cumulative Meterset Weight:
@@ -555,19 +498,19 @@ module RTP
       # Dose Rate Set:
       add_doserate(cp.doserate, cp_item)
       # Gantry Angle & Rotation Direction:
-      add_gantry(cp.gantry_angle, cp.gantry_dir, cp_item)
+      add_angle(cp_item, '300A,011E', '300A,011F', cp.gantry_angle, cp.gantry_dir, :current_gantry)
       # Beam Limiting Device Angle & Rotation Direction:
-      add_collimator(cp.collimator_angle, cp.collimator_dir, cp_item)
+      add_angle(cp_item, '300A,0120', '300A,0121', cp.collimator_angle, cp.collimator_dir, :current_collimator)
       # Patient Support Angle & Rotation Direction:
-      add_couch_pedestal(cp.couch_pedestal, cp.couch_ped_dir, cp_item)
+      add_angle(cp_item, '300A,0122', '300A,0123', cp.couch_pedestal, cp.couch_ped_dir, :current_couch_pedestal)
       # Table Top Eccentric Angle & Rotation Direction:
-      add_couch_angle(cp.couch_angle, cp.couch_dir, cp_item)
+      add_angle(cp_item, '300A,0125', '300A,0126', cp.couch_angle, cp.couch_dir, :current_couch_angle)
       # Table Top Vertical Position:
-      add_couch_vertical(cp.couch_vertical, cp_item)
+      add_couch_position(cp_item, '300A,0128', cp.couch_vertical, :current_couch_vertical)
       # Table Top Longitudinal Position:
-      add_couch_longitudinal(cp.couch_vertical, cp_item)
+      add_couch_position(cp_item, '300A,0129', cp.couch_longitudinal, :current_couch_longitudinal)
       # Table Top Lateral Position:
-      add_couch_lateral(cp.couch_vertical, cp_item)
+      add_couch_position(cp_item, '300A,012A', cp.couch_lateral, :current_couch_lateral)
       # Isocenter Position (x\y\z):
       add_isosenter(cp.parent.parent.site_setup, cp_item)
       cp_item
@@ -613,26 +556,45 @@ module RTP
     # @param [ControlPoint] cp the RTP control point to fetch device parameters from
     # @return [DICOM::Sequence] the constructed beam limiting device positions sequence
     #
-    def create_beam_limiting_device_positions(cp_item, cp)
+    def create_beam_limiting_device_positions(cp_item, cp, options={})
       dp_seq = DICOM::Sequence.new('300A,011A', :parent => cp_item)
       # The ASYMX item ('backup jaws') doesn't exist on all models:
       if ['SYM', 'ASY'].include?(cp.parent.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', "#{cp.dcm_collimator_x1}\\#{cp.dcm_collimator_x2}", :parent => dp_item_x)
+        DICOM::Element.new('300A,011C', "#{cp.dcm_collimator_x1(options[:scale])}\\#{cp.dcm_collimator_x2(options[:scale])}", :parent => dp_item_x)
       end
       # 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', "#{cp.dcm_collimator_y1}\\#{cp.dcm_collimator_y2}", :parent => dp_item_y)
+      DICOM::Element.new('300A,011C', "#{cp.dcm_collimator_y1(options[:scale])}\\#{cp.dcm_collimator_y2(options[:scale])}", :parent => dp_item_y)
       # 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:
-      DICOM::Element.new('300A,011C', cp.dcm_mlc_positions, :parent => dp_item_mlcx)
+      DICOM::Element.new('300A,011C', cp.dcm_mlc_positions(options[:scale]), :parent => dp_item_mlcx)
+      dp_seq
+    end
+
+    # Creates a beam limiting device positions sequence in the given DICOM object.
+    #
+    # @param [DICOM::Item] cp_item the DICOM control point item in which to insert the sequence
+    # @param [Field] field the RTP treatment field to fetch device parameters from
+    # @return [DICOM::Sequence] the constructed beam limiting device positions sequence
+    #
+    def create_beam_limiting_device_positions_from_field(cp_item, field, options={})
+      dp_seq = DICOM::Sequence.new('300A,011A', :parent => cp_item)
+      # ASYMX:
+      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.dcm_collimator_x1}\\#{field.dcm_collimator_x2}", :parent => dp_item_x)
+      # ASYMY:
+      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.dcm_collimator_y1}\\#{field.dcm_collimator_y2}", :parent => dp_item_y)
       dp_seq
     end