From c0ad97e9ddc9683d40072904d322b1f875ba0d28 Mon Sep 17 00:00:00 2001 From: michealroberts Date: Tue, 26 Nov 2024 16:50:38 +0000 Subject: [PATCH] feat: add epoch support to AddObservationEntry() in @observerly/iris feat: add epoch support to AddObservationEntry() in @observerly/iris --- coverage.txt | 282 +++++++++++++++++++++--------------------- pkg/fits/fits.go | 14 ++- pkg/fits/fits_test.go | 11 +- 3 files changed, 158 insertions(+), 149 deletions(-) diff --git a/coverage.txt b/coverage.txt index f4c15dd..74461cb 100644 --- a/coverage.txt +++ b/coverage.txt @@ -205,32 +205,6 @@ github.com/observerly/iris/pkg/frames/light.go:74.2,120.8 7 1 github.com/observerly/iris/pkg/frames/master.go:17.79,21.16 2 1 github.com/observerly/iris/pkg/frames/master.go:21.16,23.3 1 0 github.com/observerly/iris/pkg/frames/master.go:26.2,35.8 2 1 -github.com/observerly/iris/pkg/palette/palette.go:40.61,56.12 8 1 -github.com/observerly/iris/pkg/palette/palette.go:56.12,63.17 5 1 -github.com/observerly/iris/pkg/palette/palette.go:63.17,65.4 1 0 -github.com/observerly/iris/pkg/palette/palette.go:67.3,67.9 1 1 -github.com/observerly/iris/pkg/palette/palette.go:71.2,71.12 1 1 -github.com/observerly/iris/pkg/palette/palette.go:71.12,78.17 5 1 -github.com/observerly/iris/pkg/palette/palette.go:78.17,80.4 1 0 -github.com/observerly/iris/pkg/palette/palette.go:82.3,82.9 1 1 -github.com/observerly/iris/pkg/palette/palette.go:86.2,86.12 1 1 -github.com/observerly/iris/pkg/palette/palette.go:86.12,93.17 5 1 -github.com/observerly/iris/pkg/palette/palette.go:93.17,95.4 1 0 -github.com/observerly/iris/pkg/palette/palette.go:97.3,97.9 1 1 -github.com/observerly/iris/pkg/palette/palette.go:100.2,100.12 1 1 -github.com/observerly/iris/pkg/palette/palette.go:100.12,106.3 5 1 -github.com/observerly/iris/pkg/palette/palette.go:108.2,108.32 1 1 -github.com/observerly/iris/pkg/palette/palette.go:114.73,120.28 3 6 -github.com/observerly/iris/pkg/palette/palette.go:120.28,121.28 1 12 -github.com/observerly/iris/pkg/palette/palette.go:121.28,123.24 1 36 -github.com/observerly/iris/pkg/palette/palette.go:123.24,125.5 1 0 -github.com/observerly/iris/pkg/palette/palette.go:127.4,127.30 1 36 -github.com/observerly/iris/pkg/palette/palette.go:131.3,133.25 2 12 -github.com/observerly/iris/pkg/palette/palette.go:137.2,137.20 1 6 -github.com/observerly/iris/pkg/palette/palette.go:137.20,139.3 1 0 -github.com/observerly/iris/pkg/palette/palette.go:141.2,143.16 2 6 -github.com/observerly/iris/pkg/palette/palette.go:143.16,145.3 1 0 -github.com/observerly/iris/pkg/palette/palette.go:147.2,147.15 1 6 github.com/observerly/iris/pkg/qsort/qsort.go:16.41,26.6 6 18 github.com/observerly/iris/pkg/qsort/qsort.go:26.6,27.7 1 25 github.com/observerly/iris/pkg/qsort/qsort.go:27.7,29.21 2 48 @@ -265,6 +239,32 @@ github.com/observerly/iris/pkg/qsort/qsort.go:127.2,129.27 2 2 github.com/observerly/iris/pkg/qsort/qsort.go:129.27,130.19 1 7 github.com/observerly/iris/pkg/qsort/qsort.go:130.19,132.4 1 6 github.com/observerly/iris/pkg/qsort/qsort.go:136.2,136.30 1 2 +github.com/observerly/iris/pkg/palette/palette.go:40.61,56.12 8 1 +github.com/observerly/iris/pkg/palette/palette.go:56.12,63.17 5 1 +github.com/observerly/iris/pkg/palette/palette.go:63.17,65.4 1 0 +github.com/observerly/iris/pkg/palette/palette.go:67.3,67.9 1 1 +github.com/observerly/iris/pkg/palette/palette.go:71.2,71.12 1 1 +github.com/observerly/iris/pkg/palette/palette.go:71.12,78.17 5 1 +github.com/observerly/iris/pkg/palette/palette.go:78.17,80.4 1 0 +github.com/observerly/iris/pkg/palette/palette.go:82.3,82.9 1 1 +github.com/observerly/iris/pkg/palette/palette.go:86.2,86.12 1 1 +github.com/observerly/iris/pkg/palette/palette.go:86.12,93.17 5 1 +github.com/observerly/iris/pkg/palette/palette.go:93.17,95.4 1 0 +github.com/observerly/iris/pkg/palette/palette.go:97.3,97.9 1 1 +github.com/observerly/iris/pkg/palette/palette.go:100.2,100.12 1 1 +github.com/observerly/iris/pkg/palette/palette.go:100.12,106.3 5 1 +github.com/observerly/iris/pkg/palette/palette.go:108.2,108.32 1 1 +github.com/observerly/iris/pkg/palette/palette.go:114.73,120.28 3 6 +github.com/observerly/iris/pkg/palette/palette.go:120.28,121.28 1 12 +github.com/observerly/iris/pkg/palette/palette.go:121.28,123.24 1 36 +github.com/observerly/iris/pkg/palette/palette.go:123.24,125.5 1 0 +github.com/observerly/iris/pkg/palette/palette.go:127.4,127.30 1 36 +github.com/observerly/iris/pkg/palette/palette.go:131.3,133.25 2 12 +github.com/observerly/iris/pkg/palette/palette.go:137.2,137.20 1 6 +github.com/observerly/iris/pkg/palette/palette.go:137.20,139.3 1 0 +github.com/observerly/iris/pkg/palette/palette.go:141.2,143.16 2 6 +github.com/observerly/iris/pkg/palette/palette.go:143.16,145.3 1 0 +github.com/observerly/iris/pkg/palette/palette.go:147.2,147.15 1 6 github.com/observerly/iris/pkg/utils/array.go:22.57,23.22 1 2 github.com/observerly/iris/pkg/utils/array.go:23.22,25.3 1 1 github.com/observerly/iris/pkg/utils/array.go:27.2,29.19 2 1 @@ -398,15 +398,15 @@ github.com/observerly/iris/pkg/statistics/stats.go:207.24,212.3 3 770008 github.com/observerly/iris/pkg/statistics/stats.go:216.2,218.11 2 5 github.com/observerly/iris/pkg/statistics/stats.go:234.100,240.24 3 3 github.com/observerly/iris/pkg/statistics/stats.go:240.24,242.7 2 769000 -github.com/observerly/iris/pkg/statistics/stats.go:242.7,245.43 2 769111 +github.com/observerly/iris/pkg/statistics/stats.go:242.7,245.43 2 769110 github.com/observerly/iris/pkg/statistics/stats.go:245.43,246.10 1 769000 github.com/observerly/iris/pkg/statistics/stats.go:250.3,250.16 1 769000 github.com/observerly/iris/pkg/statistics/stats.go:253.2,255.15 2 3 github.com/observerly/iris/pkg/statistics/stats.go:266.96,272.24 3 3 github.com/observerly/iris/pkg/statistics/stats.go:272.24,275.7 2 769000 -github.com/observerly/iris/pkg/statistics/stats.go:275.7,279.43 3 769194 -github.com/observerly/iris/pkg/statistics/stats.go:279.43,280.13 1 127 -github.com/observerly/iris/pkg/statistics/stats.go:283.4,284.45 2 769067 +github.com/observerly/iris/pkg/statistics/stats.go:275.7,279.43 3 769146 +github.com/observerly/iris/pkg/statistics/stats.go:279.43,280.13 1 98 +github.com/observerly/iris/pkg/statistics/stats.go:283.4,284.45 2 769048 github.com/observerly/iris/pkg/statistics/stats.go:284.45,285.10 1 769000 github.com/observerly/iris/pkg/statistics/stats.go:289.3,289.50 1 769000 github.com/observerly/iris/pkg/statistics/stats.go:294.2,296.11 2 3 @@ -414,74 +414,74 @@ github.com/observerly/iris/pkg/statistics/stats.go:305.72,316.20 6 1 github.com/observerly/iris/pkg/statistics/stats.go:316.20,330.107 6 2 github.com/observerly/iris/pkg/statistics/stats.go:330.107,336.4 3 1 github.com/observerly/iris/pkg/statistics/stats.go:338.3,338.38 1 1 -github.com/observerly/iris/pkg/fits/fits.go:87.82,106.2 5 14 -github.com/observerly/iris/pkg/fits/fits.go:111.53,118.16 3 1 -github.com/observerly/iris/pkg/fits/fits.go:118.16,120.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:122.2,122.10 1 1 -github.com/observerly/iris/pkg/fits/fits.go:129.107,135.20 3 9 -github.com/observerly/iris/pkg/fits/fits.go:135.20,137.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:139.2,165.3 6 9 -github.com/observerly/iris/pkg/fits/fits.go:170.82,217.2 16 1 -github.com/observerly/iris/pkg/fits/fits.go:221.73,232.2 4 1 -github.com/observerly/iris/pkg/fits/fits.go:236.90,244.2 4 1 -github.com/observerly/iris/pkg/fits/fits.go:248.51,250.14 1 1 -github.com/observerly/iris/pkg/fits/fits.go:250.14,252.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:255.2,257.16 2 1 -github.com/observerly/iris/pkg/fits/fits.go:257.16,259.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:262.2,267.21 3 1 -github.com/observerly/iris/pkg/fits/fits.go:273.45,277.16 2 3 -github.com/observerly/iris/pkg/fits/fits.go:277.16,279.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:282.2,282.105 1 3 -github.com/observerly/iris/pkg/fits/fits.go:282.105,284.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:286.2,288.9 2 3 -github.com/observerly/iris/pkg/fits/fits.go:288.9,290.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:293.2,293.25 1 3 -github.com/observerly/iris/pkg/fits/fits.go:293.25,295.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:297.2,303.9 4 3 -github.com/observerly/iris/pkg/fits/fits.go:303.9,305.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:307.2,311.9 3 3 -github.com/observerly/iris/pkg/fits/fits.go:311.9,313.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:316.2,320.9 3 3 -github.com/observerly/iris/pkg/fits/fits.go:320.9,322.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:325.2,335.9 5 3 -github.com/observerly/iris/pkg/fits/fits.go:335.9,337.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:339.2,343.16 3 3 -github.com/observerly/iris/pkg/fits/fits.go:343.16,345.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:347.2,349.12 2 3 -github.com/observerly/iris/pkg/fits/fits.go:355.60,361.16 3 4 -github.com/observerly/iris/pkg/fits/fits.go:361.16,363.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:366.2,368.16 2 4 -github.com/observerly/iris/pkg/fits/fits.go:368.16,370.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:372.2,372.17 1 4 -github.com/observerly/iris/pkg/fits/fits.go:378.90,381.16 2 5 -github.com/observerly/iris/pkg/fits/fits.go:381.16,383.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:386.2,390.18 3 5 -github.com/observerly/iris/pkg/fits/fits.go:390.18,393.35 2 5 -github.com/observerly/iris/pkg/fits/fits.go:393.35,395.4 1 9920 -github.com/observerly/iris/pkg/fits/fits.go:397.3,399.17 2 5 -github.com/observerly/iris/pkg/fits/fits.go:399.17,401.4 1 0 -github.com/observerly/iris/pkg/fits/fits.go:404.2,404.17 1 5 -github.com/observerly/iris/pkg/fits/fits.go:411.75,419.16 4 3 -github.com/observerly/iris/pkg/fits/fits.go:419.16,421.3 1 0 -github.com/observerly/iris/pkg/fits/fits.go:423.2,423.16 1 3 -github.com/observerly/iris/pkg/fits/fits.go:426.11,427.44 1 3 -github.com/observerly/iris/pkg/fits/fits.go:430.11,432.63 1 0 -github.com/observerly/iris/pkg/fits/fits.go:435.9,437.60 1 0 -github.com/observerly/iris/pkg/fits/fits.go:440.10,442.61 1 0 -github.com/observerly/iris/pkg/fits/fits.go:445.10,447.61 1 0 -github.com/observerly/iris/pkg/fits/fits.go:450.10,452.61 1 0 -github.com/observerly/iris/pkg/fits/fits.go:455.2,455.18 1 3 -github.com/observerly/iris/pkg/fits/fits.go:461.74,463.2 1 3 +github.com/observerly/iris/pkg/fits/fits.go:88.82,107.2 5 14 +github.com/observerly/iris/pkg/fits/fits.go:112.53,119.16 3 1 +github.com/observerly/iris/pkg/fits/fits.go:119.16,121.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:123.2,123.10 1 1 +github.com/observerly/iris/pkg/fits/fits.go:130.107,136.20 3 9 +github.com/observerly/iris/pkg/fits/fits.go:136.20,138.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:140.2,166.3 6 9 +github.com/observerly/iris/pkg/fits/fits.go:171.82,221.2 17 1 +github.com/observerly/iris/pkg/fits/fits.go:225.73,236.2 4 1 +github.com/observerly/iris/pkg/fits/fits.go:240.90,248.2 4 1 +github.com/observerly/iris/pkg/fits/fits.go:252.51,254.14 1 1 +github.com/observerly/iris/pkg/fits/fits.go:254.14,256.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:259.2,261.16 2 1 +github.com/observerly/iris/pkg/fits/fits.go:261.16,263.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:266.2,271.21 3 1 +github.com/observerly/iris/pkg/fits/fits.go:277.45,281.16 2 3 +github.com/observerly/iris/pkg/fits/fits.go:281.16,283.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:286.2,286.105 1 3 +github.com/observerly/iris/pkg/fits/fits.go:286.105,288.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:290.2,292.9 2 3 +github.com/observerly/iris/pkg/fits/fits.go:292.9,294.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:297.2,297.25 1 3 +github.com/observerly/iris/pkg/fits/fits.go:297.25,299.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:301.2,307.9 4 3 +github.com/observerly/iris/pkg/fits/fits.go:307.9,309.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:311.2,315.9 3 3 +github.com/observerly/iris/pkg/fits/fits.go:315.9,317.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:320.2,324.9 3 3 +github.com/observerly/iris/pkg/fits/fits.go:324.9,326.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:329.2,339.9 5 3 +github.com/observerly/iris/pkg/fits/fits.go:339.9,341.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:343.2,347.16 3 3 +github.com/observerly/iris/pkg/fits/fits.go:347.16,349.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:351.2,353.12 2 3 +github.com/observerly/iris/pkg/fits/fits.go:359.60,365.16 3 4 +github.com/observerly/iris/pkg/fits/fits.go:365.16,367.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:370.2,372.16 2 4 +github.com/observerly/iris/pkg/fits/fits.go:372.16,374.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:376.2,376.17 1 4 +github.com/observerly/iris/pkg/fits/fits.go:382.90,385.16 2 5 +github.com/observerly/iris/pkg/fits/fits.go:385.16,387.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:390.2,394.18 3 5 +github.com/observerly/iris/pkg/fits/fits.go:394.18,397.35 2 5 +github.com/observerly/iris/pkg/fits/fits.go:397.35,399.4 1 9920 +github.com/observerly/iris/pkg/fits/fits.go:401.3,403.17 2 5 +github.com/observerly/iris/pkg/fits/fits.go:403.17,405.4 1 0 +github.com/observerly/iris/pkg/fits/fits.go:408.2,408.17 1 5 +github.com/observerly/iris/pkg/fits/fits.go:415.75,423.16 4 3 +github.com/observerly/iris/pkg/fits/fits.go:423.16,425.3 1 0 +github.com/observerly/iris/pkg/fits/fits.go:427.2,427.16 1 3 +github.com/observerly/iris/pkg/fits/fits.go:430.11,431.44 1 3 +github.com/observerly/iris/pkg/fits/fits.go:434.11,436.63 1 0 +github.com/observerly/iris/pkg/fits/fits.go:439.9,441.60 1 0 +github.com/observerly/iris/pkg/fits/fits.go:444.10,446.61 1 0 +github.com/observerly/iris/pkg/fits/fits.go:449.10,451.61 1 0 +github.com/observerly/iris/pkg/fits/fits.go:454.10,456.61 1 0 +github.com/observerly/iris/pkg/fits/fits.go:459.2,459.18 1 3 +github.com/observerly/iris/pkg/fits/fits.go:465.74,467.2 1 3 github.com/observerly/iris/pkg/fits/header.go:80.72,113.2 10 28 -github.com/observerly/iris/pkg/fits/header.go:141.42,142.37 1 118 -github.com/observerly/iris/pkg/fits/header.go:142.37,143.50 1 1626 +github.com/observerly/iris/pkg/fits/header.go:141.42,142.37 1 120 +github.com/observerly/iris/pkg/fits/header.go:142.37,143.50 1 1660 github.com/observerly/iris/pkg/fits/header.go:143.50,145.4 1 29 -github.com/observerly/iris/pkg/fits/header.go:147.2,147.56 1 89 -github.com/observerly/iris/pkg/fits/header.go:153.79,154.27 1 199 +github.com/observerly/iris/pkg/fits/header.go:147.2,147.56 1 91 +github.com/observerly/iris/pkg/fits/header.go:153.79,154.27 1 200 github.com/observerly/iris/pkg/fits/header.go:155.12,159.4 1 0 -github.com/observerly/iris/pkg/fits/header.go:160.14,162.38 1 118 +github.com/observerly/iris/pkg/fits/header.go:160.14,162.38 1 120 github.com/observerly/iris/pkg/fits/header.go:162.38,168.4 2 29 -github.com/observerly/iris/pkg/fits/header.go:171.3,174.4 1 89 +github.com/observerly/iris/pkg/fits/header.go:171.3,174.4 1 91 github.com/observerly/iris/pkg/fits/header.go:175.11,176.45 1 0 github.com/observerly/iris/pkg/fits/header.go:176.45,178.4 1 0 github.com/observerly/iris/pkg/fits/header.go:179.3,182.4 1 0 @@ -496,12 +496,12 @@ github.com/observerly/iris/pkg/fits/header.go:211.14,215.4 1 0 github.com/observerly/iris/pkg/fits/header.go:216.14,217.32 1 0 github.com/observerly/iris/pkg/fits/header.go:217.32,219.4 1 0 github.com/observerly/iris/pkg/fits/header.go:220.3,223.4 1 0 -github.com/observerly/iris/pkg/fits/header.go:224.15,228.4 1 12 +github.com/observerly/iris/pkg/fits/header.go:224.15,228.4 1 11 github.com/observerly/iris/pkg/fits/header.go:229.15,230.50 1 0 github.com/observerly/iris/pkg/fits/header.go:230.50,232.4 1 0 github.com/observerly/iris/pkg/fits/header.go:233.3,236.4 1 0 github.com/observerly/iris/pkg/fits/header.go:238.10,239.56 1 0 -github.com/observerly/iris/pkg/fits/header.go:242.2,242.12 1 170 +github.com/observerly/iris/pkg/fits/header.go:242.2,242.12 1 171 github.com/observerly/iris/pkg/fits/header.go:247.46,250.28 2 4 github.com/observerly/iris/pkg/fits/header.go:250.28,254.38 2 4 github.com/observerly/iris/pkg/fits/header.go:254.38,256.4 1 0 @@ -513,16 +513,16 @@ github.com/observerly/iris/pkg/fits/header.go:277.2,277.12 1 4 github.com/observerly/iris/pkg/fits/header.go:285.78,302.28 8 11 github.com/observerly/iris/pkg/fits/header.go:302.28,304.3 1 2 github.com/observerly/iris/pkg/fits/header.go:306.2,306.30 1 11 -github.com/observerly/iris/pkg/fits/header.go:306.30,308.3 1 40 +github.com/observerly/iris/pkg/fits/header.go:306.30,308.3 1 42 github.com/observerly/iris/pkg/fits/header.go:310.2,310.27 1 11 github.com/observerly/iris/pkg/fits/header.go:310.27,312.3 1 19 github.com/observerly/iris/pkg/fits/header.go:314.2,314.29 1 11 -github.com/observerly/iris/pkg/fits/header.go:314.29,316.3 1 13 +github.com/observerly/iris/pkg/fits/header.go:314.29,316.3 1 12 github.com/observerly/iris/pkg/fits/header.go:318.2,318.28 1 11 github.com/observerly/iris/pkg/fits/header.go:318.28,320.3 1 13 github.com/observerly/iris/pkg/fits/header.go:322.2,327.28 3 11 github.com/observerly/iris/pkg/fits/header.go:327.28,328.46 1 11 -github.com/observerly/iris/pkg/fits/header.go:328.46,330.4 1 16480 +github.com/observerly/iris/pkg/fits/header.go:328.46,330.4 1 16400 github.com/observerly/iris/pkg/fits/header.go:333.2,333.17 1 11 github.com/observerly/iris/pkg/fits/header.go:339.77,349.37 4 65 github.com/observerly/iris/pkg/fits/header.go:349.37,350.51 1 650 @@ -562,12 +562,12 @@ github.com/observerly/iris/pkg/fits/header.go:481.23,483.3 1 0 github.com/observerly/iris/pkg/fits/header.go:486.2,489.11 2 13 github.com/observerly/iris/pkg/fits/header.go:489.11,491.3 1 13 github.com/observerly/iris/pkg/fits/header.go:493.2,493.55 1 13 -github.com/observerly/iris/pkg/fits/header.go:499.59,500.18 1 53 +github.com/observerly/iris/pkg/fits/header.go:499.59,500.18 1 55 github.com/observerly/iris/pkg/fits/header.go:500.18,502.3 1 0 -github.com/observerly/iris/pkg/fits/header.go:503.2,503.23 1 53 +github.com/observerly/iris/pkg/fits/header.go:503.2,503.23 1 55 github.com/observerly/iris/pkg/fits/header.go:503.23,505.3 1 11 -github.com/observerly/iris/pkg/fits/header.go:508.2,510.22 2 53 -github.com/observerly/iris/pkg/fits/header.go:510.22,512.3 1 38 +github.com/observerly/iris/pkg/fits/header.go:508.2,510.22 2 55 +github.com/observerly/iris/pkg/fits/header.go:510.22,512.3 1 40 github.com/observerly/iris/pkg/fits/header.go:512.8,517.23 3 15 github.com/observerly/iris/pkg/fits/header.go:517.23,520.4 2 0 github.com/observerly/iris/pkg/fits/header.go:522.3,522.85 1 15 @@ -576,25 +576,25 @@ github.com/observerly/iris/pkg/fits/header.go:530.18,532.3 1 0 github.com/observerly/iris/pkg/fits/header.go:534.2,534.23 1 85 github.com/observerly/iris/pkg/fits/header.go:534.23,536.3 1 8 github.com/observerly/iris/pkg/fits/header.go:538.2,538.59 1 85 -github.com/observerly/iris/pkg/fits/header.go:544.73,546.18 1 17 +github.com/observerly/iris/pkg/fits/header.go:544.73,546.18 1 16 github.com/observerly/iris/pkg/fits/header.go:546.18,548.3 1 0 -github.com/observerly/iris/pkg/fits/header.go:548.8,548.25 1 17 -github.com/observerly/iris/pkg/fits/header.go:548.25,550.3 1 14 -github.com/observerly/iris/pkg/fits/header.go:553.2,553.23 1 17 +github.com/observerly/iris/pkg/fits/header.go:548.8,548.25 1 16 +github.com/observerly/iris/pkg/fits/header.go:548.25,550.3 1 13 +github.com/observerly/iris/pkg/fits/header.go:553.2,553.23 1 16 github.com/observerly/iris/pkg/fits/header.go:553.23,555.3 1 2 -github.com/observerly/iris/pkg/fits/header.go:555.8,555.30 1 15 +github.com/observerly/iris/pkg/fits/header.go:555.8,555.30 1 14 github.com/observerly/iris/pkg/fits/header.go:555.30,557.3 1 14 -github.com/observerly/iris/pkg/fits/header.go:559.2,566.61 3 17 +github.com/observerly/iris/pkg/fits/header.go:559.2,566.61 3 16 github.com/observerly/iris/pkg/fits/header.go:566.61,569.3 1 4 -github.com/observerly/iris/pkg/fits/header.go:569.8,572.3 1 13 -github.com/observerly/iris/pkg/fits/header.go:575.2,575.66 1 17 +github.com/observerly/iris/pkg/fits/header.go:569.8,572.3 1 12 +github.com/observerly/iris/pkg/fits/header.go:575.2,575.66 1 16 github.com/observerly/iris/pkg/fits/header.go:581.33,584.2 2 11 -github.com/observerly/iris/pkg/fits/header.go:587.46,624.2 22 1 -github.com/observerly/iris/pkg/fits/header.go:629.92,636.37 3 0 -github.com/observerly/iris/pkg/fits/header.go:636.37,639.22 2 0 -github.com/observerly/iris/pkg/fits/header.go:639.22,641.4 1 0 -github.com/observerly/iris/pkg/fits/header.go:644.3,647.29 2 0 -github.com/observerly/iris/pkg/fits/header.go:650.2,650.18 1 0 +github.com/observerly/iris/pkg/fits/header.go:589.46,626.2 22 1 +github.com/observerly/iris/pkg/fits/header.go:631.92,638.37 3 0 +github.com/observerly/iris/pkg/fits/header.go:638.37,641.22 2 0 +github.com/observerly/iris/pkg/fits/header.go:641.22,643.4 1 0 +github.com/observerly/iris/pkg/fits/header.go:646.3,649.29 2 0 +github.com/observerly/iris/pkg/fits/header.go:652.2,652.18 1 0 github.com/observerly/iris/pkg/photometry/convolution.go:17.94,20.36 2 1 github.com/observerly/iris/pkg/photometry/convolution.go:20.36,21.37 1 400 github.com/observerly/iris/pkg/photometry/convolution.go:21.37,32.23 5 240000 @@ -647,7 +647,7 @@ github.com/observerly/iris/pkg/photometry/stars.go:95.101,101.2 3 2 github.com/observerly/iris/pkg/photometry/stars.go:106.97,137.2 13 1 github.com/observerly/iris/pkg/photometry/stars.go:143.119,147.25 2 95855 github.com/observerly/iris/pkg/photometry/stars.go:147.25,151.39 2 862695 -github.com/observerly/iris/pkg/photometry/stars.go:151.39,154.4 2 862167 +github.com/observerly/iris/pkg/photometry/stars.go:151.39,154.4 2 862254 github.com/observerly/iris/pkg/photometry/stars.go:157.2,159.23 2 95855 github.com/observerly/iris/pkg/photometry/stars.go:166.89,170.25 2 7 github.com/observerly/iris/pkg/photometry/stars.go:170.25,171.20 1 10253216 @@ -660,38 +660,38 @@ github.com/observerly/iris/pkg/photometry/stars.go:203.95,216.34 6 5 github.com/observerly/iris/pkg/photometry/stars.go:216.34,222.3 3 85435 github.com/observerly/iris/pkg/photometry/stars.go:224.2,231.29 4 5 github.com/observerly/iris/pkg/photometry/stars.go:231.29,237.44 3 10420 -github.com/observerly/iris/pkg/photometry/stars.go:237.44,240.4 2 10174 +github.com/observerly/iris/pkg/photometry/stars.go:237.44,240.4 2 10173 github.com/observerly/iris/pkg/photometry/stars.go:243.2,243.31 1 5 github.com/observerly/iris/pkg/photometry/stars.go:248.85,265.26 8 6 -github.com/observerly/iris/pkg/photometry/stars.go:265.26,270.38 2 8582 -github.com/observerly/iris/pkg/photometry/stars.go:270.38,271.41 1 18284 +github.com/observerly/iris/pkg/photometry/stars.go:265.26,270.38 2 8581 +github.com/observerly/iris/pkg/photometry/stars.go:270.38,271.41 1 18281 github.com/observerly/iris/pkg/photometry/stars.go:271.41,272.13 1 1130 -github.com/observerly/iris/pkg/photometry/stars.go:275.4,275.39 1 17154 -github.com/observerly/iris/pkg/photometry/stars.go:275.39,276.42 1 44144 +github.com/observerly/iris/pkg/photometry/stars.go:275.4,275.39 1 17151 +github.com/observerly/iris/pkg/photometry/stars.go:275.39,276.42 1 44135 github.com/observerly/iris/pkg/photometry/stars.go:276.42,277.14 1 4636 -github.com/observerly/iris/pkg/photometry/stars.go:281.5,284.53 2 39508 -github.com/observerly/iris/pkg/photometry/stars.go:284.53,291.22 5 224935 +github.com/observerly/iris/pkg/photometry/stars.go:281.5,284.53 2 39499 +github.com/observerly/iris/pkg/photometry/stars.go:284.53,291.22 5 224543 github.com/observerly/iris/pkg/photometry/stars.go:291.22,292.27 1 7278 -github.com/observerly/iris/pkg/photometry/stars.go:299.3,309.17 5 1304 +github.com/observerly/iris/pkg/photometry/stars.go:299.3,309.17 5 1303 github.com/observerly/iris/pkg/photometry/stars.go:309.17,311.4 1 180 -github.com/observerly/iris/pkg/photometry/stars.go:311.9,312.24 1 1124 -github.com/observerly/iris/pkg/photometry/stars.go:312.24,314.5 1 3966 -github.com/observerly/iris/pkg/photometry/stars.go:316.4,316.38 1 1124 -github.com/observerly/iris/pkg/photometry/stars.go:319.3,319.19 1 1304 +github.com/observerly/iris/pkg/photometry/stars.go:311.9,312.24 1 1123 +github.com/observerly/iris/pkg/photometry/stars.go:312.24,314.5 1 3957 +github.com/observerly/iris/pkg/photometry/stars.go:316.4,316.38 1 1123 +github.com/observerly/iris/pkg/photometry/stars.go:319.3,319.19 1 1303 github.com/observerly/iris/pkg/photometry/stars.go:322.2,325.31 3 6 github.com/observerly/iris/pkg/photometry/stars.go:331.106,333.26 1 3 -github.com/observerly/iris/pkg/photometry/stars.go:333.26,336.71 2 665 -github.com/observerly/iris/pkg/photometry/stars.go:336.71,342.39 3 1285 -github.com/observerly/iris/pkg/photometry/stars.go:342.39,343.40 1 42405 -github.com/observerly/iris/pkg/photometry/stars.go:343.40,348.46 3 1399365 -github.com/observerly/iris/pkg/photometry/stars.go:348.46,350.20 2 1377090 -github.com/observerly/iris/pkg/photometry/stars.go:350.20,352.8 1 1362841 -github.com/observerly/iris/pkg/photometry/stars.go:355.6,357.19 3 1399365 -github.com/observerly/iris/pkg/photometry/stars.go:362.4,365.19 3 1285 +github.com/observerly/iris/pkg/photometry/stars.go:333.26,336.71 2 664 +github.com/observerly/iris/pkg/photometry/stars.go:336.71,342.39 3 1283 +github.com/observerly/iris/pkg/photometry/stars.go:342.39,343.40 1 42339 +github.com/observerly/iris/pkg/photometry/stars.go:343.40,348.46 3 1397187 +github.com/observerly/iris/pkg/photometry/stars.go:348.46,350.20 2 1374912 +github.com/observerly/iris/pkg/photometry/stars.go:350.20,352.8 1 1360667 +github.com/observerly/iris/pkg/photometry/stars.go:355.6,357.19 3 1397187 +github.com/observerly/iris/pkg/photometry/stars.go:362.4,365.19 3 1283 github.com/observerly/iris/pkg/photometry/stars.go:365.19,367.5 1 0 -github.com/observerly/iris/pkg/photometry/stars.go:369.4,384.44 10 1285 -github.com/observerly/iris/pkg/photometry/stars.go:384.44,386.5 1 1285 -github.com/observerly/iris/pkg/photometry/stars.go:388.4,396.16 2 1285 +github.com/observerly/iris/pkg/photometry/stars.go:369.4,384.44 10 1283 +github.com/observerly/iris/pkg/photometry/stars.go:384.44,386.5 1 1283 +github.com/observerly/iris/pkg/photometry/stars.go:388.4,396.16 2 1283 github.com/observerly/iris/pkg/photometry/stars.go:400.2,400.14 1 3 github.com/observerly/iris/pkg/photometry/stars.go:407.143,412.26 3 2 github.com/observerly/iris/pkg/photometry/stars.go:412.26,420.32 4 417 diff --git a/pkg/fits/fits.go b/pkg/fits/fits.go index a8f4439..5c4d6e1 100644 --- a/pkg/fits/fits.go +++ b/pkg/fits/fits.go @@ -59,7 +59,8 @@ type FITSImage struct { type FITSObservation struct { DateObs time.Time `json:"dateObs"` // Date of observation e.g., 2022-05-15 MJDObs float32 `json:"mjdObs"` // Modified Julian Date (JD − 2,400,000.5) of the observation - Equinox float32 `json:"equinox"` // Equinox of observation e.g., J2000 + Equinox float32 `json:"equinox"` // Equinox of observation e.g., J2000.0 + Epoch float32 `json:"epoch"` // Epoch of observation e.g., J2022.0 RA float32 `json:"ra"` // Right Ascension of observation Dec float32 `json:"dec"` // Declination of observation Altitude float32 `json:"altitude"` // Altitude of the observation @@ -175,22 +176,25 @@ func (f *FITSImage) AddObservationEntry(observation *FITSObservation) *FITSImage f.Header.Set("DATE-OBS", observation.DateObs.Format("2006-01-02"), "Date of observation") // Set the Julian Date of the Observation: - f.Header.Set("JD-OBS", observation.MJDObs, "Julian Date of the observation") + f.Header.Set("JD-OBS", observation.MJDObs+2400000.5, "Julian Date of the observation") // Set the Modified Julian Date of the Observation: f.Header.Set("MJD-OBS", observation.MJDObs, "Modified Julian Date of the observation") // Set the Equinox of the Observation: - f.Header.Set("EQUINOX", observation.Equinox, "Equinox of observation e.g., Julian 2000.0") + f.Header.Set("EQUINOX", fmt.Sprintf("J%.1f", observation.Equinox), "Equinox of observation e.g., J2000.0") + + // Set the Epoch of the Observation: + f.Header.Set("EPOCH", fmt.Sprintf("J%.1f", observation.Epoch), "Epoch of observation") // Set the astrometric reference frame or celestial coordinate system used for the celestial coordinates: f.Header.Set("RADESYS", "ICRS", "International Celestial Reference System") // Set the Right Ascension of the Observation: - f.Header.Set("RA", observation.RA, "Right Ascension (in degrees) of the observation") + f.Header.Set("RA", observation.RA, "Right Ascension (in degrees) at J2000.0") // Set the Declination of the Observation: - f.Header.Set("DEC", observation.Dec, "Declination (in degrees) of the observation") + f.Header.Set("DEC", observation.Dec, "Declination (in degrees) at J2000.0") // Set the local Altitude of the Observation: f.Header.Set("ALT", observation.Altitude, "Altitude (in degrees) of the observation") diff --git a/pkg/fits/fits_test.go b/pkg/fits/fits_test.go index 644ae3b..0c8b869 100644 --- a/pkg/fits/fits_test.go +++ b/pkg/fits/fits_test.go @@ -492,7 +492,8 @@ func TestNewAddObservationEntry(t *testing.T) { fit.AddObservationEntry(&FITSObservation{ DateObs: time.Date(2022, 5, 14, 0, 0, 0, 0, time.UTC), MJDObs: 59713, - Equinox: 2023.7, + Equinox: 2000.0, + Epoch: 2023.7, RA: 24.7122222, Dec: 41.2691667, Object: "M31", @@ -509,8 +510,12 @@ func TestNewAddObservationEntry(t *testing.T) { t.Errorf("Expected the MJD-OBS to be 59713, but got %f", fit.Header.Floats["MJD-OBS"].Value) } - if fit.Header.Floats["EQUINOX"].Value != 2023.7 { - t.Errorf("Expected the EQUINOX to be 2023.7, but got %f", fit.Header.Floats["EQUINOX"].Value) + if fit.Header.Strings["EQUINOX"].Value != "J2000.0" { + t.Errorf("Expected the EQUINOX to be J2023.7, but got %f", fit.Header.Floats["EQUINOX"].Value) + } + + if fit.Header.Strings["EPOCH"].Value != "J2023.7" { + t.Errorf("Expected the EPOCH to be J2023.7, but got %f", fit.Header.Floats["EPOCH"].Value) } if fit.Header.Floats["RA"].Value != 24.7122222 {