Merge pull request #54 from spice-herald/laser_driver

Laser driver

Author: serfass

bin/run_daq.py

@@ -9,6 +9,13 @@
 import time
 from pprint import pprint
 import copy
+import warnings
+warnings.filterwarnings(
+    'ignore',
+    message=("Unexpected MsgID format. "
+             "Consider updating the device's firmware."))
+
+
 
 if __name__ == "__main__":
 
@@ -55,6 +62,12 @@
                         dest="acquire_exttrig", action="store_true",
                         help='Acquire external trigger data')
 
+    parser.add_argument('--acquire-calib','--acquire-calibration','--acquire_calibration',
+                        dest="acquire_calibration", action="store_true",
+                        help='Acquire calibration data')
+
+    
+
     #parser.add_argument('--acquire-thresh','--acquire_thresh',
     #                    '--acquire-threshold',
     #                    dest="acquire_thresh", action="store_true",
@@ -140,14 +153,15 @@
     acquisition_types = ['continuous',
                          'didv', 'iv',
                          'exttrig', 'randoms',
-                         'threshold']
+                         'threshold', 'calibration']
 
     acquisition_args = [args.acquire_cont,
                         args.acquire_didv,
                         args.acquire_iv,
                         args.acquire_exttrig,
                         args.acquire_rand,
-                        args.acquire_thresh]
+                        args.acquire_thresh,
+                        args.acquire_calibration]
 
     inds = list(np.where(acquisition_args)[0])
     if len(inds) > 1:

pytesdaq/analyzer/analyzer.py

@@ -486,21 +486,21 @@ def fit_didv(self, data_array=None, sample_rate=None, unit='Amps',
             poles = None
             if do_fit_1pole:
                 print('Info: Starting dIdV 1-pole Fit')
-                didv_inst.dofit(1)
+                didv_inst.dofit(1, fcutoff=100e3)
                 result = didv_inst.fitresult(1)
                 poles = 1
                 print('Info: dIdV 1-pole Fit Done')
 
             if do_fit_2pole:
                 print('Info: Starting dIdV 2-pole Fit')
-                didv_inst.dofit(2)
+                didv_inst.dofit(2, fcutoff=100e3)
                 result = didv_inst.fitresult(2)
                 poles = 2
                 print('Info: dIdV 2-pole Fit Done')
 
             if do_fit_3pole:
                 print('Info: Starting dIdV 3-pole Fit')
-                didv_inst.dofit(3)
+                didv_inst.dofit(3, fcutoff=100e3)
                 result = didv_inst.fitresult(3)
                 poles = 3
                 print('Info: dIdV 3-pole Fit Done')

pytesdaq/config/daq.ini_example

@@ -19,7 +19,7 @@
 # if run "duration" longer than series max time
 # then run is splitted in multiple series
 # number of series within group = total duration / series max time
-series_max_time = 15m
+series_max_time = 30m
 
 # split open/restricted series (for blinding purpose)
 split_series = False
@@ -35,24 +35,31 @@ sample_rate = 1250000
 voltage_min = -5
 voltage_max = 5
 
+# Beginning/end of series calib (configuration in "calibration" field)
+add_series_start_calib = True
+add_series_end_calib = False
+calib_run_time = 5m
+
 
 # Beginning/end of series didv (configuration in "didv" field)
 add_series_start_didv = True
 add_series_end_didv = False
-didv_run_time = 60s
-didv_detector_channels = TES50x200Ar,TES200x800Ar,TES200x800Xe
+didv_run_time = 40s
+#didv_detector_channels = Mv41pcRadLeft, Mv41pcRadRight,Mv41pcNormLeft, Mv41pcNormRight
+#didv_detector_channels = TES800x200ArB,TES800x200XeA,TES800x200XeB
+
 
 # Beginning/end of series iv (configuration in "iv" field)
 add_series_start_iv = True
 add_series_end_iv = False
 iv_run_time = 10s
-iv_detector_channels = TES50x200Ar,TES200x800Ar,TES200x800Xe
+#iv_detector_channels = Mv3025pcBigFinsLeft,Mv3025pcRegularLeft,Mv3025pcRegularRight
 
 
 [randoms] 
 
 # maximum series time
-#series_max_time = 90s
+series_max_time = 20m
 
 # trace length in millisec (ms) or  seconds (s)
 # Alternatively use "nb_samples"
@@ -71,7 +78,7 @@ voltage_max = 5
 [exttrig] 
 
 # single series max time in seconds(s) or minutes (m)
-series_max_time = 10m
+series_max_time = 1m
 
 
 # trace length in millisec (ms) or  seconds (s)
@@ -100,7 +107,7 @@ voltage_max = 5
 sample_rate = 1250000
 
 # number of cycles test signal -> trace length
-nb_cycles = 3
+nb_cycles = 2.1
 
 # voltage range (volts)
 voltage_min = -5
@@ -124,25 +131,73 @@ voltage_max = 5
 # IMPORT NOTE: frequency/voltage need to have same format!
 
 signal_gen_voltage_mV = 10
-signal_gen_frequency_Hz =  40
+signal_gen_frequency_Hz =  50
 
 
 
 
 [iv] 
 
 # tes bias
-tes_bias_list = 140,120,100,current
+tes_bias_list = 140,135,130,current
 
 
 # relock (either once or all steps)
 relock_first_step = False
-relock_all_steps  = True
+relock_all_steps  = False
 
 
 # trace length in millisec (ms) or  seconds (s)
 # Alternatively use "nb_samples"
-trace_length = 5ms
+trace_length = 20ms
+
+# sample rate
+sample_rate = 1250000
+
+# voltage min/max
+voltage_min = -5
+voltage_max = 5
+
+
+[calibration]
+
+# add noise on top of calib
+add_calib_noise = False
+calib_noise_run_time = 0.5m
+
+
+# -----------
+# laser setup
+# -----------
+#   - offset/voltage [V], voltage = [pp, high, or low]
+#   - pulse width [s]
+#   - frequency [Hz]
+#   - phase = 0 hard coded
+control_channel = 1
+control_offset = 0
+control_voltage_high = 3.8 
+control_voltage_low = 1
+control_pulse_width = 20e-6 # 1.85e-6
+control_frequency = 40
+
+# TTL (set ttl_channel = None is no TTL)
+# frequency same as control
+ttl_channel = 2
+ttl_offset = 0
+ttl_voltage_high = 1
+ttl_voltage_low = 0
+ttl_pulse_width = 100e-6
+
+# Add TTL channel to raw data
+# leave commented if not saved in data
+ttl_adc_channel = 4
+ttl_adc_id = adc1
+
+# ---------
+# DAQ setup
+# ---------
+# FIXME: only continuous data for now (hard coded)
+trace_length = 10s
 
 # sample rate
 sample_rate = 1250000

pytesdaq/config/settings.py

@@ -240,6 +240,21 @@ def get_signal_generator(self):
 
         return controller
 
+    def get_laser_signal_generator(self):
+        """
+        get signal generator device name
+            
+        Returns:
+             str o NoneType
+        """
+        controller = None
+        try:
+            controller = self._get_setting('setup','laser_signal_generator')
+        except:
+            pass
+    
+        return controller
+    
 
     def enable_redis(self):
         """

pytesdaq/config/setup.ini.example_feb

@@ -25,8 +25,8 @@ facility = 2
 
 # Fridge run number and  date/time fridge was at base temperature
 # (syntax: mm/dd/yyyy HH:MM)
-fridge_run = 43
-fridge_run_start = 04/29/2024 09:00
+fridge_run = 65
+fridge_run_start = 08/04/2025 08:00
 
 # data path 
 data_path = /sdata/runs
@@ -36,6 +36,7 @@ squid_controller = feb
 tes_controller = feb
 signal_generator = agilent33500B
 temperature_controllers = macrt
+laser_signal_generator = rigolDG832
 
 # VISA Library (leave commented if standard path)
 #visa_library = /usr/lib/x86_64-linux-gnu/libvisa.so.20.0.0
@@ -72,13 +73,11 @@ voltage_max = 10
 #   Controller ->  "controller:[controller_name]_[channel]"
 #   TES wiring ->  "tes:[channel]  (optional if same channel name as controller channel)
 #   Detector   ->  "detector:[name]"  (detector channel name)
-connection0 = detector:TES50x200Ar, tes:A, controller:feb1_A
-connection1 = detector:TES200x800Ar, tes:B, controller:feb1_B
-connection2 = detector:TES100x400Xe, tes:C, controller:feb1_C
-connection3 = detector:TES200x800Xe, tes:D, controller:feb1_D
-
-#connection4 = detector:AcceleromterZ, controller:accelerometer
-#connection4 = detector:keysightTTL, controller:keysight_ttl
+connection0 = detector:Mv4025pcBFRadLeft, tes:A, controller:feb1_A
+connection1 = detector:Mv4025pcBFRadRight, tes:B, controller:feb1_B
+connection2 = detector:Mv4025pcBFNormLeft, tes:C, controller:feb1_C
+connection3 = detector:Mv4025pcBFNormRight, tes:D, controller:feb1_D
+connection4 = detector:rigolTTL,  controller:ttl_ttl
 
 
 # Electronics and detector readout constants
@@ -94,10 +93,16 @@ connection3 = detector:TES200x800Xe, tes:D, controller:feb1_D
 #  preamp_gain (for open loop calculation)
 #  signal_gen_resistance: [Ohms]  -> resistance in the TES line
 #     
-detector_config0 = signal_gen_resistance:30000, shunt_resistance: 0.005, squid_turn_ratio:10, feedback_resistance:1250, parasitic_resistance:0.0035
-detector_config1 = signal_gen_resistance:30000, shunt_resistance: 0.005, squid_turn_ratio:10, feedback_resistance:1250, parasitic_resistance:0.0022
-detector_config2 = signal_gen_resistance:30000, shunt_resistance: 0.005, squid_turn_ratio:10, feedback_resistance:1250, parasitic_resistance:0.00265
-detector_config3 = signal_gen_resistance:30000, shunt_resistance: 0.005, squid_turn_ratio:10, feedback_resistance:1250, parasitic_resistance:0.0022
+detector_config0 = signal_gen_resistance:30000, shunt_resistance: 0.005, squid_turn_ratio:10, feedback_resistance:1250, parasitic_resistance:0.003
+detector_config1 = signal_gen_resistance:30000, shunt_resistance: 0.005, squid_turn_ratio:10, feedback_resistance:1250, parasitic_resistance:0.0019
+detector_config2 = signal_gen_resistance:30000, shunt_resistance: 0.005, squid_turn_ratio:10, feedback_resistance:1250, parasitic_resistance:0.0018
+detector_config3 = signal_gen_resistance:30000, shunt_resistance: 0.005, squid_turn_ratio:10, feedback_resistance:1250, parasitic_resistance:0.00183
+detector_config4 = signal_gen_resistance:30000, shunt_resistance: 1, squid_turn_ratio:1, feedback_resistance:1, parasitic_resistance:0
+detector_config5 = signal_gen_resistance:30000, shunt_resistance: 1, squid_turn_ratio:1, feedback_resistance:1, parasitic_resistance:0
+detector_config6 = signal_gen_resistance:30000, shunt_resistance: 1, squid_turn_ratio:1, feedback_resistance:1, parasitic_resistance:0
+detector_config7 = signal_gen_resistance:30000, shunt_resistance: 1, squid_turn_ratio:1, feedback_resistance:1, parasitic_resistance:0
+
+
 
 
 
@@ -162,6 +167,12 @@ output_fix_gain = 1
 #visa_address = TCPIP::192.168.2:12::5025::SOCKET
 visa_address =  GPIB::10::INSTR
 attenuation = 5.01
+#attenuation = 1
+
+[rigolDG832]
+visa_address = USB0::0x1AB1::1603::DG8A204201623::INSTR
+
+
 
 
 [temperature_controllers]
@@ -189,8 +200,9 @@ lakeshore_heater0 = name:heaterMCls, global_number:30
 # Format:
 #   macrt_modules = module1:[module name], module2:...
 # (no specific format for module name, need to be unique)
-macrt_modules = module1:mmr3-174, module2:mmr3-184, module3:mgc3-66
-
+#macrt_modules = module1:mmr3-174, module3:mgc3-66
+#macrt_modules = module1:mmr3-174, module2:mmr3-184
+macrt_modules = module1:mmr3-174, module3:mgc3-66
 
 # Individual module setup
 # Format:
@@ -203,12 +215,12 @@ macrt_modules = module1:mmr3-174, module2:mmr3-184, module3:mgc3-66
 
 # Resistance module MMR3-174 - channels are labeled 1, 2, or 3
 macrt_mmr3-174_setup = type:mmr3, ip:192.168.0.31
+macrt_mmr3-174_chan1 = name:MC, global_number:16, type:FR, serial:105D
 macrt_mmr3-174_chan2 = name:CP, global_number:17, type:RX, serial:R654
 macrt_mmr3-174_chan3 = name:Still, global_number:18, type:CX, serial:121325
 
 # Resistance MMR3-184 - channels are labeled 1, 2, or 3
 macrt_mmr3-184_setup = type:mmr3, ip:192.168.0.32
-macrt_mmr3-184_chan1 = name:MC, global_number:19, type:FR, serial:105D
 macrt_mmr3-184_chan2 = name:2nde, global_number:20, type:CX, serial:121324
 macrt_mmr3-184_chan3 = name:1st, global_number:21, type:CX, serial:121322