diff --git a/hp4155/measurements.py b/hp4155/measurements.py index 75377f90a5c5f4a292b788c4b50ec3296e2b49b2..a91eb91a7225df9600cc4ccacb36ebf15e76be97 100644 --- a/hp4155/measurements.py +++ b/hp4155/measurements.py @@ -274,7 +274,7 @@ def ctlm(field_name ='M00',start=-50*10**(-3),stop=50*10**(-3),step=10**(-3),com del device #tlm/ctlm final part -def tlm_final(field_name ='M00',start=-50*10**(-3),stop=50*10**(-3),step=10**(-3),comp=10,distances=(5,10,15,25,45),time='MED',innen=0): +def tlm_final(innen=0,distances=(5,10,15,25,45),field_name ='M00',start=-50*10**(-3),stop=50*10**(-3),step=10**(-3),comp=10,time='MED'): #connect to the device device = module.HP4155a('GPIB0::17::INSTR') @@ -346,18 +346,20 @@ def tlm_final(field_name ='M00',start=-50*10**(-3),stop=50*10**(-3),step=10**(-3 device.display_variable('Y1','I') device.display_variable('Y2','R') - device.display_variable_min_max('X','MIN',-10) - device.display_variable_min_max('X','MAX',10) - device.display_variable_min_max('Y1','MIN',start) - device.display_variable_min_max('Y1','MAX',stop) - device.display_variable_min_max('Y2','MIN',0) - device.display_variable_min_max('Y2','MAX',200) + ###-----------------------------autoscaling after measurement------------------------------------------------------------------------------ + #device.display_variable_min_max('X','MIN',-comp) + #device.display_variable_min_max('X','MAX',comp) + #device.display_variable_min_max('Y1','MIN',start) + #device.display_variable_min_max('Y1','MAX',stop) + #device.display_variable_min_max('Y2','MIN',0) + #device.display_variable_min_max('Y2','MAX',200) #start measurement device.single_measurement() while device.operation_completed() == False: pass - + + device.autoscaling() #return data from the device V=device.return_data('V') diff --git a/hp4155/module.py b/hp4155/module.py index 3f0364606a70e2fd837b56cc8c991e800e676d09..6d3439079b675a1f05f45579d96fcb7e959cddc2 100644 --- a/hp4155/module.py +++ b/hp4155/module.py @@ -217,4 +217,7 @@ class HP4155a(object): def display_variable_min_max(self,axis,extremum,value): command = f":PAGE:DISP:GRAP:{axis}:{extremum} {value}" - self.inst.write(command) \ No newline at end of file + self.inst.write(command) + + def autoscaling(self): + self.inst.write(":PAGE:GLIS:SCAL:AUTO ONCE") \ No newline at end of file diff --git a/hp4155/tlm_final.ipynb b/hp4155/tlm_final.ipynb index 5dbdaf366ed81d9b83aae70fc93971b2fb100612..d456b8d32e3fd27ec4db3223fa1914e14c104c06 100644 --- a/hp4155/tlm_final.ipynb +++ b/hp4155/tlm_final.ipynb @@ -111,7 +111,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.4" + "version": "3.9.7" } }, "nbformat": 4,