Commit 6fc506ab authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

update

parent 46920c5e
......@@ -964,10 +964,10 @@ class MCIsimulator():
##################################################################################################
# booleans to control the flow # scale thibaut's values
if 'thibaut' in self.values['parallelTrapfile']:
if 'thibaut' in self.information['parallelTrapfile']:
self.nt_p /= 0.576 # thibaut's values traps / pixel
self.sigma_p *= 1.e4 # thibaut's values in m**2
if 'thibaut' in self.values['serialTrapfile']:
if 'thibaut' in self.information['serialTrapfile']:
self.nt_s *= 0.576 # thibaut's values traps / pixel #should be division?
self.sigma_s *= 1.e4 # thibaut's values in m**2
......
......@@ -29,18 +29,18 @@ def onOrbitObsPosition(path, input_ra_list, input_dec_list, input_pmra_list, inp
checkInputList(input_rv_list, input_nstars)
checkInputList(input_parallax_list, input_nstars)
if isinstance(type(input_x), type(1.1)): # type(input_x) != type(1.1):
raise TypeError("Parameter 8 is not double!", input_x)
if isinstance(type(input_y), type(1.1)): # type(input_y) != type(1.1):
raise TypeError("Parameter 9 is not double!", input_y)
if isinstance(type(input_z), type(1.1)): # type(input_z) != type(1.1):
raise TypeError("Parameter 10 is not double!", input_z)
if isinstance(type(input_vx), type(1.1)): # type(input_vx) != type(1.1):
raise TypeError("Parameter 11 is not double!", input_vx)
if isinstance(type(input_vy), type(1.1)): # type(input_vy) != type(1.1):
raise TypeError("Parameter 12 is not double!", input_vy)
if isinstance(type(input_vz), type(1.1)): # type(input_vz) != type(1.1):
raise TypeError("Parameter 13 is not double!", input_vz)
# if isinstance(type(input_x), type(1.1)): # type(input_x) != type(1.1):
# raise TypeError("Parameter 8 is not double!", input_x)
# if isinstance(type(input_y), type(1.1)): # type(input_y) != type(1.1):
# raise TypeError("Parameter 9 is not double!", input_y)
# if isinstance(type(input_z), type(1.1)): # type(input_z) != type(1.1):
# raise TypeError("Parameter 10 is not double!", input_z)
# if isinstance(type(input_vx), type(1.1)): # type(input_vx) != type(1.1):
# raise TypeError("Parameter 11 is not double!", input_vx)
# if isinstance(type(input_vy), type(1.1)): # type(input_vy) != type(1.1):
# raise TypeError("Parameter 12 is not double!", input_vy)
# if isinstance(type(input_vz), type(1.1)): # type(input_vz) != type(1.1):
# raise TypeError("Parameter 13 is not double!", input_vz)
# Convert km -> m
input_x = input_x*1000.0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment