diff --git a/galaxy/wrapper/bamCompare.xml b/galaxy/wrapper/bamCompare.xml index 6e654af427..0e012b5747 100644 --- a/galaxy/wrapper/bamCompare.xml +++ b/galaxy/wrapper/bamCompare.xml @@ -198,7 +198,7 @@ - + + --> + @@ -240,9 +240,9 @@ - - - + + + @@ -257,9 +257,9 @@ - - - + + + @@ -274,8 +274,8 @@ - - + + diff --git a/galaxy/wrapper/test-data/bamCompare_result2.bw b/galaxy/wrapper/test-data/bamCompare_result2.bw index d6d5c0438b..75b87e5000 100644 Binary files a/galaxy/wrapper/test-data/bamCompare_result2.bw and b/galaxy/wrapper/test-data/bamCompare_result2.bw differ diff --git a/galaxy/wrapper/test-data/bamCoverage_result1.bw b/galaxy/wrapper/test-data/bamCoverage_result1.bw index d489b05384..695105d378 100644 Binary files a/galaxy/wrapper/test-data/bamCoverage_result1.bw and b/galaxy/wrapper/test-data/bamCoverage_result1.bw differ diff --git a/galaxy/wrapper/test-data/bamCoverage_result2.bw b/galaxy/wrapper/test-data/bamCoverage_result2.bw index 70ef6dd0cc..846ed84a57 100644 Binary files a/galaxy/wrapper/test-data/bamCoverage_result2.bw and b/galaxy/wrapper/test-data/bamCoverage_result2.bw differ diff --git a/galaxy/wrapper/test-data/bamCoverage_result3.bg b/galaxy/wrapper/test-data/bamCoverage_result3.bg index 1e0793e5c2..25cf375b05 100644 --- a/galaxy/wrapper/test-data/bamCoverage_result3.bg +++ b/galaxy/wrapper/test-data/bamCoverage_result3.bg @@ -1,7 +1,7 @@ -chrM 0 210 9.76876e+06 -chrM 210 220 9.56092e+06 -chrM 220 230 7.6903e+06 -chrM 230 240 5.19615e+06 -chrM 240 250 3.32554e+06 -chrM 250 260 623538 +chrM 0 210 9768765 +chrM 210 220 9560919 +chrM 220 230 7690304.5 +chrM 230 240 5196151.5 +chrM 240 250 3325537 +chrM 250 260 623538.2 chrM 260 16569 0 diff --git a/galaxy/wrapper/test-data/bamCoverage_result4.bg b/galaxy/wrapper/test-data/bamCoverage_result4.bg index 24b6f0c3c7..ded2d121f4 100644 --- a/galaxy/wrapper/test-data/bamCoverage_result4.bg +++ b/galaxy/wrapper/test-data/bamCoverage_result4.bg @@ -1,472 +1,472 @@ -phiX174 0 10 16038.5 -phiX174 10 20 48115.4 -phiX174 20 70 144346 -phiX174 70 80 192462 -phiX174 80 90 176423 -phiX174 90 100 160385 -phiX174 100 120 112269 -phiX174 120 140 144346 -phiX174 140 150 160385 -phiX174 150 160 128308 -phiX174 160 170 160385 -phiX174 170 180 176423 +phiX174 0 10 16038.46 +phiX174 10 20 48115.39 +phiX174 20 70 144346.16 +phiX174 70 80 192461.55 +phiX174 80 90 176423.08 +phiX174 90 100 160384.63 +phiX174 100 120 112269.23 +phiX174 120 140 144346.16 +phiX174 140 150 160384.63 +phiX174 150 160 128307.7 +phiX174 160 170 160384.63 +phiX174 170 180 176423.08 phiX174 180 200 208500 -phiX174 200 210 192462 -phiX174 210 220 240577 -phiX174 220 230 272654 -phiX174 230 240 336808 -phiX174 240 250 320769 -phiX174 250 260 288692 -phiX174 260 270 336808 -phiX174 270 280 400962 +phiX174 200 210 192461.55 +phiX174 210 220 240576.92 +phiX174 220 230 272653.84 +phiX174 230 240 336807.7 +phiX174 240 250 320769.25 +phiX174 250 260 288692.3 +phiX174 260 270 336807.7 +phiX174 270 280 400961.56 phiX174 280 300 417000 -phiX174 300 310 352846 -phiX174 310 320 320769 -phiX174 320 330 368885 -phiX174 330 340 352846 -phiX174 340 350 288692 -phiX174 350 360 256615 -phiX174 360 370 224538 -phiX174 370 380 240577 -phiX174 380 390 304731 -phiX174 390 400 256615 -phiX174 400 410 240577 -phiX174 410 420 224538 -phiX174 420 450 288692 -phiX174 450 460 304731 -phiX174 460 470 336808 +phiX174 300 310 352846.16 +phiX174 310 320 320769.25 +phiX174 320 330 368884.63 +phiX174 330 340 352846.16 +phiX174 340 350 288692.3 +phiX174 350 360 256615.4 +phiX174 360 370 224538.45 +phiX174 370 380 240576.92 +phiX174 380 390 304730.78 +phiX174 390 400 256615.4 +phiX174 400 410 240576.92 +phiX174 410 420 224538.45 +phiX174 420 450 288692.3 +phiX174 450 460 304730.78 +phiX174 460 470 336807.7 phiX174 470 490 417000 -phiX174 490 510 497192 -phiX174 510 520 465115 -phiX174 520 530 561346 -phiX174 530 540 497192 -phiX174 540 550 529269 -phiX174 550 560 545308 -phiX174 560 570 641538 +phiX174 490 510 497192.3 +phiX174 510 520 465115.4 +phiX174 520 530 561346.2 +phiX174 530 540 497192.3 +phiX174 540 550 529269.25 +phiX174 550 560 545307.7 +phiX174 560 570 641538.5 phiX174 570 580 625500 -phiX174 580 590 561346 -phiX174 590 600 609462 -phiX174 600 610 545308 +phiX174 580 590 561346.2 +phiX174 590 600 609461.56 +phiX174 600 610 545307.7 phiX174 610 630 625500 -phiX174 630 640 577385 -phiX174 640 650 513231 -phiX174 650 660 545308 -phiX174 660 670 561346 -phiX174 670 680 593423 -phiX174 680 690 657577 -phiX174 690 700 641538 -phiX174 700 710 561346 -phiX174 710 730 593423 -phiX174 730 740 513231 -phiX174 740 760 593423 -phiX174 760 770 497192 -phiX174 770 780 513231 -phiX174 780 790 529269 -phiX174 790 800 545308 -phiX174 800 810 449077 -phiX174 810 820 433038 -phiX174 820 830 368885 -phiX174 830 840 320769 -phiX174 840 850 352846 -phiX174 850 860 304731 -phiX174 860 870 336808 -phiX174 870 880 256615 -phiX174 880 890 352846 -phiX174 890 900 384923 -phiX174 900 910 465115 -phiX174 910 920 545308 -phiX174 920 930 561346 -phiX174 930 940 545308 -phiX174 940 950 577385 -phiX174 950 960 593423 -phiX174 960 970 513231 -phiX174 970 980 481154 -phiX174 980 990 433038 +phiX174 630 640 577384.6 +phiX174 640 650 513230.8 +phiX174 650 660 545307.7 +phiX174 660 670 561346.2 +phiX174 670 680 593423.06 +phiX174 680 690 657576.94 +phiX174 690 700 641538.5 +phiX174 700 710 561346.2 +phiX174 710 730 593423.06 +phiX174 730 740 513230.8 +phiX174 740 760 593423.06 +phiX174 760 770 497192.3 +phiX174 770 780 513230.8 +phiX174 780 790 529269.25 +phiX174 790 800 545307.7 +phiX174 800 810 449076.9 +phiX174 810 820 433038.47 +phiX174 820 830 368884.63 +phiX174 830 840 320769.25 +phiX174 840 850 352846.16 +phiX174 850 860 304730.78 +phiX174 860 870 336807.7 +phiX174 870 880 256615.4 +phiX174 880 890 352846.16 +phiX174 890 900 384923.1 +phiX174 900 910 465115.4 +phiX174 910 920 545307.7 +phiX174 920 930 561346.2 +phiX174 930 940 545307.7 +phiX174 940 950 577384.6 +phiX174 950 960 593423.06 +phiX174 960 970 513230.8 +phiX174 970 980 481153.84 +phiX174 980 990 433038.47 phiX174 990 1000 417000 -phiX174 1000 1010 449077 -phiX174 1010 1030 577385 -phiX174 1030 1040 753808 -phiX174 1040 1050 785885 -phiX174 1050 1060 817962 -phiX174 1060 1070 866077 +phiX174 1000 1010 449076.9 +phiX174 1010 1030 577384.6 +phiX174 1030 1040 753807.7 +phiX174 1040 1050 785884.6 +phiX174 1050 1060 817961.6 +phiX174 1060 1070 866076.94 phiX174 1070 1080 834000 -phiX174 1080 1090 866077 -phiX174 1090 1100 769846 -phiX174 1100 1110 737769 -phiX174 1110 1120 657577 -phiX174 1120 1130 641538 +phiX174 1080 1090 866076.94 +phiX174 1090 1100 769846.2 +phiX174 1100 1110 737769.25 +phiX174 1110 1120 657576.94 +phiX174 1120 1130 641538.5 phiX174 1130 1140 625500 -phiX174 1140 1150 673615 +phiX174 1140 1150 673615.4 phiX174 1150 1160 625500 -phiX174 1160 1170 593423 -phiX174 1170 1180 609462 -phiX174 1180 1190 577385 -phiX174 1190 1200 513231 -phiX174 1200 1210 481154 -phiX174 1210 1220 561346 -phiX174 1220 1230 481154 -phiX174 1230 1240 449077 -phiX174 1240 1250 352846 -phiX174 1250 1260 336808 -phiX174 1260 1270 400962 -phiX174 1270 1280 352846 -phiX174 1280 1290 368885 -phiX174 1290 1300 320769 -phiX174 1300 1310 384923 -phiX174 1310 1320 513231 -phiX174 1320 1330 497192 -phiX174 1330 1340 513231 -phiX174 1340 1350 481154 -phiX174 1350 1370 497192 -phiX174 1370 1390 465115 -phiX174 1390 1400 352846 -phiX174 1400 1410 449077 -phiX174 1410 1430 481154 -phiX174 1430 1450 545308 -phiX174 1450 1460 561346 -phiX174 1460 1470 577385 -phiX174 1470 1480 609462 -phiX174 1480 1490 593423 -phiX174 1490 1500 545308 -phiX174 1500 1510 657577 +phiX174 1160 1170 593423.06 +phiX174 1170 1180 609461.56 +phiX174 1180 1190 577384.6 +phiX174 1190 1200 513230.8 +phiX174 1200 1210 481153.84 +phiX174 1210 1220 561346.2 +phiX174 1220 1230 481153.84 +phiX174 1230 1240 449076.9 +phiX174 1240 1250 352846.16 +phiX174 1250 1260 336807.7 +phiX174 1260 1270 400961.56 +phiX174 1270 1280 352846.16 +phiX174 1280 1290 368884.63 +phiX174 1290 1300 320769.25 +phiX174 1300 1310 384923.1 +phiX174 1310 1320 513230.8 +phiX174 1320 1330 497192.3 +phiX174 1330 1340 513230.8 +phiX174 1340 1350 481153.84 +phiX174 1350 1370 497192.3 +phiX174 1370 1390 465115.4 +phiX174 1390 1400 352846.16 +phiX174 1400 1410 449076.9 +phiX174 1410 1430 481153.84 +phiX174 1430 1450 545307.7 +phiX174 1450 1460 561346.2 +phiX174 1460 1470 577384.6 +phiX174 1470 1480 609461.56 +phiX174 1480 1490 593423.06 +phiX174 1490 1500 545307.7 +phiX174 1500 1510 657576.94 phiX174 1510 1520 625500 -phiX174 1520 1540 785885 -phiX174 1540 1550 721731 -phiX174 1550 1570 753808 -phiX174 1570 1580 769846 -phiX174 1580 1590 673615 +phiX174 1520 1540 785884.6 +phiX174 1540 1550 721730.8 +phiX174 1550 1570 753807.7 +phiX174 1570 1580 769846.2 +phiX174 1580 1590 673615.4 phiX174 1590 1600 625500 -phiX174 1600 1610 561346 -phiX174 1610 1620 529269 -phiX174 1620 1630 497192 -phiX174 1630 1640 465115 -phiX174 1640 1650 481154 -phiX174 1650 1660 497192 -phiX174 1660 1670 529269 -phiX174 1670 1680 593423 -phiX174 1680 1690 513231 -phiX174 1690 1700 529269 -phiX174 1700 1710 593423 -phiX174 1710 1720 545308 -phiX174 1720 1730 529269 -phiX174 1730 1740 577385 -phiX174 1740 1750 529269 -phiX174 1750 1760 433038 +phiX174 1600 1610 561346.2 +phiX174 1610 1620 529269.25 +phiX174 1620 1630 497192.3 +phiX174 1630 1640 465115.4 +phiX174 1640 1650 481153.84 +phiX174 1650 1660 497192.3 +phiX174 1660 1670 529269.25 +phiX174 1670 1680 593423.06 +phiX174 1680 1690 513230.8 +phiX174 1690 1700 529269.25 +phiX174 1700 1710 593423.06 +phiX174 1710 1720 545307.7 +phiX174 1720 1730 529269.25 +phiX174 1730 1740 577384.6 +phiX174 1740 1750 529269.25 +phiX174 1750 1760 433038.47 phiX174 1760 1770 417000 -phiX174 1770 1780 368885 -phiX174 1780 1790 352846 -phiX174 1790 1810 336808 -phiX174 1810 1820 320769 -phiX174 1820 1830 465115 -phiX174 1830 1860 705692 -phiX174 1860 1870 801923 -phiX174 1870 1880 737769 -phiX174 1880 1890 673615 -phiX174 1890 1900 705692 -phiX174 1900 1910 609462 -phiX174 1910 1920 400962 -phiX174 1920 1930 465115 -phiX174 1930 1940 545308 -phiX174 1940 1950 449077 -phiX174 1950 1960 481154 -phiX174 1960 1970 529269 -phiX174 1970 1980 673615 -phiX174 1980 1990 641538 -phiX174 1990 2000 657577 -phiX174 2000 2010 673615 -phiX174 2010 2020 641538 -phiX174 2020 2030 657577 -phiX174 2030 2050 673615 -phiX174 2050 2060 481154 -phiX174 2060 2070 513231 -phiX174 2070 2080 481154 -phiX174 2080 2100 513231 -phiX174 2100 2110 529269 -phiX174 2110 2120 513231 -phiX174 2120 2130 529269 -phiX174 2130 2140 545308 -phiX174 2140 2150 513231 -phiX174 2150 2160 545308 +phiX174 1770 1780 368884.63 +phiX174 1780 1790 352846.16 +phiX174 1790 1810 336807.7 +phiX174 1810 1820 320769.25 +phiX174 1820 1830 465115.4 +phiX174 1830 1860 705692.3 +phiX174 1860 1870 801923.1 +phiX174 1870 1880 737769.25 +phiX174 1880 1890 673615.4 +phiX174 1890 1900 705692.3 +phiX174 1900 1910 609461.56 +phiX174 1910 1920 400961.56 +phiX174 1920 1930 465115.4 +phiX174 1930 1940 545307.7 +phiX174 1940 1950 449076.9 +phiX174 1950 1960 481153.84 +phiX174 1960 1970 529269.25 +phiX174 1970 1980 673615.4 +phiX174 1980 1990 641538.5 +phiX174 1990 2000 657576.94 +phiX174 2000 2010 673615.4 +phiX174 2010 2020 641538.5 +phiX174 2020 2030 657576.94 +phiX174 2030 2050 673615.4 +phiX174 2050 2060 481153.84 +phiX174 2060 2070 513230.8 +phiX174 2070 2080 481153.84 +phiX174 2080 2100 513230.8 +phiX174 2100 2110 529269.25 +phiX174 2110 2120 513230.8 +phiX174 2120 2130 529269.25 +phiX174 2130 2140 545307.7 +phiX174 2140 2150 513230.8 +phiX174 2150 2160 545307.7 phiX174 2160 2170 417000 -phiX174 2170 2180 352846 -phiX174 2180 2190 433038 -phiX174 2190 2200 449077 -phiX174 2200 2210 433038 -phiX174 2210 2220 481154 -phiX174 2220 2230 545308 -phiX174 2230 2240 593423 +phiX174 2170 2180 352846.16 +phiX174 2180 2190 433038.47 +phiX174 2190 2200 449076.9 +phiX174 2200 2210 433038.47 +phiX174 2210 2220 481153.84 +phiX174 2220 2230 545307.7 +phiX174 2230 2240 593423.06 phiX174 2240 2250 625500 -phiX174 2250 2260 721731 +phiX174 2250 2260 721730.8 phiX174 2260 2270 625500 -phiX174 2270 2290 593423 -phiX174 2290 2300 609462 -phiX174 2300 2310 737769 -phiX174 2310 2320 769846 -phiX174 2320 2330 866077 -phiX174 2330 2340 850038 -phiX174 2340 2350 898154 -phiX174 2350 2360 801923 -phiX174 2360 2370 914192 -phiX174 2370 2380 801923 -phiX174 2380 2390 641538 -phiX174 2390 2400 593423 +phiX174 2270 2290 593423.06 +phiX174 2290 2300 609461.56 +phiX174 2300 2310 737769.25 +phiX174 2310 2320 769846.2 +phiX174 2320 2330 866076.94 +phiX174 2330 2340 850038.5 +phiX174 2340 2350 898153.8 +phiX174 2350 2360 801923.1 +phiX174 2360 2370 914192.3 +phiX174 2370 2380 801923.1 +phiX174 2380 2390 641538.5 +phiX174 2390 2400 593423.06 phiX174 2400 2410 417000 -phiX174 2410 2420 400962 -phiX174 2420 2430 352846 -phiX174 2430 2440 481154 -phiX174 2440 2450 449077 -phiX174 2450 2460 609462 -phiX174 2460 2470 673615 -phiX174 2470 2480 737769 -phiX174 2480 2490 753808 -phiX174 2490 2500 769846 -phiX174 2500 2510 785885 -phiX174 2510 2520 641538 -phiX174 2520 2530 657577 -phiX174 2530 2540 529269 -phiX174 2540 2550 465115 -phiX174 2550 2560 384923 -phiX174 2560 2570 433038 -phiX174 2570 2590 465115 -phiX174 2590 2600 449077 -phiX174 2600 2620 529269 -phiX174 2620 2630 545308 -phiX174 2630 2640 689654 +phiX174 2410 2420 400961.56 +phiX174 2420 2430 352846.16 +phiX174 2430 2440 481153.84 +phiX174 2440 2450 449076.9 +phiX174 2450 2460 609461.56 +phiX174 2460 2470 673615.4 +phiX174 2470 2480 737769.25 +phiX174 2480 2490 753807.7 +phiX174 2490 2500 769846.2 +phiX174 2500 2510 785884.6 +phiX174 2510 2520 641538.5 +phiX174 2520 2530 657576.94 +phiX174 2530 2540 529269.25 +phiX174 2540 2550 465115.4 +phiX174 2550 2560 384923.1 +phiX174 2560 2570 433038.47 +phiX174 2570 2590 465115.4 +phiX174 2590 2600 449076.9 +phiX174 2600 2620 529269.25 +phiX174 2620 2630 545307.7 +phiX174 2630 2640 689653.8 phiX174 2640 2650 625500 -phiX174 2650 2660 561346 -phiX174 2660 2670 545308 -phiX174 2670 2680 609462 -phiX174 2680 2700 657577 +phiX174 2650 2660 561346.2 +phiX174 2660 2670 545307.7 +phiX174 2670 2680 609461.56 +phiX174 2680 2700 657576.94 phiX174 2700 2710 625500 -phiX174 2710 2720 593423 -phiX174 2720 2740 657577 -phiX174 2740 2750 817962 -phiX174 2750 2760 866077 -phiX174 2760 2770 850038 -phiX174 2770 2780 882115 -phiX174 2780 2790 962308 -phiX174 2790 2800 817962 +phiX174 2710 2720 593423.06 +phiX174 2720 2740 657576.94 +phiX174 2740 2750 817961.6 +phiX174 2750 2760 866076.94 +phiX174 2760 2770 850038.5 +phiX174 2770 2780 882115.4 +phiX174 2780 2790 962307.7 +phiX174 2790 2800 817961.6 phiX174 2800 2810 834000 -phiX174 2810 2820 801923 -phiX174 2820 2830 673615 -phiX174 2830 2840 705692 +phiX174 2810 2820 801923.1 +phiX174 2820 2830 673615.4 +phiX174 2830 2840 705692.3 phiX174 2840 2860 625500 -phiX174 2860 2870 609462 -phiX174 2870 2880 705692 -phiX174 2880 2890 657577 -phiX174 2890 2900 609462 -phiX174 2900 2910 657577 -phiX174 2910 2930 561346 -phiX174 2930 2940 513231 -phiX174 2940 2950 561346 -phiX174 2950 2960 497192 -phiX174 2960 2970 577385 -phiX174 2970 2980 593423 -phiX174 2980 2990 513231 -phiX174 2990 3000 529269 -phiX174 3000 3010 561346 -phiX174 3010 3020 513231 -phiX174 3020 3030 465115 -phiX174 3030 3040 433038 +phiX174 2860 2870 609461.56 +phiX174 2870 2880 705692.3 +phiX174 2880 2890 657576.94 +phiX174 2890 2900 609461.56 +phiX174 2900 2910 657576.94 +phiX174 2910 2930 561346.2 +phiX174 2930 2940 513230.8 +phiX174 2940 2950 561346.2 +phiX174 2950 2960 497192.3 +phiX174 2960 2970 577384.6 +phiX174 2970 2980 593423.06 +phiX174 2980 2990 513230.8 +phiX174 2990 3000 529269.25 +phiX174 3000 3010 561346.2 +phiX174 3010 3020 513230.8 +phiX174 3020 3030 465115.4 +phiX174 3030 3040 433038.47 phiX174 3040 3050 417000 -phiX174 3050 3060 545308 -phiX174 3060 3070 561346 +phiX174 3050 3060 545307.7 +phiX174 3060 3070 561346.2 phiX174 3070 3080 625500 -phiX174 3080 3100 577385 -phiX174 3100 3110 721731 -phiX174 3110 3120 673615 -phiX174 3120 3130 641538 -phiX174 3130 3140 609462 -phiX174 3140 3160 673615 -phiX174 3160 3180 769846 -phiX174 3180 3190 705692 -phiX174 3190 3200 657577 -phiX174 3200 3210 673615 -phiX174 3210 3220 737769 -phiX174 3220 3230 657577 -phiX174 3230 3240 705692 +phiX174 3080 3100 577384.6 +phiX174 3100 3110 721730.8 +phiX174 3110 3120 673615.4 +phiX174 3120 3130 641538.5 +phiX174 3130 3140 609461.56 +phiX174 3140 3160 673615.4 +phiX174 3160 3180 769846.2 +phiX174 3180 3190 705692.3 +phiX174 3190 3200 657576.94 +phiX174 3200 3210 673615.4 +phiX174 3210 3220 737769.25 +phiX174 3220 3230 657576.94 +phiX174 3230 3240 705692.3 phiX174 3240 3250 625500 -phiX174 3250 3260 545308 -phiX174 3260 3270 593423 +phiX174 3250 3260 545307.7 +phiX174 3260 3270 593423.06 phiX174 3270 3280 625500 -phiX174 3280 3290 577385 -phiX174 3290 3300 529269 -phiX174 3300 3310 513231 -phiX174 3310 3320 529269 -phiX174 3320 3330 609462 -phiX174 3330 3340 657577 -phiX174 3340 3370 641538 -phiX174 3370 3390 657577 -phiX174 3390 3400 577385 -phiX174 3400 3430 481154 -phiX174 3430 3440 513231 -phiX174 3440 3450 609462 -phiX174 3450 3460 577385 -phiX174 3460 3480 673615 -phiX174 3480 3490 721731 +phiX174 3280 3290 577384.6 +phiX174 3290 3300 529269.25 +phiX174 3300 3310 513230.8 +phiX174 3310 3320 529269.25 +phiX174 3320 3330 609461.56 +phiX174 3330 3340 657576.94 +phiX174 3340 3370 641538.5 +phiX174 3370 3390 657576.94 +phiX174 3390 3400 577384.6 +phiX174 3400 3430 481153.84 +phiX174 3430 3440 513230.8 +phiX174 3440 3450 609461.56 +phiX174 3450 3460 577384.6 +phiX174 3460 3480 673615.4 +phiX174 3480 3490 721730.8 phiX174 3490 3500 834000 -phiX174 3500 3510 801923 -phiX174 3510 3520 898154 -phiX174 3520 3530 769846 -phiX174 3530 3540 753808 -phiX174 3540 3550 785885 -phiX174 3550 3560 753808 -phiX174 3560 3570 689654 -phiX174 3570 3580 497192 -phiX174 3580 3590 465115 -phiX174 3590 3610 433038 +phiX174 3500 3510 801923.1 +phiX174 3510 3520 898153.8 +phiX174 3520 3530 769846.2 +phiX174 3530 3540 753807.7 +phiX174 3540 3550 785884.6 +phiX174 3550 3560 753807.7 +phiX174 3560 3570 689653.8 +phiX174 3570 3580 497192.3 +phiX174 3580 3590 465115.4 +phiX174 3590 3610 433038.47 phiX174 3610 3620 417000 -phiX174 3620 3630 400962 -phiX174 3630 3640 384923 -phiX174 3640 3650 352846 -phiX174 3650 3660 433038 -phiX174 3660 3680 400962 +phiX174 3620 3630 400961.56 +phiX174 3630 3640 384923.1 +phiX174 3640 3650 352846.16 +phiX174 3650 3660 433038.47 +phiX174 3660 3680 400961.56 phiX174 3680 3690 417000 -phiX174 3690 3700 336808 -phiX174 3700 3710 384923 -phiX174 3710 3720 433038 +phiX174 3690 3700 336807.7 +phiX174 3700 3710 384923.1 +phiX174 3710 3720 433038.47 phiX174 3720 3730 625500 -phiX174 3730 3740 593423 -phiX174 3740 3750 705692 -phiX174 3750 3760 673615 -phiX174 3760 3780 657577 +phiX174 3730 3740 593423.06 +phiX174 3740 3750 705692.3 +phiX174 3750 3760 673615.4 +phiX174 3760 3780 657576.94 phiX174 3780 3790 625500 -phiX174 3790 3800 497192 +phiX174 3790 3800 497192.3 phiX174 3800 3810 417000 -phiX174 3810 3820 449077 -phiX174 3820 3830 433038 -phiX174 3830 3840 545308 +phiX174 3810 3820 449076.9 +phiX174 3820 3830 433038.47 +phiX174 3830 3840 545307.7 phiX174 3840 3850 625500 -phiX174 3850 3860 769846 -phiX174 3860 3870 801923 -phiX174 3870 3880 769846 -phiX174 3880 3890 721731 -phiX174 3890 3900 673615 -phiX174 3900 3910 641538 -phiX174 3910 3920 593423 -phiX174 3920 3930 449077 -phiX174 3930 3950 400962 -phiX174 3950 3960 433038 -phiX174 3960 3970 529269 -phiX174 3970 3980 593423 -phiX174 3980 3990 561346 -phiX174 3990 4000 641538 +phiX174 3850 3860 769846.2 +phiX174 3860 3870 801923.1 +phiX174 3870 3880 769846.2 +phiX174 3880 3890 721730.8 +phiX174 3890 3900 673615.4 +phiX174 3900 3910 641538.5 +phiX174 3910 3920 593423.06 +phiX174 3920 3930 449076.9 +phiX174 3930 3950 400961.56 +phiX174 3950 3960 433038.47 +phiX174 3960 3970 529269.25 +phiX174 3970 3980 593423.06 +phiX174 3980 3990 561346.2 +phiX174 3990 4000 641538.5 phiX174 4000 4010 625500 -phiX174 4010 4020 609462 -phiX174 4020 4030 641538 -phiX174 4030 4040 657577 -phiX174 4040 4050 545308 -phiX174 4050 4060 481154 -phiX174 4060 4070 449077 -phiX174 4070 4080 400962 -phiX174 4080 4090 433038 -phiX174 4090 4100 529269 -phiX174 4100 4110 400962 -phiX174 4110 4120 368885 -phiX174 4120 4130 304731 -phiX174 4130 4150 368885 -phiX174 4150 4160 336808 -phiX174 4160 4170 384923 -phiX174 4170 4180 272654 -phiX174 4180 4190 336808 -phiX174 4190 4200 352846 -phiX174 4200 4210 368885 -phiX174 4210 4230 320769 -phiX174 4230 4250 336808 -phiX174 4250 4260 384923 -phiX174 4260 4280 481154 -phiX174 4280 4290 449077 -phiX174 4290 4300 465115 -phiX174 4300 4310 529269 -phiX174 4310 4320 609462 -phiX174 4320 4330 577385 -phiX174 4330 4340 465115 +phiX174 4010 4020 609461.56 +phiX174 4020 4030 641538.5 +phiX174 4030 4040 657576.94 +phiX174 4040 4050 545307.7 +phiX174 4050 4060 481153.84 +phiX174 4060 4070 449076.9 +phiX174 4070 4080 400961.56 +phiX174 4080 4090 433038.47 +phiX174 4090 4100 529269.25 +phiX174 4100 4110 400961.56 +phiX174 4110 4120 368884.63 +phiX174 4120 4130 304730.78 +phiX174 4130 4150 368884.63 +phiX174 4150 4160 336807.7 +phiX174 4160 4170 384923.1 +phiX174 4170 4180 272653.84 +phiX174 4180 4190 336807.7 +phiX174 4190 4200 352846.16 +phiX174 4200 4210 368884.63 +phiX174 4210 4230 320769.25 +phiX174 4230 4250 336807.7 +phiX174 4250 4260 384923.1 +phiX174 4260 4280 481153.84 +phiX174 4280 4290 449076.9 +phiX174 4290 4300 465115.4 +phiX174 4300 4310 529269.25 +phiX174 4310 4320 609461.56 +phiX174 4320 4330 577384.6 +phiX174 4330 4340 465115.4 phiX174 4340 4350 417000 -phiX174 4350 4360 433038 -phiX174 4360 4380 513231 -phiX174 4380 4390 481154 -phiX174 4390 4400 449077 -phiX174 4400 4410 529269 -phiX174 4410 4420 657577 -phiX174 4420 4430 705692 -phiX174 4430 4440 785885 -phiX174 4440 4450 817962 -phiX174 4450 4460 801923 -phiX174 4460 4470 769846 -phiX174 4470 4480 785885 -phiX174 4480 4490 689654 +phiX174 4350 4360 433038.47 +phiX174 4360 4380 513230.8 +phiX174 4380 4390 481153.84 +phiX174 4390 4400 449076.9 +phiX174 4400 4410 529269.25 +phiX174 4410 4420 657576.94 +phiX174 4420 4430 705692.3 +phiX174 4430 4440 785884.6 +phiX174 4440 4450 817961.6 +phiX174 4450 4460 801923.1 +phiX174 4460 4470 769846.2 +phiX174 4470 4480 785884.6 +phiX174 4480 4490 689653.8 phiX174 4490 4500 625500 -phiX174 4500 4510 609462 -phiX174 4510 4520 465115 -phiX174 4520 4540 433038 -phiX174 4540 4550 497192 -phiX174 4550 4560 481154 -phiX174 4560 4570 433038 -phiX174 4570 4580 465115 +phiX174 4500 4510 609461.56 +phiX174 4510 4520 465115.4 +phiX174 4520 4540 433038.47 +phiX174 4540 4550 497192.3 +phiX174 4550 4560 481153.84 +phiX174 4560 4570 433038.47 +phiX174 4570 4580 465115.4 phiX174 4580 4590 417000 -phiX174 4590 4600 433038 -phiX174 4600 4610 529269 -phiX174 4610 4620 513231 -phiX174 4620 4630 577385 -phiX174 4630 4640 609462 -phiX174 4640 4660 689654 -phiX174 4660 4670 721731 -phiX174 4670 4680 673615 -phiX174 4680 4690 609462 -phiX174 4690 4700 689654 -phiX174 4700 4720 481154 -phiX174 4720 4730 400962 -phiX174 4730 4740 465115 -phiX174 4740 4760 561346 -phiX174 4760 4780 593423 -phiX174 4780 4790 609462 -phiX174 4790 4800 689654 -phiX174 4800 4810 673615 -phiX174 4810 4820 657577 -phiX174 4820 4830 593423 +phiX174 4590 4600 433038.47 +phiX174 4600 4610 529269.25 +phiX174 4610 4620 513230.8 +phiX174 4620 4630 577384.6 +phiX174 4630 4640 609461.56 +phiX174 4640 4660 689653.8 +phiX174 4660 4670 721730.8 +phiX174 4670 4680 673615.4 +phiX174 4680 4690 609461.56 +phiX174 4690 4700 689653.8 +phiX174 4700 4720 481153.84 +phiX174 4720 4730 400961.56 +phiX174 4730 4740 465115.4 +phiX174 4740 4760 561346.2 +phiX174 4760 4780 593423.06 +phiX174 4780 4790 609461.56 +phiX174 4790 4800 689653.8 +phiX174 4800 4810 673615.4 +phiX174 4810 4820 657576.94 +phiX174 4820 4830 593423.06 phiX174 4830 4850 625500 -phiX174 4850 4860 577385 -phiX174 4860 4870 513231 -phiX174 4870 4880 497192 -phiX174 4880 4890 593423 -phiX174 4890 4900 513231 -phiX174 4900 4910 481154 +phiX174 4850 4860 577384.6 +phiX174 4860 4870 513230.8 +phiX174 4870 4880 497192.3 +phiX174 4880 4890 593423.06 +phiX174 4890 4900 513230.8 +phiX174 4900 4910 481153.84 phiX174 4910 4920 417000 -phiX174 4920 4930 384923 -phiX174 4930 4950 352846 -phiX174 4950 4960 272654 -phiX174 4960 4970 176423 -phiX174 4970 4980 240577 +phiX174 4920 4930 384923.1 +phiX174 4930 4950 352846.16 +phiX174 4950 4960 272653.84 +phiX174 4960 4970 176423.08 +phiX174 4970 4980 240576.92 phiX174 4980 4990 208500 -phiX174 4990 5020 288692 -phiX174 5020 5030 352846 -phiX174 5030 5040 336808 -phiX174 5040 5050 368885 -phiX174 5050 5060 304731 -phiX174 5060 5070 288692 -phiX174 5070 5080 240577 -phiX174 5080 5090 304731 -phiX174 5090 5100 272654 -phiX174 5100 5110 224538 -phiX174 5110 5120 256615 -phiX174 5120 5130 320769 +phiX174 4990 5020 288692.3 +phiX174 5020 5030 352846.16 +phiX174 5030 5040 336807.7 +phiX174 5040 5050 368884.63 +phiX174 5050 5060 304730.78 +phiX174 5060 5070 288692.3 +phiX174 5070 5080 240576.92 +phiX174 5080 5090 304730.78 +phiX174 5090 5100 272653.84 +phiX174 5100 5110 224538.45 +phiX174 5110 5120 256615.4 +phiX174 5120 5130 320769.25 phiX174 5130 5140 417000 -phiX174 5140 5160 497192 -phiX174 5160 5170 481154 -phiX174 5170 5180 577385 -phiX174 5180 5190 561346 -phiX174 5190 5200 529269 -phiX174 5200 5210 465115 -phiX174 5210 5220 449077 -phiX174 5220 5230 400962 -phiX174 5230 5240 449077 -phiX174 5240 5250 368885 -phiX174 5250 5260 272654 -phiX174 5260 5270 304731 -phiX174 5270 5280 336808 -phiX174 5280 5290 272654 -phiX174 5290 5300 192462 -phiX174 5300 5310 144346 -phiX174 5310 5340 96230.8 -phiX174 5340 5350 64153.8 -phiX174 5350 5386 32076.9 +phiX174 5140 5160 497192.3 +phiX174 5160 5170 481153.84 +phiX174 5170 5180 577384.6 +phiX174 5180 5190 561346.2 +phiX174 5190 5200 529269.25 +phiX174 5200 5210 465115.4 +phiX174 5210 5220 449076.9 +phiX174 5220 5230 400961.56 +phiX174 5230 5240 449076.9 +phiX174 5240 5250 368884.63 +phiX174 5250 5260 272653.84 +phiX174 5260 5270 304730.78 +phiX174 5270 5280 336807.7 +phiX174 5280 5290 272653.84 +phiX174 5290 5300 192461.55 +phiX174 5300 5310 144346.16 +phiX174 5310 5340 96230.77 +phiX174 5340 5350 64153.85 +phiX174 5350 5386 32076.93 diff --git a/galaxy/wrapper/test-data/bamCoverage_result4.bw b/galaxy/wrapper/test-data/bamCoverage_result4.bw index 6eb0b982ac..82ee20c0b6 100644 Binary files a/galaxy/wrapper/test-data/bamCoverage_result4.bw and b/galaxy/wrapper/test-data/bamCoverage_result4.bw differ diff --git a/galaxy/wrapper/test-data/bamCoverage_result5.bw b/galaxy/wrapper/test-data/bamCoverage_result5.bw index fba54ecc8a..cfd82515c7 100644 Binary files a/galaxy/wrapper/test-data/bamCoverage_result5.bw and b/galaxy/wrapper/test-data/bamCoverage_result5.bw differ diff --git a/galaxy/wrapper/test-data/bamCoverage_result6.bw b/galaxy/wrapper/test-data/bamCoverage_result6.bw index c4676fe2fc..969d8052a5 100644 Binary files a/galaxy/wrapper/test-data/bamCoverage_result6.bw and b/galaxy/wrapper/test-data/bamCoverage_result6.bw differ diff --git a/galaxy/wrapper/test-data/coverage_filtered.bg b/galaxy/wrapper/test-data/coverage_filtered.bg index 4448c0afb8..30e2ccbe9f 100644 --- a/galaxy/wrapper/test-data/coverage_filtered.bg +++ b/galaxy/wrapper/test-data/coverage_filtered.bg @@ -1,19 +1,19 @@ -3R 0 50 0.295172 -3R 50 100 0.885515 -3R 100 150 2.21379 -3R 150 250 4.87034 -3R 250 300 3.0993 -3R 300 350 2.36137 -3R 350 400 2.21379 -3R 400 450 3.54206 -3R 450 500 4.13241 -3R 500 550 2.0662 -3R 550 600 2.50896 -3R 600 650 4.57516 -3R 650 700 3.24689 -3R 700 750 3.39448 -3R 750 800 3.83723 -3R 900 950 1.91862 -3R 950 1000 1.32827 -3R 1000 1050 0.73793 +3R 0 50 0.33 +3R 50 100 1 +3R 100 150 2.5 +3R 150 250 5.49 +3R 250 300 3.49 +3R 300 350 2.66 +3R 350 400 2.5 +3R 400 450 3.99 +3R 450 500 4.66 +3R 500 550 2.33 +3R 550 600 2.83 +3R 600 650 5.16 +3R 650 750 3.66 +3R 750 800 2.5 +3R 800 900 0 +3R 900 950 0.5 +3R 950 1000 1.33 +3R 1000 1050 0.83 3R 1050 1500 0 diff --git a/galaxy/wrapper/test-data/plotCorrelation_result1.png b/galaxy/wrapper/test-data/plotCorrelation_result1.png index a0f7558e93..c2373582bb 100644 Binary files a/galaxy/wrapper/test-data/plotCorrelation_result1.png and b/galaxy/wrapper/test-data/plotCorrelation_result1.png differ diff --git a/galaxy/wrapper/test-data/plotCorrelation_result1.tabular b/galaxy/wrapper/test-data/plotCorrelation_result1.tabular index 16d9470a65..524a3a25c6 100644 --- a/galaxy/wrapper/test-data/plotCorrelation_result1.tabular +++ b/galaxy/wrapper/test-data/plotCorrelation_result1.tabular @@ -1,4 +1,3 @@ -#plotCorrelation --outFileCorMatrix 'bowtie2 test1.bam' 'bowtie2 test1.bam' 'bowtie2 test1.bam' 1.0000 1.0000 'bowtie2 test1.bam' 1.0000 1.0000 diff --git a/galaxy/wrapper/test-data/plotPCA_result2.png b/galaxy/wrapper/test-data/plotPCA_result2.png index ad0ee26656..f2feec050e 100644 Binary files a/galaxy/wrapper/test-data/plotPCA_result2.png and b/galaxy/wrapper/test-data/plotPCA_result2.png differ diff --git a/galaxy/wrapper/test-data/plotPCA_result2.tabular b/galaxy/wrapper/test-data/plotPCA_result2.tabular index ebdc6ff748..3ae66a2321 100644 --- a/galaxy/wrapper/test-data/plotPCA_result2.tabular +++ b/galaxy/wrapper/test-data/plotPCA_result2.tabular @@ -1,4 +1,3 @@ -#plotPCA --outFileNameData Component bowtie2-test1.bam bowtie2-test1.bam Eigenvalue -1 -0.7071067811865476 -0.7071067811865475 4.0 -2 -0.7071067811865475 0.7071067811865476 1.2325951644078315e-32 +1 1.9994942044176225 0.0 2.9999999999999996 +2 -0.9607959164084681 0.0 0.0 diff --git a/galaxy/wrapper/test-data/profiler_result1.png b/galaxy/wrapper/test-data/profiler_result1.png index 6bdfb4adaf..2cdfba2255 100644 Binary files a/galaxy/wrapper/test-data/profiler_result1.png and b/galaxy/wrapper/test-data/profiler_result1.png differ diff --git a/pydeeptools/deeptools/bamCoverage2.py b/pydeeptools/deeptools/bamCoverage2.py index b8fd97ffce..deac6d428a 100644 --- a/pydeeptools/deeptools/bamCoverage2.py +++ b/pydeeptools/deeptools/bamCoverage2.py @@ -144,8 +144,15 @@ def main(args=None): args.normalizeUsing = 'None' if not args.Offset: args.Offset = [0, 0] + # in rust, no offset is encoded as 0,0 + # in python code 1, -1 corresponds to no offset. elif len(args.Offset) == 1: args.Offset = [args.Offset[0], 0] + else: + if args.Offset[1] == -1: + args.Offset[1] = 0 + args.Offset = [args.Offset[0], args.Offset[1]] + if not args.extendReads: args.extendReads = False args.extendReadsLen = 0 diff --git a/pyproject.toml b/pyproject.toml index 61d0af858f..c218cb5687 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,20 +63,20 @@ repository = "https://github.com/deeptools/deepTools" packages = ["deeptools"] [project.scripts] -#alignmentSieve = "deeptools.alignmentSieve:main" -#bamCompare = "deeptools.bamCompare:main" -#bamCoverage = "deeptools.bamCoverage:main" +alignmentSieve = "deeptools.alignmentSieve:main" +#bamCompare_old = "deeptools.bamCompare:main" +#bamCoverage_old = "deeptools.bamCoverage:main" bamPEFragmentSize = "deeptools.bamPEFragmentSize:main" bigwigAverage = "deeptools.bigwigAverage:main" bigwigCompare = "deeptools.bigwigCompare:main" computeGCBias = "deeptools.computeGCBias:main" -#computeMatrix = "deeptools.computeMatrix:main" +#computeMatrix_old = "deeptools.computeMatrix:main" computeMatrixOperations = "deeptools.computeMatrixOperations:main" correctGCBias = "deeptools.correctGCBias:main" deeptools = "deeptools.deeptools_list_tools:main" estimateReadFiltering = "deeptools.estimateReadFiltering:main" estimateScaleFactor = "deeptools.estimateScaleFactor:main" -#multiBamSummary = "deeptools.multiBamSummary:main" +#multiBamSummary_old = "deeptools.multiBamSummary:main" multiBigwigSummary = "deeptools.multiBigwigSummary:main" plotCorrelation = "deeptools.plotCorrelation:main" plotCoverage = "deeptools.plotCoverage:main" @@ -88,5 +88,5 @@ plotProfile = "deeptools.plotProfile:main" bamCoverage = "deeptools.bamCoverage2:main" bamCompare = "deeptools.bamCompare2:main" computeMatrix = "deeptools.computeMatrix2:main" -alignmentSieve = "deeptools.alignmentSieve2:main" +#alignmentSieve = "deeptools.alignmentSieve2:main" multiBamSummary = "deeptools.multiBamSummary2:main"