Merge pull request #57 from spice-herald/lbl_update

LBL updates

Author: serfass

bin/controller.py

@@ -297,17 +297,28 @@
 
 
     if args.signal_gen_voltage_mV is not None:
-
+        
         #  write to sg
+        print(f'INFO: Setting amplitude to {args.signal_gen_voltage_mV} mV')
+
         if args.signal_gen_voltage_mV is not nan:
-            
-            print(f'INFO: Setting amplitude to {args.signal_gen_voltage_mV} mV')
-            
-            myinstruments.set_signal_gen_params(
-                voltage=float(args.signal_gen_voltage_mV),
-                voltage_unit='mV'
+        
+            if channels:
+                
+                for chan in channels:
+                    myinstruments.set_signal_gen_params(
+                        detector_channel=chan,
+                        voltage=float(args.signal_gen_voltage_mV),
+                        voltage_unit='mV'
+                    )
+            else:
+                myinstruments.set_signal_gen_params(
+                    voltage=float(args.signal_gen_voltage_mV),
+                    voltage_unit='mV'
                 )
-                            
+        else:
+            print('ERROR: voltage is NaN. Doing nothing...')
+                
         # read from board
         readback = myinstruments.get_signal_gen_params()
 
@@ -331,12 +342,23 @@
         #  write to board
         if args.signal_gen_offset_mV is not nan:
             print(f'INFO: Setting offset to {args.signal_gen_offset_mV} mV')
+
+            
+            if channels:
+                for chan in channels:
+                    myinstruments.set_signal_gen_params(
+                        detector_channel=chan,
+                        offset=args.signal_gen_offset_mV,
+                        offset_unit='mV'
+                    )
+            else:
+                myinstruments.set_signal_gen_params(
+                    offset=args.signal_gen_offset_mV,
+                    offset_unit='mV'
+                )
+        else:
+            print('ERROR: offset value is NaN. Doing nothing...')
 
-            myinstruments.set_signal_gen_params(
-                offset=args.signal_gen_offset_mV,
-                offset_unit='mV'
-            )
-                            
         # read from board
         readback = myinstruments.get_signal_gen_params()
 

pytesdaq/config/iv_didv.ini.example_lbl

@@ -14,21 +14,60 @@ use_negative_tes_bias = false
 use_tes_bias_vect = false
 
 # bias vect [uA]
-tes_bias_vect = 0,4,8,12,15,18,20,22,24,26,28,30,32,34,36,38,44,48,52,60,70,80,100,140,180,210,240,280,300,350,400,450,500,1000
+#tes_bias_vect = 100, 50,20,10,5,1
 
 # min/max/steps [all in muAmps]
 # 100x25: 400,0,80,20,40,5,5
 # 800x200: 2000,0,400,100,200,25,25
 # 1%: 1500,0,250,75,250,15,15
 # Ch1 4%: 2000,0,1000,250,250,30,25
 # Ch4 4%: 400,0,200,50,50,6,5
-tes_bias_max = 2000 
+
+#bias parameters used on 3/3/25 (for channel 7
+#tes_bias_max = 1100 
+#tes_bias_min = 0
+#tes_bias_T =  300
+#tes_bias_SC =  10
+#tes_bias_step_N = 200
+#tes_bias_step_T = 20
+#tes_bias_step_SC = 3
+
+#bias parameters used to run IV for all dry channels (run24)
+#tes_bias_max = 1500 
+#tes_bias_min = 0
+#tes_bias_T =  400
+#tes_bias_SC =  50
+#tes_bias_step_N = 200
+#tes_bias_step_T = 14
+#tes_bias_step_SC = 10
+
+#Run 24 modification for the SQUID tests
+tes_bias_max = 1500 
 tes_bias_min = 0
-tes_bias_T =  750
-tes_bias_SC =  300
-tes_bias_step_N = 250
-tes_bias_step_T = 50
-tes_bias_step_SC = 30
+tes_bias_T =  300
+tes_bias_SC =  50
+tes_bias_step_N = 200
+tes_bias_step_T = 14
+tes_bias_step_SC = 10
+
+#Mini dIdV taken 3/12 at 14.3 SL condensed
+#tes_bias_max = 247.26
+#tes_bias_min = 244.26
+#tes_bias_T = 246.26
+#tes_bias_SC = 245.126
+#tes_bias_step_N = 1
+#tes_bias_step_T = 1
+#tes_bias_step_SC = 1
+ 
+#test parameters for short runs
+#tes_bias_max = 120 
+#tes_bias_min = 117
+#tes_bias_T =  119
+#tes_bias_SC =  118
+#tes_bias_step_N = 1
+#tes_bias_step_T = 1scp -r ./run21/raw/didv_I4_D20241219_T175712/ wmatava@tessy.lbl.gov:/data/lbl/run21/raw
+
+#tes_bias_step_SC = 1
 
 
 # Temperature sweep, temperature in mk
@@ -41,7 +80,7 @@ thermometer_name = MC
 heater_name = heaterMC
 
 
-use_temperature_vect = true		
+use_temperature_vect = false		
 temperature_vect = 15,20
 #temperature_min = 0
 #temperature_max = 0
@@ -59,7 +98,7 @@ temperature_tolerance_percent = 0.4
 sample_rate = 1250000
 
 # run time in seconds
-run_time = 5
+run_time = 60
 
 # trace length:
 
@@ -79,10 +118,10 @@ voltage_max = 10
 # that needs to be changed
 
 # take dIdV data one channel out a time or together
-loop_channels = true 
+loop_channels = false 
 
 # run time in seconds
-run_time = 5
+run_time = 180
 
 # ADC setup
 
@@ -98,10 +137,22 @@ voltage_max = 10
 
 # signal generator
 # amplitude in mVpp
-signal_gen_voltage = 20
+signal_gen_voltage = 4
 
 # frequency in Hz
 signal_gen_frequency =  80
 
 # shape: 1= square, 2=sine, 3=triangle, 4 = arbitrary waveform
 signal_gen_shape = 1
+
+
+
+[rn]
+
+# Rn TES bias [uA]
+tes_bias = 400
+
+# any parameters in this section supersede dIdV parameters
+signal_gen_voltage = 100 
+voltage_min = -2
+

pytesdaq/config/setup.ini.example_lbl

@@ -21,8 +21,8 @@ facility = 4
 
 # Fridge run number and  date/time fridge was at base temperature
 # (syntax: mm/dd/yyyy HH:MM)
-fridge_run = 12
-fridge_run_start = 03/08/2024 19:00
+fridge_run = 99
+fridge_run_start = 05/26/2025 19:00
 
 # raw data base path (run# directory automatically   created)
 data_path = /home/mwilliams/data
@@ -31,6 +31,7 @@ data_path = /home/mwilliams/data
 #tes_controller = keithley2400
 tes_controller = agilent33500B
 signal_generator = agilent33500B
+laser_signal_generator = rigolDG832
 
 # instruments or driver not available, keep commented
 # squid_controller = starcryo 
@@ -63,37 +64,42 @@ trigger_type = 1
 trigger_channel = pfi0
 
 
-
 # NI ADC connection information
 # connection# (# ADC channel 0-7) = ...
 #      Controller ->  "controller:[name]_[channel]"
 #      TES wiring ->  "tes:[channel]  (optional if same as controller channel)
 #      Detector   ->  "detector:[name]_[channel]"  (set to "None" if no parameter
-connection0 = detector:Si_4percent, controller:starcryo1_1
-connection1 = detector:W1D4_center, controller:starcryo1_2
-connection2 = detector:W1E3, controller:starcryo1_3
-connection3 = detector:W2A5_TES100x25, controller:starcryo1_4
-#connection4 = detector:PCB_AccelZ, controller:NONE_5
-#connection5 = detector:PCB_AccelY, controller:NONE_6
+connection0 = detector:no_device_connected, controller:starcryo1_1
+connection1 = detector:MV4_1F4_E_4pc, controller:starcryo1_2
+connection2 = detector:MV4_1C6_1pc_bf, controller:starcryo1_3
+connection3 = detector:MV4_1A5_E_veto, controller:starcryo1_4
+connection4 = detector:MV4_1B4_E_1pc, controller:starcryo1_5
+connection5 = detector:MV4_1B3_E_1pc_bf, controller:starcryo1_6
+connection6 = detector:MV4_1E4_E_4pc, controller:starcryo1_7
+connection7 = detector:MV4_1I5_veto, controller:starcryo1_8
 #connection6 = detector:PCB_AccelX, controller:NONE_7
-
+#connection7 = detector:rigolTTL,  controller:ttl_ttl
 
 #  Electronics and detector readout configuration if not set by SQUID/TES/SG controllers
 # 
 #  shunt_resistance [Ohms] 
-#  squid_turn_ratio  
+#  squid_turn_ratio  shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
 #  feedback_resistance [Ohms] (magnicon->not needed, read from board)
-#  parasitic_resistance [Ohms] (if known)
+#  parasitic_resistance [Ohms] (if known)MV4
 #  tes_bias_resistance: [Ohms]
 #  output_gain (for close/open loop calculation)
 #  preamp_gain (for open loop calculation)
 #  signal_gen_resistance: [Ohms]  -> resistance in the TES line
 #     
 
-detector_config0 = tes_bias_resistance: 1700, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
-detector_config1 = tes_bias_resistance: 40000, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
+detector_config0 = tes_bias_resistance: 2047, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
+detector_config1 = tes_bias_resistance: 2047, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
 detector_config2 = tes_bias_resistance: 2047, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
-detector_config3 = tes_bias_resistance: 20000, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
+detector_config3 = tes_bias_resistance: 2047, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
+detector_config4 = tes_bias_resistance: 2047, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
+detector_config5 = tes_bias_resistance: 2047, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
+detector_config6 = tes_bias_resistance: 2047, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
+detector_config7 = tes_bias_resistance: 2047, signal_gen_resistance: 2047, output_gain: 1, shunt_resistance: 0.002, squid_turn_ratio:10, feedback_resistance:100000
 
 [polaris_daq]
 lib = /lib/libnidaq.so
@@ -117,6 +123,8 @@ attenuation = 1.0
 visa_address = ASRL3::INSTR
 voltage_source = true
 
+[rigolDG832]
+visa_address = USB0::0x1AB1::1603::DG8A211800738::INSTR
 
 [temperature_controllers]
 # Lakeshore

pytesdaq/instruments/agilent/agilent33500B.py

@@ -35,9 +35,10 @@ def __init__(self, visa_address, visa_library=None,
         self._generator_onoff = 'off'
 
         # signal generator attenuation
-        self._attenuation = attenuation
+        self._attenuation = float(attenuation)
 
-        self.set_auto_range(1)
+        # auto range off
+        self.set_auto_range(0)
 
     def set_auto_range(self, auto, source=1):
 
@@ -76,7 +77,9 @@ def set_load_resistance(self, load='infinity', source=1):
             or resistance value in Ohm
         """
         # check input
-        if isinstance(load, int):
+        if (isinstance(load, int)
+            or isinstance(load, float)):
+            load = int(load)
             if load<50:
                 load = 50
             if load>1e6: