Skip to content

Commit 0cbf939

Browse files
authored
Merge branch 'lofar-astron:master' into Fix-statistics-of-the-residual-image
2 parents 2324d6a + efdd116 commit 0cbf939

41 files changed

Lines changed: 292 additions & 283 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

test/reference_outputs/catalogues/tbdsf_process_image.in_fits.pybdsf.gaul

Lines changed: 48 additions & 47 deletions
Large diffs are not rendered by default.

test/reference_outputs/catalogues/tbdsf_process_image.in_fits.pybdsf.gaul.FITS

Lines changed: 23 additions & 22 deletions
Large diffs are not rendered by default.
Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,51 @@
11
# Region file format: DS9 version 4.0
22
global color=green font="helvetica 10 normal" select=1 highlite=1 edit=1 move=1 delete=1 include=1 fixed=0 source
33
fk5
4-
ellipse(258.251144743606,64.16025664957343,56.95229621766153",53.00990952076791",97.26671113142405) # text={tbdsf_process_image.in_fits_w0_i0_s0_g0}
5-
ellipse(258.25370085954904,64.15177012085591,63.72302388018877",42.89180910605235",222.4492129416978) # text={tbdsf_process_image.in_fits_w0_i0_s0_g1}
6-
ellipse(258.1871527478031,64.29219530186056,76.17217278648222",63.973419748499296",111.96815573659975) # text={tbdsf_process_image.in_fits_w0_i2_s3_g2}
7-
ellipse(258.1815520143971,64.27140665312471,54.0",54.0",90.0) # text={tbdsf_process_image.in_fits_w0_i2_s4_g3}
8-
ellipse(258.093421047197,64.14194417623547,57.80855021986335",43.42670686324028",262.45456847114053) # text={tbdsf_process_image.in_fits_w0_i3_s5_g4}
9-
ellipse(258.1503422176401,64.44774926885286,54.55743004586177",50.34983247258747",131.475016509682) # text={tbdsf_process_image.in_fits_w0_i4_s6_g5}
10-
ellipse(258.046191733356,64.26088166904505,64.04313914784923",50.74540770094594",242.4899187710543) # text={tbdsf_process_image.in_fits_w0_i5_s7_g6}
11-
ellipse(257.99781136162756,64.2782401932823,71.11671861687374",62.02919671446578",244.1653914808416) # text={tbdsf_process_image.in_fits_w0_i5_s8_g7}
12-
ellipse(258.0156809310393,64.22778509088576,53.318660590778414",45.425877237460526",98.28277970714305) # text={tbdsf_process_image.in_fits_w0_i6_s9_g8}
13-
ellipse(257.9451057562919,64.48652523174617,54.64468675628351",47.388815151017305",263.5993219377618) # text={tbdsf_process_image.in_fits_w0_i7_s10_g9}
14-
ellipse(257.8647419115774,64.78652596378484,104.04390876347748",51.891891046969356",149.01004353114092) # text={tbdsf_process_image.in_fits_w0_i8_s11_g10}
15-
ellipse(257.8503829143695,64.28349715094954,49.50311733523201",42.15506869421105",95.33858874919119) # text={tbdsf_process_image.in_fits_w0_i9_s12_g11}
16-
ellipse(257.7213890038119,64.84279836199923,53.98492543542282",47.15908245252569",90.20962222594548) # text={tbdsf_process_image.in_fits_w0_i10_s13_g12}
17-
ellipse(257.73869443677904,64.86187739021614,54.091914671344064",46.788645102577306",242.6811875689067) # text={tbdsf_process_image.in_fits_w0_i10_s14_g13}
18-
ellipse(257.69081773664294,64.19941539764326,74.54047149054797",42.078282382899836",236.5266158196569) # text={tbdsf_process_image.in_fits_w0_i11_s15_g14}
19-
ellipse(257.6396093933974,64.50232583128762,60.03732755563491",52.68554568268609",264.5857052678835) # text={tbdsf_process_image.in_fits_w0_i12_s16_g15}
20-
ellipse(257.66083513239187,64.49364149805737,55.08431016428197",52.24372509623305",97.17749060355084) # text={tbdsf_process_image.in_fits_w0_i12_s16_g16}
21-
ellipse(257.6344577717749,64.65420358487933,54.01018900836802",46.55568475608075",107.32829401573618) # text={tbdsf_process_image.in_fits_w0_i13_s17_g17}
22-
ellipse(257.60225742507276,64.75506491342287,53.910101075414865",49.408138087621914",267.6810178793629) # text={tbdsf_process_image.in_fits_w0_i14_s18_g18}
23-
ellipse(257.58257740600834,64.46392925675445,49.90299411594646",44.3784963984662",100.21810973375887) # text={tbdsf_process_image.in_fits_w0_i15_s19_g19}
24-
ellipse(257.4423045498979,64.759990550475,56.68264272841056",50.71058017075928",102.06398439930219) # text={tbdsf_process_image.in_fits_w0_i16_s20_g20}
25-
ellipse(257.42333481698086,64.55903004544432,64.83490695465368",49.882545343986294",90.57380216009787) # text={tbdsf_process_image.in_fits_w0_i17_s21_g21}
26-
ellipse(257.30095308559964,64.5123741149839,47.56279301254615",43.02542405157786",263.08869854032554) # text={tbdsf_process_image.in_fits_w0_i18_s22_g22}
27-
ellipse(257.26674323404137,64.61898160240014,62.410394574342014",47.4124573258624",129.52544425154795) # text={tbdsf_process_image.in_fits_w0_i19_s23_g23}
28-
ellipse(257.23468631523485,64.32713536091964,52.610296045452685",47.51459798070709",262.56493135628864) # text={tbdsf_process_image.in_fits_w0_i20_s24_g24}
29-
ellipse(257.1764561696155,64.18189461882822,51.90666531490877",45.51373228140054",262.77595019068735) # text={tbdsf_process_image.in_fits_w0_i21_s25_g25}
30-
ellipse(257.1632403866559,64.6428658819653,52.700500420024",43.5189098446929",268.4385005858985) # text={tbdsf_process_image.in_fits_w0_i22_s26_g26}
31-
ellipse(257.13875379767876,64.79579767610417,49.92584826467388",46.20852785798526",248.6485253776974) # text={tbdsf_process_image.in_fits_w0_i23_s27_g27}
32-
ellipse(257.1092062147455,64.33382300173083,42.21293487371512",36.435544385864006",104.2223866103582) # text={tbdsf_process_image.in_fits_w0_i24_s28_g28}
33-
ellipse(257.06468468786704,64.72465970384042,51.35528478921363",43.713513279346515",258.7273777795446) # text={tbdsf_process_image.in_fits_w0_i25_s29_g29}
34-
ellipse(257.045761070189,64.36824182809686,53.669684520584674",46.11957891417484",258.907969315846) # text={tbdsf_process_image.in_fits_w0_i26_s30_g30}
35-
ellipse(257.01434187399275,64.20604763984578,57.51319900144749",50.899648055649216",266.557984426086) # text={tbdsf_process_image.in_fits_w0_i27_s31_g31}
36-
ellipse(256.9843362709805,64.41157493912749,61.29764965674525",54.923617071788",264.45101513938073) # text={tbdsf_process_image.in_fits_w0_i28_s32_g32}
37-
ellipse(256.9253997421614,64.57052533124703,57.291076512908575",49.81710314839629",132.42621697298367) # text={tbdsf_process_image.in_fits_w0_i29_s33_g33}
38-
ellipse(256.7857983686765,64.29133805242569,52.95805787861601",43.47772575268438",123.42895351001869) # text={tbdsf_process_image.in_fits_w0_i30_s34_g34}
39-
ellipse(256.54473828550465,64.63689344768626,64.85487973990233",58.84110790368065",234.00031800258677) # text={tbdsf_process_image.in_fits_w0_i31_s35_g35}
40-
ellipse(256.5896217981064,64.63398472722695,58.851458892760604",52.19662040559365",93.65533301933735) # text={tbdsf_process_image.in_fits_w0_i31_s35_g36}
41-
ellipse(256.59815349256667,64.45705801832372,50.47002703760066",45.72201056341276",93.10958555125501) # text={tbdsf_process_image.in_fits_w0_i32_s36_g37}
42-
ellipse(258.26116932754326,64.12835479385679,71.38973174946182",61.34631569223134",204.49452989380575) # text={tbdsf_process_image.in_fits_w1_i0_s1_g38}
43-
ellipse(258.2451339141245,64.25646175189276,192.3643185179648",103.03364308183056",259.06485776980287) # text={tbdsf_process_image.in_fits_w1_i1_s2_g39}
44-
ellipse(257.8825119916437,64.82080635773373,84.99128462767239",69.868571337322",210.3283738233202) # text={tbdsf_process_image.in_fits_w1_i33_s37_g40}
45-
ellipse(257.6467152079941,64.33523607598964,77.89239399017484",60.14787225225027",188.84391809255789) # text={tbdsf_process_image.in_fits_w1_i34_s38_g41}
46-
ellipse(258.0883864116285,64.13713210349275,297.0397515746143",171.3004252372753",170.47529329774835) # text={tbdsf_process_image.in_fits_w2_i3_s5_g42}
47-
ellipse(256.98945128756327,64.42230181165175,184.7730979669709",135.39015409124747",250.2234245963142) # text={tbdsf_process_image.in_fits_w1_i28_s32_g42}
4+
ellipse(258.24308867493687,64.25689497039352,115.79928957943433",52.059221542692974",250.65114937990745) # text={tbdsf_process_image.in_fits_w0_i1_s2_g0}
5+
ellipse(258.1871527478031,64.29219530186056,76.17217278648222",63.973419748499296",111.96815573659975) # text={tbdsf_process_image.in_fits_w0_i2_s3_g1}
6+
ellipse(258.1815520143971,64.27140665312471,54.0",54.0",90.0) # text={tbdsf_process_image.in_fits_w0_i2_s4_g2}
7+
ellipse(258.093421047197,64.14194417623547,57.80855021986335",43.42670686324028",262.45456847114053) # text={tbdsf_process_image.in_fits_w0_i3_s5_g3}
8+
ellipse(258.1503422176401,64.44774926885286,54.55743004586177",50.34983247258747",131.475016509682) # text={tbdsf_process_image.in_fits_w0_i4_s6_g4}
9+
ellipse(258.046191733356,64.26088166904505,64.04313914784923",50.74540770094594",242.4899187710543) # text={tbdsf_process_image.in_fits_w0_i5_s7_g5}
10+
ellipse(257.99781136162756,64.2782401932823,71.11671861687374",62.02919671446578",244.1653914808416) # text={tbdsf_process_image.in_fits_w0_i5_s8_g6}
11+
ellipse(258.0156809310393,64.22778509088576,53.318660590778414",45.425877237460526",98.28277970714305) # text={tbdsf_process_image.in_fits_w0_i6_s9_g7}
12+
ellipse(257.9451057562919,64.48652523174617,54.64468675628351",47.388815151017305",263.5993219377618) # text={tbdsf_process_image.in_fits_w0_i7_s10_g8}
13+
ellipse(257.8647419115774,64.78652596378484,104.04390876347748",51.891891046969356",149.01004353114092) # text={tbdsf_process_image.in_fits_w0_i8_s11_g9}
14+
ellipse(257.8503829143695,64.28349715094954,49.50311733523201",42.15506869421105",95.33858874919119) # text={tbdsf_process_image.in_fits_w0_i9_s12_g10}
15+
ellipse(257.7213890038119,64.84279836199923,53.98492543542282",47.15908245252569",90.20962222594548) # text={tbdsf_process_image.in_fits_w0_i10_s13_g11}
16+
ellipse(257.73869443677904,64.86187739021614,54.091914671344064",46.788645102577306",242.6811875689067) # text={tbdsf_process_image.in_fits_w0_i10_s14_g12}
17+
ellipse(257.69081773664294,64.19941539764326,74.54047149054797",42.078282382899836",236.5266158196569) # text={tbdsf_process_image.in_fits_w0_i11_s15_g13}
18+
ellipse(257.6396093933974,64.50232583128762,60.03732755563491",52.68554568268609",264.5857052678835) # text={tbdsf_process_image.in_fits_w0_i12_s16_g14}
19+
ellipse(257.66083513239187,64.49364149805737,55.08431016428197",52.24372509623305",97.17749060355084) # text={tbdsf_process_image.in_fits_w0_i12_s16_g15}
20+
ellipse(257.6344577717749,64.65420358487933,54.01018900836802",46.55568475608075",107.32829401573618) # text={tbdsf_process_image.in_fits_w0_i13_s17_g16}
21+
ellipse(257.60225742507276,64.75506491342287,53.910101075414865",49.408138087621914",267.6810178793629) # text={tbdsf_process_image.in_fits_w0_i14_s18_g17}
22+
ellipse(257.58257740600834,64.46392925675445,49.90299411594646",44.3784963984662",100.21810973375887) # text={tbdsf_process_image.in_fits_w0_i15_s19_g18}
23+
ellipse(257.4423045498979,64.759990550475,56.68264272841056",50.71058017075928",102.06398439930219) # text={tbdsf_process_image.in_fits_w0_i16_s20_g19}
24+
ellipse(257.42333481698086,64.55903004544432,64.83490695465368",49.882545343986294",90.57380216009787) # text={tbdsf_process_image.in_fits_w0_i17_s21_g20}
25+
ellipse(257.30095308559964,64.5123741149839,47.56279301254615",43.02542405157786",263.08869854032554) # text={tbdsf_process_image.in_fits_w0_i18_s22_g21}
26+
ellipse(257.26674323404137,64.61898160240014,62.410394574342014",47.4124573258624",129.52544425154795) # text={tbdsf_process_image.in_fits_w0_i19_s23_g22}
27+
ellipse(257.23468631523485,64.32713536091964,52.610296045452685",47.51459798070709",262.56493135628864) # text={tbdsf_process_image.in_fits_w0_i20_s24_g23}
28+
ellipse(257.1764561696155,64.18189461882822,51.90666531490877",45.51373228140054",262.77595019068735) # text={tbdsf_process_image.in_fits_w0_i21_s25_g24}
29+
ellipse(257.1632403866559,64.6428658819653,52.700500420024",43.5189098446929",268.4385005858985) # text={tbdsf_process_image.in_fits_w0_i22_s26_g25}
30+
ellipse(257.13875379767876,64.79579767610417,49.92584826467388",46.20852785798526",248.6485253776974) # text={tbdsf_process_image.in_fits_w0_i23_s27_g26}
31+
ellipse(257.1092062147455,64.33382300173083,42.21293487371512",36.435544385864006",104.2223866103582) # text={tbdsf_process_image.in_fits_w0_i24_s28_g27}
32+
ellipse(257.06468468786704,64.72465970384042,51.35528478921363",43.713513279346515",258.7273777795446) # text={tbdsf_process_image.in_fits_w0_i25_s29_g28}
33+
ellipse(257.045761070189,64.36824182809686,53.669684520584674",46.11957891417484",258.907969315846) # text={tbdsf_process_image.in_fits_w0_i26_s30_g29}
34+
ellipse(257.01434187399275,64.20604763984578,57.51319900144749",50.899648055649216",266.557984426086) # text={tbdsf_process_image.in_fits_w0_i27_s31_g30}
35+
ellipse(256.9843362709805,64.41157493912749,61.29764965674525",54.923617071788",264.45101513938073) # text={tbdsf_process_image.in_fits_w0_i28_s32_g31}
36+
ellipse(256.9253997421614,64.57052533124703,57.291076512908575",49.81710314839629",132.42621697298367) # text={tbdsf_process_image.in_fits_w0_i29_s33_g32}
37+
ellipse(256.7857983686765,64.29133805242569,52.95805787861601",43.47772575268438",123.42895351001869) # text={tbdsf_process_image.in_fits_w0_i30_s34_g33}
38+
ellipse(256.54473828550465,64.63689344768626,64.85487973990233",58.84110790368065",234.00031800258677) # text={tbdsf_process_image.in_fits_w0_i31_s35_g34}
39+
ellipse(256.5896217981064,64.63398472722695,58.851458892760604",52.19662040559365",93.65533301933735) # text={tbdsf_process_image.in_fits_w0_i31_s35_g35}
40+
ellipse(256.59815349256667,64.45705801832372,50.47002703760066",45.72201056341276",93.10958555125501) # text={tbdsf_process_image.in_fits_w0_i32_s36_g36}
41+
ellipse(258.24952560944956,64.15895613560089,78.66096049776189",67.7375882462505",269.8905449945094) # text={tbdsf_process_image.in_fits_w1_i0_s0_g37}
42+
ellipse(258.2593165693302,64.12856906114794,62.95170168717371",53.94074253628668",192.8821093330953) # text={tbdsf_process_image.in_fits_w1_i0_s1_g38}
43+
ellipse(258.0810309849038,64.13753349284765,208.37570078902692",69.20277325949918",175.22672425734262) # text={tbdsf_process_image.in_fits_w1_i3_s5_g39}
44+
ellipse(257.88251190222854,64.82080645414293,85.0425883909623",69.91002397762423",210.32485253424488) # text={tbdsf_process_image.in_fits_w1_i33_s37_g40}
45+
ellipse(257.64671525665045,64.33523630449281,77.94023554628039",60.18631199646672",188.840516037307) # text={tbdsf_process_image.in_fits_w1_i34_s38_g41}
46+
ellipse(256.9894504682099,64.42230161520725,184.8978809199177",135.47448957322231",250.23047455646946) # text={tbdsf_process_image.in_fits_w1_i28_s32_g42}
4847
ellipse(257.8735680517425,64.23258802980378,124.70914324328758",70.72530826103186",173.69837929869433) # text={tbdsf_process_image.in_fits_w0_i34_s39_g42}
49-
ellipse(256.56442949703785,64.6607713802034,95.6904452236559",66.62533771076797",241.2453273338905) # text={tbdsf_process_image.in_fits_w1_i31_s35_g43}
48+
ellipse(256.56442966866825,64.66077155806049,95.75441720965102",66.66778680297249",241.24943625060337) # text={tbdsf_process_image.in_fits_w1_i31_s35_g43}
5049
ellipse(257.69488650549687,64.44949570934533,163.2876602728479",87.82201945727486",200.95858957505635) # text={tbdsf_process_image.in_fits_w0_i35_s40_g43}
50+
ellipse(257.69600088286626,64.41493843612918,99.05838574458863",32.010967617463386",97.65977261585604) # text={tbdsf_process_image.in_fits_w0_i36_s41_g44}
51+
ellipse(257.5278273876821,64.63402777923505,46.42835022797814",22.353493501074155",232.08586807135072) # text={tbdsf_process_image.in_fits_w0_i37_s42_g45}

test/reference_outputs/catalogues/tbdsf_process_image.in_fits.pybdsf.kvis.ann

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22

33
color green
44

5-
text 258.25114 64.16026 0
6-
ellipse 258.25114 64.16026 0.0158201 0.0147250 7.2667
7-
text 258.25370 64.15177 0
8-
ellipse 258.25370 64.15177 0.0177008 0.0119144 132.4492
9-
text 258.26117 64.12835 0
10-
ellipse 258.26117 64.12835 0.0198305 0.0170406 114.4945
11-
text 258.24513 64.25646 1
12-
ellipse 258.24513 64.25646 0.0534345 0.0286205 169.0649
5+
text 258.24953 64.15896 0
6+
ellipse 258.24953 64.15896 0.0218503 0.0188160 179.8905
7+
text 258.25932 64.12857 0
8+
ellipse 258.25932 64.12857 0.0174866 0.0149835 102.8821
9+
text 258.24309 64.25689 1
10+
ellipse 258.24309 64.25689 0.0321665 0.0144609 160.6511
1311
text 258.18715 64.29220 2
1412
ellipse 258.18715 64.29220 0.0211589 0.0177704 21.9682
1513
text 258.18155 64.27141 2
1614
ellipse 258.18155 64.27141 0.0150000 0.0150000 0.0000
1715
text 258.09342 64.14194 3
1816
ellipse 258.09342 64.14194 0.0160579 0.0120630 172.4546
19-
text 258.08839 64.13713 3
20-
ellipse 258.08839 64.13713 0.0825110 0.0475835 80.4753
17+
text 258.08103 64.13753 3
18+
ellipse 258.08103 64.13753 0.0578821 0.0192230 85.2267
2119
text 258.15034 64.44775 4
2220
ellipse 258.15034 64.44775 0.0151548 0.0139861 41.4750
2321
text 258.04619 64.26088 5
@@ -75,7 +73,7 @@ ellipse 257.01434 64.20605 0.0159759 0.0141388 176.5580
7573
text 256.98434 64.41157 28
7674
ellipse 256.98434 64.41157 0.0170271 0.0152566 174.4510
7775
text 256.98945 64.42230 28
78-
ellipse 256.98945 64.42230 0.0513259 0.0376084 160.2234
76+
ellipse 256.98945 64.42230 0.0513605 0.0376318 160.2305
7977
text 256.92540 64.57053 29
8078
ellipse 256.92540 64.57053 0.0159142 0.0138381 42.4262
8179
text 256.78580 64.29134 30
@@ -85,14 +83,18 @@ ellipse 256.54474 64.63689 0.0180152 0.0163448 144.0003
8583
text 256.58962 64.63398 31
8684
ellipse 256.58962 64.63398 0.0163476 0.0144991 3.6553
8785
text 256.56443 64.66077 31
88-
ellipse 256.56443 64.66077 0.0265807 0.0185070 151.2453
86+
ellipse 256.56443 64.66077 0.0265984 0.0185188 151.2494
8987
text 256.59815 64.45706 32
9088
ellipse 256.59815 64.45706 0.0140195 0.0127006 3.1096
9189
text 257.88251 64.82081 33
92-
ellipse 257.88251 64.82081 0.0236087 0.0194079 120.3284
90+
ellipse 257.88251 64.82081 0.0236229 0.0194195 120.3249
9391
text 257.64672 64.33524 34
94-
ellipse 257.64672 64.33524 0.0216368 0.0167077 98.8439
92+
ellipse 257.64672 64.33524 0.0216501 0.0167184 98.8405
9593
text 257.87357 64.23259 35
9694
ellipse 257.87357 64.23259 0.0346414 0.0196459 83.6984
9795
text 257.69489 64.44950 36
9896
ellipse 257.69489 64.44950 0.0453577 0.0243950 110.9586
97+
text 257.69600 64.41494 37
98+
ellipse 257.69600 64.41494 0.0275162 0.0088919 7.6598
99+
text 257.52783 64.63403 38
100+
ellipse 257.52783 64.63403 0.0128968 0.0062093 142.0859

0 commit comments

Comments
 (0)