Automatic and Manual Stop after individual set and reset!

hp4155/memristor (Version 4.1)/memristor.py

@@ -437,9 +437,10 @@ def on_full_button_clicked(b):
                     if sampling.value == True: #before set(10mv)
                         R_mean_set = sampling_check(0.01,device) # Here HRS
                         resistances.append(R_mean_set)
-                        if auto_stop.value == True and abs(R_mean_set/R_mean_init)< abs(threshold).value:
+                        if auto_stop.value == True and abs(R_mean_init/R_mean_set)< abs(threshold.value):
                             stop = True
 
+                    if stop == False: # do the reset everything ok
                         V34,I34 = sweep(0,Vreset.value,step.value,CC_vreset.value,integration_time.value,device) #reset
                         plot_sweep(V34,I34,f"RESET Iteration {i+1}")
 
@@ -448,19 +449,25 @@ def on_full_button_clicked(b):
                         if sampling.value == True:#-0.1V
                             R_mean_reset = sampling_check(-0.01,device) #here LRS
                             resistances.append(R_mean_reset)
-                        if auto_stop.value == True and abs(R_mean_set/R_mean_reset)< abs(threshold).value:
+                            if auto_stop.value == True and abs(R_mean_reset/R_mean_set)< abs(threshold.value):
                                 stop = True
 
-                    #Quick Contact Check after reset Process 
+                        #butterfly curve
+                        V=np.concatenate((V12,V34))
+                        I=np.concatenate((I12,I34))
+ 
+                    else: # Set 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!
+                        
+                    #Quick Contact Check after reset Process even if it fails
                     if auto_qcc.value == True:
                         if qcc_select.value == 'EBL':
                             R = EBL(device)
                         else: # OL
                             R = OL(device)
 
-                    #butterfly curve
-                    V=np.concatenate((V12,V34))
-                    I=np.concatenate((I12,I34))
                    
                     #create data frame and save to file
                     df = create_data_frame(V,I)