diff --git a/hp4155/memristor (Version 4.1)/help.py b/hp4155/memristor (Version 4.1)/help.py index 31cf081e06461409cde5d113bcc0d6d0493d9082..7be4c12dd2bc5aa224cab1b4e904750c0e171be3 100644 --- a/hp4155/memristor (Version 4.1)/help.py +++ b/hp4155/memristor (Version 4.1)/help.py @@ -177,16 +177,16 @@ def sweep(start,stop,step,comp,integration,voltmeter,device): vname = 'V1', mode = 'I', func = 'CONS', - value = 0 + value = 0, comp = 'MAX', ) - smu_voltmeter_3.update( + smu_voltmeter_3.update( iname = 'I3', vname = 'V3', mode = 'I', func = 'CONS', - value = 0 + value = 0, comp = 'MAX', ) @@ -204,7 +204,7 @@ def sweep(start,stop,step,comp,integration,voltmeter,device): device.setup_smu(4,smu_ground) # Do it as the tool would do it - if volmeter == True: + if voltmeter == True: device.user_function("VMEAS","V","V3-V1") device.setup_cons_smu(1,smu_voltmeter_1) device.setup_cons_smu(3,smu_voltmeter_3) diff --git a/hp4155/memristor (Version 4.1)/memristor.py b/hp4155/memristor (Version 4.1)/memristor.py index 2cce96bbacae9aa3fc77d50172f09215826fe43f..83c2d6b056615cb301ad0f3c89fa20eb6169d169 100644 --- a/hp4155/memristor (Version 4.1)/memristor.py +++ b/hp4155/memristor (Version 4.1)/memristor.py @@ -308,7 +308,7 @@ def on_set_button_clicked(b): plot_sweep(V12,I12,'SET') df = create_data_frame(V12,I12) if voltmeter.value == True: - df["V3-V1 (V)"] = np.array(device.return_data("VMEAS")) + df["V3-V1 (V)"] = np.array(device.return_values("VMEAS")) display(df) @@ -358,7 +358,7 @@ def on_reset_button_clicked(b): plot_sweep(V34,I34,'RESET') df = create_data_frame(V34,I34) if voltmeter.value == True: - df["V3-V1 (V)"] = np.array(device.return_data("VMEAS")) + df["V3-V1 (V)"] = np.array(device.return_values("VMEAS")) display(df) if sampling.value == True: #do sampling set after reset process(100mV) @@ -440,7 +440,7 @@ def on_full_button_clicked(b): V12,I12 = sweep(0,Vset.value,step.value,CC_vset.value,integration_time.value,voltmeter.value,device) #set if voltmeter.value == True: - V12_meas = np.array(device.return_data("VMEAS")) + V12_meas = np.array(device.return_values("VMEAS")) plot_sweep(V12,I12,f"SET Iteration {i+1}") #after set/before reset @@ -452,9 +452,10 @@ def on_full_button_clicked(b): if stop == False: # do the reset everything ok V34,I34 = sweep(0,Vreset.value,step.value,CC_vreset.value,integration_time.value,device) #reset + if voltmeter.value == True: + V34_meas = np.array(device.return_values("VMEAS")) plot_sweep(V34,I34,f"RESET Iteration {i+1}") - #after reset if sampling.value == True:#-0.1V R_mean_reset = sampling_check(-0.01,device) #here LRS @@ -465,11 +466,17 @@ def on_full_button_clicked(b): #butterfly curve V=np.concatenate((V12,V34)) I=np.concatenate((I12,I34)) + + if voltmeter.value == True: + # Save also the voltmeter values + V_meas = np.concatenate((V12_meas,V34_meas)) - else: # Set failed keep only the set data + else: # reset failed keep only the set data V = np.copy(V12) I = np.copy(I12) R_mean_reset = float('nan') # Indicates that also the reset sampling check did not happen not a number! + if voltmeter.value == True: + V_meas = np.copy(V12_meas) #Quick Contact Check after reset Process even if it fails if auto_qcc.value == True: @@ -481,6 +488,8 @@ def on_full_button_clicked(b): #create data frame and save to file df = create_data_frame(V,I) + if voltmeter.value == True: + df["V3-V1 (V)"] = V_meas display(df) if i == 0 : header.extend([f"{i+1} Iteration"]) diff --git a/hp4155/memristor (Version 4.1)/memristor_buttons.ipynb b/hp4155/memristor (Version 4.1)/memristor_buttons.ipynb index 58113201c12cae12d3621073babce75be92ce993..88cb89e3f03b6c93326853cef690641d1d75f948 100644 --- a/hp4155/memristor (Version 4.1)/memristor_buttons.ipynb +++ b/hp4155/memristor (Version 4.1)/memristor_buttons.ipynb @@ -9,7 +9,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "38e9df2d71aa4c47946afdab7283fcb5", + "model_id": "1f221176677c4614b75cb474fcca185b", "version_major": 2, "version_minor": 0 }, @@ -23,7 +23,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "891d087e72f44bc68d9e6f0b66ae895c", + "model_id": "088f88e1a8144184a72e2557888069f5", "version_major": 2, "version_minor": 0 }, @@ -37,7 +37,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "50b7551dd46f459499e748aaf5a7ec0c", + "model_id": "de2ec7b83d1e4014b6ef96e6fe163b42", "version_major": 2, "version_minor": 0 }, @@ -51,7 +51,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "ab08cb608ea848b9b05a0a9d08bd011a", + "model_id": "788a5c97480944999e4dbda16a35e652", "version_major": 2, "version_minor": 0 },