clean up genunits

Author: rob

docs/instruments.md

@@ -313,7 +313,7 @@ system.get_list_of_bad_markets()
 
 ### Automatically excluded
 
-It's also possible that there are some instruments that have zero positions. The most likely explanation for this is that you have set a speed limit on trading costs, and there are no trading rules that are cheap enough to trade the given instrument.
+It's also possible that there are some instruments that have zero positions. The most likely explanation for this is that you have set a speed limit on trading costs, and there are no trading rules that are cheap enough to trade the given instrument. These are automatically added to the list of markets given a zero weight for optimisation. 
 
 
 ## Customising the list of 'all instruments' and 'excluded for optimisation'

sysbrokers/IB/ib_instruments_data.py

@@ -9,7 +9,7 @@
 from sysbrokers.broker_instrument_data import brokerFuturesInstrumentData
 
 from syscore.fileutils import resolve_path_and_filename_for_package
-from syscore.genutils import value_or_npnan
+from syscore.genutils import return_another_value_if_nan
 from syscore.objects import missing_instrument, missing_file
 
 from sysobjects.instruments import futuresInstrument
@@ -173,11 +173,11 @@ def get_instrument_object_from_config(
     config_row = config[config.Instrument == instrument_code]
     symbol = config_row.IBSymbol.values[0]
     exchange = config_row.IBExchange.values[0]
-    currency = value_or_npnan(config_row.IBCurrency.values[0], NOT_REQUIRED_FOR_IB)
-    ib_multiplier = value_or_npnan(
+    currency = return_another_value_if_nan(config_row.IBCurrency.values[0], NOT_REQUIRED_FOR_IB)
+    ib_multiplier = return_another_value_if_nan(
         config_row.IBMultiplier.values[0], NOT_REQUIRED_FOR_IB
     )
-    price_magnifier = value_or_npnan(config_row.priceMagnifier.values[0], 1.0)
+    price_magnifier = return_another_value_if_nan(config_row.priceMagnifier.values[0], 1.0)
     ignore_weekly = config_row.IgnoreWeekly.values[0]
 
     # We use the flexibility of futuresInstrument to add additional arguments