diff --git a/ObservationSim/Astrometry/Astrometry_util.py b/ObservationSim/Astrometry/Astrometry_util.py index 1d32cb48eebe6410b13e029637177005ddf2e64c..00f33fb3b679d613393ed93a037aa60087e48a39 100644 --- a/ObservationSim/Astrometry/Astrometry_util.py +++ b/ObservationSim/Astrometry/Astrometry_util.py @@ -107,7 +107,7 @@ def on_orbit_obs_position(input_ra_list, input_dec_list, input_pmra_list, input_ input_dec = c_double(input_dec_list[i]) input_pmra = c_double(input_pmra_list[i]) input_pmdec = c_double(input_pmdec_list[i]) - input_rv = c_double(input_rv_list[i]) + input_rv = c_double(input_rv_list[i] * 3600.) # Convert from km/s to km/h input_parallax = c_double(input_parallax_list[i]) p3 = d3(input_x, input_y, input_z) v3 = d3(input_vx, input_vy, input_vz) @@ -120,7 +120,7 @@ def on_orbit_obs_position(input_ra_list, input_dec_list, input_pmra_list, input_ DAT = c_double(37.0) output_ra = c_double(0.0) output_dec = c_double(0.0) - rs = shao.onOrbitObs(input_ra, input_dec, input_pmra, input_pmdec, input_rv, input_parallax, \ + rs = shao.onOrbitObs(input_ra, input_dec, input_parallax, input_pmra, input_pmdec, input_rv, \ input_year_c, input_month_c, input_day_c, input_hour_c, input_minute_c, input_second_c, \ DAT, byref(p3), byref(v3), \ input_year_c, input_month_c, input_day_c, input_hour_c, input_minute_c, input_second_c, \ diff --git a/ObservationSim/Config/ChipOutput.py b/ObservationSim/Config/ChipOutput.py index fb3110bb07c5c04838a23d2d7b2f71cf384a9e42..1633e04777bd5942f8c7aca4686e9a9e03a3f869 100755 --- a/ObservationSim/Config/ChipOutput.py +++ b/ObservationSim/Config/ChipOutput.py @@ -37,7 +37,7 @@ class ChipOutput(object): fh.setFormatter(formatter) self.logger.addHandler(fh) - hdr1 = "obj_ID ID_chip filter xImage yImage ra dec ra_orig dec_orig z mag obj_type " + hdr1 = "# obj_ID ID_chip filter xImage yImage ra dec ra_orig dec_orig z mag obj_type " hdr2 = "thetaR bfrac hlr_disk hlr_bulge e1_disk e2_disk e1_bulge e2_bulge g1 g2 " hdr3 = "sed_type av redden " hdr4 = "pm_ra pm_dec RV parallax\n"