Migrating to v8.0.0-rc3 for rfsoc work.

slaclab · Jan 25, 2024 · c0caf7c · c0caf7c
1 parent d1b434d
commit c0caf7c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/cfg_files/lab1/experiment_lab1_rfsoc.cfg b/cfg_files/lab1/experiment_lab1_rfsoc.cfg
@@ -6,7 +6,7 @@
 
 	"band_0" : {
 		"iq_swap_in" : 0,
-		"iq_swap_out" : 0,
+		"iq_swap_out" : 1,
 		"refPhaseDelay" : 6,
 		"refPhaseDelayFine" : 16,
 		"trigRstDly" : 15, # 0xF
@@ -22,7 +22,7 @@
 
 	"band_1" : {
 		"iq_swap_in" : 0,
-		"iq_swap_out" : 0,
+		"iq_swap_out" : 1,
 		"refPhaseDelay" : 6,
 		"refPhaseDelayFine" : 19,
 		"trigRstDly" : 15, # 0xF

diff --git a/cfg_files/lab1/smurf_startup_rfsoc.cfg b/cfg_files/lab1/smurf_startup_rfsoc.cfg
@@ -5,7 +5,7 @@ crate_id=1
 
 # COMTEL max fan level is 100, ASIS is 15, ELMA is 15 # We're using an
 #ELMA crate on campus right now.
-max_fan_level=8
+max_fan_level=50
 # Badly named ; actually only sets the max fan level to the value
 # specified above by max_fan_level.
 set_crate_fans_to_full=true
@@ -48,11 +48,11 @@ parallel_setup=true
 # Directory on server file system of pysmurf docker directory.  Will
 # use the run.sh script in this directory to instantiate pysmurf
 # dockers.
-pysmurf=/home/cryo/docker/pysmurf/dev/v7.2.0_rfsoc
+pysmurf=/home/cryo/docker/pysmurf/dev/v7.4.0_rfsoc
 
 unset rfsoc_cfgs
 read -r -d '' rfsoc_cfgs << EOM
-3    /home/cryo/docker/smurf/dev/v7.3.4_rfsoc	cfg_files/lab1/experiment_lab1_rfsoc.cfg
+3    /home/cryo/docker/smurf/dev/v7.4.0_rfsoc	cfg_files/lab1/experiment_lab1_rfsoc.cfg
 EOM
 
 tmux_session_name=smurf

diff --git a/python/pysmurf/client/util/smurf_util.py b/python/pysmurf/client/util/smurf_util.py
@@ -4627,6 +4627,7 @@ def get_timing_mode(self):
         :func:`~pysmurf.client.command.smurf_command.SmurfCommandMixin.get_timing_link_up` : Is external timing data being received?
         """
         ## Poll all registers needed to determine which timing mode we're in.
+        mode=None
 
         # Crossbar
         cbar = [self.get_crossbar_output_config(i) for i in range(4)]

diff --git a/scratch/shawn/fill_band.py b/scratch/shawn/fill_band.py
@@ -17,7 +17,7 @@
 # to N.  Otherwise you'll get the max possible,
 # if None.  Only used if one_subband_at_a_time is False
 #restrict_nper_band=None
-restrict_nper_band=None#231
+restrict_nper_band=231
 
 print('filling bands %s'%str(band))