Merge branch 'M3202A_2Dloop_fix' of...

Merge branch 'M3202A_2Dloop_fix' of https://github.com/stephanlphilips/pulse_lib into M3202A_2Dloop_fix

pulse_lib/keysight/M3202A_uploader.py

@@ -96,7 +96,7 @@ class M3202A_Uploader:
             if job.seq_id == seq_id and job.index == index and not job.released:
                 return job
 
-        raise ValueError("Sequence with id {}, index {} not placed for upload .. . Always make sure to first upload your segment and then do the playback.")
+        raise ValueError(f'Sequence with id {seq_id}, index {index} not placed for upload .. . Always make sure to first upload your segment and then do the playback.')
 
 
     def play(self, seq_id, index, release_job = True):

pulse_lib/segments/segment_container.py

@@ -380,6 +380,10 @@ class segment_container():
                 j = 0
                 for d in data:
                     if not (d['stop'] - d['start'] < 1 or (d['v_start'] == 0 and d['v_stop'] == 0)):
+                        if (not bb_d) and d['start'] > 0:
+                            d0 = {'start': 0, 'stop': d['start'], 'v_start': 0, 'v_stop': 0, 'index_start': 0, 'index_stop': 0}
+                            bb_d['p0'] = d0
+                            j += 1
                         bb_d[('p%i' %j)] = d
                         j += 1
                 if bb_d:

pulse_lib/segments/segment_markers.py

@@ -17,7 +17,7 @@ class reference_marker_4_IQ:
 
 class segment_marker(segment_base):
 	"""docstring for segment_marker"""
-	def __init__(self, name, HVI_variable_data = None, marker_voltage = 2500):
+	def __init__(self, name, HVI_variable_data = None, marker_voltage = 1500):
 		"""
 		init marker object
 		Args:

pulse_lib/segments/utility/looping.py

@@ -183,7 +183,7 @@ class logspace(loop_obj):
     """docstring for logspace"""
     def __init__(self, start, stop, n_steps = 50, name = None, unit = None, axis = -1, setvals = None):
         super().__init__()
-        super().add_data(np.logspace(np.log10(start), np.log10(stop), n_steps), axis = axis, labels = name, units = unit, setvals= setvals)
+        super().add_data(np.logspace(start, stop, n_steps), axis = axis, labels = name, units = unit, setvals = setvals)
 
 class geomspace(loop_obj):
     """docstring for geomspace"""

pulse_lib/sequencer.py

@@ -164,11 +164,11 @@ class sequencer():
 
         self.params =[]
 
-#       for i in range(len(self.labels)):
-#           par_name = self.labels[i]
-#           set_param = index_param(par_name, self, dim = i)
-#           self.params.append(set_param)
-#           setattr(self, par_name, set_param)
+        for i in range(len(self.labels)):
+            par_name = self.labels[i]
+            set_param = index_param(par_name, self, dim = i)
+            self.params.append(set_param)
+            setattr(self, par_name, set_param)