diff --git a/dfmux/python/Housekeeping.py b/dfmux/python/Housekeeping.py index ef57d35a..317f3edc 100644 --- a/dfmux/python/Housekeeping.py +++ b/dfmux/python/Housekeeping.py @@ -1,7 +1,6 @@ from spt3g import core from spt3g.dfmux import DfMuxHousekeepingMap, HkBoardInfo, HkMezzanineInfo, HkModuleInfo, HkChannelInfo, DfMuxWiringMap, DfMuxChannelMapping -from spt3g.dfmux.IceboardConversions import convert_TF from .TuberClient import TuberClient import socket, struct, time import numpy diff --git a/dfmux/python/unittransforms.py b/dfmux/python/unittransforms.py index ca19a939..74f2838b 100644 --- a/dfmux/python/unittransforms.py +++ b/dfmux/python/unittransforms.py @@ -1,9 +1,9 @@ import numpy from spt3g import core -from spt3g.dfmux import HousekeepingForBolo +from .Housekeeping import HousekeepingForBolo # Transfer functions for 3G and SPTpol boards -from spt3g.dfmux import IceboardConversions +from .IceboardConversions import convert_TF, convert_adc_samples from .wtl_ConvertUtils import convert_squid, convert_demod, convert_mb def counts_to_rms_amps(wiringmap, hkmap, bolo, system, tf=None): @@ -11,9 +11,9 @@ def counts_to_rms_amps(wiringmap, hkmap, bolo, system, tf=None): if system == 'ICE': if chanhk.dan_streaming_enable: - tf_I = IceboardConversions.convert_TF(modhk.nuller_gain, target='nuller', custom_TF=tf, unit='RAW', frequency=chanhk.carrier_frequency/core.G3Units.Hz) + tf_I = convert_TF(modhk.nuller_gain, target='nuller', custom_TF=tf, unit='RAW', frequency=chanhk.carrier_frequency/core.G3Units.Hz) else: - tf_V = IceboardConversions.convert_adc_samples('Streamer') + tf_V = convert_adc_samples('Streamer') tf_I = tf_V/modhk.squid_transimpedance if chanhk.carrier_frequency != 0: tf_I /= numpy.sqrt(2) # Use RMS amps @@ -41,7 +41,7 @@ def bolo_bias_voltage_rms(wiringmap, hkmap, bolo, system, tf=None): boardhk, mezzhk, modhk, chanhk = HousekeepingForBolo(hkmap, wiringmap, bolo, True) if system == 'ICE': - tf_V = IceboardConversions.convert_TF(modhk.carrier_gain, target='carrier', custom_TF=tf, unit='NORMALIZED', frequency=chanhk.carrier_frequency/core.G3Units.Hz) + tf_V = convert_TF(modhk.carrier_gain, target='carrier', custom_TF=tf, unit='NORMALIZED', frequency=chanhk.carrier_frequency/core.G3Units.Hz) volts = tf_V * chanhk.carrier_amplitude * core.G3Units.V if chanhk.carrier_frequency != 0: volts /= numpy.sqrt(2) # Use RMS amps