@@ -1538,7 +1538,7 @@ def get_closest_subband(self, f, band, as_offset=True):
15381538 Args
15391539 ----
15401540 f : float
1541- The frequency to search for a subband.
1541+ The frequency in MHz to search for a subband.
15421542 band : int
15431543 The band to identify.
15441544 as_offset : bool, optional, default True
@@ -1635,7 +1635,7 @@ def get_master_assignment(self, band):
16351635 return freqs , subbands , channels , groups
16361636
16371637 @set_action ()
1638- def assign_channels (self , freq , band = None , bandcenter = None ,
1638+ def assign_channels (self , freq , band ,
16391639 channel_per_subband = 4 , as_offset = True , min_offset = 0.1 ,
16401640 new_master_assignment = False ):
16411641 """
@@ -1644,15 +1644,11 @@ def assign_channels(self, freq, band=None, bandcenter=None,
16441644 Args
16451645 ----
16461646 freq : float array
1647- The frequency of the resonators. This is not the same as
1648- the frequency output from full_band_resp. This is only
1649- where the resonators are.
1650-
1651- band : int or None, optional, default None
1647+ The frequency of the resonators in MHz. This is not the
1648+ same as the frequency output from full_band_resp. This is
1649+ only where the resonators are.
1650+ band : int
16521651 The band to assign channels.
1653- bandcenter : float array or None, optional, default None
1654- The frequency center of the band. Must supply band or
1655- subband center.
16561652 channel_per_subband : int, optional, default 4
16571653 The number of channels to assign per subband.
16581654 as_offset : bool, optional, default True
@@ -1679,10 +1675,6 @@ def assign_channels(self, freq, band=None, bandcenter=None,
16791675 """
16801676 freq = np .sort (freq ) # Just making sure its in sequential order
16811677
1682- if band is None and bandcenter is None :
1683- self .log ('Must have band or bandcenter' , self .LOG_ERROR )
1684- raise ValueError ('Must have band or bandcenter' )
1685-
16861678 subbands = np .zeros (len (freq ), dtype = int )
16871679 channels = - 1 * np .ones (len (freq ), dtype = int )
16881680 offsets = np .zeros (len (freq ))
0 commit comments