Merge pull request #201 from observerly/refactor/header/Read

refactor: Amended (h *FITSHeader) Read() in fits IRIS module.
observerly · Dec 13, 2022 · ecb18b9 · ecb18b9
2 parents 206354b + ad08d39
commit ecb18b9
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 80 deletions.
diff --git a/coverage.txt b/coverage.txt
@@ -59,51 +59,6 @@ github.com/observerly/iris/pkg/qsort/qsort.go:138.2,138.30 1 2
 github.com/observerly/iris/pkg/qsort/qsort.go:124.23,126.3 1 1
 github.com/observerly/iris/pkg/qsort/qsort.go:131.27,132.19 1 7
 github.com/observerly/iris/pkg/qsort/qsort.go:132.19,134.4 1 6
-github.com/observerly/iris/pkg/frames/master.go:17.79,21.16 2 1
-github.com/observerly/iris/pkg/frames/master.go:26.2,35.8 2 1
-github.com/observerly/iris/pkg/frames/master.go:21.16,23.3 1 0
-github.com/observerly/iris/pkg/frames/bias.go:24.144,30.31 3 6
-github.com/observerly/iris/pkg/frames/bias.go:35.2,44.21 2 6
-github.com/observerly/iris/pkg/frames/bias.go:58.2,93.8 6 6
-github.com/observerly/iris/pkg/frames/bias.go:30.31,32.3 1 14
-github.com/observerly/iris/pkg/frames/bias.go:44.21,47.17 2 2
-github.com/observerly/iris/pkg/frames/bias.go:51.3,51.20 1 2
-github.com/observerly/iris/pkg/frames/bias.go:47.17,49.4 1 0
-github.com/observerly/iris/pkg/frames/bias.go:52.8,56.3 2 4
-github.com/observerly/iris/pkg/frames/dark.go:36.175,42.31 3 2
-github.com/observerly/iris/pkg/frames/dark.go:47.2,56.21 2 2
-github.com/observerly/iris/pkg/frames/dark.go:82.2,118.8 6 2
-github.com/observerly/iris/pkg/frames/dark.go:42.31,44.3 1 10
-github.com/observerly/iris/pkg/frames/dark.go:56.21,59.17 2 2
-github.com/observerly/iris/pkg/frames/dark.go:63.3,65.17 2 2
-github.com/observerly/iris/pkg/frames/dark.go:59.17,61.4 1 0
-github.com/observerly/iris/pkg/frames/dark.go:65.17,67.4 1 0
-github.com/observerly/iris/pkg/frames/dark.go:68.8,77.17 5 0
-github.com/observerly/iris/pkg/frames/dark.go:77.17,79.4 1 0
-github.com/observerly/iris/pkg/frames/dark.go:121.91,125.16 2 1
-github.com/observerly/iris/pkg/frames/dark.go:130.2,132.16 2 1
-github.com/observerly/iris/pkg/frames/dark.go:137.2,139.16 2 1
-github.com/observerly/iris/pkg/frames/dark.go:144.2,154.8 2 1
-github.com/observerly/iris/pkg/frames/dark.go:125.16,127.3 1 0
-github.com/observerly/iris/pkg/frames/dark.go:132.16,134.3 1 0
-github.com/observerly/iris/pkg/frames/dark.go:139.16,141.3 1 0
-github.com/observerly/iris/pkg/frames/flat.go:38.175,44.31 3 2
-github.com/observerly/iris/pkg/frames/flat.go:49.2,58.21 2 2
-github.com/observerly/iris/pkg/frames/flat.go:84.2,120.8 6 2
-github.com/observerly/iris/pkg/frames/flat.go:44.31,46.3 1 10
-github.com/observerly/iris/pkg/frames/flat.go:58.21,61.17 2 2
-github.com/observerly/iris/pkg/frames/flat.go:65.3,67.17 2 2
-github.com/observerly/iris/pkg/frames/flat.go:61.17,63.4 1 0
-github.com/observerly/iris/pkg/frames/flat.go:67.17,69.4 1 0
-github.com/observerly/iris/pkg/frames/flat.go:70.8,79.17 5 0
-github.com/observerly/iris/pkg/frames/flat.go:79.17,81.4 1 0
-github.com/observerly/iris/pkg/frames/flat.go:123.91,127.16 2 1
-github.com/observerly/iris/pkg/frames/flat.go:132.2,134.16 2 1
-github.com/observerly/iris/pkg/frames/flat.go:139.2,141.16 2 1
-github.com/observerly/iris/pkg/frames/flat.go:146.2,156.8 2 1
-github.com/observerly/iris/pkg/frames/flat.go:127.16,129.3 1 0
-github.com/observerly/iris/pkg/frames/flat.go:134.16,136.3 1 0
-github.com/observerly/iris/pkg/frames/flat.go:141.16,143.3 1 0
 github.com/observerly/iris/pkg/utils/array.go:14.57,15.22 1 2
 github.com/observerly/iris/pkg/utils/array.go:19.2,21.19 2 1
 github.com/observerly/iris/pkg/utils/array.go:25.2,25.15 1 1
@@ -159,6 +114,51 @@ github.com/observerly/iris/pkg/utils/utils.go:66.10,68.5 1 0
 github.com/observerly/iris/pkg/utils/utils.go:72.44,74.30 2 0
 github.com/observerly/iris/pkg/utils/utils.go:74.30,75.31 1 0
 github.com/observerly/iris/pkg/utils/utils.go:75.31,77.7 1 0
+github.com/observerly/iris/pkg/frames/master.go:17.79,21.16 2 1
+github.com/observerly/iris/pkg/frames/master.go:26.2,35.8 2 1
+github.com/observerly/iris/pkg/frames/master.go:21.16,23.3 1 0
+github.com/observerly/iris/pkg/frames/bias.go:24.144,30.31 3 6
+github.com/observerly/iris/pkg/frames/bias.go:35.2,44.21 2 6
+github.com/observerly/iris/pkg/frames/bias.go:58.2,93.8 6 6
+github.com/observerly/iris/pkg/frames/bias.go:30.31,32.3 1 14
+github.com/observerly/iris/pkg/frames/bias.go:44.21,47.17 2 2
+github.com/observerly/iris/pkg/frames/bias.go:51.3,51.20 1 2
+github.com/observerly/iris/pkg/frames/bias.go:47.17,49.4 1 0
+github.com/observerly/iris/pkg/frames/bias.go:52.8,56.3 2 4
+github.com/observerly/iris/pkg/frames/dark.go:36.175,42.31 3 2
+github.com/observerly/iris/pkg/frames/dark.go:47.2,56.21 2 2
+github.com/observerly/iris/pkg/frames/dark.go:82.2,118.8 6 2
+github.com/observerly/iris/pkg/frames/dark.go:42.31,44.3 1 10
+github.com/observerly/iris/pkg/frames/dark.go:56.21,59.17 2 2
+github.com/observerly/iris/pkg/frames/dark.go:63.3,65.17 2 2
+github.com/observerly/iris/pkg/frames/dark.go:59.17,61.4 1 0
+github.com/observerly/iris/pkg/frames/dark.go:65.17,67.4 1 0
+github.com/observerly/iris/pkg/frames/dark.go:68.8,77.17 5 0
+github.com/observerly/iris/pkg/frames/dark.go:77.17,79.4 1 0
+github.com/observerly/iris/pkg/frames/dark.go:121.91,125.16 2 1
+github.com/observerly/iris/pkg/frames/dark.go:130.2,132.16 2 1
+github.com/observerly/iris/pkg/frames/dark.go:137.2,139.16 2 1
+github.com/observerly/iris/pkg/frames/dark.go:144.2,154.8 2 1
+github.com/observerly/iris/pkg/frames/dark.go:125.16,127.3 1 0
+github.com/observerly/iris/pkg/frames/dark.go:132.16,134.3 1 0
+github.com/observerly/iris/pkg/frames/dark.go:139.16,141.3 1 0
+github.com/observerly/iris/pkg/frames/flat.go:38.175,44.31 3 2
+github.com/observerly/iris/pkg/frames/flat.go:49.2,58.21 2 2
+github.com/observerly/iris/pkg/frames/flat.go:84.2,120.8 6 2
+github.com/observerly/iris/pkg/frames/flat.go:44.31,46.3 1 10
+github.com/observerly/iris/pkg/frames/flat.go:58.21,61.17 2 2
+github.com/observerly/iris/pkg/frames/flat.go:65.3,67.17 2 2
+github.com/observerly/iris/pkg/frames/flat.go:61.17,63.4 1 0
+github.com/observerly/iris/pkg/frames/flat.go:67.17,69.4 1 0
+github.com/observerly/iris/pkg/frames/flat.go:70.8,79.17 5 0
+github.com/observerly/iris/pkg/frames/flat.go:79.17,81.4 1 0
+github.com/observerly/iris/pkg/frames/flat.go:123.91,127.16 2 1
+github.com/observerly/iris/pkg/frames/flat.go:132.2,134.16 2 1
+github.com/observerly/iris/pkg/frames/flat.go:139.2,141.16 2 1
+github.com/observerly/iris/pkg/frames/flat.go:146.2,156.8 2 1
+github.com/observerly/iris/pkg/frames/flat.go:127.16,129.3 1 0
+github.com/observerly/iris/pkg/frames/flat.go:134.16,136.3 1 0
+github.com/observerly/iris/pkg/frames/flat.go:141.16,143.3 1 0
 github.com/observerly/iris/pkg/histogram/histogram.go:20.52,27.47 4 1
 github.com/observerly/iris/pkg/histogram/histogram.go:32.2,32.12 1 1
 github.com/observerly/iris/pkg/histogram/histogram.go:27.47,30.3 2 1708784
@@ -230,7 +230,7 @@ github.com/observerly/iris/pkg/fits/header.go:158.3,161.42 2 4
 github.com/observerly/iris/pkg/fits/header.go:153.38,155.4 1 0
 github.com/observerly/iris/pkg/fits/header.go:161.42,166.41 3 60
 github.com/observerly/iris/pkg/fits/header.go:170.4,172.30 2 60
-github.com/observerly/iris/pkg/fits/header.go:166.41,168.5 1 0
+github.com/observerly/iris/pkg/fits/header.go:166.41,167.13 1 0
 github.com/observerly/iris/pkg/fits/header.go:183.78,200.28 8 9
 github.com/observerly/iris/pkg/fits/header.go:204.2,204.30 1 9
 github.com/observerly/iris/pkg/fits/header.go:208.2,208.27 1 9
@@ -344,15 +344,15 @@ github.com/observerly/iris/pkg/statistics/stats.go:218.100,224.24 3 3
 github.com/observerly/iris/pkg/statistics/stats.go:237.2,239.15 2 3
 github.com/observerly/iris/pkg/statistics/stats.go:224.24,226.7 2 769000
 github.com/observerly/iris/pkg/statistics/stats.go:234.3,234.16 1 769000
-github.com/observerly/iris/pkg/statistics/stats.go:226.7,229.43 2 769102
+github.com/observerly/iris/pkg/statistics/stats.go:226.7,229.43 2 769146
 github.com/observerly/iris/pkg/statistics/stats.go:229.43,230.10 1 769000
 github.com/observerly/iris/pkg/statistics/stats.go:253.96,259.24 3 3
 github.com/observerly/iris/pkg/statistics/stats.go:281.2,283.11 2 3
 github.com/observerly/iris/pkg/statistics/stats.go:259.24,262.7 2 769000
 github.com/observerly/iris/pkg/statistics/stats.go:276.3,276.50 1 769000
-github.com/observerly/iris/pkg/statistics/stats.go:262.7,266.43 3 769189
-github.com/observerly/iris/pkg/statistics/stats.go:270.4,271.45 2 769074
-github.com/observerly/iris/pkg/statistics/stats.go:266.43,267.13 1 115
+github.com/observerly/iris/pkg/statistics/stats.go:262.7,266.43 3 769127
+github.com/observerly/iris/pkg/statistics/stats.go:270.4,271.45 2 769040
+github.com/observerly/iris/pkg/statistics/stats.go:266.43,267.13 1 87
 github.com/observerly/iris/pkg/statistics/stats.go:271.45,272.10 1 769000
 github.com/observerly/iris/pkg/statistics/stats.go:294.72,305.20 6 1
 github.com/observerly/iris/pkg/statistics/stats.go:305.20,319.107 6 2
@@ -411,7 +411,7 @@ github.com/observerly/iris/pkg/photometry/stars.go:80.97,111.2 13 1
 github.com/observerly/iris/pkg/photometry/stars.go:121.119,125.25 2 95855
 github.com/observerly/iris/pkg/photometry/stars.go:135.2,137.23 2 95855
 github.com/observerly/iris/pkg/photometry/stars.go:125.25,129.39 2 862695
-github.com/observerly/iris/pkg/photometry/stars.go:129.39,132.4 2 862164
+github.com/observerly/iris/pkg/photometry/stars.go:129.39,132.4 2 862161
 github.com/observerly/iris/pkg/photometry/stars.go:148.89,152.25 2 7
 github.com/observerly/iris/pkg/photometry/stars.go:178.2,178.14 1 7
 github.com/observerly/iris/pkg/photometry/stars.go:152.25,153.20 1 10253216
@@ -424,38 +424,38 @@ github.com/observerly/iris/pkg/photometry/stars.go:210.2,217.29 4 5
 github.com/observerly/iris/pkg/photometry/stars.go:229.2,229.31 1 5
 github.com/observerly/iris/pkg/photometry/stars.go:202.34,208.3 3 85435
 github.com/observerly/iris/pkg/photometry/stars.go:217.29,223.44 3 10420
-github.com/observerly/iris/pkg/photometry/stars.go:223.44,226.4 2 10172
+github.com/observerly/iris/pkg/photometry/stars.go:223.44,226.4 2 10173
 github.com/observerly/iris/pkg/photometry/stars.go:232.85,249.26 8 6
 github.com/observerly/iris/pkg/photometry/stars.go:306.2,309.31 3 6
-github.com/observerly/iris/pkg/photometry/stars.go:249.26,254.38 2 8581
-github.com/observerly/iris/pkg/photometry/stars.go:283.3,293.17 5 1303
-github.com/observerly/iris/pkg/photometry/stars.go:303.3,303.19 1 1303
-github.com/observerly/iris/pkg/photometry/stars.go:254.38,255.41 1 18281
-github.com/observerly/iris/pkg/photometry/stars.go:259.4,259.39 1 17151
+github.com/observerly/iris/pkg/photometry/stars.go:249.26,254.38 2 8582
+github.com/observerly/iris/pkg/photometry/stars.go:283.3,293.17 5 1304
+github.com/observerly/iris/pkg/photometry/stars.go:303.3,303.19 1 1304
+github.com/observerly/iris/pkg/photometry/stars.go:254.38,255.41 1 18284
+github.com/observerly/iris/pkg/photometry/stars.go:259.4,259.39 1 17154
 github.com/observerly/iris/pkg/photometry/stars.go:255.41,256.13 1 1130
-github.com/observerly/iris/pkg/photometry/stars.go:259.39,260.42 1 44135
-github.com/observerly/iris/pkg/photometry/stars.go:265.5,268.53 2 39499
+github.com/observerly/iris/pkg/photometry/stars.go:259.39,260.42 1 44144
+github.com/observerly/iris/pkg/photometry/stars.go:265.5,268.53 2 39508
 github.com/observerly/iris/pkg/photometry/stars.go:260.42,261.14 1 4636
-github.com/observerly/iris/pkg/photometry/stars.go:268.53,275.22 5 224543
+github.com/observerly/iris/pkg/photometry/stars.go:268.53,275.22 5 224935
 github.com/observerly/iris/pkg/photometry/stars.go:275.22,276.27 1 7278
 github.com/observerly/iris/pkg/photometry/stars.go:293.17,295.4 1 180
-github.com/observerly/iris/pkg/photometry/stars.go:295.9,296.24 1 1123
-github.com/observerly/iris/pkg/photometry/stars.go:300.4,300.38 1 1123
-github.com/observerly/iris/pkg/photometry/stars.go:296.24,298.5 1 3957
+github.com/observerly/iris/pkg/photometry/stars.go:295.9,296.24 1 1124
+github.com/observerly/iris/pkg/photometry/stars.go:300.4,300.38 1 1124
+github.com/observerly/iris/pkg/photometry/stars.go:296.24,298.5 1 3966
 github.com/observerly/iris/pkg/photometry/stars.go:319.106,321.26 1 3
 github.com/observerly/iris/pkg/photometry/stars.go:388.2,388.14 1 3
-github.com/observerly/iris/pkg/photometry/stars.go:321.26,324.71 2 664
-github.com/observerly/iris/pkg/photometry/stars.go:324.71,330.39 3 1283
-github.com/observerly/iris/pkg/photometry/stars.go:350.4,353.19 3 1283
-github.com/observerly/iris/pkg/photometry/stars.go:357.4,372.44 10 1283
-github.com/observerly/iris/pkg/photometry/stars.go:376.4,384.16 2 1283
-github.com/observerly/iris/pkg/photometry/stars.go:330.39,331.40 1 42339
-github.com/observerly/iris/pkg/photometry/stars.go:331.40,336.46 3 1397187
-github.com/observerly/iris/pkg/photometry/stars.go:343.6,345.19 3 1397187
-github.com/observerly/iris/pkg/photometry/stars.go:336.46,338.20 2 1374912
-github.com/observerly/iris/pkg/photometry/stars.go:338.20,340.8 1 1360667
+github.com/observerly/iris/pkg/photometry/stars.go:321.26,324.71 2 665
+github.com/observerly/iris/pkg/photometry/stars.go:324.71,330.39 3 1285
+github.com/observerly/iris/pkg/photometry/stars.go:350.4,353.19 3 1285
+github.com/observerly/iris/pkg/photometry/stars.go:357.4,372.44 10 1285
+github.com/observerly/iris/pkg/photometry/stars.go:376.4,384.16 2 1285
+github.com/observerly/iris/pkg/photometry/stars.go:330.39,331.40 1 42405
+github.com/observerly/iris/pkg/photometry/stars.go:331.40,336.46 3 1399365
+github.com/observerly/iris/pkg/photometry/stars.go:343.6,345.19 3 1399365
+github.com/observerly/iris/pkg/photometry/stars.go:336.46,338.20 2 1377090
+github.com/observerly/iris/pkg/photometry/stars.go:338.20,340.8 1 1362841
 github.com/observerly/iris/pkg/photometry/stars.go:353.19,355.5 1 0
-github.com/observerly/iris/pkg/photometry/stars.go:372.44,374.5 1 1283
+github.com/observerly/iris/pkg/photometry/stars.go:372.44,374.5 1 1285
 github.com/observerly/iris/pkg/photometry/stars.go:398.143,403.26 3 2
 github.com/observerly/iris/pkg/photometry/stars.go:499.2,501.39 2 2
 github.com/observerly/iris/pkg/photometry/stars.go:403.26,411.32 4 417

diff --git a/pkg/fits/header.go b/pkg/fits/header.go
@@ -164,7 +164,7 @@ func (h *FITSHeader) Read(r io.Reader) error {
 			values := re.FindSubmatch(line)
 
 			if len(values) == 0 || values == nil {
-				return fmt.Errorf("invalid FITS header line: %s", line)
+				continue
 			}
 
 			names := re.SubexpNames()

diff --git a/pkg/photometry/noise_test.go b/pkg/photometry/noise_test.go
@@ -1,7 +1,6 @@
 package photometry
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -38,8 +37,6 @@ func TestNewNoiseExtractor(t *testing.T) {
 		}
 	}
 
-	fmt.Println(data)
-
 	s := NewNoiseExtractor(data, 16, 16)
 
 	if s.Height != 16 {
@@ -84,8 +81,6 @@ func TestNewNoiseExtractorGaussianNoise(t *testing.T) {
 		}
 	}
 
-	fmt.Println(data)
-
 	s := NewNoiseExtractor(data, 16, 16)
 
 	if s.Height != 16 {