Skip to content

Commit bd7f5f2

Browse files
K6221 DC formating corrections
1 parent a4f3817 commit bd7f5f2

2 files changed

Lines changed: 20 additions & 7 deletions

File tree

Delta_mode_Keithley_6221_2182/IV_K6221_DC_Sweep_Frontend_V10.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ def _sweep_worker(self, params):
258258
self.data_filepath = "temp_data.csv"
259259

260260
for i, curr in enumerate(points):
261-
if not self.is_running: break
261+
if not self.is_running:
262+
break
262263
self.backend.set_current(curr)
263264
time.sleep(params['delay'])
264265
volt = self.backend.read_voltage()

tests/test_deep_simulation.py

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,27 @@ def test_04_lcr_keysight_backend(self):
114114
# SECTION 2: COMPLEX & COMBINED MODULES
115115
# =========================================================================
116116

117-
def test_05_delta_simple(self):
118-
print("\n[SIMULATION] 5. Delta Mode (Simple)...")
117+
def test_05_delta_mode_backend(self):
118+
print("\n[SIMULATION] 5. Delta Mode (K6221 + K2182)...")
119119
with patch('pyvisa.ResourceManager') as MockRM:
120-
k6221 = MockRM.return_value.open_resource.return_value
121-
with patch('builtins.input', side_effect=['0', '1e-5', '1e-6', 'test']), \
122-
patch('pandas.DataFrame.to_csv'), patch('time.sleep'):
120+
k6221 = MagicMock()
121+
MockRM.return_value.open_resource.return_value = k6221
122+
123+
# Inputs: Start=0, Stop=1e-5, Step=1e-6, File=test
124+
fake_inputs = ['0', '0.00001', '0.000001', 'delta_test']
125+
126+
# Circuit breaker for sleep to prevent infinite loops
127+
breaker = MagicMock(side_effect=[None]*10 + [Exception("Force Test Exit")])
128+
129+
with patch('builtins.input', side_effect=fake_inputs), \
130+
patch('pandas.DataFrame.to_csv'), \
131+
patch('time.sleep', breaker):
132+
123133
self.run_module_safely("Delta_mode_Keithley_6221_2182.Backends.Delta_K6221_K2182_Simple_v7")
134+
135+
# Verify at least one write command was sent
124136
self.assertTrue(k6221.write.called)
125-
print(" -> Verified: K6221 Commands Sent")
137+
print(" -> Verified: Commands sent to K6221")
126138

127139
def test_06_delta_sensing(self):
128140
print("\n[SIMULATION] 6. Delta Mode (T-Sensing)...")

0 commit comments

Comments
 (0)