rtp-connect 1.6 → 1.11

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://www.rubygems.org"
-
+source "http://www.rubygems.org"
+
 gemspec

data/Gemfile.lock

@@ -1,35 +1,45 @@
 PATH
   remote: .
   specs:
-    rtp-connect (1.6)
+    rtp-connect (1.11)
 
 GEM
   remote: http://www.rubygems.org/
   specs:
-    dicom (0.9.5)
-    diff-lcs (1.2.1)
-    metaclass (0.0.1)
-    mocha (0.13.2)
+    dicom (0.9.8)
+    diff-lcs (1.2.5)
+    metaclass (0.0.4)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    rake (0.9.6)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    yard (0.8.5)
+    rake (12.3.1)
+    redcarpet (3.4.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    yard (0.9.12)
 
 PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  bundler (~> 1.3)
-  dicom (~> 0.9.5)
-  mocha (~> 0.13)
-  rake (~> 0.9.6)
-  rspec (~> 2.13)
+  bundler (~> 1.11)
+  dicom (~> 0.9, >= 0.9.8)
+  mocha (~> 1.1)
+  rake (~> 12.3)
+  redcarpet (~> 3.4)
+  rspec (~> 3.7)
   rtp-connect!
-  yard (~> 0.8.5)
+  yard (~> 0.9, >= 0.9.12)
+
+BUNDLED WITH
+   1.16.5

data/README.md

@@ -0,0 +1,161 @@
+[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.11752.png)](http://dx.doi.org/10.5281/zenodo.11752)
+
+# RTPConnect
+
+The RTPConnect library allows you to read, edit and write RTPConnect files in Ruby.
+RTPConnect is a file format used in radiotherapy (e.g. Mosaiq) for export & import
+of treatment planning data. The library is written entirely in Ruby and has no
+external dependencies.
+
+
+## INSTALLATION
+
+  gem install rtp-connect
+
+
+## REQUIREMENTS
+
+* Ruby 1.9.3 (or higher)
+
+
+## BASIC USAGE
+
+### Load & Include
+
+    require 'rtp-connect'
+    include RTP
+
+### Read, modify and write
+
+    # Read file:
+    rtp = Plan.read('some_file.rtp')
+    # Extract the Patient's Name:
+    name = rtp.patient_last_name
+    # Modify the Patient's Name:
+    rtp.patient_last_name = 'Anonymous'
+    # Write to file:
+    rtp.write('new_file.rtp')
+
+### Create a new Plan Definition Record from scratch
+
+    # Create the instance:
+    rtp = Plan.new
+    # Set the Patient's ID attribute:
+    rtp.patient_id = '12345'
+    # Export the instance to an RTP string (with CRC):
+    output = rtp.to_s
+
+### Fix invalid RTP files:
+
+    # Read an RTP file containing invalid checksum(s):
+    rtp = Plan.read('invalid_crc.rtp', ignore_crc: true)
+    # Read an RTP file containing unknown record type(s):
+    rtp = Plan.read('custom.rtp', skip_unknown: true)
+    # Read an RTP file containing invalid CSV format:
+    rtp = Plan.read('invalid_csv.rtp', repair: true)
+    # Write a corrected RTP file:
+    rtp.write('valid.rtp')
+
+### Write RTP files for specific Mosaiq versions:
+
+    # Mosaiq 2.4:
+    rtp.write('treatment_plan.rtp', version: 2.4)
+    # Mosaiq 2.5:
+    rtp.write('treatment_plan.rtp', version: 2.5)
+    # Mosaiq 2.6 (and 2.62):
+    rtp.write('treatment_plan.rtp', version: 2.6)
+    # By default files are outputted at the latest supported version (currently 2.64) when omitting the version parameter:
+    rtp.write('treatment_plan.rtp')
+
+### Convert an RTP file to DICOM:
+
+    p = Plan.read('some_file.rtp')
+    dcm = p.to_dcm
+    dcm.write('rtplan.dcm')
+
+### Log settings
+
+    # Change the log level so that only error messages are displayed:
+    RTP.logger.level = Logger::ERROR
+    # Setting up a simple file log:
+    l = Logger.new('my_logfile.log')
+    RTP.logger = l
+    # Create a logger which ages logfile daily/monthly:
+    RTP.logger = Logger.new('foo.log', 'daily')
+    RTP.logger = Logger.new('foo.log', 'monthly')
+
+### Scripts
+
+For more comprehensive and useful examples, check out the scripts folder
+which contains various Ruby scripts that intends to show off real world
+usage scenarios of the RTPConnect library.
+
+### IRB Tip
+
+When working with the RTPConnect library in irb, you may be annoyed with all
+the information that is printed to screen, regardless of your log level.
+This is because in irb every variable loaded in the program is
+automatically printed to the screen. A useful hack to avoid this effect is
+to append ";0" after a command.
+
+Example:
+
+    rtp = Plan.read('some_file.rtp') ;0
+
+
+## RESOURCES
+
+* [Rubygems download](https://rubygems.org/gems/rtp-connect)
+* [Documentation](http://rubydoc.info/gems/rtp-connect/frames)
+* [Source code repository](https://github.com/dicom/rtp-connect)
+
+
+## RESTRICTIONS
+
+### Supported records
+
+* Plan definition [PLAN_DEF]
+* Extended plan definition [EXTENDED_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]
+* Dose tracking record [DOSE_DEF]
+
+### Unsupported records
+
+* Document based treatment field [PDF_FIELD_DEF]
+* Multileaf collimator [MLC_DEF]
+* MLC shape [MLC_SHAPE_DEF]
+* Dose action points [DOSE_ACTION]
+
+If you encounter an RTP file with an unsupported record type, please contact me.
+
+
+## COPYRIGHT
+
+Copyright 2011-2020 Christoffer Lervåg
+
+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
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see http://www.gnu.org/licenses/ .
+
+
+## ABOUT THE AUTHOR
+
+* Name: Christoffer Lervåg
+* Location: Norway
+* Email: chris.lervag [@nospam.com] @gmail.com
+
+Please don't hesitate to email me if you have any feedback related to this project!

data/lib/rtp-connect.rb

@@ -6,6 +6,7 @@ require_relative 'rtp-connect/logging'
 require_relative 'rtp-connect/record'
 # Core library:
 require_relative 'rtp-connect/plan'
+require_relative 'rtp-connect/extended_plan'
 require_relative 'rtp-connect/plan_to_dcm'
 require_relative 'rtp-connect/prescription'
 require_relative 'rtp-connect/site_setup'

data/lib/rtp-connect/constants.rb

@@ -1,58 +1,59 @@
-module RTP
-
-  # The seed value used in the RTPConnect implementation of the CCITT algorithm.
-  CRC_SEED = 0x0521
-
-  # The table & values used in the RTPConnect implementation of the CCITT algorithm.
-  CRC_TABLE = [
-    0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
-    0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
-    0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
-    0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
-    0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
-    0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
-    0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
-    0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
-    0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
-    0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
-    0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
-    0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
-    0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
-    0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
-    0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
-    0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
-    0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
-    0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
-    0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
-    0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
-    0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
-    0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
-    0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
-    0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
-    0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
-    0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
-    0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
-    0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
-    0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
-    0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
-    0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
-    0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040
-  ]
-
-  # Pairs of RTPConnect keywords and parse method names.
-  PARSE_METHOD = {
-    "PLAN_DEF" => :plan_definition,
-    "RX_DEF" => :prescription_site,
-    "SITE_SETUP_DEF" => :site_setup,
-    "SIM_DEF" => :simulation_field,
-    "FIELD_DEF" => :treatment_field,
-    "EXTENDED_FIELD_DEF" => :extended_treatment_field,
-    "PDF_FIELD_DEF" => :document_based_treatment_field,
-    "MLC_DEF" => :multileaf_collimator,
-    "CONTROL_PT_DEF" => :control_point,
-    "MLC_SHAPE_DEF" => :mlc_shape,
-    "DOSE_DEF" => :dose_tracking,
-    "DOSE_ACTION" => :dose_action,
-  }
-
+module RTP
+
+  # The seed value used in the RTPConnect implementation of the CCITT algorithm.
+  CRC_SEED = 0x0521
+
+  # The table & values used in the RTPConnect implementation of the CCITT algorithm.
+  CRC_TABLE = [
+    0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
+    0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
+    0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
+    0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
+    0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
+    0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
+    0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
+    0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
+    0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
+    0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
+    0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
+    0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
+    0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
+    0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
+    0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
+    0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
+    0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
+    0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
+    0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
+    0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
+    0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
+    0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
+    0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
+    0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
+    0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
+    0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
+    0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
+    0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
+    0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
+    0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
+    0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
+    0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040
+  ]
+
+  # Pairs of RTPConnect keywords and parse method names.
+  PARSE_METHOD = {
+    "PLAN_DEF" => :plan_definition,
+    "EXTENDED_PLAN_DEF" => :extended_plan_def,
+    "RX_DEF" => :prescription_site,
+    "SITE_SETUP_DEF" => :site_setup,
+    "SIM_DEF" => :simulation_field,
+    "FIELD_DEF" => :treatment_field,
+    "EXTENDED_FIELD_DEF" => :extended_treatment_field,
+    "PDF_FIELD_DEF" => :document_based_treatment_field,
+    "MLC_DEF" => :multileaf_collimator,
+    "CONTROL_PT_DEF" => :control_point,
+    "MLC_SHAPE_DEF" => :mlc_shape,
+    "DOSE_DEF" => :dose_tracking,
+    "DOSE_ACTION" => :dose_action,
+  }
+
 end

data/lib/rtp-connect/control_point.rb

@@ -8,8 +8,11 @@ module RTP
   #
   class ControlPoint < Record
 
+    # The number of attributes not having their own variable for this record (200 - 2).
+    NR_SURPLUS_ATTRIBUTES = 198
+
     # The Record which this instance belongs to.
-    attr_reader :parent
+    attr_accessor :parent
     # The MLC shape record (if any) that belongs to this ControlPoint.
     attr_reader :mlc_shape
     attr_reader :field_id
@@ -43,6 +46,9 @@ module RTP
     attr_reader :couch_dir
     attr_reader :couch_pedestal
     attr_reader :couch_ped_dir
+    attr_reader :iso_pos_x
+    attr_reader :iso_pos_y
+    attr_reader :iso_pos_z
     # Note: This attribute contains an array of all MLC LP A values (leaves 1..100).
     attr_reader :mlc_lp_a
     # Note: This attribute contains an array of all MLC LP B values (leaves 1..100).
@@ -56,50 +62,8 @@ module RTP
     # @raise [ArgumentError] if given a string containing an invalid number of elements
     #
     def self.load(string, parent)
-      # Get the quote-less values:
-      values = string.to_s.values
-      low_limit = 233
-      high_limit = 233
-      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 ControlPoint 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
       cp = self.new(parent)
-      # Assign the values to attributes:
-      cp.keyword = values[0]
-      cp.field_id = values[1]
-      cp.mlc_type = values[2]
-      cp.mlc_leaves = values[3]
-      cp.total_control_points = values[4]
-      cp.control_pt_number = values[5]
-      cp.mu_convention = values[6]
-      cp.monitor_units = values[7]
-      cp.wedge_position = values[8]
-      cp.energy = values[9]
-      cp.doserate = values[10]
-      cp.ssd = values[11]
-      cp.scale_convention = values[12]
-      cp.gantry_angle = values[13]
-      cp.gantry_dir = values[14]
-      cp.collimator_angle = values[15]
-      cp.collimator_dir = values[16]
-      cp.field_x_mode = values[17]
-      cp.field_x = values[18]
-      cp.collimator_x1 = values[19]
-      cp.collimator_x2 = values[20]
-      cp.field_y_mode = values[21]
-      cp.field_y = values[22]
-      cp.collimator_y1 = values[23]
-      cp.collimator_y2 = values[24]
-      cp.couch_vertical = values[25]
-      cp.couch_lateral = values[26]
-      cp.couch_longitudinal = values[27]
-      cp.couch_angle = values[28]
-      cp.couch_dir = values[29]
-      cp.couch_pedestal = values[30]
-      cp.couch_ped_dir = values[31]
-      cp.mlc_lp_a = [*values[32..131]]
-      cp.mlc_lp_b = [*values[132..231]]
-      cp.crc = values[-1]
-      return cp
+      cp.load(string)
     end
 
     # Creates a new ControlPoint.
@@ -107,14 +71,54 @@ module RTP
     # @param [Record] parent a record which is used to determine the proper parent of this instance
     #
     def initialize(parent)
+      super('CONTROL_PT_DEF', 233, 236)
       # Child:
       @mlc_shape = nil
       # Parent relation (may get more than one type of record here):
       @parent = get_parent(parent.to_record, Field)
       @parent.add_control_point(self)
-      @keyword = 'CONTROL_PT_DEF'
       @mlc_lp_a = Array.new(100)
       @mlc_lp_b = Array.new(100)
+      @attributes = [
+        # Required:
+        :keyword,
+        :field_id,
+        :mlc_type,
+        :mlc_leaves,
+        :total_control_points,
+        :control_pt_number,
+        :mu_convention,
+        :monitor_units,
+        :wedge_position,
+        :energy,
+        :doserate,
+        :ssd,
+        :scale_convention,
+        :gantry_angle,
+        :gantry_dir,
+        :collimator_angle,
+        :collimator_dir,
+        :field_x_mode,
+        :field_x,
+        :collimator_x1,
+        :collimator_x2,
+        :field_y_mode,
+        :field_y,
+        :collimator_y1,
+        :collimator_y2,
+        :couch_vertical,
+        :couch_lateral,
+        :couch_longitudinal,
+        :couch_angle,
+        :couch_dir,
+        :couch_pedestal,
+        :couch_ped_dir,
+        :iso_pos_x,
+        :iso_pos_y,
+        :iso_pos_z,
+        :mlc_lp_a,
+        :mlc_lp_b
+      ]
     end
 
     # Checks for equality.
@@ -145,51 +149,51 @@ module RTP
 
     # Converts the collimator_x1 attribute to proper DICOM format.
     #
+    # @param [Symbol] scale if set, relevant device parameters are converted from a native readout format to IEC1217 (supported values are :elekta & :varian)
     # @return [Float] the DICOM-formatted collimator_x1 attribute
     #
-    def dcm_collimator_x1
-      attribute = (scale_convertion? ? :collimator_y1 : :collimator_x1)
-      target = (@field_x_mode && !@field_x_mode.empty? ? self : @parent)
-      target.send(attribute).to_f * 10 * scale_factor
+    def dcm_collimator_x1(scale=nil)
+      dcm_collimator_1(scale, default_axis=:x)
     end
 
     # Converts the collimator_x2 attribute to proper DICOM format.
     #
+    # @param [Symbol] scale if set, relevant device parameters are converted from native readout format to IEC1217 (supported values are :elekta & :varian)
     # @return [Float] the DICOM-formatted collimator_x2 attribute
     #
-    def dcm_collimator_x2
-      attribute = (scale_convertion? ? :collimator_y2 : :collimator_x2)
-      target = (@field_x_mode && !@field_x_mode.empty? ? self : @parent)
-      target.send(attribute).to_f * 10
+    def dcm_collimator_x2(scale=nil)
+      axis = (scale == :elekta ? :y : :x)
+      dcm_collimator(axis, coeff=1, side=2)
     end
 
     # Converts the collimator_y1 attribute to proper DICOM format.
     #
+    # @param [Symbol] scale if set, relevant device parameters are converted from native readout format to IEC1217 (supported values are :elekta & :varian)
     # @return [Float] the DICOM-formatted collimator_y1 attribute
     #
-    def dcm_collimator_y1
-      attribute = (scale_convertion? ? :collimator_x1 : :collimator_y1)
-      target = (@field_y_mode && !@field_y_mode.empty? ? self : @parent)
-      target.send(attribute).to_f * 10 * scale_factor
+    def dcm_collimator_y1(scale=nil)
+      dcm_collimator_1(scale, default_axis=:y)
     end
 
     # Converts the collimator_y2 attribute to proper DICOM format.
     #
+    # @param [Symbol] scale if set, relevant device parameters are converted from native readout format to IEC1217 (supported values are :elekta & :varian)
     # @return [Float] the DICOM-formatted collimator_y2 attribute
     #
-    def dcm_collimator_y2
-      attribute = (scale_convertion? ? :collimator_x2 : :collimator_y2)
-      target = (@field_y_mode && !@field_y_mode.empty? ? self : @parent)
-      target.send(attribute).to_f * 10
+    def dcm_collimator_y2(scale=nil)
+      axis = (scale == :elekta ? :x : :y)
+      dcm_collimator(axis, coeff=1, side=2)
     end
 
     # Converts the mlc_lp_a & mlc_lp_b attributes to a proper DICOM formatted string.
     #
+    # @param [Symbol] scale if set, relevant device parameters are converted from native readout format to IEC1217 (supported values are :elekta & :varian)
     # @return [String] the DICOM-formatted leaf pair positions
     #
-    def dcm_mlc_positions
+    def dcm_mlc_positions(scale=nil)
+      coeff = (scale == :elekta ? -1 : 1)
       # As with the collimators, the first side (1/a) may need scale invertion:
-      pos_a = @mlc_lp_a.collect{|p| (p.to_f * 10 * scale_factor).round(1) unless p.empty?}.compact
+      pos_a = @mlc_lp_a.collect{|p| (p.to_f * 10 * coeff).round(1) unless p.empty?}.compact
       pos_b = @mlc_lp_b.collect{|p| (p.to_f * 10).round(1) unless p.empty?}.compact
       (pos_a + pos_b).join("\\")
     end
@@ -219,7 +223,7 @@ module RTP
     # @return [Array<String>] an array of attributes (in the same order as they appear in the RTP string)
     #
     def values
-      return [
+      [
         @keyword,
         @field_id,
         @mlc_type,
@@ -252,6 +256,9 @@ module RTP
         @couch_dir,
         @couch_pedestal,
         @couch_ped_dir,
+        @iso_pos_x,
+        @iso_pos_y,
+        @iso_pos_z,
         *@mlc_lp_a,
         *@mlc_lp_b
       ]
@@ -265,23 +272,6 @@ module RTP
       self
     end
 
-    # Encodes the ControlPoint object + any hiearchy of child objects,
-    # to a properly formatted RTPConnect ascii string.
-    #
-    # @return [String] an RTP string with a single or multiple lines/records
-    #
-    def to_s
-      str = encode
-      if children
-        children.each do |child|
-          str += child.to_s
-        end
-      end
-      return str
-    end
-
-    alias :to_str :to_s
-
     # Sets the mlc_lp_a attribute.
     #
     # @note As opposed to the ordinary (string) attributes, this attribute
@@ -289,9 +279,7 @@ module RTP
     # @param [Array<nil, #to_s>] array the new attribute values
     #
     def mlc_lp_a=(array)
-      array = array.to_a
-      raise ArgumentError, "Invalid argument 'array'. Expected length 100, got #{array.length}." unless array.length == 100
-      @mlc_lp_a = array.collect! {|e| e && e.to_s.strip}
+      @mlc_lp_a = array.to_a.validate_and_process(100)
     end
 
     # Sets the mlc_lp_b attribute.
@@ -301,21 +289,7 @@ module RTP
     # @param [Array<nil, #to_s>] array the new attribute values
     #
     def mlc_lp_b=(array)
-      array = array.to_a
-      raise ArgumentError, "Invalid argument 'array'. Expected length 100, got #{array.length}." unless array.length == 100
-      @mlc_lp_b = array.collect! {|e| e && e.to_s.strip}
-    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 'CONTROL_PT_DEF', got #{value}." unless value == "CONTROL_PT_DEF"
-      @keyword = value
+      @mlc_lp_b = array.to_a.validate_and_process(100)
     end
 
     # Sets the field_id attribute.
@@ -566,6 +540,30 @@ module RTP
       @couch_ped_dir = value && value.to_s
     end
 
+    # Sets the iso_pos_x attribute.
+    #
+    # @param [nil, #to_s] value the new attribute value
+    #
+    def iso_pos_x=(value)
+      @iso_pos_x = value && value.to_s.strip
+    end
+
+    # Sets the iso_pos_y attribute.
+    #
+    # @param [nil, #to_s] value the new attribute value
+    #
+    def iso_pos_y=(value)
+      @iso_pos_y = value && value.to_s.strip
+    end
+
+    # Sets the iso_pos_z attribute.
+    #
+    # @param [nil, #to_s] value the new attribute value
+    #
+    def iso_pos_z=(value)
+      @iso_pos_z = value && value.to_s.strip
+    end
+
 
     private
 
@@ -577,31 +575,73 @@ module RTP
     #
     alias_method :state, :values
 
-    # Checks whether the contents of the this record indicates that scale
-    # convertion is to be applied. This convertion entails converting a value
-    # from IEC1217 format to the target machine's native readout format.
-    # Note that the scope of this scale conversion is not precisely known (the
-    # current implementation is based on a few observations made from a single
-    # RTP file).
+    # Converts the collimator attribute to proper DICOM format.
     #
-    # @return [Boolean] true if the scale convention attribute indicates scale convertion
+    # @param [Symbol] axis a representation for the axis of interest (x or y)
+    # @param [Integer] coeff a coeffecient (of -1 or 1) which the attribute is multiplied with
+    # @param [Integer] nr collimator side/index (1 or 2)
+    # @return [Float] the DICOM-formatted collimator attribute
     #
-    def scale_convertion?
-      # A scale convention of 1 means that geometric parameters are represented
-      # in the target machine's native readout format, as opposed to the IEC 1217
-      # convention. The consequences of this is not totally clear, but at least for
-      # an Elekta device, there are a number of convertions which seems to be indicated.
-      @scale_convention.to_i == 1 ? true : false
+    def dcm_collimator(axis, coeff, nr)
+      mode = self.send("field_#{axis}_mode")
+      if mode && !mode.empty?
+        target = self
+      else
+        target = @parent
+      end
+      target.send("collimator_#{axis}#{nr}").to_f * 10 * coeff
     end
 
-    # Gives a factor used for scale convertion, which depends on the
-    # 'scale_convention' attribute.
+    # Converts the collimator1 attribute to proper DICOM format.
     #
-    # @param [Numerical] value the value to process
-    # @return [Numerical] the scale converted value
+    # @param [Symbol] scale if set, relevant device parameters are converted from a native readout format to IEC1217 (supported values are :elekta & :varian)
+    # @return [Float] the DICOM-formatted collimator_x1 attribute
     #
-    def scale_factor
-      scale_convertion? ? -1 : 1
+    def dcm_collimator_1(scale=nil, axis)
+      coeff = 1
+      if scale == :elekta
+        axis = (axis == :x ? :y : :x)
+        coeff = -1
+      elsif scale == :varian
+        coeff = -1
+      end
+      dcm_collimator(axis, coeff, side=1)
+    end
+
+    # Gives an array of indices indicating where the attributes of this record gets its
+    # values from in the comma separated string which the instance is created from.
+    #
+    # @param [Integer] length the number of elements to create in the indices array
+    #
+    def import_indices(length)
+      # Note that this method is defined in the parent Record class, where it is
+      # used for most record types. However, because this record has two attributes
+      # which contain an array of values, we use a custom import_indices method.
+      #
+      # Furthermore, as of Mosaiq version 2.64, the RTP ControlPoint record includes
+      # 3 new attributes: iso_pos_x/y/z. Since these (unfortunately) are not placed
+      # at the end of the record (which is the norm), but rather inserted before the
+      # MLC leaf positions, we have to take special care here to make sure that this
+      # gets right for records where these are included or excluded.
+      #
+      # Override length:
+      applied_length = 235
+      ind = Array.new(applied_length - NR_SURPLUS_ATTRIBUTES) { |i| [i] }
+      # Override indices for mlc_pl_a and mlc_lp_b:
+      # Allocation here is dependent on the RTP file version:
+      # For 2.62 and earlier, where length is 232, we dont have the 3 iso_pos_x/y/z values preceeding the mlc arrays leaf position arrays.
+      # For 2.64 (and later), where length is 235, we have the 3 iso_pos_x/y/z values preceeding the mlc leaf position arrays.
+      if length == 232
+        ind[32] = nil
+        ind[33] = nil
+        ind[34] = nil
+        ind[35] = (32..131).to_a
+        ind[36] = (132..231).to_a
+      else # (length = 235)
+        ind[35] = (35..134).to_a
+        ind[36] = (135..234).to_a
+      end
+      ind
     end
 
   end