From fe43b09af1fbf0937da16c5bca7ddcdda5d632f0 Mon Sep 17 00:00:00 2001 From: samncorn Date: Thu, 29 Feb 2024 12:52:54 -0600 Subject: [PATCH 1/4] modified trailing loss module to assume cos(dec) term has already been applied --- src/sorcha/modules/PPTrailingLoss.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sorcha/modules/PPTrailingLoss.py b/src/sorcha/modules/PPTrailingLoss.py index 408c4681..bf5eb595 100755 --- a/src/sorcha/modules/PPTrailingLoss.py +++ b/src/sorcha/modules/PPTrailingLoss.py @@ -125,6 +125,7 @@ def PPTrailingLoss( dra_name : string, optional "oif_df" column name for object RA rate. Default = "AstRARate(deg/day)" + Assumes cos(dec) normalization has already been applied ddec_name : string, optional "oif_df" column name for object dec rate. Default = "AstDecRate(deg/day)" @@ -146,7 +147,7 @@ def PPTrailingLoss( """ dmag = calcTrailingLoss( - oif_df[dra_name] * np.cos(oif_df[dec_name] * np.pi / 180), + oif_df[dra_name], oif_df[ddec_name], oif_df[seeing_name_survey], model=model, From 4f4c4979b83faeb9c09a38ac93a4a4324e468902 Mon Sep 17 00:00:00 2001 From: samncorn Date: Thu, 29 Feb 2024 12:54:43 -0600 Subject: [PATCH 2/4] changed variable name to be more clear --- src/sorcha/modules/PPTrailingLoss.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sorcha/modules/PPTrailingLoss.py b/src/sorcha/modules/PPTrailingLoss.py index bf5eb595..2fe7eab6 100755 --- a/src/sorcha/modules/PPTrailingLoss.py +++ b/src/sorcha/modules/PPTrailingLoss.py @@ -106,7 +106,7 @@ def calcTrailingLoss( def PPTrailingLoss( oif_df, model="circularPSF", - dra_name="AstRARate(deg/day)", + dra_cosdec_name="AstRARate(deg/day)", ddec_name="AstDecRate(deg/day)", dec_name="AstDec(deg)", seeing_name_survey="seeingFwhmEff", @@ -147,7 +147,7 @@ def PPTrailingLoss( """ dmag = calcTrailingLoss( - oif_df[dra_name], + oif_df[dra_cosdec_name], oif_df[ddec_name], oif_df[seeing_name_survey], model=model, From c9a03c3de0c6d7dece5cba087f5c24202a756b72 Mon Sep 17 00:00:00 2001 From: samncorn Date: Thu, 29 Feb 2024 13:06:08 -0600 Subject: [PATCH 3/4] fixed test to account for change --- tests/sorcha/test_PPTrailingLoss.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sorcha/test_PPTrailingLoss.py b/tests/sorcha/test_PPTrailingLoss.py index 8f0d1724..39c92fc8 100644 --- a/tests/sorcha/test_PPTrailingLoss.py +++ b/tests/sorcha/test_PPTrailingLoss.py @@ -67,6 +67,9 @@ def test_PPTrailingLoss(): } ) + # add cos dec term + testoifdf[ "AstRARate(deg/day)" ] *= np.cos( testoifdf["AstDec(deg)"] * np.pi/180.0 ) + np.testing.assert_array_almost_equal(0.25893924959480374, PPTrailingLoss(oif_df=testoifdf)[5], decimal=14) # Check that we give an error for an unknown model. From 83ee8b8856d500028c7e15f564ddda3f5b64d04f Mon Sep 17 00:00:00 2001 From: samncorn Date: Thu, 29 Feb 2024 13:48:02 -0600 Subject: [PATCH 4/4] updated goldens --- demo/goldens/out_end2end.csv | 102 +++++++++++++++++------------------ 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/demo/goldens/out_end2end.csv b/demo/goldens/out_end2end.csv index 79827001..46b26365 100644 --- a/demo/goldens/out_end2end.csv +++ b/demo/goldens/out_end2end.csv @@ -16,7 +16,7 @@ ObjID,FieldMJD_TAI,fieldRA,fieldDec,AstRA(deg),AstDec(deg),AstrometricSigma(deg) 632,60328.30071,141.6678165,7.1548011,141.6340253,8.6255324,1.71e-05,z,22.738,22.574,0.134,0.133,23.006,22.962 632,60329.25405,142.8361496,7.6203923,141.5610478,8.6441977,9.4e-06,g,23.021,23.184,0.065,0.065,24.462,24.39 632,60329.27614,140.7371655,9.7972372,141.5593119,8.6446401,1.15e-05,r,22.57,22.769,0.072,0.072,23.83,23.794 -632,60340.20215,140.7268621,9.0201761,140.661383,8.8967338,1.04e-05,i,22.242,22.323,0.089,0.089,23.291,23.291 +632,60340.20215,140.7268621,9.0201761,140.661383,8.8967338,1.04e-05,i,22.243,22.323,0.089,0.089,23.291,23.291 632,60340.22599,140.7268621,9.0201761,140.6593053,8.8973202,1.37e-05,z,22.125,22.353,0.119,0.119,22.942,22.942 632,60340.23094,140.7268621,9.0201761,140.6588715,8.8974841,1.15e-05,z,22.353,22.285,0.109,0.109,23.045,23.045 632,60344.1987,140.326146,7.7906532,140.3140916,9.0038306,3.22e-05,g,22.711,22.811,0.111,0.111,23.583,23.563 @@ -46,57 +46,57 @@ ObjID,FieldMJD_TAI,fieldRA,fieldDec,AstRA(deg),AstDec(deg),AstrometricSigma(deg) 632,60435.96879,136.7133685,10.5177289,137.6512034,10.8315862,1.61e-05,i,23.111,22.998,0.127,0.127,23.584,23.576 632,60437.02296,138.9314847,10.5647336,137.7208267,10.826008,1.88e-05,r,23.335,23.077,0.12,0.12,23.777,23.757 632,60437.04671,138.9314847,10.5647336,137.7223741,10.8258241,2.98e-05,i,22.863,23.183,0.177,0.177,23.207,23.187 -39265,60347.2776,196.15222,-30.2579928,196.9513602,-31.5022468,2.8e-06,r,18.418,18.413,0.003,0.003,24.037,24.0 -39265,60352.23648,196.3355205,-32.3333,196.4659201,-31.8646372,2.8e-06,r,18.379,18.369,0.002,0.002,24.407,24.407 -39265,60352.26156,196.3355205,-32.3333,196.4630603,-31.8663718,2.8e-06,i,18.189,18.183,0.003,0.003,23.939,23.939 -39265,60355.27522,196.7281447,-30.4743488,196.107271,-32.0612414,2.8e-06,g,19.0,18.995,0.003,0.003,24.853,24.771 -39265,60355.30005,196.7281447,-30.4743488,196.104048,-32.0627851,2.8e-06,r,18.352,18.343,0.002,0.002,24.432,24.35 -39265,60357.22379,196.3576384,-32.7841511,195.8535995,-32.1762697,2.8e-06,i,18.143,18.135,0.003,0.003,23.658,23.657 -39265,60370.38399,192.6418095,-32.5378881,193.6751065,-32.7017713,2.8e-06,i,18.019,18.009,0.004,0.004,23.121,23.116 -39265,60370.39696,192.6418095,-32.5378881,193.672536,-32.702038,2.9e-06,z,18.077,18.065,0.006,0.006,22.52,22.515 -39265,60371.20617,195.2225231,-33.5546893,193.5149431,-32.7186972,2.8e-06,i,18.015,18.009,0.004,0.004,23.143,23.065 -39265,60371.23081,195.2225231,-33.5546893,193.5099741,-32.7191961,2.8e-06,z,18.071,18.054,0.005,0.005,22.882,22.803 -39265,60371.39142,195.2225231,-33.5546893,193.4775272,-32.7222119,2.8e-06,i,18.015,18.003,0.004,0.004,23.258,23.175 -39265,60373.20776,193.6570145,-33.5014042,193.1122121,-32.7514399,2.8e-06,r,18.188,18.181,0.003,0.003,24.033,24.028 -39265,60373.23256,193.6570145,-33.5014042,193.107017,-32.7517903,2.8e-06,i,17.997,17.98,0.003,0.003,23.627,23.622 -39265,60374.34702,192.1142191,-34.1159491,192.87567,-32.7646366,2.8e-06,i,17.996,17.975,0.003,0.003,23.839,23.79 -39265,60374.37338,192.1142191,-34.1159491,192.8700495,-32.7648679,2.8e-06,z,18.03,18.021,0.004,0.004,23.095,23.047 -39265,60376.33574,192.885252,-33.56991,192.452841,-32.7780256,2.8e-06,g,18.811,18.794,0.002,0.002,24.822,24.817 -39265,60376.35645,192.885252,-33.56991,192.4482757,-32.7780797,2.8e-06,r,18.165,18.142,0.002,0.002,24.374,24.369 -39265,60377.36057,192.8842668,-33.5905256,192.2296042,-32.7800537,2.8e-06,r,18.148,18.134,0.003,0.003,23.995,23.987 -39265,60381.36238,192.8817522,-32.219521,191.327553,-32.7558832,2.8e-06,i,17.939,17.905,0.002,0.002,23.902,23.865 -39265,60387.30118,189.3286377,-33.5336428,189.915564,-32.6246559,2.8e-06,z,17.938,17.908,0.003,0.003,23.337,23.327 -39265,60387.32523,189.3286377,-33.5336428,189.90961,-32.623869,2.8e-06,i,17.874,17.856,0.003,0.003,23.48,23.47 -39265,60397.31722,186.1196704,-31.8560311,187.4224763,-32.1484823,2.9e-06,i,17.811,17.793,0.006,0.005,22.32,22.305 -39265,60397.34108,186.1196704,-31.8560311,187.4163987,-32.1469452,2.8e-06,z,17.87,17.852,0.005,0.005,22.586,22.572 -39265,60398.32359,186.4026034,-30.9279057,187.1695958,-32.0836358,3.2e-06,z,17.844,17.836,0.007,0.007,21.96,21.932 -39265,60402.27963,187.5349786,-32.4817212,186.1800137,-31.8006032,2.8e-06,z,17.869,17.832,0.003,0.003,23.313,23.283 -39265,60403.2865,187.334917,-30.7222495,185.9300269,-31.7216093,2.8e-06,i,17.798,17.776,0.003,0.003,23.679,23.619 -39265,60406.0597,185.645687,-30.2346361,185.2489407,-31.4902706,2.8e-06,r,18.0,17.968,0.002,0.002,24.317,24.29 -39265,60407.2205,185.4166348,-30.6409676,184.9661919,-31.3877593,2.8e-06,g,18.646,18.623,0.002,0.002,24.81,24.807 -39265,60407.24474,185.4166348,-30.6409676,184.9602174,-31.385554,2.8e-06,r,17.996,17.967,0.002,0.002,24.258,24.255 -39265,60407.27341,185.4166348,-30.6409676,184.9531745,-31.3829526,2.8e-06,r,18.0,17.971,0.002,0.002,24.335,24.331 -39265,60408.11825,183.5202571,-31.2328893,184.7501594,-31.3062049,2.8e-06,r,17.99,17.969,0.002,0.002,24.147,24.136 -39265,60411.22259,183.7822018,-31.9683561,184.0138919,-31.0101123,2.8e-06,g,18.666,18.629,0.002,0.002,24.927,24.919 -39265,60411.24676,183.7822018,-31.9683561,184.0081547,-31.0077002,2.8e-06,r,18.006,17.978,0.002,0.002,24.312,24.304 -39265,60413.102,182.1016585,-29.847999,183.5800849,-30.8210648,2.8e-06,r,18.02,17.993,0.002,0.002,24.397,24.329 -39265,60414.22197,181.6621325,-31.2405931,183.3252066,-30.7051429,2.9e-06,r,18.002,17.997,0.003,0.003,23.376,23.323 -39265,60414.24588,181.6621325,-31.2405931,183.3197216,-30.7026243,3e-06,i,17.812,17.814,0.004,0.004,22.756,22.703 -39265,60424.21651,182.4994442,-29.2493868,181.2334015,-29.5863078,3e-06,i,17.913,17.89,0.007,0.007,22.084,22.069 -39265,60424.24032,182.4994442,-29.2493868,181.2287751,-29.583469,3.1e-06,z,17.948,17.95,0.008,0.008,21.931,21.916 -39265,60425.04489,181.3900564,-28.9727969,181.0769697,-29.4884138,2.8e-06,z,17.98,17.966,0.005,0.005,22.651,22.651 -39265,60427.22296,181.6882319,-29.3941104,180.6761391,-29.2283327,2.9e-06,z,17.984,17.975,0.006,0.006,22.427,22.422 -39265,60428.18435,180.4223214,-30.2871125,180.5058519,-29.112622,2.8e-06,z,18.004,17.992,0.004,0.004,22.9,22.883 -39265,60431.00232,181.5037149,-28.7645167,180.0295552,-28.7707871,2.9e-06,g,18.826,18.821,0.003,0.003,24.149,24.123 -39265,60431.04718,181.5037149,-28.7645167,180.0220662,-28.7653501,2.8e-06,r,18.174,18.164,0.003,0.003,23.848,23.822 -39265,60436.11444,178.1673749,-27.4232305,179.2527005,-28.1462397,2.8e-06,r,18.249,18.227,0.002,0.002,24.397,24.379 -39265,60436.13866,178.1673749,-27.4232305,179.249202,-28.1432663,2.8e-06,i,18.057,18.039,0.003,0.002,23.946,23.928 +39265,60347.2776,196.15222,-30.2579928,196.9513602,-31.5022468,2.8e-06,r,18.419,18.413,0.003,0.003,24.037,24.0 +39265,60352.23648,196.3355205,-32.3333,196.4659201,-31.8646372,2.8e-06,r,18.382,18.369,0.002,0.002,24.407,24.407 +39265,60352.26156,196.3355205,-32.3333,196.4630603,-31.8663718,2.8e-06,i,18.192,18.183,0.003,0.003,23.939,23.939 +39265,60355.27522,196.7281447,-30.4743488,196.107271,-32.0612414,2.8e-06,g,19.002,18.995,0.003,0.003,24.853,24.771 +39265,60355.30005,196.7281447,-30.4743488,196.104048,-32.0627851,2.8e-06,r,18.355,18.343,0.002,0.002,24.432,24.35 +39265,60357.22379,196.3576384,-32.7841511,195.8535995,-32.1762697,2.8e-06,i,18.145,18.135,0.003,0.003,23.658,23.657 +39265,60370.38399,192.6418095,-32.5378881,193.6751065,-32.7017713,2.8e-06,i,18.024,18.009,0.004,0.004,23.121,23.116 +39265,60370.39696,192.6418095,-32.5378881,193.672536,-32.702038,2.9e-06,z,18.082,18.065,0.006,0.006,22.52,22.515 +39265,60371.20617,195.2225231,-33.5546893,193.5149431,-32.7186972,2.8e-06,i,18.019,18.009,0.004,0.004,23.143,23.065 +39265,60371.23081,195.2225231,-33.5546893,193.5099741,-32.7191961,2.8e-06,z,18.076,18.054,0.005,0.005,22.882,22.803 +39265,60371.39142,195.2225231,-33.5546893,193.4775272,-32.7222119,2.8e-06,i,18.019,18.003,0.004,0.004,23.258,23.175 +39265,60373.20776,193.6570145,-33.5014042,193.1122121,-32.7514399,2.8e-06,r,18.194,18.181,0.003,0.003,24.033,24.028 +39265,60373.23256,193.6570145,-33.5014042,193.107017,-32.7517903,2.8e-06,i,18.003,17.98,0.003,0.003,23.627,23.622 +39265,60374.34702,192.1142191,-34.1159491,192.87567,-32.7646366,2.8e-06,i,18.003,17.975,0.003,0.003,23.839,23.79 +39265,60374.37338,192.1142191,-34.1159491,192.8700495,-32.7648679,2.8e-06,z,18.036,18.021,0.004,0.004,23.095,23.047 +39265,60376.33574,192.885252,-33.56991,192.452841,-32.7780256,2.8e-06,g,18.819,18.794,0.002,0.002,24.822,24.817 +39265,60376.35645,192.885252,-33.56991,192.4482757,-32.7780797,2.8e-06,r,18.173,18.142,0.002,0.002,24.374,24.369 +39265,60377.36057,192.8842668,-33.5905256,192.2296042,-32.7800537,2.8e-06,r,18.152,18.134,0.003,0.003,23.995,23.987 +39265,60381.36238,192.8817522,-32.219521,191.327553,-32.7558832,2.8e-06,i,17.949,17.905,0.002,0.002,23.902,23.865 +39265,60387.30118,189.3286377,-33.5336428,189.915564,-32.6246559,2.8e-06,z,17.949,17.908,0.003,0.003,23.337,23.327 +39265,60387.32523,189.3286377,-33.5336428,189.90961,-32.623869,2.8e-06,i,17.879,17.856,0.003,0.003,23.48,23.47 +39265,60397.31722,186.1196704,-31.8560311,187.4224763,-32.1484823,2.9e-06,i,17.815,17.793,0.006,0.005,22.32,22.305 +39265,60397.34108,186.1196704,-31.8560311,187.4163987,-32.1469452,2.8e-06,z,17.88,17.852,0.005,0.005,22.586,22.572 +39265,60398.32359,186.4026034,-30.9279057,187.1695958,-32.0836358,3.2e-06,z,17.847,17.836,0.007,0.007,21.96,21.932 +39265,60402.27963,187.5349786,-32.4817212,186.1800137,-31.8006032,2.8e-06,z,17.881,17.832,0.003,0.003,23.313,23.283 +39265,60403.2865,187.334917,-30.7222495,185.9300269,-31.7216093,2.8e-06,i,17.806,17.776,0.003,0.003,23.679,23.619 +39265,60406.0597,185.645687,-30.2346361,185.2489407,-31.4902706,2.8e-06,r,18.009,17.968,0.002,0.002,24.317,24.29 +39265,60407.2205,185.4166348,-30.6409676,184.9661919,-31.3877593,2.8e-06,g,18.654,18.623,0.002,0.002,24.81,24.807 +39265,60407.24474,185.4166348,-30.6409676,184.9602174,-31.385554,2.8e-06,r,18.004,17.967,0.002,0.002,24.258,24.255 +39265,60407.27341,185.4166348,-30.6409676,184.9531745,-31.3829526,2.8e-06,r,18.009,17.971,0.002,0.002,24.335,24.331 +39265,60408.11825,183.5202571,-31.2328893,184.7501594,-31.3062049,2.8e-06,r,17.996,17.969,0.002,0.002,24.147,24.136 +39265,60411.22259,183.7822018,-31.9683561,184.0138919,-31.0101123,2.8e-06,g,18.676,18.629,0.002,0.002,24.927,24.919 +39265,60411.24676,183.7822018,-31.9683561,184.0081547,-31.0077002,2.8e-06,r,18.014,17.978,0.002,0.002,24.312,24.304 +39265,60413.102,182.1016585,-29.847999,183.5800849,-30.8210648,2.8e-06,r,18.028,17.993,0.002,0.002,24.397,24.329 +39265,60414.22197,181.6621325,-31.2405931,183.3252066,-30.7051429,2.9e-06,r,18.003,17.997,0.003,0.003,23.376,23.323 +39265,60414.24588,181.6621325,-31.2405931,183.3197216,-30.7026243,3e-06,i,17.813,17.814,0.004,0.004,22.756,22.703 +39265,60424.21651,182.4994442,-29.2493868,181.2334015,-29.5863078,3e-06,i,17.915,17.89,0.007,0.007,22.084,22.069 +39265,60424.24032,182.4994442,-29.2493868,181.2287751,-29.583469,3.1e-06,z,17.95,17.95,0.008,0.008,21.931,21.916 +39265,60425.04489,181.3900564,-28.9727969,181.0769697,-29.4884138,2.8e-06,z,17.985,17.966,0.005,0.005,22.651,22.651 +39265,60427.22296,181.6882319,-29.3941104,180.6761391,-29.2283327,2.9e-06,z,17.986,17.975,0.006,0.006,22.427,22.422 +39265,60428.18435,180.4223214,-30.2871125,180.5058519,-29.112622,2.8e-06,z,18.008,17.992,0.004,0.004,22.9,22.883 +39265,60431.00232,181.5037149,-28.7645167,180.0295552,-28.7707871,2.9e-06,g,18.827,18.821,0.003,0.003,24.149,24.123 +39265,60431.04718,181.5037149,-28.7645167,180.0220662,-28.7653501,2.8e-06,r,18.175,18.164,0.003,0.003,23.848,23.822 +39265,60436.11444,178.1673749,-27.4232305,179.2527005,-28.1462397,2.8e-06,r,18.252,18.227,0.002,0.002,24.397,24.379 +39265,60436.13866,178.1673749,-27.4232305,179.249202,-28.1432663,2.8e-06,i,18.059,18.039,0.003,0.002,23.946,23.928 39265,60452.12429,176.4481133,-25.0336079,177.6061295,-26.2636459,2.9e-06,z,18.291,18.286,0.007,0.007,22.517,22.447 39265,60461.07326,178.4695629,-25.9864001,177.2011074,-25.3316926,2.8e-06,i,18.353,18.341,0.004,0.004,23.445,23.418 -39265,60461.0975,178.4695629,-25.9864001,177.2004129,-25.3293086,2.9e-06,z,18.385,18.392,0.006,0.006,22.856,22.828 -39265,60487.02792,178.9473228,-24.7543595,177.886194,-23.3954052,2.8e-06,z,18.669,18.66,0.006,0.006,23.218,23.138 +39265,60461.0975,178.4695629,-25.9864001,177.2004129,-25.3293086,2.9e-06,z,18.386,18.392,0.006,0.006,22.856,22.828 +39265,60487.02792,178.9473228,-24.7543595,177.886194,-23.3954052,2.8e-06,z,18.67,18.66,0.006,0.006,23.218,23.138 39265,60487.05206,178.9473228,-24.7543595,177.8879108,-23.394166,2.8e-06,i,18.618,18.617,0.004,0.004,23.56,23.48 -39265,60490.05966,178.5100284,-24.1976256,178.1222201,-23.2514592,2.8e-06,i,18.647,18.629,0.004,0.004,23.491,23.481 +39265,60490.05966,178.5100284,-24.1976256,178.1222201,-23.2514592,2.8e-06,i,18.648,18.629,0.004,0.004,23.491,23.481 39265,60509.9941,181.8585333,-23.5909222,180.3263614,-22.7302664,5.8e-06,z,18.846,18.859,0.018,0.018,21.779,21.701 387449,60359.35523,208.4228825,3.2913902,209.5785341,2.9264822,1.37e-05,r,23.812,23.783,0.132,0.131,24.413,24.394 387449,60371.34231,208.8200039,4.9460032,209.4759214,3.9958573,5.16e-05,z,23.012,23.733,0.367,0.365,22.867,22.852 @@ -117,8 +117,8 @@ ObjID,FieldMJD_TAI,fieldRA,fieldDec,AstRA(deg),AstDec(deg),AstrometricSigma(deg) 387449,60406.2427,203.697998,7.108249,204.9545427,7.5774276,2.93e-05,g,23.792,23.707,0.152,0.151,24.14,24.111 387449,60410.26785,204.6843632,8.5256584,204.1886492,7.907984,1.13e-05,r,23.202,23.262,0.097,0.095,24.198,24.195 387449,60410.29163,204.6843632,8.5256584,204.1839243,7.9098316,1.5e-05,i,23.13,23.151,0.134,0.131,23.72,23.718 -387449,60412.21618,202.1961898,7.8606109,203.8149055,8.0541251,1.28e-05,r,23.358,23.21,0.106,0.104,24.172,24.102 -387449,60412.21842,205.1318972,8.585858,203.8144602,8.0542985,1.21e-05,r,23.378,23.37,0.102,0.1,24.191,24.154 +387449,60412.21618,202.1961898,7.8606109,203.8149055,8.0541251,1.28e-05,r,23.359,23.21,0.106,0.104,24.172,24.102 +387449,60412.21842,205.1318972,8.585858,203.8144602,8.0542985,1.21e-05,r,23.379,23.37,0.102,0.1,24.191,24.154 387449,60412.2402,202.1961898,7.8606109,203.8101585,8.0558188,2.41e-05,i,23.297,23.271,0.168,0.166,23.507,23.438 387449,60412.24244,205.1318972,8.585858,203.8096941,8.0560406,2.19e-05,i,22.963,23.262,0.158,0.156,23.546,23.51 387449,60434.11074,200.8476207,8.3288768,199.9454037,8.9398422,3.25e-05,r,23.761,23.472,0.184,0.183,23.778,23.767