diff --git a/AutoConversion.sh b/AutoConversion.sh deleted file mode 100755 index 4bc73c1..0000000 --- a/AutoConversion.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -Rscript OpusData.R Rng02_Rng2630_02.0 diff --git a/DPT/Rng02_Rng2630_02_0.DPT b/DPT/Rng02_Rng2630_02_0.DPT deleted file mode 100644 index fa983e7..0000000 --- a/DPT/Rng02_Rng2630_02_0.DPT +++ /dev/null @@ -1,1744 +0,0 @@ -3996.34528,0.96644 -3994.28105,0.96641 -3992.21682,0.96629 -3990.1526,0.96554 -3988.08837,0.96515 -3986.02414,0.96528 -3983.95991,0.96518 -3981.89568,0.9654 -3979.83146,0.96618 -3977.76723,0.96653 -3975.703,0.96644 -3973.63877,0.96627 -3971.57454,0.96596 -3969.51032,0.96598 -3967.44609,0.96633 -3965.38186,0.96651 -3963.31763,0.96675 -3961.2534,0.96743 -3959.18918,0.96804 -3957.12495,0.9679 -3955.06072,0.9668 -3952.99649,0.96548 -3950.93226,0.9652 -3948.86804,0.96606 -3946.80381,0.96708 -3944.73958,0.96771 -3942.67535,0.96745 -3940.61113,0.96708 -3938.5469,0.96753 -3936.48267,0.96749 -3934.41844,0.9665 -3932.35421,0.96584 -3930.28999,0.96564 -3928.22576,0.96556 -3926.16153,0.96629 -3924.0973,0.96702 -3922.03307,0.96668 -3919.96885,0.96625 -3917.90462,0.96642 -3915.84039,0.9671 -3913.77616,0.96743 -3911.71193,0.96687 -3909.64771,0.96637 -3907.58348,0.96675 -3905.51925,0.9673 -3903.45502,0.96708 -3901.39079,0.96689 -3899.32657,0.96725 -3897.26234,0.96733 -3895.19811,0.96741 -3893.13388,0.96785 -3891.06965,0.96787 -3889.00543,0.967 -3886.9412,0.96592 -3884.87697,0.9656 -3882.81274,0.96663 -3880.74851,0.96794 -3878.68429,0.96815 -3876.62006,0.96754 -3874.55583,0.96719 -3872.4916,0.96746 -3870.42738,0.9681 -3868.36315,0.96841 -3866.29892,0.96786 -3864.23469,0.96702 -3862.17046,0.96704 -3860.10624,0.96785 -3858.04201,0.96808 -3855.97778,0.9675 -3853.91355,0.9666 -3851.84932,0.96623 -3849.7851,0.96642 -3847.72087,0.96636 -3845.65664,0.9662 -3843.59241,0.96604 -3841.52818,0.96589 -3839.46396,0.96656 -3837.39973,0.96799 -3835.3355,0.96852 -3833.27127,0.96795 -3831.20704,0.96725 -3829.14282,0.96689 -3827.07859,0.96684 -3825.01436,0.96732 -3822.95013,0.96832 -3820.8859,0.96896 -3818.82168,0.96895 -3816.75745,0.96857 -3814.69322,0.96756 -3812.62899,0.96701 -3810.56477,0.96723 -3808.50054,0.96767 -3806.43631,0.96796 -3804.37208,0.96815 -3802.30785,0.96774 -3800.24363,0.96631 -3798.1794,0.9656 -3796.11517,0.96584 -3794.05094,0.96641 -3791.98671,0.96686 -3789.92249,0.96709 -3787.85826,0.96704 -3785.79403,0.96628 -3783.7298,0.9658 -3781.66557,0.96675 -3779.60135,0.96852 -3777.53712,0.96913 -3775.47289,0.96794 -3773.40866,0.96699 -3771.34443,0.96675 -3769.28021,0.96602 -3767.21598,0.96549 -3765.15175,0.96545 -3763.08752,0.9659 -3761.02329,0.96719 -3758.95907,0.96823 -3756.89484,0.96813 -3754.83061,0.96763 -3752.76638,0.96733 -3750.70216,0.9676 -3748.63793,0.96842 -3746.5737,0.96894 -3744.50947,0.96824 -3742.44524,0.96685 -3740.38102,0.9665 -3738.31679,0.9667 -3736.25256,0.96645 -3734.18833,0.96613 -3732.1241,0.96641 -3730.05988,0.96637 -3727.99565,0.96629 -3725.93142,0.9672 -3723.86719,0.96876 -3721.80296,0.97008 -3719.73874,0.97046 -3717.67451,0.96961 -3715.61028,0.96881 -3713.54605,0.96867 -3711.48182,0.9683 -3709.4176,0.96771 -3707.35337,0.96786 -3705.28914,0.96778 -3703.22491,0.9671 -3701.16068,0.96691 -3699.09646,0.9667 -3697.03223,0.96612 -3694.968,0.96652 -3692.90377,0.96728 -3690.83955,0.96648 -3688.77532,0.96522 -3686.71109,0.96576 -3684.64686,0.96634 -3682.58263,0.96637 -3680.51841,0.96693 -3678.45418,0.96719 -3676.38995,0.96561 -3674.32572,0.9649 -3672.26149,0.9663 -3670.19727,0.96719 -3668.13304,0.96736 -3666.06881,0.96735 -3664.00458,0.96722 -3661.94035,0.96694 -3659.87613,0.96674 -3657.8119,0.96674 -3655.74767,0.96649 -3653.68344,0.96671 -3651.61921,0.96744 -3649.55499,0.96702 -3647.49076,0.96674 -3645.42653,0.96734 -3643.3623,0.96694 -3641.29807,0.96649 -3639.23385,0.9667 -3637.16962,0.96654 -3635.10539,0.96605 -3633.04116,0.96616 -3630.97694,0.96583 -3628.91271,0.96412 -3626.84848,0.96428 -3624.78425,0.96605 -3622.72002,0.96708 -3620.6558,0.96732 -3618.59157,0.96721 -3616.52734,0.96674 -3614.46311,0.96589 -3612.39888,0.9649 -3610.33466,0.96434 -3608.27043,0.9644 -3606.2062,0.96466 -3604.14197,0.96488 -3602.07774,0.96502 -3600.01352,0.96465 -3597.94929,0.96396 -3595.88506,0.96367 -3593.82083,0.964 -3591.7566,0.96482 -3589.69238,0.96528 -3587.62815,0.96494 -3585.56392,0.9647 -3583.49969,0.96457 -3581.43546,0.9647 -3579.37124,0.96511 -3577.30701,0.96468 -3575.24278,0.96381 -3573.17855,0.96371 -3571.11432,0.96389 -3569.0501,0.9641 -3566.98587,0.96467 -3564.92164,0.96449 -3562.85741,0.96376 -3560.79319,0.96346 -3558.72896,0.9635 -3556.66473,0.96351 -3554.6005,0.96312 -3552.53627,0.96245 -3550.47205,0.96194 -3548.40782,0.9616 -3546.34359,0.96111 -3544.27936,0.96082 -3542.21513,0.96123 -3540.15091,0.96182 -3538.08668,0.96158 -3536.02245,0.96057 -3533.95822,0.96001 -3531.89399,0.96008 -3529.82977,0.9602 -3527.76554,0.96073 -3525.70131,0.96174 -3523.63708,0.96235 -3521.57285,0.96239 -3519.50863,0.96217 -3517.4444,0.96144 -3515.38017,0.96071 -3513.31594,0.96072 -3511.25171,0.96146 -3509.18749,0.96258 -3507.12326,0.96313 -3505.05903,0.96265 -3502.9948,0.96185 -3500.93058,0.96141 -3498.86635,0.96171 -3496.80212,0.96251 -3494.73789,0.96321 -3492.67366,0.96355 -3490.60944,0.96353 -3488.54521,0.96351 -3486.48098,0.96365 -3484.41675,0.96364 -3482.35252,0.96344 -3480.2883,0.96317 -3478.22407,0.96267 -3476.15984,0.96241 -3474.09561,0.96281 -3472.03138,0.96298 -3469.96716,0.96265 -3467.90293,0.96273 -3465.8387,0.96342 -3463.77447,0.96422 -3461.71024,0.96439 -3459.64602,0.96367 -3457.58179,0.96332 -3455.51756,0.96384 -3453.45333,0.96409 -3451.3891,0.9635 -3449.32488,0.96305 -3447.26065,0.96322 -3445.19642,0.96319 -3443.13219,0.96265 -3441.06797,0.96203 -3439.00374,0.96167 -3436.93951,0.96148 -3434.87528,0.96132 -3432.81105,0.96113 -3430.74683,0.96088 -3428.6826,0.96085 -3426.61837,0.96061 -3424.55414,0.96005 -3422.48991,0.96019 -3420.42569,0.96078 -3418.36146,0.9605 -3416.29723,0.95947 -3414.233,0.95881 -3412.16877,0.95891 -3410.10455,0.95957 -3408.04032,0.96034 -3405.97609,0.96079 -3403.91186,0.96101 -3401.84763,0.96145 -3399.78341,0.96211 -3397.71918,0.9626 -3395.65495,0.96298 -3393.59072,0.96355 -3391.52649,0.96404 -3389.46227,0.96434 -3387.39804,0.96451 -3385.33381,0.96455 -3383.26958,0.96442 -3381.20536,0.96393 -3379.14113,0.9635 -3377.0769,0.96382 -3375.01267,0.96444 -3372.94844,0.96439 -3370.88422,0.96382 -3368.81999,0.96378 -3366.75576,0.96449 -3364.69153,0.96498 -3362.6273,0.96486 -3360.56308,0.96485 -3358.49885,0.96504 -3356.43462,0.96489 -3354.37039,0.96443 -3352.30616,0.96407 -3350.24194,0.96419 -3348.17771,0.96459 -3346.11348,0.96459 -3344.04925,0.96409 -3341.98502,0.96411 -3339.9208,0.96527 -3337.85657,0.96624 -3335.79234,0.96579 -3333.72811,0.96514 -3331.66388,0.9649 -3329.59966,0.96436 -3327.53543,0.96432 -3325.4712,0.96497 -3323.40697,0.96472 -3321.34274,0.96405 -3319.27852,0.9644 -3317.21429,0.96489 -3315.15006,0.96474 -3313.08583,0.96487 -3311.02161,0.96509 -3308.95738,0.96475 -3306.89315,0.96451 -3304.82892,0.96461 -3302.76469,0.96452 -3300.70047,0.96452 -3298.63624,0.96513 -3296.57201,0.96557 -3294.50778,0.96536 -3292.44355,0.9649 -3290.37933,0.96454 -3288.3151,0.96487 -3286.25087,0.96532 -3284.18664,0.96513 -3282.12241,0.96482 -3280.05819,0.96468 -3277.99396,0.96436 -3275.92973,0.96411 -3273.8655,0.96431 -3271.80127,0.96503 -3269.73705,0.96609 -3267.67282,0.96638 -3265.60859,0.96567 -3263.54436,0.96517 -3261.48013,0.96531 -3259.41591,0.96531 -3257.35168,0.96486 -3255.28745,0.96454 -3253.22322,0.96452 -3251.159,0.96432 -3249.09477,0.96402 -3247.03054,0.96411 -3244.96631,0.96439 -3242.90208,0.96454 -3240.83786,0.96477 -3238.77363,0.9648 -3236.7094,0.96462 -3234.64517,0.96502 -3232.58094,0.96578 -3230.51672,0.96624 -3228.45249,0.96635 -3226.38826,0.96634 -3224.32403,0.96642 -3222.2598,0.96627 -3220.19558,0.96583 -3218.13135,0.96531 -3216.06712,0.96489 -3214.00289,0.9648 -3211.93866,0.96472 -3209.87444,0.9645 -3207.81021,0.96428 -3205.74598,0.96421 -3203.68175,0.96459 -3201.61752,0.96526 -3199.5533,0.96577 -3197.48907,0.96592 -3195.42484,0.96557 -3193.36061,0.96535 -3191.29639,0.96569 -3189.23216,0.96608 -3187.16793,0.966 -3185.1037,0.96562 -3183.03947,0.96568 -3180.97525,0.96622 -3178.91102,0.96638 -3176.84679,0.96599 -3174.78256,0.96543 -3172.71833,0.96455 -3170.65411,0.96424 -3168.58988,0.9652 -3166.52565,0.9658 -3164.46142,0.96535 -3162.39719,0.96521 -3160.33297,0.96539 -3158.26874,0.96514 -3156.20451,0.96504 -3154.14028,0.96495 -3152.07605,0.96456 -3150.01183,0.96443 -3147.9476,0.96468 -3145.88337,0.96491 -3143.81914,0.96491 -3141.75491,0.96475 -3139.69069,0.96439 -3137.62646,0.96403 -3135.56223,0.96403 -3133.498,0.96411 -3131.43378,0.96419 -3129.36955,0.96446 -3127.30532,0.96427 -3125.24109,0.96367 -3123.17686,0.96333 -3121.11264,0.96316 -3119.04841,0.96332 -3116.98418,0.96389 -3114.91995,0.9641 -3112.85572,0.96376 -3110.7915,0.9634 -3108.72727,0.96321 -3106.66304,0.96304 -3104.59881,0.96298 -3102.53458,0.96306 -3100.47036,0.96267 -3098.40613,0.96222 -3096.3419,0.96269 -3094.27767,0.9633 -3092.21344,0.96325 -3090.14922,0.96314 -3088.08499,0.96287 -3086.02076,0.96191 -3083.95653,0.9612 -3081.8923,0.96136 -3079.82808,0.96161 -3077.76385,0.96153 -3075.69962,0.96127 -3073.63539,0.96077 -3071.57117,0.96054 -3069.50694,0.96109 -3067.44271,0.96158 -3065.37848,0.96135 -3063.31425,0.9606 -3061.25003,0.95976 -3059.1858,0.95927 -3057.12157,0.95911 -3055.05734,0.95909 -3052.99311,0.95922 -3050.92889,0.95975 -3048.86466,0.96081 -3046.80043,0.96199 -3044.7362,0.96302 -3042.67197,0.96359 -3040.60775,0.9634 -3038.54352,0.96285 -3036.47929,0.9625 -3034.41506,0.96246 -3032.35083,0.96289 -3030.28661,0.96341 -3028.22238,0.96331 -3026.15815,0.96277 -3024.09392,0.96233 -3022.02969,0.9619 -3019.96547,0.96143 -3017.90124,0.9613 -3015.83701,0.96108 -3013.77278,0.96007 -3011.70855,0.95868 -3009.64433,0.95754 -3007.5801,0.95655 -3005.51587,0.95533 -3003.45164,0.95366 -3001.38742,0.95145 -2999.32319,0.94947 -2997.25896,0.94797 -2995.19473,0.9457 -2993.1305,0.94295 -2991.06628,0.94104 -2989.00205,0.93947 -2986.93782,0.93741 -2984.87359,0.93468 -2982.80936,0.93106 -2980.74514,0.92703 -2978.68091,0.92321 -2976.61668,0.91908 -2974.55245,0.91394 -2972.48822,0.90752 -2970.424,0.89993 -2968.35977,0.89203 -2966.29554,0.88531 -2964.23131,0.88109 -2962.16708,0.87974 -2960.10286,0.88044 -2958.03863,0.88211 -2955.9744,0.88406 -2953.91017,0.88582 -2951.84594,0.88752 -2949.78172,0.88922 -2947.71749,0.89045 -2945.65326,0.89088 -2943.58903,0.89046 -2941.52481,0.88908 -2939.46058,0.88654 -2937.39635,0.88297 -2935.33212,0.87879 -2933.26789,0.8741 -2931.20367,0.86921 -2929.13944,0.86474 -2927.07521,0.86025 -2925.01098,0.85558 -2922.94675,0.85202 -2920.88253,0.85063 -2918.8183,0.85232 -2916.75407,0.8577 -2914.68984,0.8657 -2912.62561,0.87459 -2910.56139,0.88283 -2908.49716,0.88925 -2906.43293,0.89344 -2904.3687,0.89596 -2902.30447,0.89757 -2900.24025,0.89855 -2898.17602,0.89941 -2896.11179,0.90096 -2894.04756,0.90353 -2891.98333,0.90675 -2889.91911,0.90992 -2887.85488,0.91277 -2885.79065,0.91548 -2883.72642,0.91814 -2881.6622,0.92038 -2879.59797,0.92143 -2877.53374,0.92185 -2875.46951,0.92264 -2873.40528,0.92319 -2871.34106,0.92277 -2869.27683,0.92195 -2867.2126,0.92109 -2865.14837,0.91969 -2863.08414,0.91758 -2861.01992,0.91429 -2858.95569,0.90931 -2856.89146,0.90307 -2854.82723,0.8963 -2852.763,0.89059 -2850.69878,0.88938 -2848.63455,0.89509 -2846.57032,0.90549 -2844.50609,0.91622 -2842.44186,0.92504 -2840.37764,0.93179 -2838.31341,0.93685 -2836.24918,0.94047 -2834.18495,0.94318 -2832.12072,0.94545 -2830.0565,0.94741 -2827.99227,0.94908 -2825.92804,0.95036 -2823.86381,0.9512 -2821.79959,0.95183 -2819.73536,0.95257 -2817.67113,0.95307 -2815.6069,0.95318 -2813.54267,0.95336 -2811.47845,0.95384 -2809.41422,0.95461 -2807.34999,0.95506 -2805.28576,0.95493 -2803.22153,0.95486 -2801.15731,0.95506 -2799.09308,0.95551 -2797.02885,0.95624 -2794.96462,0.95673 -2792.90039,0.95653 -2790.83617,0.95613 -2788.77194,0.95643 -2786.70771,0.95698 -2784.64348,0.95706 -2782.57925,0.95727 -2780.51503,0.95773 -2778.4508,0.95804 -2776.38657,0.95837 -2774.32234,0.9587 -2772.25811,0.95878 -2770.19389,0.95862 -2768.12966,0.95838 -2766.06543,0.95828 -2764.0012,0.95851 -2761.93698,0.95878 -2759.87275,0.95869 -2757.80852,0.95843 -2755.74429,0.95852 -2753.68006,0.95874 -2751.61584,0.95875 -2749.55161,0.95894 -2747.48738,0.95939 -2745.42315,0.95973 -2743.35892,0.95987 -2741.2947,0.96 -2739.23047,0.96002 -2737.16624,0.95987 -2735.10201,0.95985 -2733.03778,0.96007 -2730.97356,0.96042 -2728.90933,0.96055 -2726.8451,0.96042 -2724.78087,0.96036 -2722.71664,0.96036 -2720.65242,0.96048 -2718.58819,0.96084 -2716.52396,0.96119 -2714.45973,0.96116 -2712.3955,0.96088 -2710.33128,0.9607 -2708.26705,0.96059 -2706.20282,0.96056 -2704.13859,0.96077 -2702.07436,0.96118 -2700.01014,0.96146 -2697.94591,0.9613 -2695.88168,0.96103 -2693.81745,0.96088 -2691.75323,0.96063 -2689.689,0.96036 -2687.62477,0.96043 -2685.56054,0.96082 -2683.49631,0.96122 -2681.43209,0.9613 -2679.36786,0.96108 -2677.30363,0.96097 -2675.2394,0.96106 -2673.17517,0.96141 -2671.11095,0.96188 -2669.04672,0.96189 -2666.98249,0.96146 -2664.91826,0.96086 -2662.85403,0.96035 -2660.78981,0.96045 -2658.72558,0.96102 -2656.66135,0.96121 -2654.59712,0.96084 -2652.53289,0.96052 -2650.46867,0.96062 -2648.40444,0.96078 -2646.34021,0.9608 -2644.27598,0.96075 -2642.21175,0.96056 -2640.14753,0.96038 -2638.0833,0.9606 -2636.01907,0.96112 -2633.95484,0.96123 -2631.89062,0.96069 -2629.82639,0.96035 -2627.76216,0.96062 -2625.69793,0.96074 -2623.6337,0.96038 -2621.56948,0.96014 -2619.50525,0.96041 -2617.44102,0.96058 -2615.37679,0.96042 -2613.31256,0.96052 -2611.24834,0.96069 -2609.18411,0.96062 -2607.11988,0.96066 -2605.05565,0.96091 -2602.99142,0.96094 -2600.9272,0.96066 -2598.86297,0.96049 -2596.79874,0.96099 -2594.73451,0.96184 -2592.67028,0.96234 -2590.60606,0.96224 -2588.54183,0.96184 -2586.4776,0.96196 -2584.41337,0.96256 -2582.34914,0.96285 -2580.28492,0.96269 -2578.22069,0.96245 -2576.15646,0.96238 -2574.09223,0.9621 -2572.02801,0.96162 -2569.96378,0.96172 -2567.89955,0.96229 -2565.83532,0.96275 -2563.77109,0.96304 -2561.70687,0.963 -2559.64264,0.96252 -2557.57841,0.96216 -2555.51418,0.96231 -2553.44995,0.96275 -2551.38573,0.9632 -2549.3215,0.9636 -2547.25727,0.96359 -2545.19304,0.96283 -2543.12881,0.96236 -2541.06459,0.96265 -2539.00036,0.96287 -2536.93613,0.96296 -2534.8719,0.96324 -2532.80767,0.96355 -2530.74345,0.96363 -2528.67922,0.96373 -2526.61499,0.96414 -2524.55076,0.96458 -2522.48653,0.96449 -2520.42231,0.96403 -2518.35808,0.96401 -2516.29385,0.96479 -2514.22962,0.96559 -2512.1654,0.96545 -2510.10117,0.96504 -2508.03694,0.96499 -2505.97271,0.96519 -2503.90848,0.96571 -2501.84426,0.96569 -2499.78003,0.96515 -2497.7158,0.96523 -2495.65157,0.96548 -2493.58734,0.96531 -2491.52312,0.9652 -2489.45889,0.96532 -2487.39466,0.9655 -2485.33043,0.96548 -2483.2662,0.96507 -2481.20198,0.96491 -2479.13775,0.96534 -2477.07352,0.96599 -2475.00929,0.96675 -2472.94506,0.96701 -2470.88084,0.96636 -2468.81661,0.96586 -2466.75238,0.96617 -2464.68815,0.9664 -2462.62392,0.96606 -2460.5597,0.9659 -2458.49547,0.96609 -2456.43124,0.96616 -2454.36701,0.9659 -2452.30278,0.96541 -2450.23856,0.96521 -2448.17433,0.96543 -2446.1101,0.96562 -2444.04587,0.96562 -2441.98165,0.96553 -2439.91742,0.96533 -2437.85319,0.96531 -2435.78896,0.96574 -2433.72473,0.96618 -2431.66051,0.96579 -2429.59628,0.96464 -2427.53205,0.96403 -2425.46782,0.96449 -2423.40359,0.9649 -2421.33937,0.96452 -2419.27514,0.96414 -2417.21091,0.96429 -2415.14668,0.96439 -2413.08245,0.96423 -2411.01823,0.96376 -2408.954,0.96306 -2406.88977,0.96263 -2404.82554,0.96256 -2402.76131,0.96273 -2400.69709,0.96302 -2398.63286,0.9632 -2396.56863,0.96381 -2394.5044,0.96463 -2392.44017,0.9646 -2390.37595,0.96408 -2388.31172,0.96377 -2386.24749,0.96344 -2384.18326,0.96301 -2382.11904,0.96261 -2380.05481,0.96265 -2377.99058,0.96328 -2375.92635,0.96381 -2373.86212,0.96386 -2371.7979,0.9638 -2369.73367,0.96467 -2367.66944,0.9669 -2365.60521,0.96839 -2363.54098,0.96751 -2361.47676,0.96598 -2359.41253,0.96561 -2357.3483,0.96588 -2355.28407,0.96537 -2353.21984,0.96427 -2351.15562,0.9639 -2349.09139,0.96392 -2347.02716,0.9635 -2344.96293,0.96336 -2342.8987,0.96433 -2340.83448,0.96519 -2338.77025,0.965 -2336.70602,0.96446 -2334.64179,0.96442 -2332.57756,0.9647 -2330.51334,0.96442 -2328.44911,0.96289 -2326.38488,0.96068 -2324.32065,0.95925 -2322.25643,0.95891 -2320.1922,0.95938 -2318.12797,0.96056 -2316.06374,0.96152 -2313.99951,0.96167 -2311.93529,0.96192 -2309.87106,0.96262 -2307.80683,0.96293 -2305.7426,0.96322 -2303.67837,0.96356 -2301.61415,0.96285 -2299.54992,0.96204 -2297.48569,0.9627 -2295.42146,0.96339 -2293.35723,0.96247 -2291.29301,0.96149 -2289.22878,0.96158 -2287.16455,0.96127 -2285.10032,0.96023 -2283.03609,0.95992 -2280.97187,0.96053 -2278.90764,0.96129 -2276.84341,0.9623 -2274.77918,0.96329 -2272.71495,0.96368 -2270.65073,0.96399 -2268.5865,0.96411 -2266.52227,0.9637 -2264.45804,0.96334 -2262.39382,0.96333 -2260.32959,0.96336 -2258.26536,0.96326 -2256.20113,0.96375 -2254.1369,0.96504 -2252.07268,0.96585 -2250.00845,0.96559 -2247.94422,0.96468 -2245.87999,0.96371 -2243.81576,0.96371 -2241.75154,0.96471 -2239.68731,0.9653 -2237.62308,0.96499 -2235.55885,0.96486 -2233.49462,0.96534 -2231.4304,0.96574 -2229.36617,0.96559 -2227.30194,0.9647 -2225.23771,0.96337 -2223.17348,0.96228 -2221.10926,0.96227 -2219.04503,0.96284 -2216.9808,0.96342 -2214.91657,0.96414 -2212.85234,0.9645 -2210.78812,0.96439 -2208.72389,0.96466 -2206.65966,0.966 -2204.59543,0.9658 -2202.53121,0.96426 -2200.46698,0.96497 -2198.40275,0.96634 -2196.33852,0.96677 -2194.27429,0.96715 -2192.21007,0.9669 -2190.14584,0.96647 -2188.08161,0.96645 -2186.01738,0.96624 -2183.95315,0.96683 -2181.88893,0.96734 -2179.8247,0.96757 -2177.76047,0.96972 -2175.69624,0.97068 -2173.63201,0.96817 -2171.56779,0.96637 -2169.50356,0.96726 -2167.43933,0.96839 -2165.3751,0.96732 -2163.31087,0.9652 -2161.24665,0.96713 -2159.18242,0.97323 -2157.11819,0.97739 -2155.05396,0.97815 -2152.98973,0.97663 -2150.92551,0.97411 -2148.86128,0.9726 -2146.79705,0.97142 -2144.73282,0.97054 -2142.66859,0.97107 -2140.60437,0.97145 -2138.54014,0.97095 -2136.47591,0.971 -2134.41168,0.97195 -2132.34746,0.9725 -2130.28323,0.97195 -2128.219,0.97105 -2126.15477,0.97038 -2124.09054,0.9695 -2122.02632,0.96772 -2119.96209,0.96541 -2117.89786,0.96456 -2115.83363,0.96575 -2113.7694,0.96684 -2111.70518,0.96671 -2109.64095,0.96584 -2107.57672,0.96496 -2105.51249,0.96438 -2103.44826,0.9644 -2101.38404,0.96564 -2099.31981,0.96693 -2097.25558,0.96697 -2095.19135,0.96676 -2093.12712,0.96701 -2091.0629,0.96697 -2088.99867,0.96625 -2086.93444,0.96538 -2084.87021,0.96497 -2082.80598,0.96521 -2080.74176,0.96568 -2078.67753,0.96539 -2076.6133,0.96422 -2074.54907,0.96342 -2072.48485,0.96411 -2070.42062,0.9655 -2068.35639,0.96576 -2066.29216,0.96585 -2064.22793,0.96674 -2062.16371,0.96713 -2060.09948,0.9672 -2058.03525,0.96765 -2055.97102,0.96805 -2053.90679,0.96726 -2051.84257,0.96541 -2049.77834,0.9648 -2047.71411,0.9657 -2045.64988,0.96707 -2043.58565,0.96839 -2041.52143,0.96861 -2039.4572,0.96891 -2037.39297,0.97037 -2035.32874,0.97084 -2033.26451,0.97022 -2031.20029,0.97002 -2029.13606,0.96942 -2027.07183,0.96915 -2025.0076,0.96862 -2022.94337,0.96732 -2020.87915,0.96823 -2018.81492,0.97089 -2016.75069,0.97302 -2014.68646,0.9733 -2012.62224,0.97281 -2010.55801,0.97344 -2008.49378,0.97376 -2006.42955,0.97402 -2004.36532,0.97445 -2002.3011,0.97265 -2000.23687,0.97023 -1998.17264,0.96987 -1996.10841,0.96932 -1994.04418,0.96754 -1991.97996,0.96733 -1989.91573,0.96874 -1987.8515,0.96924 -1985.78727,0.96823 -1983.72304,0.9664 -1981.65882,0.96514 -1979.59459,0.96681 -1977.53036,0.97003 -1975.46613,0.97093 -1973.4019,0.96941 -1971.33768,0.96823 -1969.27345,0.96899 -1967.20922,0.96975 -1965.14499,0.96902 -1963.08076,0.96788 -1961.01654,0.96741 -1958.95231,0.96739 -1956.88808,0.96589 -1954.82385,0.96295 -1952.75963,0.96159 -1950.6954,0.96264 -1948.63117,0.96403 -1946.56694,0.96468 -1944.50271,0.96481 -1942.43849,0.96451 -1940.37426,0.96462 -1938.31003,0.96585 -1936.2458,0.96736 -1934.18157,0.96781 -1932.11735,0.96756 -1930.05312,0.96762 -1927.98889,0.96758 -1925.92466,0.96744 -1923.86043,0.96814 -1921.79621,0.96869 -1919.73198,0.96833 -1917.66775,0.96867 -1915.60352,0.96853 -1913.53929,0.96736 -1911.47507,0.9675 -1909.41084,0.96865 -1907.34661,0.96867 -1905.28238,0.96785 -1903.21815,0.96802 -1901.15393,0.9692 -1899.0897,0.97031 -1897.02547,0.9707 -1894.96124,0.96993 -1892.89702,0.96882 -1890.83279,0.96911 -1888.76856,0.97006 -1886.70433,0.97028 -1884.6401,0.96996 -1882.57588,0.96958 -1880.51165,0.96964 -1878.44742,0.96973 -1876.38319,0.96948 -1874.31896,0.96912 -1872.25474,0.96898 -1870.19051,0.96927 -1868.12628,0.96985 -1866.06205,0.96997 -1863.99782,0.97001 -1861.9336,0.97013 -1859.86937,0.96964 -1857.80514,0.96869 -1855.74091,0.9679 -1853.67668,0.96756 -1851.61246,0.96769 -1849.54823,0.96782 -1847.484,0.96736 -1845.41977,0.96688 -1843.35554,0.96721 -1841.29132,0.96786 -1839.22709,0.96755 -1837.16286,0.96643 -1835.09863,0.96567 -1833.0344,0.96566 -1830.97018,0.96548 -1828.90595,0.96427 -1826.84172,0.96325 -1824.77749,0.9633 -1822.71327,0.96377 -1820.64904,0.96394 -1818.58481,0.96413 -1816.52058,0.96456 -1814.45635,0.96488 -1812.39213,0.96458 -1810.3279,0.96367 -1808.26367,0.96278 -1806.19944,0.96241 -1804.13521,0.96248 -1802.07099,0.9627 -1800.00676,0.96267 -1797.94253,0.96216 -1795.8783,0.96183 -1793.81407,0.96143 -1791.74985,0.96094 -1789.68562,0.96072 -1787.62139,0.96049 -1785.55716,0.96015 -1783.49293,0.96001 -1781.42871,0.95981 -1779.36448,0.95953 -1777.30025,0.9596 -1775.23602,0.95971 -1773.17179,0.95937 -1771.10757,0.95873 -1769.04334,0.9587 -1766.97911,0.95873 -1764.91488,0.95861 -1762.85066,0.95796 -1760.78643,0.95663 -1758.7222,0.95518 -1756.65797,0.95347 -1754.59374,0.95128 -1752.52952,0.94844 -1750.46529,0.9438 -1748.40106,0.93686 -1746.33683,0.92876 -1744.2726,0.91873 -1742.20838,0.90608 -1740.14415,0.88923 -1738.07992,0.87104 -1736.01569,0.85204 -1733.95146,0.81906 -1731.88724,0.77911 -1729.82301,0.74574 -1727.75878,0.71229 -1725.69455,0.67913 -1723.63032,0.64487 -1721.5661,0.6136 -1719.50187,0.58512 -1717.43764,0.54665 -1715.37341,0.50664 -1713.30918,0.48108 -1711.24496,0.46543 -1709.18073,0.45934 -1707.1165,0.4673 -1705.05227,0.49381 -1702.98805,0.52806 -1700.92382,0.57337 -1698.85959,0.62988 -1696.79536,0.67518 -1694.73113,0.71574 -1692.66691,0.74516 -1690.60268,0.7676 -1688.53845,0.78726 -1686.47422,0.80186 -1684.40999,0.81554 -1682.34577,0.82666 -1680.28154,0.83192 -1678.21731,0.83498 -1676.15308,0.83726 -1674.08885,0.84086 -1672.02463,0.84747 -1669.9604,0.85771 -1667.89617,0.86919 -1665.83194,0.87774 -1663.76771,0.88567 -1661.70349,0.8932 -1659.63926,0.89857 -1657.57503,0.90252 -1655.5108,0.90599 -1653.44657,0.9093 -1651.38235,0.91196 -1649.31812,0.91372 -1647.25389,0.91575 -1645.18966,0.91823 -1643.12544,0.92008 -1641.06121,0.92145 -1638.99698,0.92255 -1636.93275,0.92385 -1634.86852,0.92559 -1632.8043,0.92729 -1630.74007,0.92858 -1628.67584,0.92972 -1626.61161,0.93063 -1624.54738,0.93131 -1622.48316,0.93172 -1620.41893,0.93154 -1618.3547,0.93058 -1616.29047,0.92872 -1614.22624,0.92741 -1612.16202,0.92734 -1610.09779,0.92811 -1608.03356,0.92942 -1605.96933,0.93136 -1603.9051,0.93378 -1601.84088,0.93644 -1599.77665,0.93876 -1597.71242,0.9403 -1595.64819,0.94114 -1593.58396,0.94155 -1591.51974,0.94174 -1589.45551,0.94149 -1587.39128,0.94023 -1585.32705,0.93722 -1583.26282,0.93211 -1581.1986,0.92589 -1579.13437,0.92146 -1577.07014,0.92146 -1575.00591,0.92621 -1572.94169,0.93096 -1570.87746,0.93512 -1568.81323,0.9392 -1566.749,0.94149 -1564.68477,0.94273 -1562.62055,0.94398 -1560.55632,0.94524 -1558.49209,0.94577 -1556.42786,0.94575 -1554.36363,0.9459 -1552.29941,0.94613 -1550.23518,0.94658 -1548.17095,0.94713 -1546.10672,0.94756 -1544.04249,0.94782 -1541.97827,0.94771 -1539.91404,0.94713 -1537.84981,0.94656 -1535.78558,0.94604 -1533.72135,0.94479 -1531.65713,0.94325 -1529.5929,0.94254 -1527.52867,0.94239 -1525.46444,0.94267 -1523.40021,0.94324 -1521.33599,0.94375 -1519.27176,0.94291 -1517.20753,0.9397 -1515.1433,0.93489 -1513.07908,0.92993 -1511.01485,0.924 -1508.95062,0.91434 -1506.88639,0.89245 -1504.82216,0.87757 -1502.75794,0.88476 -1500.69371,0.90148 -1498.62948,0.91967 -1496.56525,0.93278 -1494.50102,0.93904 -1492.4368,0.94118 -1490.37257,0.94102 -1488.30834,0.93898 -1486.24411,0.93601 -1484.17988,0.93237 -1482.11566,0.92736 -1480.05143,0.92071 -1477.9872,0.91328 -1475.92297,0.90508 -1473.85874,0.89569 -1471.79452,0.88661 -1469.73029,0.88165 -1467.66606,0.87926 -1465.60183,0.87532 -1463.5376,0.8657 -1461.47338,0.85227 -1459.40915,0.83968 -1457.34492,0.83234 -1455.28069,0.83159 -1453.21647,0.83249 -1451.15224,0.83833 -1449.08801,0.85197 -1447.02378,0.86896 -1444.95955,0.88221 -1442.89533,0.8917 -1440.8311,0.89894 -1438.76687,0.90414 -1436.70264,0.9085 -1434.63841,0.91224 -1432.57419,0.91582 -1430.50996,0.92053 -1428.44573,0.92561 -1426.3815,0.929 -1424.31727,0.93019 -1422.25305,0.92877 -1420.18882,0.92226 -1418.12459,0.90428 -1416.06036,0.87604 -1413.99613,0.841 -1411.93191,0.80237 -1409.86768,0.77495 -1407.80345,0.77277 -1405.73922,0.79525 -1403.67499,0.82708 -1401.61077,0.84965 -1399.54654,0.86077 -1397.48231,0.86304 -1395.41808,0.85803 -1393.35386,0.8491 -1391.28963,0.84041 -1389.2254,0.83357 -1387.16117,0.83068 -1385.09694,0.83451 -1383.03272,0.84305 -1380.96849,0.85354 -1378.90426,0.86458 -1376.84003,0.87529 -1374.7758,0.8856 -1372.71158,0.89457 -1370.64735,0.90103 -1368.58312,0.90583 -1366.51889,0.90977 -1364.45466,0.91336 -1362.39044,0.91702 -1360.32621,0.92013 -1358.26198,0.92206 -1356.19775,0.92234 -1354.13352,0.92029 -1352.0693,0.91676 -1350.00507,0.91507 -1347.94084,0.91759 -1345.87661,0.9223 -1343.81238,0.92604 -1341.74816,0.92802 -1339.68393,0.92828 -1337.6197,0.92679 -1335.55547,0.92381 -1333.49125,0.91904 -1331.42702,0.91207 -1329.36279,0.90271 -1327.29856,0.89092 -1325.23433,0.87781 -1323.17011,0.86682 -1321.10588,0.86262 -1319.04165,0.8665 -1316.97742,0.87425 -1314.91319,0.88039 -1312.84897,0.88263 -1310.78474,0.88106 -1308.72051,0.8764 -1306.65628,0.86963 -1304.59205,0.86194 -1302.52783,0.85394 -1300.4636,0.84503 -1298.39937,0.83384 -1296.33514,0.8193 -1294.27091,0.8007 -1292.20669,0.77802 -1290.14246,0.75217 -1288.07823,0.72461 -1286.014,0.69689 -1283.94977,0.6698 -1281.88555,0.64334 -1279.82132,0.61749 -1277.75709,0.5922 -1275.69286,0.56748 -1273.62863,0.54334 -1271.56441,0.51998 -1269.50018,0.49895 -1267.43595,0.48252 -1265.37172,0.4722 -1263.3075,0.46828 -1261.24327,0.46903 -1259.17904,0.47149 -1257.11481,0.47283 -1255.05058,0.47146 -1252.98636,0.46738 -1250.92213,0.46151 -1248.8579,0.45524 -1246.79367,0.45049 -1244.72944,0.44945 -1242.66522,0.45391 -1240.60099,0.4646 -1238.53676,0.48126 -1236.47253,0.50281 -1234.4083,0.52732 -1232.34408,0.55274 -1230.27985,0.57771 -1228.21562,0.60138 -1226.15139,0.62325 -1224.08716,0.643 -1222.02294,0.66036 -1219.95871,0.6754 -1217.89448,0.68834 -1215.83025,0.69902 -1213.76602,0.70608 -1211.7018,0.707 -1209.63757,0.70223 -1207.57334,0.69852 -1205.50911,0.70296 -1203.44489,0.71528 -1201.38066,0.73082 -1199.31643,0.74652 -1197.2522,0.7611 -1195.18797,0.77374 -1193.12375,0.7842 -1191.05952,0.79274 -1188.99529,0.79956 -1186.93106,0.80468 -1184.86683,0.8082 -1182.80261,0.81034 -1180.73838,0.81124 -1178.67415,0.81099 -1176.60992,0.80992 -1174.54569,0.80909 -1172.48147,0.80978 -1170.41724,0.81279 -1168.35301,0.81813 -1166.28878,0.82451 -1164.22455,0.8302 -1162.16033,0.83443 -1160.0961,0.83724 -1158.03187,0.83903 -1155.96764,0.84011 -1153.90341,0.84027 -1151.83919,0.83955 -1149.77496,0.83847 -1147.71073,0.83725 -1145.6465,0.83594 -1143.58228,0.83422 -1141.51805,0.83087 -1139.45382,0.82451 -1137.38959,0.81405 -1135.32536,0.79803 -1133.26114,0.7752 -1131.19691,0.74602 -1129.13268,0.7131 -1127.06845,0.67992 -1125.00422,0.64867 -1122.94,0.61998 -1120.87577,0.59406 -1118.81154,0.57325 -1116.74731,0.56274 -1114.68308,0.56486 -1112.61886,0.57299 -1110.55463,0.57357 -1108.4904,0.55668 -1106.42617,0.52523 -1104.36194,0.49114 -1102.29772,0.46501 -1100.23349,0.45171 -1098.16926,0.45135 -1096.10503,0.4611 -1094.0408,0.47681 -1091.97658,0.49426 -1089.91235,0.51025 -1087.84812,0.52347 -1085.78389,0.53547 -1083.71967,0.55002 -1081.65544,0.56977 -1079.59121,0.59363 -1077.52698,0.6182 -1075.46275,0.64071 -1073.39853,0.6598 -1071.3343,0.67523 -1069.27007,0.68784 -1067.20584,0.69847 -1065.14161,0.70749 -1063.07739,0.71539 -1061.01316,0.72258 -1058.94893,0.72928 -1056.8847,0.73542 -1054.82047,0.74072 -1052.75625,0.74466 -1050.69202,0.74674 -1048.62779,0.74723 -1046.56356,0.74699 -1044.49933,0.74691 -1042.43511,0.74719 -1040.37088,0.74718 -1038.30665,0.74616 -1036.24242,0.74309 -1034.17819,0.73584 -1032.11397,0.72312 -1030.04974,0.70876 -1027.98551,0.69988 -1025.92128,0.69647 -1023.85706,0.68673 -1021.79283,0.658 -1019.7286,0.61257 -1017.66437,0.57492 -1015.60014,0.57359 -1013.53592,0.6072 -1011.47169,0.64976 -1009.40746,0.6849 -1007.34323,0.7107 -1005.279,0.72859 -1003.21478,0.74057 -1001.15055,0.74821 -999.08632,0.75222 -997.02209,0.75296 -994.95786,0.75135 -992.89364,0.74919 -990.82941,0.74777 -988.76518,0.74722 -986.70095,0.74747 -984.63672,0.74854 -982.5725,0.75091 -980.50827,0.75452 -978.44404,0.75771 -976.37981,0.75887 -974.31558,0.75784 -972.25136,0.75538 -970.18713,0.75217 -968.1229,0.7485 -966.05867,0.74494 -963.99444,0.74209 -961.93022,0.73984 -959.86599,0.73805 -957.80176,0.73697 -955.73753,0.73679 -953.67331,0.73742 -951.60908,0.73837 -949.54485,0.73881 -947.48062,0.73748 -945.41639,0.7334 -943.35217,0.7265 -941.28794,0.71742 -939.22371,0.70782 -937.15948,0.69994 -935.09525,0.69526 -933.03103,0.69467 -930.9668,0.69888 -928.90257,0.70753 -926.83834,0.71782 -924.77411,0.72531 -922.70989,0.7263 -920.64566,0.71936 -918.58143,0.70634 -916.5172,0.69446 -914.45297,0.6935 -912.38875,0.70592 -910.32452,0.7247 -908.26029,0.74218 -906.19606,0.75566 -904.13183,0.76541 -902.06761,0.77248 -900.00338,0.7778 -897.93915,0.78188 -895.87492,0.7855 -893.8107,0.78893 -891.74647,0.79169 -889.68224,0.7936 -887.61801,0.79382 -885.55378,0.79084 -883.48956,0.78346 -881.42533,0.77111 -879.3611,0.75319 -877.29687,0.72765 -875.23264,0.69392 -873.16842,0.66616 -871.10419,0.66841 -869.03996,0.69914 -866.97573,0.73214 -864.9115,0.75322 -862.84728,0.76512 -860.78305,0.77265 -858.71882,0.77789 -856.65459,0.78133 -854.59036,0.78339 -852.52614,0.78474 -850.46191,0.7857 -848.39768,0.78638 -846.33345,0.78712 -844.26922,0.788 -842.205,0.78937 -840.14077,0.79165 -838.07654,0.79379 -836.01231,0.79469 -833.94809,0.79484 -831.88386,0.79482 -829.81963,0.79512 -827.7554,0.79639 -825.69117,0.79876 -823.62695,0.8014 -821.56272,0.8028 -819.49849,0.80215 -817.43426,0.79914 -815.37003,0.79398 -813.30581,0.78862 -811.24158,0.78651 -809.17735,0.78963 -807.11312,0.79593 -805.04889,0.80241 -802.98467,0.8081 -800.92044,0.81144 -798.85621,0.80951 -796.79198,0.80329 -794.72775,0.79959 -792.66353,0.80325 -790.5993,0.81201 -788.53507,0.82142 -786.47084,0.82934 -784.40661,0.83557 -782.34239,0.84026 -780.27816,0.84352 -778.21393,0.84637 -776.1497,0.84956 -774.08548,0.85211 -772.02125,0.85375 -769.95702,0.85577 -767.89279,0.85813 -765.82856,0.85971 -763.76434,0.86038 -761.70011,0.85988 -759.63588,0.85715 -757.57165,0.85144 -755.50742,0.84283 -753.4432,0.83366 -751.37897,0.82847 -749.31474,0.83006 -747.25051,0.83663 -745.18628,0.84344 -743.12206,0.84463 -741.05783,0.83359 -738.9936,0.80481 -736.92937,0.75736 -734.86514,0.69694 -732.80092,0.63236 -730.73669,0.56838 -728.67246,0.50586 -726.60823,0.45298 -724.544,0.42745 -722.47978,0.43769 -720.41555,0.47365 -718.35132,0.51864 -716.28709,0.56161 -714.22286,0.59929 -712.15864,0.63054 -710.09441,0.65343 -708.03018,0.66792 -705.96595,0.67744 -703.90173,0.687 -701.8375,0.69921 -699.77327,0.71269 -697.70904,0.72536 -695.64481,0.73613 -693.58059,0.74427 -691.51636,0.75071 -689.45213,0.75638 -687.3879,0.76042 -685.32367,0.76305 -683.25945,0.76521 -681.19522,0.76719 -679.13099,0.76976 -677.06676,0.77316 -675.00253,0.77668 -672.93831,0.77961 -670.87408,0.78183 -668.80985,0.78458 -666.74562,0.7886 -664.68139,0.79168 -662.61717,0.79385 -660.55294,0.79583 -658.48871,0.79777 -656.42448,0.79988 -654.36025,0.80189 -652.29603,0.80327 -650.2318,0.80459 -648.16757,0.80631 -646.10334,0.808 -644.03912,0.80948 -641.97489,0.81088 -639.91066,0.81205 -637.84643,0.81256 -635.7822,0.81131 -633.71798,0.80793 -631.65375,0.80631 -629.58952,0.80947 -627.52529,0.81397 -625.46106,0.81629 -623.39684,0.81711 -621.33261,0.81784 -619.26838,0.81901 -617.20415,0.82049 -615.13992,0.82165 -613.0757,0.8222 -611.01147,0.82269 -608.94724,0.82374 -606.88301,0.8248 -604.81878,0.82546 -602.75456,0.82602 -600.69033,0.82626 -598.6261,0.82599 -596.56187,0.82577 -594.49764,0.82576 -592.43342,0.82587 -590.36919,0.82627 -588.30496,0.8262 -586.24073,0.8256 -584.17651,0.82541 -582.11228,0.82549 -580.04805,0.82536 -577.98382,0.82497 -575.91959,0.82453 -573.85537,0.82434 -571.79114,0.82421 -569.72691,0.82375 -567.66268,0.82251 -565.59845,0.82069 -563.53423,0.81909 -561.47,0.81843 -559.40577,0.8188 -557.34154,0.81833 -555.27731,0.81659 -553.21309,0.81539 -551.14886,0.81466 -549.08463,0.81435 -547.0204,0.81474 -544.95617,0.81394 -542.89195,0.81113 -540.82772,0.80803 -538.76349,0.80578 -536.69926,0.80385 -534.63503,0.80167 -532.57081,0.80016 -530.50658,0.79975 -528.44235,0.79907 -526.37812,0.7979 -524.3139,0.79726 -522.24967,0.7962 -520.18544,0.79379 -518.12121,0.79058 -516.05698,0.78656 -513.99276,0.78208 -511.92853,0.77774 -509.8643,0.77357 -507.80007,0.76855 -505.73584,0.76084 -503.67162,0.75036 -501.60739,0.73825 -499.54316,0.72765 -497.47893,0.7211 -495.4147,0.7192 -493.35048,0.72171 -491.28625,0.72724 -489.22202,0.73323 -487.15779,0.73728 -485.09356,0.73959 -483.02934,0.7415 -480.96511,0.74373 -478.90088,0.74555 -476.83665,0.74531 -474.77242,0.74471 -472.7082,0.74465 -470.64397,0.74315 -468.57974,0.74143 -466.51551,0.73976 -464.45129,0.73729 -462.38706,0.73613 -460.32283,0.7371 -458.2586,0.73785 -456.19437,0.73633 -454.13015,0.73374 -452.06592,0.7321 -450.00169,0.7318 -447.93746,0.73286 -445.87323,0.73495 -443.80901,0.73576 -441.74478,0.73509 -439.68055,0.73552 -437.61632,0.73716 -435.55209,0.73834 -433.48787,0.73749 -431.42364,0.73458 -429.35941,0.73245 -427.29518,0.73214 -425.23095,0.73187 -423.16673,0.73206 -421.1025,0.73443 -419.03827,0.73783 -416.97404,0.7375 -414.90981,0.73419 -412.84559,0.73176 -410.78136,0.73148 -408.71713,0.73191 -406.6529,0.73239 -404.58867,0.7322 -402.52445,0.73042 -400.46022,0.72682 -398.39599,0.72146 diff --git a/OpusData.R b/OpusData.R index 68a181d..a76635a 100644 --- a/OpusData.R +++ b/OpusData.R @@ -1,25 +1,24 @@ #!/usr/bin/env Rscript # Attach packages to workspace, execute with every new session -library("filesstrings") source("ReadOpus.R") # Determine file path -path <- commandArgs(trailingOnly = TRUE)[1] -file_name <- commandArgs(trailingOnly = TRUE)[2] -file_path <- paste0(path, file_name) +#path <- commandArgs(trailingOnly = TRUE)[1] +#file_name <- commandArgs(trailingOnly = TRUE)[2] +#file_path <- paste0(path, file_name) +file_path <- commandArgs(trailingOnly = TRUE)[1] + +print(file_path) # Convert opus binary file into dataframe data <- read_opus_univ(file_path, 5) -# Move the file to OPUS_old where it will remain temporarily in case of an error -file.move(file_path, "OPUS_old/", overwrite = TRUE) - # Replace last "." with "_", add ".DPT" -file_name <- paste0(sub(".([^.]*)$", "_\\1", file_name), ".DPT") +#file_name <- paste0(sub(".([^.]*)$", "_\\1", file_name), ".DPT") # Determine target, where the result should appear -target_path <- paste0(path, "../DPT/", file_name) +target_path <- paste0("/tmp/", sub('.*\\/', "", file_path)) # Create file file.create(target_path) @@ -28,7 +27,7 @@ file.create(target_path) write.table(data, target_path, row.names = FALSE, col.names = FALSE, sep = ",") # Call python script -system(paste('python3 transferData.py', file_name)) - +system(paste('python3 transferData.py', target_path)) +#py_run_file("transfer.py",local=FALSE, convert=FALSE) diff --git a/dirMonitor.sh b/dirMonitor.sh deleted file mode 100755 index 491c1f2..0000000 --- a/dirMonitor.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -inotifywait -m -q OPUS -e create -e moved_to | - while read fpath action file; do - Rscript OpusData.R $fpath $file >& /dev/null - done diff --git a/transferData.py b/transferData.py index 5208719..d33b8fb 100644 --- a/transferData.py +++ b/transferData.py @@ -1,11 +1,15 @@ import requests import sys +import re file_name = sys.argv[1] -dptFile = open("DPT/" + file_name, 'r') +print(file_name) + +dptFile = open(file_name, 'r') lines = dptFile.readlines() -jsonString = '[' +subject = re.split("(?<=_)(.+)(?=_)", file_name)[1] +jsonString = '{\" + subject + \": [' # Concatenate data for line in lines: @@ -14,12 +18,16 @@ for line in lines: # Remove last comma jsonString = jsonString[:-1] -jsonString += ']' +jsonString += ']}' headers = { - 'accept': '*/*', - 'Authorization': 'Basic ZGVmaW5tYV9jb25uZWN0X1JuZ0B0YTJlMzViYjkyZDRjNDkyZDgwMjdkNDMyOTMxNzBkMDRfaHViOkRlZmlubWE=', - 'Content-Type': 'application/json', + 'accept': '*/*', + 'hono-ttd': '10', + 'Authorization': 'Basic ZGVmaW5tYUB0MzhiYmNjZDE2MjE3NDViODgxMTk5ZGI2ZWQzZGFiNmE6RGVGaW5NYWNoZW4yMDIwIQ==', + 'Content-Type': 'application/json', } -data = '{"topic":"definma_connect/Rng/things/twin/commands/modify", "path":"features/data","value":{"properties":' + jsonString + '}}' +response = requests.post('https://http.bosch-iot-hub.com/telemetry', headers=headers, data=jsonString) + +print(response) +