Moved nofDishes to user settings section.

applications/apertif/matlab/apertif_arts_firmware_model.py

@@ -333,6 +333,34 @@ if wgChirp:
     selChanx         = 32      # N_chan_x / 2 = center of subband
     selChanxFraction = 0.0     # center channel, yields constant in fine channel
 
+# Number of dishes
+# - not used for Apertif correlator, because it only models auto visibilities
+# - only used for Arts array beamformers:
+#   . use  1 to verify the expected TAB, IAB output signal level
+#   . use 12 is all dishes for Arts SC1 or for IAB
+#   . use 10 is equidistant dishes for Arts SC4
+#   . use  8 is equidistant and fixed dishes for Arts SC3
+# The actual number of dishes does not alter the TAB or IAB output level, 
+# because the number of dishes is compensated via the TAB weights in case of
+# SC1 when sc1_use_qua = True and SC4 or via the IAB gain in case of the IAB.
+# When sc1_use_qua = False then the TAB output does increase with the number
+# of dishes, because then the TAB weigth is fixed at 1. Still for SC1 the
+# maximum gain with N_dish = 12 dishes is log2(sqrt(12)) = 1.8 bits, so with
+# 6 bit beamlet input and 8 bit voltage TAB data this gain still fits, and
+# therefore it is fine to use sc1_use_qua = False for SC1.
+# Typical values:
+# . nofDishes = 16    # model only
+# . nofDishes = 12    # RT2-9,a-d, all for Apertif XC and Arts SC1
+# . nofDishes = 10    # RT2-9,a,b at equidistant for Arts SC4
+# . nofDishes = 8     # RT2-9 fixed at equidistant for commensal Arts SC3
+# . nofDishes = 1     # model default, because tabWeightSc1, tabWeightSc4 and
+#                     # iabGainReg nomalize for nofDishes. Therefore use 
+#                     # nofDishes = 1 to speed up simulation, except when modeling
+#                     # Arts SC1 with fixed tabWeightSc1 = 1 (when sc1_use_qua =
+#                     # False).
+nofDishes = 1
+
+
 ################################################################################
 # Apertif / Arts settings
 N_fft         = pi_apr.N_FFT            # = 1024
@@ -365,33 +393,6 @@ W_cb_product = pi_apr.W_cb_in + pi_apr.W_cb_weight - 1  # = 31 = 16 + 16 -1, do
 # Number of bits for fraction < 1
 W_beamlet_fraction = pi_apr.W_beamlet_fraction    # number of bits for fraction < 1
 
-################################################################################
-# Arts settings
-
-# Number of dishes
-# . use  1 to verify the expected TAB, IAB output signal level
-# . use 12 is all dishes for Arts SC1 or for IAB
-# . use 10 is equidistant dishes for Arts SC4
-# . use  8 is equidistant and fixed dishes for Arts SC3
-# The actual number of dishes does not alter the TAB or IAB output level, 
-# because the number of dishes is compensated via the TAB weights in case of
-# SC1 when sc1_use_qua = True and SC4 or via the IAB gain in case of the IAB.
-# When sc1_use_qua = False then the TAB output does increase with the number
-# of dishes, because then the TAB weigth is fixed at 1. Still for SC1 the
-# maximum gain with N_dish = 12 dishes is log2(sqrt(12)) = 1.8 bits, so with
-# 6 bit beamlet input and 8 bit voltage TAB data this gain still fits, and
-# therefore it is fine to use sc1_use_qua = False for SC1.
-nofDishes = 16    # model only
-nofDishes = 12    # RT2-9,a-d, all for Apertif XC and Arts SC1
-nofDishes = 10    # RT2-9,a,b at equidistant for Arts SC4
-nofDishes = 8     # RT2-9 fixed at equidistant for commensal Arts SC3
-nofDishes = 1     # model default, because tabWeightSc1, tabWeightSc4 and
-                  # iabGainReg nomalize for nofDishes. Therefore use 
-                  # nofDishes = 1 to speed up simulation, except when modeling
-                  # Arts SC1 with fixed tabWeightSc1 = 1 (when sc1_use_qua =
-                  # False).
-nofDishes = 1
-
 ################################################################################    
 # Arts SC1 beamlet TAB
 if sc1_use_qua: