Commit adb90dd3 authored by Fang Yuedong's avatar Fang Yuedong
Browse files

Merge branch 'develop' into wcs_test

parents 8649bb95 78bf42f6
2000 7.94E-20
2500 3.83E-19
3000 1.63E-18
3500 2.72E-18
4000 3.12E-18
4500 4.97E-18
5000 5.07E-18
5500 5.17E-18
6000 5.14E-18
7000 4.48E-18
8000 3.82E-18
9000 3.18E-18
10000 2.70E-18
11000 2.26E-18
12000 1.94E-18
13000 1.68E-18
14000 1.46E-18
15000 1.26E-18
16000 1.09E-18
17000 9.27E-19
# A erg/s/A/arcsec^2/cm^2
1000 1.26e-28
1100 1.02e-26
1200 1.05e-25
1400 2.5e-24
1500 9.12e-24
1600 2.3e-22
1700 7.06e-21
1800 1.5e-20
1900 2.2e-20
2000 3.49e-20
2100 1.21e-19
2200 2.16e-19
2300 1.75e-19
2400 1.79e-19
2500 2.47e-19
2600 2.93e-19
2700 9.95e-19
2800 2.82e-19
2900 2.04e-18
3000 1.2e-18
3100 1.46e-18
3200 2.25e-18
3400 2.81e-18
3500 2.73e-18
3600 2.68e-18
3700 3.25e-18
3800 3.05e-18
3900 3.27e-18
4000 4.54e-18
4250 4.48e-18
4500 5.32e-18
5000 4.92e-18
5250 5.28e-18
5500 5.2e-18
5750 5.33e-18
6000 5.11e-18
6250 4.94e-18
6500 4.88e-18
6750 4.69e-18
7000 4.4e-18
7250 4.34e-18
7500 4.13e-18
7750 3.95e-18
8000 3.85e-18
8250 3.68e-18
8500 3.46e-18
8750 3.36e-18
9000 3.23e-18
9250 3.07e-18
9500 2.98e-18
9750 2.86e-18
10000 2.78e-18
10250 2.67e-18
10500 2.56e-18
10750 2.41e-18
11000 2.31e-18
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
30000 15000 7000 3140 1610 985 640 439.106795917950 332.953759944373 275 227.040718244473 184.215493793075 150 126.619219993047 111.295375994437 100 88.7046240055627 73.3807800069534 50
20000 12000 6000 2940 1540 945 625 434.136797758554 329.872405260036 271 223.547334192282 182.480458923860 150 127.340532138986 111.872425711189 100 88.1275742888112 72.6594678610140 50
16000 8000 4740 2470 1370 865 590 424.924281880506 325.703844589420 264 216.192536238306 177.535146441613 148 127.046313907011 112.081495570053 100 87.6962822077246 72.0647972041002 50.0000000000000
11500 6780 3440 1860 1110 755 525 379.404487437312 298.581196755993 251 210.819373149455 174.952207929139 146 125.577279224129 111.350712268192 100 88.2048432873637 72.6449429980935 50
6400 4480 2410 1410 910 635 454 340.751783794961 276.748855303552 237 201.241198619320 168.117212939671 141 122.135273579611 109.263774419244 99 87.9584478029781 72.7536153092783 50
3840 2830 1730 1100 749 545 410 320.344426947347 262.847445764680 223 188.949910583017 159.472507970269 136 119.263338127992 107.188448280172 97 85.9226628309394 71.1811063164520 50
2480 1870 1220 845 615 467 365 293.396992658036 243.591181463075 207 176.533897785140 151.075388060617 131 116.245193979181 104.996155183345 95 84.0038448166554 69.7548060208193 50
1650 1270 910 680 510 397 320 264.610999197860 224.242861979717 193 166.095447800706 143.176731474096 125 111.822024414131 101.902063975749 93 82.8757138020283 69.2890866969798 50
1180 940 700 530 416 338 282 239.383076216900 206.105287077371 179 155.528255539422 135.661786794464 120 108.689086810597 100.062380559589 92 82.3820638848555 69.0886909671804 50
910 730 555 442 356 292 250 217.177087096913 189.491057165516 166 145.936910467127 129.234403723928 116 106.038233997541 97.9416983091442 90 80.5027461353003 67.7395437802365 50
727.458461874842 590.813948067450 458.193770946183 380.572133876131 310.356532547090 256.488736025072 222.994441816550 196.671226703445 173.815072589959 153.993110811782 136.873310808416 122.526994434613 111.126321648939 102.546129456415 95.4719630478941 88.2920446606834 79.3945965320918 67.1678408994278 50
597.965786285821 501.989953285938 394.904124012041 330.741575203306 272.426631477206 229.377054599373 200.722233330368 178.298184971317 159.500061954463 143.183118953515 128.502453511432 115.812534648182 105.767674252986 98.6162295599359 92.9827391826220 87.0857870795079 79.1439572090571 67.3758335297333 50
505 442 352 292 243 209 183 162.948572168708 147.332365312119 134 121.348535356634 109.968784724353 101 95.0646938121630 90.7184217163971 86 78.9482449502696 67.6019728545037 50
434.185639242502 392.917767644504 318.376629582089 263.460345936839 222.213128168793 193.706429839947 169.485130042169 151.204192642909 137.846384427846 126.706631884706 115.748672194896 105.611485314551 97.6028618934907 92.4866702185601 88.8510891247191 84.7403750839550 78.1987845682555 67.2705740496079 50
379.733278070694 351.223716015657 291.034402908743 242.720597293047 207.589653411575 181.900455075790 159.198062706301 142.411627057649 130.568767913886 120.897501975771 111.291656158755 102.308298237053 95.1703061995698 90.5932607902020 87.2635537728093 83.3602796662423 77.0625329893514 66.5494082609872 50
338 317 269 227 196 172 151 135.608650155770 124.774226094307 116 107.379198451166 99.3648656018433 93 88.8745560395662 85.7663114983196 82 75.9003551683471 65.7921106271005 50
305.576758932926 289.996462836015 251.299710725463 213.919815709849 184.976139962921 162.759618689212 143.916889866626 129.942315002235 119.830751582977 111.550732019764 103.559236179535 96.2670337533281 90.5733418882097 86.9591551723739 84.2325779585342 80.7834920405337 75.0017792122157 65.2773212674234 50
279.989990320293 268.633701169951 236.958264352989 202.709368957841 174.696236357976 154.280384356725 137.633663992575 124.996787950500 115.479466152946 107.523169439697 99.9646100690791 93.2214659735947 88.1066565042906 85.0296921673207 82.7864480892672 79.7693905518192 74.3709858366659 64.9837002254965 50
259 251 225 193 166 147 132 120.465513676140 111.554773867063 104 96.8743867494711 90.6150297791503 86 83.4073096963458 81.6147366459656 79 73.9408189095900 64.8149125258764 50
240.766584285053 235.503788418843 214.572675664209 184.452983816359 159.437867535078 141.218058366167 126.921384565401 116.141066332417 107.932382590812 101.016365962164 94.4576243640234 88.6950668978497 84.5111779610779 82.2885391283921 80.8101206834713 78.4589900872436 73.6182148006372 64.6708622845800 50
225.047501388876 221.834071897130 205.317724864488 176.849334282997 154.403178934298 136.681711201015 122.526540582659 112.212537983324 104.653215400233 98.4172276728472 92.4433471106159 87.1508159029366 83.3289937091939 81.3714666204164 80.0887264542075 77.8954914598142 73.2064798864838 64.4364099834633 50
212 210 197 170 150 133 119 108.968150170540 101.799499174001 96 90.4505707007701 85.5319895790017 82 80.2295670263797 79.0725425099927 77 72.4830130455629 63.9926551958425 50
201.690237260197 200.025420525649 189.446623654739 163.786767543232 145.568686193063 129.849629327603 116.434608908807 106.594275830766 99.4340907887345 93.6430633908398 88.2383060221020 83.5493421751065 80.2337981193304 78.5974046590145 77.5383107374556 75.6027698327141 71.3370354228506 63.2873609859257 50
193.820004124204 191.992974204493 182.733799152023 158.374775391654 141.394751608534 127.177956024402 114.556469973086 104.869893480803 97.5423671128237 91.5486606096547 86.1255446666051 81.5577937981954 78.3921834737485 76.8539016661414 75.8817863624661 74.0930880533685 70.1050572294944 62.5349443814896 50
188 186 177 154 138 125 113 103.472133032474 96.0903350126002 90 84.5712734023673 80.0733060196831 77 75.5390696543528 74.6534779457045 73 69.2354109431844 62.0164859012028 50
183.842837044530 182.024159108189 172.344533420539 150.807353418120 135.768869174150 123.346387286385 111.525364984557 102.194863876581 95.0804127903208 89.2261952892916 83.9273482154446 79.4828215244692 76.4425184504893 75.0392867782103 74.2377524946620 72.6854861374556 69.0300582442024 61.9190393525135 50
180.968778410604 179.564401655269 168.710041490384 148.577490076315 134.536333150083 122.310168405082 110.395727673146 101.298913319835 94.6606644919416 89.2399817403860 84.1171019637652 79.6572074513917 76.5467168402564 75.1263973841518 74.3544108040747 72.8432674378230 69.2054776231947 62.0535516979877 50
179 178 166 147 134 122 110 101.161848147921 95.0155655993437 90 84.9567367232255 80.3383120527731 77 75.4186123665846 74.5571121154899 73 69.3317767733990 62.1369431889709 50
177.716192339462 176.914980078633 164.212279700143 145.946781747252 133.985466739967 122.542599304634 110.686153375186 102.107114286080 96.2902104428977 91.4521554519937 86.2753467707504 81.3049172606660 77.5516836342678 75.6227629219776 74.5104734257943 72.8034337656115 69.0902625613226 61.9595784328209 50
177.527104455602 176.712382137394 163.722331182737 146.018968006791 134.830286161505 124.136925910825 112.638397112107 104.241674217759 98.4721687469323 93.4914124288013 87.9535951873799 82.4835397260425 78.1987269430036 75.8001614550468 74.3229427532328 72.3856940471913 68.6070385465521 61.6055994609451 50
179 178 165 148 137 127 116 107.618369565958 101.509629084266 96 89.8850372551827 83.8376297796048 79 76.1007406725702 74.2139258713895 72 68.1194074619438 61.2325926607631 50
182.588689893918 181.204809466168 168.324866297409 152.368482555836 140.770745347464 131.186919198783 120.730021514699 112.131318192577 105.251463102523 98.8170347545853 91.9445480061505 85.3102631039541 79.9803766420691 76.6271017220435 74.3467174753257 71.8415195408390 67.8138035575069 60.9658651642528 50
188.293174137357 186.030514239601 173.215448593483 158.383674933557 145.661040722416 136.105090914582 126.050683878426 117.039742915109 109.149274748558 101.609183359224 93.9322814719671 86.7630167892887 81.0287457580997 77.2925195138329 74.6601679460091 71.8732156326712 67.6731871518618 60.8016070816238 50
196 192 179 165 151 141 131 121.444142789946 112.555351044031 104 95.6297114342393 88.0370932777062 82 77.9629373990224 75.0370165858846 72 67.6296500807821 60.7037292676442 50
205.595714751532 198.636152427066 185.006773628739 171.171880621998 156.116737055362 145.117131307640 134.615982788241 124.445016873482 114.821979010604 105.613038862998 96.8183116745740 88.9736950113039 82.7490320196781 78.5042987286960 75.3600026973967 72.1267843673288 67.6152841800409 60.6361425770818 50
216.966865661637 205.461857200499 190.564022591480 175.853739666387 160.340365763647 147.701969690105 135.936645151968 125.142864222108 115.301445669936 106.071854134304 97.2795559745780 89.4140244321794 83.1307344690420 78.7825468539377 75.5118655829902 72.1584804591610 67.5621812854119 60.5627578647043 50
230 212 195 178 163 148 134 122.638183892218 113.346038043688 105 96.7949181158581 89.1992839824302 83 78.6636251258314 75.3753445451096 72 67.4024332326682 60.4474859852797 50
\ No newline at end of file
......@@ -29,17 +29,17 @@ setup(name='CSSTSim',
version='2.0.0',
packages=find_packages(),
install_requires=[
'numpy>=1.18.5',
'galsim>=2.2.4',
'pyyaml>=5.3.1',
'astropy>=4.0.1',
'scipy>=1.5.0',
'mpi4py>=3.0.3',
'sep>=1.0.3',
'healpy>=1.14.0',
'h5py>=2.10.0',
'Cython>=0.29.21',
'numba>=0.50.1'
# 'numpy>=1.18.5',
# 'galsim>=2.2.4',
# 'pyyaml>=5.3.1',
# 'astropy>=4.0.1',
# 'scipy>=1.5.0',
# 'mpi4py>=3.0.3',
# 'sep>=1.0.3',
# 'healpy>=1.14.0',
# 'h5py>=2.10.0',
# 'Cython>=0.29.21',
# 'numba>=0.50.1'
],
package_data = {
'ObservationSim.Astrometry.lib': ['libshao.so'],
......@@ -53,6 +53,8 @@ setup(name='CSSTSim',
'ObservationSim.Instrument.data.flatCube': ['*.fits'],
'Catalog.data': ['*.fits'],
'ObservationSim.Config.Header':['*.header','*.lst'],
'ObservationSim.Straylight.data': ['*.dat'],
'ObservationSim.Straylight.lib': ['*'],
},
ext_modules = cythonize(extensions),
)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment