origen_testers 0.52.14 → 0.53.0

data/lib/origen_testers/program_generators.rb

@@ -1,4 +1,10 @@
 require 'active_support/concern'
+# Ensure the OrigenTesters namespace and its autoloads (Interface, J750, V93K,
+# etc.) are registered. This file can be loaded directly (e.g. when a plugin
+# interface does `include OrigenTesters::ProgramGenerators` before origen_testers
+# has been fully required), in which case `include Interface` / the PLATFORMS
+# constants below would otherwise raise an uninitialized-constant error.
+require 'origen_testers'
 module OrigenTesters
   # Include this module to create an interface that supports multiple tester
   # types.

data/lib/origen_testers/smartest_based_tester/base/flow.rb

@@ -33,7 +33,7 @@ module OrigenTesters
           tester.smt8?
         end
 
-        def var_filename
+        def var_filename # rubocop:disable Lint/DuplicateMethods
           @var_filename || 'global'
         end
 
@@ -41,24 +41,22 @@ module OrigenTesters
           @var_filename = new_var_filename
         end
 
-        def subdirectory
-          @subdirectory ||= begin
-            if smt8?
-              parents = []
-              f = parent
-              while f
-                parents.unshift(File.basename(f.filename, '.*').to_s.downcase)
-                f = f.parent
-              end
-              if Origen.interface.respond_to?(:insertion) && tester.insertion_in_the_flow_path
-                File.join tester.package_namespace, Origen.interface.insertion.to_s, 'flows', *parents
-              else
-                File.join tester.package_namespace, 'flows', *parents
-              end
-            else
-              'testflow/mfh.testflow.group'
-            end
-          end
+        def subdirectory # rubocop:disable Lint/DuplicateMethods
+          @subdirectory ||= if smt8?
+                              parents = []
+                              f = parent
+                              while f
+                                parents.unshift(File.basename(f.filename, '.*').to_s.downcase)
+                                f = f.parent
+                              end
+                              if Origen.interface.respond_to?(:insertion) && tester.insertion_in_the_flow_path
+                                File.join tester.package_namespace, Origen.interface.insertion.to_s, 'flows', *parents
+                              else
+                                File.join tester.package_namespace, 'flows', *parents
+                              end
+                            else
+                              'testflow/mfh.testflow.group'
+                            end
         end
 
         def filename
@@ -79,7 +77,7 @@ module OrigenTesters
           end
         end
 
-        def flow_name(filename = nil)
+        def flow_name(filename = nil) # rubocop:disable Lint/DuplicateMethods
           @flow_name_ = @flow_name unless smt8?
           @flow_name_ ||= begin
             flow_name = (filename || self.filename).sub(/\..*/, '').upcase
@@ -91,11 +89,11 @@ module OrigenTesters
           end
         end
 
-        def flow_bypass
+        def flow_bypass # rubocop:disable Lint/DuplicateMethods
           @flow_bypass || false
         end
 
-        def flow_description
+        def flow_description # rubocop:disable Lint/DuplicateMethods
           @flow_description || ''
         end
 
@@ -153,9 +151,8 @@ module OrigenTesters
           @ast ||= begin
             unique_id = smt8? ? nil : sig
             atp.ast(unique_id: unique_id, optimization: :smt,
-                  implement_continue: !tester.force_pass_on_continue,
-                  optimize_flags_when_continue: !tester.force_pass_on_continue
-                   )
+                    implement_continue: !tester.force_pass_on_continue,
+                    optimize_flags_when_continue: !tester.force_pass_on_continue)
           end
         end
 
@@ -188,6 +185,7 @@ module OrigenTesters
         def finalize(options = {})
           if smt8?
             return unless top_level? || options[:called_by_top_level]
+
             super
             # Refresh the ast before finalized gets set to true
             # If ast gets called by the user the finalized flag will lock it to the incorrect value
@@ -206,6 +204,7 @@ module OrigenTesters
                 unless sub_flow
                   fail "Something went wrong, couldn't find the sub-flow object for path #{path}"
                 end
+
                 # on_fail and on_pass nodes are removed because they will be rendered by the sub-flow's parent
                 sub_flow.instance_variable_set(:@ast, sub_flow_ast.remove(:on_fail, :on_pass).updated(:flow))
                 sub_flow.instance_variable_set(:@finalized, true)  # To stop the AST being regenerated
@@ -509,6 +508,7 @@ module OrigenTesters
           if smt8? && !(step == -1 || step == 1)
             fail 'SMT8 does not support steps other than -1 or 1.'
           end
+
           if step.is_a?(String) || step.is_a?(Symbol)
             step = generate_flag_name(step)
             if tester.smt7?
@@ -520,6 +520,7 @@ module OrigenTesters
           else
             var = generate_flag_name(node.to_a[3])
           end
+
           test_num_inc = node.to_a[4]
           unless smt8?
             var = "@#{var}"
@@ -538,7 +539,9 @@ module OrigenTesters
               stop = "#{stop + step}"
             end
             line "for #{var} = #{start}; #{var} #{compare} #{stop} ; #{var} = #{var} #{incdec}; do"
-            line "test_number_loop_increment = #{test_num_inc}"
+            unless tester.disable_test_number_loop_increment || options[:disable_test_number_loop_increment]
+              line "test_number_loop_increment = #{test_num_inc}"
+            end
             line '{'
             @indent += 1
             process_all(node.children)
@@ -558,6 +561,7 @@ module OrigenTesters
 
         def generate_expr_string(node, options = {})
           return node unless node.respond_to?(:type)
+
           case node.type
           when :eq, :ne, :gt, :ge, :lt, :le
             result = "#{generate_expr_term(node.to_a[0])} "             # operand 1
@@ -570,7 +574,8 @@ module OrigenTesters
         end
 
         def generate_expr_term(val)
-          return val if val.is_a?(Fixnum) || val.is_a?(Integer) || val.is_a?(Float)
+          return val if val.is_a?(Integer) || val.is_a?(Float)
+
           case val[0]
           when '$'
             if smt8?

data/lib/origen_testers/smartest_based_tester/base/generator.rb

@@ -83,9 +83,11 @@ module OrigenTesters
         # Returns the current flow object (Origen.interface.flow)
         def flow(id = Origen.file_handler.current_file.basename('.rb').to_s)
           return @current_flow if @current_flow
+
           id = id.to_s.sub(/_resources?/, '')
           filename = id.split('.').last
           return flow_sheets[id] if flow_sheets[id] # will return flow if already existing
+
           p = platform::Flow.new
           p.inhibit_output if Origen.interface.resources_mode?
           if id == Origen.file_handler.current_file.basename('.rb').to_s && Origen.interface.try(:use_flow_name_for_top_level)

data/lib/origen_testers/smartest_based_tester/base/limits_file.rb

@@ -36,7 +36,7 @@ module OrigenTesters
               l += ',default,default'
             else
               test_modes.each { |mode| l += ",#{mode}" }
-              test_modes.each { |mode| l += ",#{mode}" }
+              test_modes.each { |mode| l += ",#{mode}" } # rubocop:disable Style/CombinableLoops
             end
             lines << l
 
@@ -282,7 +282,7 @@ module OrigenTesters
                 # "Low Limit"
                 l << f((options[:limits][mode] || options[:limits][nil] || {})[:lsl] || 'na')
               end
-              test_modes.each do |mode|
+              test_modes.each do |mode| # rubocop:disable Style/CombinableLoops
                 # "High Limit"
                 l << f((options[:limits][mode] || options[:limits][nil] || {})[:usl] || 'na')
               end

data/lib/origen_testers/smartest_based_tester/base/pattern_master.rb

@@ -13,15 +13,15 @@ module OrigenTesters
           @paths = {}
         end
 
-        def filename
+        def filename # rubocop:disable Lint/DuplicateMethods
           @filename || flow.filename.sub('.tf', '.pmfl')
         end
 
-        def subdirectory
+        def subdirectory # rubocop:disable Lint/DuplicateMethods
           @subdirectory ||= 'vectors'
         end
 
-        def paths
+        def paths # rubocop:disable Lint/DuplicateMethods
           { '../vectors' => patterns }
         end
 

data/lib/origen_testers/smartest_based_tester/base/processors/extract_flow_vars.rb

@@ -1,4 +1,4 @@
-require 'set'
+require 'set' # rubocop:disable Lint/RedundantRequireStatement -- needed for Ruby 2.6
 module OrigenTesters
   module SmartestBasedTester
     class Base

data/lib/origen_testers/smartest_based_tester/base/test_method.rb

@@ -122,6 +122,7 @@ module OrigenTesters
 
         def handle_val_type(val, type, attr)
           return val if val == '' && !tester.smt8?
+
           case type
           when :current, 'CURR'
             "#{val}[A]"
@@ -155,11 +156,13 @@ module OrigenTesters
             unless val.is_a?(Array)
               fail "#{val} is not an Array. List_strings must have Array values"
             end
+
             "##{val}"
           when :list_classes
             unless val.is_a?(Array)
               fail "#{val} is not an Array. List_classes must have Array values"
             end
+
             "##{val.to_s.gsub('"', '')}"
           else
             fail "Unknown type for attribute #{attr}: #{type}"

data/lib/origen_testers/smartest_based_tester/base/test_methods/dc_tml.rb

@@ -94,7 +94,7 @@ module OrigenTesters
             output_dc:         {
               class_name:              'OutputDC',
               pinlist:                 [:string, ''],
-              mode:                    [:string, 'PROGRAMLOAD', %w(PROGRAMLOAD, PPMU SPMU PPMUTERM SPMUTERM)],
+              mode:                    [:string, 'PROGRAMLOAD', %w(PROGRAMLOAD PPMU SPMU PPMUTERM SPMUTERM)],
               measure_level:           [:string, 'BOTH', %(BOTH LOW HIGH)],
               force_current_low:       [:current, 0],
               force_current_high:      [:current, 0],

data/lib/origen_testers/smartest_based_tester/base/test_methods/limits.rb

@@ -19,7 +19,7 @@ module OrigenTesters
             @render = true
           end
 
-          def unit=(val)
+          def unit=(val) # rubocop:disable Lint/DuplicateMethods
             case val.to_s.downcase
             when 'v', 'volts'
               @unit = 'V'

data/lib/origen_testers/smartest_based_tester/base/variables_file.rb

@@ -11,7 +11,7 @@ module OrigenTesters
         def initialize(options = {})
         end
 
-        def subdirectory
+        def subdirectory # rubocop:disable Lint/DuplicateMethods
           @subdirectory ||= 'testflow/mfh.testflow.setup'
         end
 

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -70,6 +70,9 @@ module OrigenTesters
       # delayed: false is supplied when defining the test
       attr_accessor :delayed_binning
 
+      # When set to true, disable the rendering of the `test_number_loop_increment` line
+      attr_accessor :disable_test_number_loop_increment
+
       # Sets the package namespace that all generated test collateral should be placed under,
       # defaults to the application's namespace if not defined (SMT8 only)
       attr_writer :package_namespace
@@ -100,6 +103,8 @@ module OrigenTesters
           multiport_postfix: false
         }.merge(options)
 
+        @disable_test_number_loop_increment = options[:disable_test_number_loop_increment] || false
+
         @smt_version = options[:smt_version] || 7
 
         @separate_bins_file = options[:separate_bins_file] || false
@@ -201,12 +206,13 @@ module OrigenTesters
       def seq_path
         @seq_path || 'specs'
       end
+
       # Set the test mode(s) that you want to see in the limits files, supply an array of mode names
       # to set multiple.
       def limitfile_test_modes=(val)
         @limitfile_test_modes = Array(val).map(&:to_s)
       end
-      alias_method :limitsfile_test_modes, :limitfile_test_modes=
+      alias_method :limitsfile_test_modes, :limitfile_test_modes= # rubocop:disable Lint/DuplicateMethods
 
       # return the multiport burst name
       # provide the name you want to obtain multiport for
@@ -281,7 +287,7 @@ module OrigenTesters
           super(options)
         end
 
-        unless options_overlay.nil?
+        unless options_overlay.nil? # rubocop:disable Lint/EmptyConditionalBody, Lint/RedundantCopDisableDirective
           # stage = :body if ovly_style == :subroutine 		# always set stage back to body in case subr overlay was selected
         end
       end
@@ -363,12 +369,12 @@ module OrigenTesters
       # other platforms, such as the J750, is required.
       def store(*pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
-        options = { offset: 0
-                  }.merge(options)
+        options = { offset: 0 }.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
           fail 'For the V93K you must supply the pins to store/capture'
         end
+
         pins.each do |pin|
           pin.restore_state do
             pin.capture
@@ -390,12 +396,12 @@ module OrigenTesters
       #   $tester.cycle                # This is the vector that will be captured
       def store_next_cycle(*pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
           fail 'For the V93K you must supply the pins to store/capture'
         end
+
         pins.each { |pin| pin.save; pin.capture }
         # Register this clean up function to be run after the next vector
         # is generated, cool or what!
@@ -465,8 +471,7 @@ module OrigenTesters
       # ==== Examples
       #   $tester.handshake                   # Pass control to the tester for a measurement
       def handshake(options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         ::Pattern.split(options)
       end
 
@@ -475,8 +480,7 @@ module OrigenTesters
       # ==== Examples
       #   $tester.freq_count($top.pin(:d_out))                 # Freq measure on pin "d_out"
       def freq_count(_pin, options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         ::Pattern.split(options)
       end
 
@@ -701,8 +705,7 @@ module OrigenTesters
 
       # An internal method called by Origen to create the pattern header
       def pattern_header(options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         pin_list = ordered_pins.map do |p|
           if Origen.app.pin_pattern_order.include?(p.id)
             # specified name overrides pin name
@@ -733,7 +736,7 @@ module OrigenTesters
       # An internal method called by Origen to generate the pattern footer
       def pattern_footer(options = {})
         options = {
-          end_in_ka:      false
+          end_in_ka: false
         }.merge(options)
         if options[:end_in_ka]
           Origen.log.warning '93K keep alive not yet implemented!'

data/lib/origen_testers/smartest_based_tester/decompiler/avc.rb

@@ -24,8 +24,7 @@ module OrigenTesters
           end
           OrigenTesters::Decompiler::Nodes::Frontmatter.new(context:        context,
                                                             pattern_header: header,
-                                                            comments:       []
-                                                           )
+                                                            comments:       [])
         end
 
         def parse_pinlist(raw_pinlist:, context:)
@@ -35,16 +34,14 @@ module OrigenTesters
           # up the names.
           # E.g.: FORMAT TCLK TDI TDO TMS;
           OrigenTesters::Decompiler::Nodes::Pinlist.new(context: context,
-                                                        pins:    raw_pinlist[raw_pinlist.index('FORMAT')..raw_pinlist.index(';') - 1].split(/\s+/)[1..-1].map(&:strip)
-                                                       )
+                                                        pins:    raw_pinlist[raw_pinlist.index('FORMAT')..raw_pinlist.index(';') - 1].split(/\s+/)[1..-1].map(&:strip))
         end
 
         def parse_vector(raw_vector:, context:, meta:)
           if raw_vector =~ Regexp.new('^\s*#')
             # Comment
             OrigenTesters::Decompiler::Nodes::CommentBlock.new(context:  context,
-                                                               comments: raw_vector.split("\n")
-                                                              )
+                                                               comments: raw_vector.split("\n"))
           elsif raw_vector =~ Regexp.new('^R\d+\s')
             # Vector
             elements = raw_vector.split(/\s+/, 2 + context.pinlist.size)
@@ -56,8 +53,7 @@ module OrigenTesters
                                         repeat:     elements[0].gsub('R', '').to_i,
                                         timeset:    elements[1],
                                         pin_states: (elements[2..-2] || []) << elements[-1][0],
-                                        comment:    elements[-1][1]
-                                       )
+                                        comment:    elements[-1][1])
           else
             # Anything that doesn't start with Rxyz where xyz is some integer
             # will be considered a sequencer instruction
@@ -66,8 +62,7 @@ module OrigenTesters
 
             nodes_namespace::SequencerInstruction.new(context:     context,
                                                       instruction: inst_plus_args[0],
-                                                      arguments:   inst_plus_args[1..-1]
-                                                     )
+                                                      arguments:   inst_plus_args[1..-1])
           end
         end
       end

data/lib/origen_testers/smartest_based_tester/decompiler/nodes.rb

@@ -5,7 +5,7 @@ module OrigenTesters
         class SequencerInstruction < OrigenTesters::Decompiler::Nodes::Node
           PLATFORM_NODES = [:instruction, :arguments]
 
-          def initialize(instruction:, arguments: [], context:)
+          def initialize(instruction:, context:, arguments: [])
             @execute = false
 
             @instruction = instruction

data/lib/origen_testers/smartest_based_tester/decompiler.rb

@@ -27,6 +27,7 @@ module OrigenTesters
           if current_indices[:pinlist_start] && line !~ /^\s/
             next true
           end
+
           false
         end,
 

data/lib/origen_testers/smartest_based_tester/smt8.rb

@@ -9,8 +9,7 @@ module OrigenTesters
 
       # An internal method called by Origen to create the pattern header
       def pattern_header(options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         @program_lines = []
         @program_action_lines = []
         if zip_patterns
@@ -40,7 +39,7 @@ module OrigenTesters
       # An internal method called by Origen to generate the pattern footer
       def pattern_footer(options = {})
         options = {
-          end_in_ka:      false
+          end_in_ka: false
         }.merge(options)
         if options[:end_in_ka]
           Origen.log.warning '93K keep alive not yet implemented!'
@@ -128,9 +127,9 @@ module OrigenTesters
             elsif comment =~ /^SQPG LBGN (\d+);/
               @program_lines << "    <Instruction id=\"loop\" value=\"#{Regexp.last_match(1)}\"/>"
             elsif comment =~ /^SQPG LEND;/
-              @program_lines << "    <Instruction id=\"loopEnd\"/>"
+              @program_lines << '    <Instruction id="loopEnd"/>'
             elsif comment =~ /^SQPG RETC (\d) (\d);/
-              @program_lines << "    <Instruction id=\"returnConditional\">"
+              @program_lines << '    <Instruction id="returnConditional">'
               @program_lines << "      <Assignment id=\"onFail\" value=\"#{Regexp.last_match(1) == '0' ? 'false' : 'true'}\"/>"
               @program_lines << "      <Assignment id=\"resetFail\" value=\"#{Regexp.last_match(2) == '0' ? 'false' : 'true'}\"/>"
               @program_lines << '    </Instruction>'
@@ -150,7 +149,7 @@ module OrigenTesters
           # Close out current gen_vec group
           write_gen_vec
           if has_repeat
-            @program_lines << "    <Instruction id=\"genVec\" value=\"1\">"
+            @program_lines << '    <Instruction id="genVec" value="1">'
             @program_lines << "      <Assignment id=\"repeat\" value=\"#{vec.repeat}\"/>"
             @program_lines << '    </Instruction>'
             @gen_vec -= 1

data/lib/origen_testers/smartest_based_tester/v93k/test_suite.rb

@@ -38,8 +38,7 @@ module OrigenTesters
              hardware_dsp_disable
              site_control
              site_match
-             force_serial
-          )
+             force_serial)
 
         ALIASES = {
           tim_equ_set:     :timing_equation,

data/lib/origen_testers/smartest_based_tester/v93k.rb

@@ -1,7 +1,7 @@
 module OrigenTesters
   module SmartestBasedTester
     class V93K < Base
-      require 'origen_testers/smartest_based_tester/v93k/generator.rb'
+      require 'origen_testers/smartest_based_tester/v93k/generator'
     end
   end
   V93K = SmartestBasedTester::V93K

data/lib/origen_testers/smartest_based_tester/v93k_smt8/shmoo_test.rb

@@ -23,8 +23,7 @@ module OrigenTesters
           signal:  :result_signal
         }
 
-        DEFAULTS = {
-        }
+        DEFAULTS = {}
 
         NO_STRING_TYPES = [:list_strings, :list_classes, :class]
         # Generate accessors for all attributes and their aliases
@@ -76,6 +75,7 @@ module OrigenTesters
               if axes_names.include?(aname.to_sym)
                 fail "Axis name #{aname} is already used in shmoo test '#{@name}'"
               end
+
               axes << ShmooTestAxis.new(aname.to_sym, a)
             end
           else
@@ -250,6 +250,7 @@ module OrigenTesters
               if trackings_names.include?(tname.to_sym)
                 fail "Tracking name #{tname} is already used in shmoo test axis '#{@name}'"
               end
+
               trackings << ShmooTestTracking.new(tname.to_sym, t)
             end
           end

data/lib/origen_testers/smartest_based_tester/v93k_smt8/test_suite.rb

@@ -27,8 +27,7 @@ module OrigenTesters
           test_function: :test_method
         }
 
-        DEFAULTS = {
-        }
+        DEFAULTS = {}
 
         NO_STRING_TYPES = [:list_strings, :list_classes, :class]
         # Generate accessors for all attributes and their aliases
@@ -118,12 +117,13 @@ module OrigenTesters
             unless value_hash.is_a?(Hash)
               fail "Provided value to nested params was not a Hash. Instead the value was #{value_hash.class}"
             end
+
             dynamic_spacing = ' ' * (4 * nested_loop_count)
             l << "#{dynamic_spacing}#{name}[#{key}] = {" unless name.nil?
             nested_params.each do |nested_param|
               # Guarentee hash is using all symbol keys
               # Since we cannot guarentee ruby version is greater than 2.5, we have to use an older syntax to
-              value_hash = value_hash.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo }
+              value_hash = value_hash.transform_keys(&:to_sym)
               nested_key = nested_param.first.to_s.gsub('.', '_').to_sym
               nested_key_underscore = nested_key.to_s.underscore.to_sym
               nested_params_accepted_keys << nested_key
@@ -134,6 +134,7 @@ module OrigenTesters
                  value_hash.keys.include?(nested_key_underscore) && nested_key != nested_key_underscore
                 fail 'You are using a hash based test method and provided both the parameter name and alias name.'
               end
+
               nested_key = nested_key_underscore if value_hash.keys.include?(nested_key_underscore)
               if nested_param.last.first.is_a?(Hash) && value_hash[nested_key].is_a?(Hash)
                 value_hash[nested_key].each do |inner_key, inner_meta_hash|
@@ -170,7 +171,7 @@ module OrigenTesters
           if value.is_a?(String)
             if value =~ /setupRef(.*)/
               # Do not wrap setupRef calls in quotes
-              return value
+              value
             else
               "\"#{value}\""
             end

data/lib/origen_testers/smartest_based_tester/v93k_smt8.rb

@@ -1,7 +1,7 @@
 module OrigenTesters
   module SmartestBasedTester
     class V93K_SMT8 < Base
-      require 'origen_testers/smartest_based_tester/v93k_smt8/generator.rb'
+      require 'origen_testers/smartest_based_tester/v93k_smt8/generator'
     end
   end
   V93K_SMT8 = SmartestBasedTester::V93K_SMT8

data/lib/origen_testers/stil_based_tester/base.rb

@@ -65,8 +65,7 @@ module OrigenTesters
 
       # An internal method called by Origen to create the pattern header
       def pattern_header(options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
 
         @pattern_name = options[:pattern]
 
@@ -242,7 +241,7 @@ module OrigenTesters
                     end
                     if v == 0
                       line << 'L'
-                    elsif v == 0
+                    elsif v == 0 # rubocop:disable Lint/DuplicateElsifCondition
                       line << 'H'
                     else
                       line << 'L/H/X'
@@ -301,12 +300,12 @@ module OrigenTesters
       # other platforms, such as the J750, is required.
       def store(*pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
-        options = { offset: 0
-                  }.merge(options)
+        options = { offset: 0 }.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
           fail 'For the STIL generation you must supply the pins to store/capture'
         end
+
         pins.each do |pin|
           pin.restore_state do
             pin.capture
@@ -326,12 +325,12 @@ module OrigenTesters
       #   $tester.cycle                # This is the vector that will be captured
       def store_next_cycle(*pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
           fail 'For STIL generation you must supply the pins to store/capture'
         end
+
         pins.each { |pin| pin.save; pin.capture }
         # Register this clean up function to be run after the next vector
         # is generated, cool or what!