From e6ff13117145c9a53081092ecf10c191a4e56607 Mon Sep 17 00:00:00 2001 From: jrob93 Date: Mon, 7 Oct 2024 12:36:43 +0100 Subject: [PATCH] update df colour files dtypes --- tests/adler/science/test_Colour.py | 1 + .../df_6098332225018_g_r_app_3_N_ref_1.csv | 30 +++++++++---------- .../df_6098332225018_g_r_app_3_N_ref_3.csv | 30 +++++++++---------- .../df_6098332225018_g_r_app_3_N_ref_5.csv | 30 +++++++++---------- 4 files changed, 46 insertions(+), 45 deletions(-) diff --git a/tests/adler/science/test_Colour.py b/tests/adler/science/test_Colour.py index ebb44ce..89813f3 100644 --- a/tests/adler/science/test_Colour.py +++ b/tests/adler/science/test_Colour.py @@ -113,3 +113,4 @@ def test_col_obs_ref( for x in list(df_col): print(x) assert_array_almost_equal(np.array(df_col[x]), np.array(df_ref[x])) + # TODO: diasourceId failing on ubuntu tests, due to float? need to save as str/int? diff --git a/tests/data/df_6098332225018_g_r_app_3_N_ref_1.csv b/tests/data/df_6098332225018_g_r_app_3_N_ref_1.csv index 2e1a24f..cb79dba 100644 --- a/tests/data/df_6098332225018_g_r_app_3_N_ref_1.csv +++ b/tests/data/df_6098332225018_g_r_app_3_N_ref_1.csv @@ -1,16 +1,16 @@ ,diaSourceId,midPointMjdTai,g-r,delta_t_g-r,g-rErr,reduced_mag_r,midPointMjdTai1_r,midPointMjdTai2_r,reduced_mag,magErr -0,5.806484744413722e+18,61485.3588,0.6294446491054693,7.961480000005395,0.13199999928474426,17.19602428734781,61477.39732,61477.39732,17.82546893645328,0.13199999928474426 -1,-1.3708475149938232e+18,61500.36601,0.4263135941635241,3.041850000001432,0.052000001072883606,17.12261631655302,61497.32416,61497.32416,17.548929910716545,0.052000001072883606 -2,-6.386483006798365e+18,61504.33885,0.42122628677132923,0.024510000002919696,0.05700000002980232,17.124690121245848,61504.31434,61504.31434,17.545916408017177,0.05700000002980232 -3,8.031997375699514e+18,61524.2819,0.4764025061950221,19.967560000004596,0.06199999898672104,17.124690121245848,61504.31434,61504.31434,17.60109262744087,0.06199999898672104 -4,7.261031060333294e+18,61525.31814,0.4042173365957282,0.024610000000393484,0.04699999839067459,17.12594053322733,61525.29353,61525.29353,17.530157869823057,0.04699999839067459 -5,-2.1009955061655716e+18,61536.27685,0.3952621411742143,4.973070000000007,0.039000000804662704,17.079219277970388,61531.30378,61531.30378,17.474481419144603,0.039000000804662704 -6,-4.613899454603302e+18,61556.37692,0.39311468820022455,0.024060000003373716,0.03200000151991844,16.86932185451553,61556.35286,61556.35286,17.262436542715754,0.03200000151991844 -7,6.671138127230664e+18,61558.20527,0.46069696316152786,1.8524099999995087,0.03200000151991844,16.86932185451553,61556.35286,61556.35286,17.330018817677058,0.03200000151991844 -8,-4.138723505372602e+18,61558.20674,0.43270389806093235,1.8538800000023912,0.029999999329447746,16.86932185451553,61556.35286,61556.35286,17.302025752576462,0.029999999329447746 -9,1.709187193968832e+18,61589.25295,0.5580614970225177,1.968010000004142,0.028999999165534973,16.528121747094456,61587.28494,61587.28494,17.086183244116974,0.028999999165534973 -10,-8.609372919476238e+18,61589.25519,0.5070543021077363,1.9702500000057626,0.032999999821186066,16.528121747094456,61587.28494,61587.28494,17.035176049202192,0.032999999821186066 -11,-7.967431354029224e+17,61590.002,0.4279341627624582,0.023699999997916166,0.04399999976158142,16.585115951758564,61589.9783,61589.9783,17.013050114521022,0.04399999976158142 -12,8.768036112299468e+18,61590.24357,0.5062322871868119,0.26526999999623513,0.02199999988079071,16.585115951758564,61589.9783,61589.9783,17.091348238945375,0.02199999988079071 -13,4.1433705206815264e+17,61616.20243,0.5004836109665014,0.19327999999950407,0.032999999821186066,16.94770017875798,61616.00915,61616.00915,17.44818378972448,0.032999999821186066 -14,-8.355039433456489e+18,61648.07405,0.4917527634000258,0.024980000001960434,0.054999999701976776,17.135632936586298,61648.04907,61648.04907,17.627385699986323,0.054999999701976776 +0,5806484744413721600,61485.3588,0.6294446491054693,7.961480000005395,0.13199999928474426,17.19602428734781,61477.39732,61477.39732,17.82546893645328,0.13199999928474426 +1,-1370847514993823232,61500.36601,0.4263135941635241,3.041850000001432,0.052000001072883606,17.12261631655302,61497.32416,61497.32416,17.548929910716545,0.052000001072883606 +2,-6386483006798364672,61504.33885,0.42122628677132923,0.024510000002919696,0.05700000002980232,17.124690121245848,61504.31434,61504.31434,17.545916408017177,0.05700000002980232 +3,8031997375699514368,61524.2819,0.4764025061950221,19.967560000004596,0.06199999898672104,17.124690121245848,61504.31434,61504.31434,17.60109262744087,0.06199999898672104 +4,7261031060333293568,61525.31814,0.4042173365957282,0.024610000000393484,0.04699999839067459,17.12594053322733,61525.29353,61525.29353,17.530157869823057,0.04699999839067459 +5,-2100995506165571584,61536.27685,0.3952621411742143,4.973070000000007,0.039000000804662704,17.079219277970388,61531.30378,61531.30378,17.474481419144603,0.039000000804662704 +6,-4613899454603301888,61556.37692,0.39311468820022455,0.024060000003373716,0.03200000151991844,16.86932185451553,61556.35286,61556.35286,17.262436542715754,0.03200000151991844 +7,6671138127230663680,61558.20527,0.46069696316152786,1.8524099999995087,0.03200000151991844,16.86932185451553,61556.35286,61556.35286,17.330018817677058,0.03200000151991844 +8,-4138723505372601856,61558.20674,0.43270389806093235,1.8538800000023912,0.029999999329447746,16.86932185451553,61556.35286,61556.35286,17.302025752576462,0.029999999329447746 +9,1709187193968832000,61589.25295,0.5580614970225177,1.968010000004142,0.028999999165534973,16.528121747094456,61587.28494,61587.28494,17.086183244116974,0.028999999165534973 +10,-8609372919476238336,61589.25519,0.5070543021077363,1.9702500000057626,0.032999999821186066,16.528121747094456,61587.28494,61587.28494,17.035176049202192,0.032999999821186066 +11,-796743135402922368,61590.002,0.4279341627624582,0.023699999997916166,0.04399999976158142,16.585115951758564,61589.9783,61589.9783,17.013050114521022,0.04399999976158142 +12,8768036112299467776,61590.24357,0.5062322871868119,0.26526999999623513,0.02199999988079071,16.585115951758564,61589.9783,61589.9783,17.091348238945375,0.02199999988079071 +13,414337052068152640,61616.20243,0.5004836109665014,0.19327999999950407,0.032999999821186066,16.94770017875798,61616.00915,61616.00915,17.44818378972448,0.032999999821186066 +14,-8355039433456489472,61648.07405,0.4917527634000258,0.024980000001960434,0.054999999701976776,17.135632936586298,61648.04907,61648.04907,17.627385699986323,0.054999999701976776 diff --git a/tests/data/df_6098332225018_g_r_app_3_N_ref_3.csv b/tests/data/df_6098332225018_g_r_app_3_N_ref_3.csv index cd3f82d..515481c 100644 --- a/tests/data/df_6098332225018_g_r_app_3_N_ref_3.csv +++ b/tests/data/df_6098332225018_g_r_app_3_N_ref_3.csv @@ -1,16 +1,16 @@ ,diaSourceId,midPointMjdTai,g-r,delta_t_g-r,g-rErr,reduced_mag_r,midPointMjdTai1_r,midPointMjdTai2_r,reduced_mag,magErr -0,5.806484744413722e+18,61485.3588,0.6646031133749091,7.961480000005395,0.1387787184136571,17.16086582307837,61469.38552,61477.39732,17.82546893645328,0.13199999928474426 -1,-1.3708475149938232e+18,61500.36601,0.3998204721333032,3.041850000001432,0.061730424176583504,17.149109438583242,61477.39732,61497.32416,17.548929910716545,0.052000001072883606 -2,-6.386483006798365e+18,61504.33885,0.41306100220004893,0.024510000002919696,0.06719475757019573,17.13285540581713,61503.35033,61504.31434,17.545916408017177,0.05700000002980232 -3,8.031997375699514e+18,61524.2819,0.4682372216237418,19.967560000004596,0.07148521046953224,17.13285540581713,61503.35033,61504.31434,17.60109262744087,0.06199999898672104 -4,7.261031060333294e+18,61525.31814,0.41017516413599964,0.024610000000393484,0.047603929903510755,17.119982705687057,61504.31434,61525.29353,17.530157869823057,0.04699999839067459 -5,-2.1009955061655716e+18,61536.27685,0.3696556612160329,4.973070000000007,0.0435304535193636,17.10482575792857,61524.3074,61531.30378,17.474481419144603,0.039000000804662704 -6,-4.613899454603302e+18,61556.37692,0.23760932081133745,0.024060000003373716,0.11609811521344783,17.024827221904417,61525.29353,61556.35286,17.262436542715754,0.03200000151991844 -7,6.671138127230664e+18,61558.20527,0.30519159577264077,1.8524099999995087,0.11609811521344783,17.024827221904417,61525.29353,61556.35286,17.330018817677058,0.03200000151991844 -8,-4.138723505372602e+18,61558.20674,0.27719853067204525,1.8538800000023912,0.11556284964731135,17.024827221904417,61525.29353,61556.35286,17.302025752576462,0.029999999329447746 -9,1.709187193968832e+18,61589.25295,0.483080272053364,1.968010000004142,0.09278157251016264,16.60310297206361,61562.31723,61587.28494,17.086183244116974,0.028999999165534973 -10,-8.609372919476238e+18,61589.25519,0.43207307713858256,1.9702500000057626,0.09410855558372905,16.60310297206361,61562.31723,61587.28494,17.035176049202192,0.032999999821186066 -11,-7.967431354029224e+17,61590.002,0.4132712746425149,0.023699999997916166,0.05221424730174361,16.599778839878507,61589.277,61589.9783,17.013050114521022,0.04399999976158142 -12,8.768036112299468e+18,61590.24357,0.4915693990668686,0.26526999999623513,0.03569772593630112,16.599778839878507,61589.277,61589.9783,17.091348238945375,0.02199999988079071 -13,4.1433705206815264e+17,61616.20243,0.5299196193560611,0.19327999999950407,0.041117958024899405,16.91826417036842,61610.20336,61616.00915,17.44818378972448,0.032999999821186066 -14,-8.355039433456489e+18,61648.07405,0.5006338385771478,0.024980000001960434,0.08026750494410353,17.126751861409176,61620.16575,61648.04907,17.627385699986323,0.054999999701976776 +0,5806484744413721600,61485.3588,0.6646031133749091,7.961480000005395,0.1387787184136571,17.16086582307837,61469.38552,61477.39732,17.82546893645328,0.13199999928474426 +1,-1370847514993823232,61500.36601,0.3998204721333032,3.041850000001432,0.061730424176583504,17.149109438583242,61477.39732,61497.32416,17.548929910716545,0.052000001072883606 +2,-6386483006798364672,61504.33885,0.41306100220004893,0.024510000002919696,0.06719475757019573,17.13285540581713,61503.35033,61504.31434,17.545916408017177,0.05700000002980232 +3,8031997375699514368,61524.2819,0.4682372216237418,19.967560000004596,0.07148521046953224,17.13285540581713,61503.35033,61504.31434,17.60109262744087,0.06199999898672104 +4,7261031060333293568,61525.31814,0.41017516413599964,0.024610000000393484,0.047603929903510755,17.119982705687057,61504.31434,61525.29353,17.530157869823057,0.04699999839067459 +5,-2100995506165571584,61536.27685,0.3696556612160329,4.973070000000007,0.0435304535193636,17.10482575792857,61524.3074,61531.30378,17.474481419144603,0.039000000804662704 +6,-4613899454603301888,61556.37692,0.23760932081133745,0.024060000003373716,0.11609811521344783,17.024827221904417,61525.29353,61556.35286,17.262436542715754,0.03200000151991844 +7,6671138127230663680,61558.20527,0.30519159577264077,1.8524099999995087,0.11609811521344783,17.024827221904417,61525.29353,61556.35286,17.330018817677058,0.03200000151991844 +8,-4138723505372601856,61558.20674,0.27719853067204525,1.8538800000023912,0.11556284964731135,17.024827221904417,61525.29353,61556.35286,17.302025752576462,0.029999999329447746 +9,1709187193968832000,61589.25295,0.483080272053364,1.968010000004142,0.09278157251016264,16.60310297206361,61562.31723,61587.28494,17.086183244116974,0.028999999165534973 +10,-8609372919476238336,61589.25519,0.43207307713858256,1.9702500000057626,0.09410855558372905,16.60310297206361,61562.31723,61587.28494,17.035176049202192,0.032999999821186066 +11,-796743135402922368,61590.002,0.4132712746425149,0.023699999997916166,0.05221424730174361,16.599778839878507,61589.277,61589.9783,17.013050114521022,0.04399999976158142 +12,8768036112299467776,61590.24357,0.4915693990668686,0.26526999999623513,0.03569772593630112,16.599778839878507,61589.277,61589.9783,17.091348238945375,0.02199999988079071 +13,414337052068152640,61616.20243,0.5299196193560611,0.19327999999950407,0.041117958024899405,16.91826417036842,61610.20336,61616.00915,17.44818378972448,0.032999999821186066 +14,-8355039433456489472,61648.07405,0.5006338385771478,0.024980000001960434,0.08026750494410353,17.126751861409176,61620.16575,61648.04907,17.627385699986323,0.054999999701976776 diff --git a/tests/data/df_6098332225018_g_r_app_3_N_ref_5.csv b/tests/data/df_6098332225018_g_r_app_3_N_ref_5.csv index 6e4384d..7b22d94 100644 --- a/tests/data/df_6098332225018_g_r_app_3_N_ref_5.csv +++ b/tests/data/df_6098332225018_g_r_app_3_N_ref_5.csv @@ -1,16 +1,16 @@ ,diaSourceId,midPointMjdTai,g-r,delta_t_g-r,g-rErr,reduced_mag_r,midPointMjdTai1_r,midPointMjdTai2_r,reduced_mag,magErr -0,5.806484744413722e+18,61485.3588,0.6646031133749091,7.961480000005395,0.1387787184136571,17.16086582307837,61469.38552,61477.39732,17.82546893645328,0.13199999928474426 -1,-1.3708475149938232e+18,61500.36601,0.40214961118913806,3.041850000001432,0.06408282905927162,17.146780299527407,61469.38552,61497.32416,17.548929910716545,0.052000001072883606 -2,-6.386483006798365e+18,61504.33885,0.411249516593152,0.024510000002919696,0.06403779113904624,17.134666891424025,61497.32416,61504.31434,17.545916408017177,0.05700000002980232 -3,8.031997375699514e+18,61524.2819,0.4664257360168449,19.967560000004596,0.0685261888982895,17.134666891424025,61497.32416,61504.31434,17.60109262744087,0.06199999898672104 -4,7.261031060333294e+18,61525.31814,0.4033930271697166,0.024610000000393484,0.05524451285749118,17.12676484265334,61503.35033,61525.29353,17.530157869823057,0.04699999839067459 -5,-2.1009955061655716e+18,61536.27685,0.3506598671390968,4.973070000000007,0.05091030826493725,17.123821552005506,61503.35078,61531.30378,17.474481419144603,0.039000000804662704 -6,-4.613899454603302e+18,61556.37692,0.20073869280633616,0.024060000003373716,0.10276020693938347,17.061697849909418,61504.31434,61556.35286,17.262436542715754,0.03200000151991844 -7,6.671138127230664e+18,61558.20527,0.2683209677676395,1.8524099999995087,0.10276020693938347,17.061697849909418,61504.31434,61556.35286,17.330018817677058,0.03200000151991844 -8,-4.138723505372602e+18,61558.20674,0.24032790266704396,1.8538800000023912,0.10215507815432866,17.061697849909418,61504.31434,61556.35286,17.302025752576462,0.029999999329447746 -9,1.709187193968832e+18,61589.25295,0.40181661190363016,1.968010000004142,0.12432445391335133,16.684366632213344,61558.23271,61587.28494,17.086183244116974,0.028999999165534973 -10,-8.609372919476238e+18,61589.25519,0.3508094169888487,1.9702500000057626,0.12531787533089708,16.684366632213344,61558.23271,61587.28494,17.035176049202192,0.032999999821186066 -11,-7.967431354029224e+17,61590.002,0.4366844446633422,0.023699999997916166,0.057457452706149006,16.57636566985768,61586.24199,61589.9783,17.013050114521022,0.04399999976158142 -12,8.768036112299468e+18,61590.24357,0.5149825690876959,0.26526999999623513,0.04300417290467258,16.57636566985768,61586.24199,61589.9783,17.091348238945375,0.02199999988079071 -13,4.1433705206815264e+17,61616.20243,0.6651807942177115,0.19327999999950407,0.17001002587811542,16.78300299550677,61589.27924,61616.00915,17.44818378972448,0.032999999821186066 -14,-8.355039433456489e+18,61648.07405,0.5616368620560408,0.024980000001960434,0.10406682109366068,17.065748837930283,61616.22684,61648.04907,17.627385699986323,0.054999999701976776 +0,5806484744413721600,61485.3588,0.6646031133749091,7.961480000005395,0.1387787184136571,17.16086582307837,61469.38552,61477.39732,17.82546893645328,0.13199999928474426 +1,-1370847514993823232,61500.36601,0.40214961118913806,3.041850000001432,0.06408282905927162,17.146780299527407,61469.38552,61497.32416,17.548929910716545,0.052000001072883606 +2,-6386483006798364672,61504.33885,0.411249516593152,0.024510000002919696,0.06403779113904624,17.134666891424025,61497.32416,61504.31434,17.545916408017177,0.05700000002980232 +3,8031997375699514368,61524.2819,0.4664257360168449,19.967560000004596,0.0685261888982895,17.134666891424025,61497.32416,61504.31434,17.60109262744087,0.06199999898672104 +4,7261031060333293568,61525.31814,0.4033930271697166,0.024610000000393484,0.05524451285749118,17.12676484265334,61503.35033,61525.29353,17.530157869823057,0.04699999839067459 +5,-2100995506165571584,61536.27685,0.3506598671390968,4.973070000000007,0.05091030826493725,17.123821552005506,61503.35078,61531.30378,17.474481419144603,0.039000000804662704 +6,-4613899454603301888,61556.37692,0.20073869280633616,0.024060000003373716,0.10276020693938347,17.061697849909418,61504.31434,61556.35286,17.262436542715754,0.03200000151991844 +7,6671138127230663680,61558.20527,0.2683209677676395,1.8524099999995087,0.10276020693938347,17.061697849909418,61504.31434,61556.35286,17.330018817677058,0.03200000151991844 +8,-4138723505372601856,61558.20674,0.24032790266704396,1.8538800000023912,0.10215507815432866,17.061697849909418,61504.31434,61556.35286,17.302025752576462,0.029999999329447746 +9,1709187193968832000,61589.25295,0.40181661190363016,1.968010000004142,0.12432445391335133,16.684366632213344,61558.23271,61587.28494,17.086183244116974,0.028999999165534973 +10,-8609372919476238336,61589.25519,0.3508094169888487,1.9702500000057626,0.12531787533089708,16.684366632213344,61558.23271,61587.28494,17.035176049202192,0.032999999821186066 +11,-796743135402922368,61590.002,0.4366844446633422,0.023699999997916166,0.057457452706149006,16.57636566985768,61586.24199,61589.9783,17.013050114521022,0.04399999976158142 +12,8768036112299467776,61590.24357,0.5149825690876959,0.26526999999623513,0.04300417290467258,16.57636566985768,61586.24199,61589.9783,17.091348238945375,0.02199999988079071 +13,414337052068152640,61616.20243,0.6651807942177115,0.19327999999950407,0.17001002587811542,16.78300299550677,61589.27924,61616.00915,17.44818378972448,0.032999999821186066 +14,-8355039433456489472,61648.07405,0.5616368620560408,0.024980000001960434,0.10406682109366068,17.065748837930283,61616.22684,61648.04907,17.627385699986323,0.054999999701976776