diff --git a/vna_system/calibration/current_calibration b/vna_system/calibration/current_calibration deleted file mode 120000 index 635f973..0000000 --- a/vna_system/calibration/current_calibration +++ /dev/null @@ -1 +0,0 @@ -s21_start100_stop8800_points1000_bw1khz/bambambum \ No newline at end of file diff --git a/vna_system/core/acquisition/data_acquisition.py b/vna_system/core/acquisition/data_acquisition.py index f373b25..975c18d 100644 --- a/vna_system/core/acquisition/data_acquisition.py +++ b/vna_system/core/acquisition/data_acquisition.py @@ -200,13 +200,24 @@ class VNADataAcquisition: self._reset_sweep_state() - # Read until exactly one sweep is completed + if self._stop_event.is_set(): + logger.debug("Stop requested before sweep start; aborting sweep replay") + return + + # Read until exactly one sweep is completed. Honor stop requests only + # between sweeps so we do not break out mid-collection. sweep_completed = False - while not sweep_completed and self._running and not self._stop_event.is_set(): + while not sweep_completed: + if self._stop_event.is_set() and not self._collecting: + logger.debug("Stop requested with no active sweep; exiting loop") + break dir_b = f.read(1) if not dir_b: # EOF reached; wait for more data to arrive on disk - logger.debug("EOF reached; waiting for more data") + if self._collecting: + logger.warning("EOF reached while sweep in progress; aborting partial sweep") + else: + logger.debug("EOF reached; waiting for more data") time.sleep(0.1) break diff --git a/vna_system/core/processors/configs/bscan_config.json b/vna_system/core/processors/configs/bscan_config.json index 7264e82..3a87bb4 100644 --- a/vna_system/core/processors/configs/bscan_config.json +++ b/vna_system/core/processors/configs/bscan_config.json @@ -1,10 +1,10 @@ { - "open_air": false, + "open_air": true, "axis": "abs", - "data_limitation": "ph_only_2", - "cut": 0.417, - "max": 0.6, - "gain": 0.0, + "data_limitation": "ph_only_1", + "cut": 1.291, + "max": 1.0, + "gain": 0.9, "start_freq": 100.0, "stop_freq": 8800.0, "clear_history": false, diff --git a/vna_system/core/processors/configs/magnitude_config.json b/vna_system/core/processors/configs/magnitude_config.json index d0aae19..f266070 100644 --- a/vna_system/core/processors/configs/magnitude_config.json +++ b/vna_system/core/processors/configs/magnitude_config.json @@ -1,5 +1,5 @@ { "y_min": -80, "y_max": 40, - "show_phase": false + "show_phase": true } \ No newline at end of file diff --git a/vna_system/references/current_reference b/vna_system/references/current_reference index 8264ba0..23221cf 120000 --- a/vna_system/references/current_reference +++ b/vna_system/references/current_reference @@ -1 +1 @@ -s21_start100_stop8800_points1000_bw1khz/testet \ No newline at end of file +s21_start100_stop8800_points1000_bw1khz/ффывфы \ No newline at end of file diff --git a/vna_system/references/s21_start100_stop8800_points1000_bw1khz/ффывфы/info.json b/vna_system/references/s21_start100_stop8800_points1000_bw1khz/ффывфы/info.json new file mode 100644 index 0000000..b510dcf --- /dev/null +++ b/vna_system/references/s21_start100_stop8800_points1000_bw1khz/ффывфы/info.json @@ -0,0 +1,7 @@ +{ + "name": "ффывфы", + "timestamp": "2025-09-30T16:45:34.508464", + "preset_filename": "s21_start100_stop8800_points1000_bw1khz.bin", + "description": "", + "metadata": {} +} \ No newline at end of file diff --git a/vna_system/references/s21_start100_stop8800_points1000_bw1khz/ффывфы/sweep_data.json b/vna_system/references/s21_start100_stop8800_points1000_bw1khz/ффывфы/sweep_data.json new file mode 100644 index 0000000..3f0e92c --- /dev/null +++ b/vna_system/references/s21_start100_stop8800_points1000_bw1khz/ффывфы/sweep_data.json @@ -0,0 +1,4007 @@ +{ + "sweep_number": 39, + "timestamp": 1759239934.4998827, + "points": [ + [ + 9.449118078919128e-05, + -5.99798340772395e-06 + ], + [ + 0.0001382601767545566, + -2.3137254174798727e-05 + ], + [ + 0.00017105022561736405, + -3.222216400899924e-05 + ], + [ + 8.515033550793305e-05, + -2.1726656996179372e-05 + ], + [ + 0.0001984138070838526, + 8.368784619960934e-05 + ], + [ + 0.0002050792536465451, + -1.2624616829270963e-05 + ], + [ + 8.206823986256495e-05, + -3.124562499579042e-05 + ], + [ + 0.0002736087772063911, + 3.7465339119080454e-05 + ], + [ + 0.00011798428022302687, + -0.00013352150563150644 + ], + [ + 0.00012450631766114384, + -1.8194896256318316e-05 + ], + [ + 0.00016872154083102942, + -7.572845061076805e-05 + ], + [ + 8.645393972983584e-05, + -2.1170255422475748e-05 + ], + [ + 0.00020156409300398082, + -0.00012596418673638254 + ], + [ + 5.321089338394813e-05, + -0.00010653883509803563 + ], + [ + 9.633271838538349e-05, + -7.56638910388574e-05 + ], + [ + 8.915874786907807e-05, + 5.057280577602796e-05 + ], + [ + 0.00013217977539170533, + -5.003870319342241e-05 + ], + [ + 0.00014326476957648993, + -4.372810508357361e-05 + ], + [ + 4.4403921492630616e-05, + -0.0001833571877796203 + ], + [ + -1.7748307072906755e-05, + -2.0205585315125063e-05 + ], + [ + 0.00017632253002375364, + -6.341705739032477e-05 + ], + [ + 1.7401416698703542e-05, + 4.816988075617701e-05 + ], + [ + 4.366963548818603e-05, + -8.790394349489361e-05 + ], + [ + 3.2687730708858e-05, + -0.0001368742814520374 + ], + [ + 0.00015887792687863111, + 4.9431393563281745e-05 + ], + [ + 0.0002496491651982069, + -0.00013561519153881818 + ], + [ + 3.3640419133007526e-05, + -2.8388236387399957e-05 + ], + [ + 2.4571174435550347e-05, + -0.00021197143360041082 + ], + [ + 0.0002788888814393431, + -7.890133565524593e-05 + ], + [ + 3.9164009649539366e-05, + -2.9959488529129885e-05 + ], + [ + 0.00021434627706184983, + -4.518737841863185e-05 + ], + [ + 6.23985324637033e-05, + 6.074887096474413e-06 + ], + [ + 8.885133865987882e-05, + -2.9086046197335236e-05 + ], + [ + 7.854175055399537e-05, + -7.601914694532752e-05 + ], + [ + -2.5114552045124583e-05, + 6.410069181583822e-05 + ], + [ + 1.9636911019915715e-05, + -1.887311736936681e-05 + ], + [ + 0.00015778809029143304, + -5.2169791160849854e-05 + ], + [ + 0.00011796422040788457, + 6.624386151088402e-05 + ], + [ + 0.0001373750128550455, + -8.98169309948571e-05 + ], + [ + 5.3561841923510656e-05, + -2.2668604287900962e-05 + ], + [ + 4.731062290375121e-05, + -8.743868966121227e-05 + ], + [ + 7.6762713433709e-05, + -0.00017878208018373698 + ], + [ + 0.00011234494741074741, + 4.24437275796663e-05 + ], + [ + 7.149635348469019e-05, + 3.087916047661565e-05 + ], + [ + 7.910322779025591e-07, + 0.00012029350182274356 + ], + [ + 0.00017679791199043393, + 0.00012184192019049078 + ], + [ + 0.00019726407481357455, + 0.00011369666026439518 + ], + [ + 0.000263114896370098, + -3.6798668588744476e-05 + ], + [ + 5.6974149629240856e-05, + -6.934769044164568e-05 + ], + [ + 9.828209294937551e-05, + 2.2687579985358752e-05 + ], + [ + 0.00020536119700409472, + 9.444778697798029e-05 + ], + [ + 0.00016580896044615656, + 2.195427441620268e-05 + ], + [ + 8.603910828242078e-05, + -8.643670298624784e-06 + ], + [ + 0.00026036781491711736, + 0.00010131909948540851 + ], + [ + 0.0001267930492758751, + 0.00017020039376802742 + ], + [ + 8.823328244034201e-05, + -0.00011362575605744496 + ], + [ + 0.00011080593685619533, + 3.0484097806038335e-05 + ], + [ + 0.00013542278611566871, + -2.4672068320796825e-05 + ], + [ + 0.00011231322423554957, + -4.429317050380632e-05 + ], + [ + 6.210130959516391e-05, + -1.4709060451423284e-05 + ], + [ + 7.340870797634125e-05, + -5.8625966630643234e-05 + ], + [ + 0.00021506505436263978, + -0.00013546270201914012 + ], + [ + -2.2312164219329134e-05, + -0.00017962905985768884 + ], + [ + 1.176994828711031e-05, + 4.095294207218103e-05 + ], + [ + -4.4327465730020776e-05, + -7.946527330204844e-05 + ], + [ + -9.682941708888393e-06, + 0.00017824562382884324 + ], + [ + 4.041134161525406e-05, + 0.0002596094273030758 + ], + [ + 0.00021497801935765892, + -7.021625060588121e-05 + ], + [ + 0.00026547221932560205, + 3.4676509130804334e-06 + ], + [ + 0.0001538195792818442, + -3.03267711387889e-06 + ], + [ + 0.00012835000234190375, + 2.87807979475474e-05 + ], + [ + 0.00017257861327379942, + 8.328078547492623e-05 + ], + [ + 0.00031808720086701214, + 0.00021755848138127476 + ], + [ + 0.00018443065346218646, + -5.6106226111296564e-05 + ], + [ + -1.2095346392015927e-05, + -0.0001649813784752041 + ], + [ + 0.00025944114895537496, + -4.7686560719739646e-05 + ], + [ + 0.00018693138554226607, + -0.00011227835057070479 + ], + [ + 0.000147575672599487, + -5.1341045036679134e-05 + ], + [ + 0.0002407392457826063, + 7.23551565897651e-05 + ], + [ + 0.00018684289534576237, + -9.409050835529342e-05 + ], + [ + 9.681378287496045e-05, + 0.00011956080561503768 + ], + [ + 4.073619948030682e-06, + -8.204891491914168e-05 + ], + [ + 3.0584207706851885e-05, + 0.00011979915871052071 + ], + [ + 0.00018640745838638395, + -5.675434658769518e-05 + ], + [ + 0.00017900865350384265, + 0.0001824048231355846 + ], + [ + 0.00018924892356153578, + -0.00015533452096860856 + ], + [ + 5.1333114242879674e-05, + 6.892314559081569e-07 + ], + [ + 0.0002226667565992102, + -0.0001271737419301644 + ], + [ + 0.0003128579701296985, + 1.0242927601211704e-05 + ], + [ + 0.0002694357535801828, + 2.2861499019199982e-05 + ], + [ + 0.00013627749285660684, + 2.9503435143851675e-05 + ], + [ + 0.0001262560545001179, + -0.00015334015188273042 + ], + [ + 0.00014588063640985638, + -4.123483449802734e-05 + ], + [ + 6.326747825369239e-05, + 1.229595272889128e-05 + ], + [ + 0.00013910858251620084, + 8.696169970789924e-05 + ], + [ + 0.00029472418827936053, + 8.181936573237181e-05 + ], + [ + 5.787619375041686e-05, + 5.665707249136176e-06 + ], + [ + 0.00015276069461833686, + -0.00012063104077242315 + ], + [ + 0.00024106983619276434, + -0.00013255371595732868 + ], + [ + 0.0001520806399639696, + 0.00011317396274534985 + ], + [ + 0.00013204944843892008, + -0.0002159677678719163 + ], + [ + 0.00012168817193014547, + -3.25413748214487e-05 + ], + [ + 0.00013640860561281443, + -7.126377749955282e-05 + ], + [ + 0.00020821393991354853, + 2.7739211873267777e-05 + ], + [ + 0.0001559988158987835, + -0.00016136598424054682 + ], + [ + 8.554342639399692e-05, + 0.00012124643399147317 + ], + [ + 0.00043252171599306166, + -0.0002681770420167595 + ], + [ + 0.0001446768146706745, + -0.00014075968647375703 + ], + [ + -2.5331915821880102e-05, + 0.00011190834629815072 + ], + [ + 0.00021152777480892837, + 4.6965327783254907e-05 + ], + [ + 0.00011546615132829174, + -5.216114004724659e-05 + ], + [ + -9.011332440422848e-05, + 1.3721411960432306e-05 + ], + [ + -8.158208970598935e-07, + -0.00026137224631384015 + ], + [ + -6.140883488114923e-05, + -0.00012463150778785348 + ], + [ + 0.00018407987954560667, + 1.28594319903641e-06 + ], + [ + -3.0843642889522016e-05, + -1.2188680557301268e-05 + ], + [ + 7.963267853483558e-05, + -0.0001913930755108595 + ], + [ + 0.00014741574705112725, + -0.00016463494102936238 + ], + [ + -4.3143463699379936e-05, + 7.231927884276956e-05 + ], + [ + 6.308359297690913e-05, + 7.520359213231131e-05 + ], + [ + -2.8024091079714708e-05, + -7.946156983962283e-05 + ], + [ + 0.00012974430865142494, + -0.00028128427220508456 + ], + [ + 0.0001088721037376672, + -0.0002349336282350123 + ], + [ + -2.1257632397464477e-05, + -9.65160652413033e-05 + ], + [ + 0.0001945245749084279, + -0.0001310228108195588 + ], + [ + -5.9083333326270804e-05, + 1.2213031368446536e-05 + ], + [ + 0.00021259475033730268, + -0.0002649498637765646 + ], + [ + 5.37814739800524e-05, + -1.306291960645467e-05 + ], + [ + 0.0001864314399426803, + -6.641212530666962e-05 + ], + [ + -8.000557863852009e-05, + -0.00014541791460942477 + ], + [ + 0.0001541983219794929, + -2.753914122877177e-05 + ], + [ + 2.613316837596358e-06, + -3.2300570182997035e-06 + ], + [ + 0.0001912408188218251, + -7.79389520175755e-05 + ], + [ + -9.583726205164567e-05, + -6.924325862200931e-05 + ], + [ + 1.7602027583052404e-05, + 5.254252755548805e-05 + ], + [ + -9.215455065714195e-05, + 3.254113835282624e-05 + ], + [ + -4.052947770105675e-05, + 9.208125266013667e-05 + ], + [ + -0.00013176206266507506, + -9.386244528286625e-06 + ], + [ + -9.119139576796442e-05, + 7.697832916164771e-05 + ], + [ + 6.52388553135097e-05, + -7.603827725688461e-06 + ], + [ + -0.0002825096598826349, + 1.447684371669311e-05 + ], + [ + -4.20974065491464e-05, + 1.2226694707351271e-05 + ], + [ + -9.792998025659472e-05, + 0.00010179373202845454 + ], + [ + -0.00015659304335713387, + 8.977310062618926e-05 + ], + [ + 6.589110125787556e-05, + 0.00016903919458854944 + ], + [ + -7.11252650944516e-05, + -4.800559509021696e-06 + ], + [ + 5.541198333958164e-05, + 0.00011116635869257152 + ], + [ + 5.860701094206888e-06, + 0.0002997706469614059 + ], + [ + -0.00021435054077301174, + 8.713354327483103e-05 + ], + [ + -5.725818255086779e-07, + 0.0002320314961252734 + ], + [ + 0.00014788703992962837, + 0.00017199966532643884 + ], + [ + 4.769506995216943e-05, + 0.0002688363892957568 + ], + [ + 0.00011159510904690251, + 0.00022589022410102189 + ], + [ + -7.172015466494486e-05, + 7.137264765333384e-05 + ], + [ + 0.0001638486864976585, + 0.00023964984575286508 + ], + [ + -4.466757673071697e-06, + 0.00023349908587988466 + ], + [ + 9.638210758566856e-05, + 0.0004153292684350163 + ], + [ + 0.00015644919767510146, + 0.0002327083348063752 + ], + [ + 0.0001323667966062203, + 0.00016507810505572706 + ], + [ + 0.00014930061297491193, + 0.00030707288533449173 + ], + [ + 5.602599776466377e-05, + 0.0001345848577329889 + ], + [ + 0.00021541549358516932, + 0.0003978169697802514 + ], + [ + 0.00022764482127968222, + 0.0001607049780432135 + ], + [ + 0.00013453196152113378, + 0.0003199393395334482 + ], + [ + 0.00018546760838944465, + 0.0004004852962680161 + ], + [ + 0.0002543148584663868, + 0.0004914830788038671 + ], + [ + 0.00033861389965750277, + 0.00046994033618830144 + ], + [ + 0.00036922493018209934, + 0.0004563633701764047 + ], + [ + 0.0002644311171025038, + 0.00043695882777683437 + ], + [ + 0.00035111510078422725, + 0.0005496187368407845 + ], + [ + 0.000528990407474339, + 0.000535719096660614 + ], + [ + 0.0006065493216738105, + 0.0003617525799199939 + ], + [ + 0.0007662777788937092, + 0.0006353522767312825 + ], + [ + 0.0008601322188042104, + 0.0004444826627150178 + ], + [ + 0.0012423360021784902, + 0.0004494751919992268 + ], + [ + 0.001297350157983601, + 0.00031458173179998994 + ], + [ + 0.001493327203206718, + -0.00010449370893184096 + ], + [ + 0.0015161804622039199, + -0.00033121922751888633 + ], + [ + 0.0014117391547188163, + -0.0006107869558036327 + ], + [ + 0.00099196657538414, + -0.0009449393837712705 + ], + [ + 0.0007825469365343451, + -0.0011041349498555064 + ], + [ + 0.0005085007869638503, + -0.0011321016354486346 + ], + [ + 0.000266713002929464, + -0.0009948344668373466 + ], + [ + 0.0001427863899152726, + -0.0008151093497872353 + ], + [ + 3.06370020553004e-05, + -0.0009020360303111374 + ], + [ + 3.671401645988226e-05, + -0.0008634754922240973 + ], + [ + -8.624526526546106e-05, + -0.0006801169365644455 + ], + [ + -6.313803169177845e-05, + -0.0006475306581705809 + ], + [ + -0.0001338321453658864, + -0.0005732625140808523 + ], + [ + -0.00013895027223043144, + -0.00028440283495001495 + ], + [ + -0.0002574605750851333, + -0.0003419728309381753 + ], + [ + -0.0002262906782561913, + -0.00039319240022450686 + ], + [ + -3.985298462794162e-06, + -0.0003610981220845133 + ], + [ + -0.00020428243442438543, + -0.000318981590680778 + ], + [ + -0.0002270994009450078, + -0.0002923455322161317 + ], + [ + -0.00011314650328131393, + -0.00014853410539217293 + ], + [ + -0.00017365520761813968, + -0.00016944292292464525 + ], + [ + -8.783000339462887e-06, + -0.00014917018415872008 + ], + [ + -2.5358796847285703e-05, + -0.00012715932098217309 + ], + [ + 9.455339750275016e-05, + -0.00015372195048257709 + ], + [ + 3.613570879679173e-05, + -0.0001472106814617291 + ], + [ + 0.00012548078666441143, + -0.00012063005851814523 + ], + [ + 0.00015292361786123365, + -0.00014296565495897084 + ], + [ + 0.0002632501709740609, + -0.0002174378460040316 + ], + [ + 0.000285604503005743, + -0.00043002047459594905 + ], + [ + 1.8430072259434382e-06, + -0.0005577597767114639 + ], + [ + -5.2345454605529085e-05, + -0.0005649514496326447 + ], + [ + -0.00026258474099449813, + -0.00048596851411275566 + ], + [ + -0.0003357628302183002, + -0.0003342946874909103 + ], + [ + -0.0004409343528095633, + -0.00038381022750400007 + ], + [ + -0.0005019910749979317, + -0.00030469827470369637 + ], + [ + -0.0005122619913890958, + -0.00016339437570422888 + ], + [ + -0.00052890635561198, + -1.3319602658157237e-05 + ], + [ + -0.0004330121155362576, + -7.973249739734456e-05 + ], + [ + -0.00043544478830881417, + -4.8936650273390114e-05 + ], + [ + -0.0004768726066686213, + 2.2554901079274714e-05 + ], + [ + -0.0005275954026728868, + 1.5506648196605965e-05 + ], + [ + -0.0003991830162703991, + 7.129813457140699e-05 + ], + [ + -0.000356371165253222, + 7.50765175325796e-05 + ], + [ + -0.0002868043666239828, + 0.00021540500165428966 + ], + [ + -0.0002159887517336756, + 5.987142867525108e-05 + ], + [ + -0.000378998665837571, + 0.00027368697919882834 + ], + [ + -0.0003270331071689725, + 0.00010704265150707215 + ], + [ + -0.0002846736169885844, + 0.00023243266332428902 + ], + [ + -0.0003112120903097093, + 0.0003397039254195988 + ], + [ + -0.0002582981833256781, + 0.00027511827647686005 + ], + [ + -9.147395758191124e-05, + 0.0003324889112263918 + ], + [ + -0.0001436163584003225, + 0.00027357207727618515 + ], + [ + -0.00017136674432549626, + 0.00038153116474859416 + ], + [ + -0.00014785028179176152, + 0.0005345498793758452 + ], + [ + -0.00017542828572914004, + 0.0004432690911926329 + ], + [ + -0.000124910322483629, + 0.00033375812927260995 + ], + [ + -5.557337135542184e-05, + 0.0004817949957214296 + ], + [ + -0.0001161867257906124, + 0.00038474821485579014 + ], + [ + -0.0001170425966847688, + 0.00037941025220789015 + ], + [ + -2.80617405223893e-05, + 0.0004681265272665769 + ], + [ + 4.6662087697768584e-05, + 0.00040317210368812084 + ], + [ + -1.6348218196071684e-05, + 0.0006411796202883124 + ], + [ + 7.442687638103962e-05, + 0.0004659900441765785 + ], + [ + 0.00015181206981651485, + 0.00039921345887705684 + ], + [ + 0.00013119370851200074, + 0.0004460071213543415 + ], + [ + 0.00010335457773180678, + 0.00048577209236100316 + ], + [ + 0.00015079577860888094, + 0.0005288322572596371 + ], + [ + 0.00022394767438527197, + 0.0006239041103981435 + ], + [ + 0.00027781209792010486, + 0.0005176449776627123 + ], + [ + 0.00040180626092478633, + 0.0006051555974408984 + ], + [ + 0.00041701033478602767, + 0.0006264123367145658 + ], + [ + 0.0004761387244798243, + 0.0005775766912847757 + ], + [ + 0.0005125129828229547, + 0.0006153950234875083 + ], + [ + 0.0005082129500806332, + 0.0005228760419413447 + ], + [ + 0.0005898457602597773, + 0.0005283027421683073 + ], + [ + 0.0006248832796700299, + 0.0004915110184811056 + ], + [ + 0.000702428340446204, + 0.0004833012935705483 + ], + [ + 0.0007076435722410679, + 0.0005487743765115738 + ], + [ + 0.0008649280061945319, + 0.0003532816481310874 + ], + [ + 0.0007884746883064508, + 0.000413328263675794 + ], + [ + 0.0008453979389742017, + 0.0002849270240403712 + ], + [ + 0.0009245309047400951, + 0.0001833739224821329 + ], + [ + 0.0009583180653862655, + 0.00024443818256258965 + ], + [ + 0.0008774783345870674, + 0.00012352157500572503 + ], + [ + 0.0009180475608445704, + 5.60589978704229e-05 + ], + [ + 0.0008362717926502228, + -9.882845006359275e-06 + ], + [ + 0.0009742517722770572, + -6.628527626162395e-05 + ], + [ + 0.0009500618907622993, + -0.00016961236542556435 + ], + [ + 0.0010185044957324862, + -0.00025223573902621865 + ], + [ + 0.000929812784306705, + -0.0003800832200795412 + ], + [ + 0.0009062105091288686, + -0.0004852478741668165 + ], + [ + 0.0008924633148126304, + -0.000505105359479785 + ], + [ + 0.0007872532587498426, + -0.0005730901029892266 + ], + [ + 0.0007492260774597526, + -0.0005249339737929404 + ], + [ + 0.0007394091226160526, + -0.000581346161197871 + ], + [ + 0.0008253985433839262, + -0.00048295213491655886 + ], + [ + 0.0008054914651438594, + -0.0006106612854637206 + ], + [ + 0.0009399830014444888, + -0.0006495507550425828 + ], + [ + 0.0008883791160769761, + -0.000862140383105725 + ], + [ + 0.0008558190311305225, + -0.0010403463384136558 + ], + [ + 0.0008293261053040624, + -0.0012031649239361286 + ], + [ + 0.0006172462599352002, + -0.0013699759729206562 + ], + [ + 0.0005136788822710514, + -0.00151453772559762 + ], + [ + 0.0001977211213670671, + -0.0015495128463953733 + ], + [ + -1.5948322470649146e-05, + -0.001562665798701346 + ], + [ + -0.00027104586479254067, + -0.00148600316606462 + ], + [ + -0.0006334091303870082, + -0.0015045346226543188 + ], + [ + -0.0007558516226708889, + -0.0013912717113271356 + ], + [ + -0.0009718853398226202, + -0.0011265766806900501 + ], + [ + -0.0011329406406730413, + -0.0008869340526871383 + ], + [ + -0.0011619160650298, + -0.0008061274420469999 + ], + [ + -0.0012356739025563002, + -0.0006403916049748659 + ], + [ + -0.0012712120078504086, + -0.0005005146958865225 + ], + [ + -0.0012541889445856214, + -0.0003150257107336074 + ], + [ + -0.0013332088710740209, + -0.0001168502785731107 + ], + [ + -0.001173342578113079, + 0.0001739755825838074 + ], + [ + -0.0010297821136191487, + 0.00039204195491038263 + ], + [ + -0.0008057667873799801, + 0.0005735018639825284 + ], + [ + -0.0006127902306616306, + 0.000579698069486767 + ], + [ + -0.00048410214367322624, + 0.000498037610668689 + ], + [ + -0.0005408223369158804, + 0.00045469627366401255 + ], + [ + -0.0004892759025096893, + 0.0003805727756116539 + ], + [ + -0.0004633541975636035, + 0.00041964565753005445 + ], + [ + -0.00048525448073633015, + 0.0004119858203921467 + ], + [ + -0.0005098705878481269, + 0.0004388932138681412 + ], + [ + -0.00046640305663459003, + 0.0005314841400831938 + ], + [ + -0.00043491763062775135, + 0.0005679979221895337 + ], + [ + -0.00046502589248120785, + 0.0006796515663154423 + ], + [ + -0.00043359005940146744, + 0.0006356394151225686 + ], + [ + -0.00041229333146475255, + 0.0006830382626503706 + ], + [ + -0.00029866601107642055, + 0.0007324842154048383 + ], + [ + -9.20183229027316e-05, + 0.00082368403673172 + ], + [ + -3.2728101359680295e-05, + 0.0008199946605600417 + ], + [ + -3.134784128633328e-05, + 0.0008902659174054861 + ], + [ + 0.00015004293527454138, + 0.0008554586092941463 + ], + [ + 0.00015141154290176928, + 0.000804947572760284 + ], + [ + 0.00040028037619777024, + 0.0007921837968751788 + ], + [ + 0.00023649555805604905, + 0.000777414592448622 + ], + [ + 0.00043120290501974523, + 0.0007087751291692257 + ], + [ + 0.000550994707737118, + 0.0007531293667852879 + ], + [ + 0.0005117747932672501, + 0.000672758324071765 + ], + [ + 0.0007006787927821279, + 0.0005595517577603459 + ], + [ + 0.0006818129331804812, + 0.000516519125085324 + ], + [ + 0.0006425087922252715, + 0.000355118972947821 + ], + [ + 0.0008304088842123747, + 0.0003890448424499482 + ], + [ + 0.0007125890115275979, + 0.0003996464074589312 + ], + [ + 0.0007156010251492262, + 0.00020857331401202828 + ], + [ + 0.0007001396152190864, + 0.00016263863653875887 + ], + [ + 0.0007451032870449126, + -2.5099448976106942e-05 + ], + [ + 0.0006700727390125394, + -3.689610093715601e-05 + ], + [ + 0.0007130805170163512, + -0.00017279184248764068 + ], + [ + 0.0006525755161419511, + -0.00020075333304703236 + ], + [ + 0.000593960692640394, + -0.00016198754019569606 + ], + [ + 0.0007102392264641821, + -0.00025344305322505534 + ], + [ + 0.0005729033146053553, + -0.0002435310889268294 + ], + [ + 0.0005077538080513477, + -0.0002940554404631257 + ], + [ + 0.00046925348578952253, + -0.0002201729512307793 + ], + [ + 0.0003316030197311193, + -0.0002665523497853428 + ], + [ + 0.00040456565329805017, + -0.0003062730247620493 + ], + [ + 0.0003435212711337954, + -0.0003850683569908142 + ], + [ + 0.00043902324978262186, + -0.00033665646333247423 + ], + [ + 0.00021265455870889127, + -0.00022051647829357535 + ], + [ + 0.0003258872020523995, + -0.00041217112448066473 + ], + [ + 0.00018945519695989788, + -0.00031838304130360484 + ], + [ + 0.0002565083559602499, + -0.0004298150015529245 + ], + [ + 0.00016668267198838294, + -0.00030814495403319597 + ], + [ + 8.593697566539049e-05, + -0.00024663491058163345 + ], + [ + 5.763490844401531e-05, + -0.00035600061528384686 + ], + [ + 6.928799848537892e-05, + -0.0003400129498913884 + ], + [ + 0.00010762068995973095, + -0.00031901468173600733 + ], + [ + -3.486251080175862e-05, + -0.0001750743977027014 + ], + [ + 0.00015580070612486452, + -0.0002367601846344769 + ], + [ + 5.421055175247602e-05, + -0.00012824451550841331 + ], + [ + -5.1708269893424585e-05, + -0.00026753684505820274 + ], + [ + 1.2596686246979516e-05, + -0.0001186126028187573 + ], + [ + 1.5719924704171717e-05, + -0.00023866680567152798 + ], + [ + -0.0001095596599043347, + -0.0001882286451291293 + ], + [ + -2.918583049904555e-05, + -8.183835598174483e-05 + ], + [ + -6.15456810919568e-05, + -0.00010135621414519846 + ], + [ + 7.167688636400271e-06, + -3.988904063589871e-05 + ], + [ + -1.8272588931722566e-05, + -7.194905629148707e-05 + ], + [ + -1.505197178630624e-05, + -4.524986434262246e-05 + ], + [ + 4.669584086514078e-05, + 4.99972484249156e-05 + ], + [ + 0.0001203835490741767, + 3.601810021791607e-05 + ], + [ + 6.522735930047929e-05, + -5.9256257372908294e-05 + ], + [ + 7.926774560473859e-05, + -2.4341077278222656e-06 + ], + [ + 0.00011200058361282572, + -1.685553252173122e-05 + ], + [ + 1.4906823707860895e-05, + 1.801724465622101e-05 + ], + [ + 6.041507367626764e-05, + 2.595269506855402e-05 + ], + [ + 0.00014190048386808485, + 1.3752449376625009e-05 + ], + [ + 0.00010516202746657655, + -5.8794787037186325e-05 + ], + [ + 0.00013513844169210643, + -2.1445535821840167e-05 + ], + [ + 2.9866890827179304e-07, + 4.83395233459305e-05 + ], + [ + 0.00018228773842565715, + 0.0001316639973083511 + ], + [ + 0.00014398428902495652, + 5.066194717073813e-05 + ], + [ + 4.074541720910929e-05, + 7.031051791273057e-05 + ], + [ + 8.464856364298612e-05, + 8.176705887308344e-05 + ], + [ + 0.0002275802835356444, + 5.694304036296671e-06 + ], + [ + 0.00015606769011355937, + -9.714465704746544e-06 + ], + [ + 0.00015519261069130152, + -1.1018726127076661e-06 + ], + [ + 0.00015426224854309112, + -6.465349724749103e-05 + ], + [ + 2.1669897250831127e-05, + -8.151284419000149e-05 + ], + [ + 7.665833254577592e-05, + -1.066535241989186e-05 + ], + [ + 2.2569280190509744e-05, + -7.703063602093607e-05 + ], + [ + 8.837033237796277e-05, + -2.317203097845777e-06 + ], + [ + 9.638095070840791e-05, + -2.7495740141603164e-05 + ], + [ + 0.00016053576837293804, + -8.837440691422671e-05 + ], + [ + 0.00016364376642741263, + -2.4573748305556364e-05 + ], + [ + 0.00015429446648340672, + -4.9438636779086664e-05 + ], + [ + 7.91603306424804e-05, + -4.087449633516371e-05 + ], + [ + 2.412135472695809e-05, + -2.9390459530986845e-05 + ], + [ + 9.568623499944806e-05, + 2.1083773390273564e-05 + ], + [ + 7.281985017471015e-05, + -4.983140388503671e-05 + ], + [ + 0.00012349824828561395, + -8.373566379304975e-05 + ], + [ + 6.345762812998146e-05, + 4.371099203126505e-05 + ], + [ + 0.00014732236741110682, + -6.196866888785735e-05 + ], + [ + 2.4732225938350894e-05, + 4.3834948883159086e-05 + ], + [ + 5.253751623968128e-06, + -1.4437887330132071e-05 + ], + [ + 9.116025466937572e-05, + -7.055601258798561e-07 + ], + [ + 7.597766671096906e-05, + 5.371020961320028e-05 + ], + [ + 0.00010287442273693159, + 4.398077726364136e-05 + ], + [ + 0.00021165196085348725, + -2.5149236535071395e-05 + ], + [ + 0.0001242871512658894, + -9.614432201487944e-06 + ], + [ + 0.00015076849376782775, + 6.534261046908796e-05 + ], + [ + 0.00013679212133865803, + 3.986628871643916e-05 + ], + [ + 0.00022842847101856023, + 4.3395884858909994e-05 + ], + [ + 0.00010366718925070018, + -5.122771835885942e-05 + ], + [ + 0.00012417226389516145, + -2.8622609534068033e-05 + ], + [ + 0.0002484337310306728, + -6.991746340645477e-05 + ], + [ + 9.325030987383798e-05, + -9.598935866961256e-05 + ], + [ + 0.00012609013356268406, + -3.746182846953161e-05 + ], + [ + 8.658809383632615e-05, + -5.427088399301283e-05 + ], + [ + 9.818973921937868e-05, + -8.615245315013453e-05 + ], + [ + 4.1531478927936405e-05, + -2.1340463717933744e-05 + ], + [ + 0.00012992494157515466, + -0.00013413478154689074 + ], + [ + 0.00010954644676530734, + -6.544912321260199e-05 + ], + [ + 8.505846199113876e-05, + -6.354672950692475e-05 + ], + [ + 0.00012334053462836891, + -1.989655902434606e-05 + ], + [ + 0.0001194478027173318, + -9.589641558704898e-05 + ], + [ + 5.495269942912273e-05, + 3.588045365177095e-05 + ], + [ + 9.507920185569674e-05, + 2.264923750772141e-05 + ], + [ + 0.0001638503308640793, + -0.00010645000293152407 + ], + [ + 0.00018064449250232428, + 4.930587238050066e-05 + ], + [ + 0.00013502981164492667, + 1.2107314432796557e-05 + ], + [ + 0.00014201733574736863, + 1.9302677173982374e-05 + ], + [ + 0.00010111237497767434, + 3.885504338541068e-05 + ], + [ + 7.172875484684482e-05, + -4.765501944348216e-05 + ], + [ + 0.00017746280354913324, + -1.5700472431490198e-05 + ], + [ + 0.00010317980195395648, + -5.033897650719155e-06 + ], + [ + 0.00011776035535149276, + -0.00014980118430685252 + ], + [ + 6.269064760999754e-05, + -9.45474130276125e-06 + ], + [ + 0.0001282964803976938, + -4.690924470196478e-05 + ], + [ + 7.157561049098149e-05, + -8.215592242777348e-05 + ], + [ + 0.000124754587886855, + -8.099009573925287e-05 + ], + [ + 0.00011480151442810893, + -8.801829972071573e-05 + ], + [ + 6.62000966258347e-05, + -3.95794959331397e-05 + ], + [ + 0.00011497434024931863, + -2.8313164875726216e-05 + ], + [ + 3.1178646167973056e-05, + -6.490934902103618e-05 + ], + [ + 2.4501576262991875e-05, + -4.700789577327669e-05 + ], + [ + 3.8652244256809354e-05, + -8.50554570206441e-05 + ], + [ + 3.386811295058578e-05, + -0.00012176481686765328 + ], + [ + 4.8324895033147186e-05, + -3.2213520171353593e-05 + ], + [ + 4.151502434979193e-05, + -1.49268335007946e-05 + ], + [ + 3.986469891970046e-05, + -3.773112257476896e-05 + ], + [ + 7.946973346406594e-05, + -7.5672337516152766e-06 + ], + [ + 8.419987716479227e-05, + -5.7234487030655146e-05 + ], + [ + 1.676982174103614e-05, + -1.4871244275127538e-05 + ], + [ + 0.00011158240522490814, + 1.7187910998472944e-05 + ], + [ + 7.458223262801766e-05, + -1.9378816432435997e-05 + ], + [ + 0.00010377439321018755, + 1.0887099051615223e-05 + ], + [ + 1.3842509360983968e-05, + -4.93230254505761e-05 + ], + [ + 5.871312532690354e-05, + 1.8754641132545657e-05 + ], + [ + 2.1029740310041234e-05, + 8.996309043141082e-05 + ], + [ + 7.353037653956562e-05, + -4.824090865440667e-06 + ], + [ + -1.8579778043203987e-05, + -6.5099980020022485e-06 + ], + [ + 4.941396036883816e-05, + 4.655515294871293e-05 + ], + [ + 5.7123470469377935e-05, + 8.351391443284228e-05 + ], + [ + 7.721318252151832e-05, + 9.43680788623169e-05 + ], + [ + 7.291320798685774e-05, + 3.582936551538296e-05 + ], + [ + 0.00010050201672129333, + 1.3907189895689953e-05 + ], + [ + 1.5681833247072063e-05, + 2.7254676751908846e-05 + ], + [ + 3.023676254088059e-05, + 3.294548878329806e-05 + ], + [ + -2.573140045569744e-05, + 5.213074109633453e-05 + ], + [ + 0.00011218525469303131, + 3.704622577060945e-05 + ], + [ + 5.264255378278904e-05, + 3.3530577638885006e-05 + ], + [ + 3.00619394693058e-05, + 2.9932320103398524e-05 + ], + [ + 5.749459160142578e-05, + 5.222209438215941e-05 + ], + [ + 7.459543121512979e-05, + 8.516007801517844e-05 + ], + [ + 0.0001262226578546688, + 6.727047002641484e-05 + ], + [ + 2.366003900533542e-05, + 9.922379831550643e-05 + ], + [ + 7.143601396819577e-05, + 0.00011065106082241982 + ], + [ + 6.665333057753742e-05, + 0.0001342116593150422 + ], + [ + 9.238284837920219e-05, + 6.077688522054814e-05 + ], + [ + 8.876480569597334e-05, + 0.00012706275447271764 + ], + [ + 0.00010623988055158406, + 0.00013941150973550975 + ], + [ + 6.976487929932773e-05, + 0.00011803987581515685 + ], + [ + 0.00017880089581012726, + 0.0001634965738048777 + ], + [ + 0.0001332927931798622, + 0.0001404088834533468 + ], + [ + 0.0001556155038997531, + 0.0001092342718038708 + ], + [ + 0.0002315917517989874, + 0.00013343679893296212 + ], + [ + 0.00019308828632347286, + 0.00018166298104915768 + ], + [ + 0.00024722408852539957, + 0.00017583530279807746 + ], + [ + 0.00019707287719938904, + 0.00021863933943677694 + ], + [ + 0.0003117695450782776, + 0.0001837493182392791 + ], + [ + 0.0002982208679895848, + 0.0001752272801240906 + ], + [ + 0.00040936339064501226, + 0.00013845720968674868 + ], + [ + 0.00032847232068888843, + 9.079442679649219e-05 + ], + [ + 0.00033658865140751004, + 0.00010839664901141077 + ], + [ + 0.00040153844747692347, + 0.000157244605361484 + ], + [ + 0.00041768173105083406, + 5.6398512242594734e-05 + ], + [ + 0.0004910153220407665, + 1.8769733287626877e-05 + ], + [ + 0.000481599970953539, + -0.00010010320693254471 + ], + [ + 0.0005079270340502262, + -7.276303949765861e-05 + ], + [ + 0.0005314244190230966, + -0.0001755333214532584 + ], + [ + 0.0005378713249228895, + -0.0003769160248339176 + ], + [ + 0.0006354893557727337, + -0.0003197018231730908 + ], + [ + 0.0005697535816580057, + -0.00043729550088755786 + ], + [ + 0.000514519342686981, + -0.0005210731760598719 + ], + [ + 0.0003121491172350943, + 5.3516298066824675e-05 + ], + [ + 0.00036088444176129997, + 5.766572576249018e-05 + ], + [ + 0.0003289748274255544, + 1.2458751371013932e-05 + ], + [ + 0.0003548631211742759, + -4.58775284641888e-05 + ], + [ + 0.0003799686091952026, + -4.541583257378079e-05 + ], + [ + 0.0003067812358494848, + -0.00013686143211089075 + ], + [ + 0.0003275824128650129, + -0.00017655844567343593 + ], + [ + 0.00034677982330322266, + -0.00017953359929379076 + ], + [ + 0.00030609642271883786, + -0.0002577936102170497 + ], + [ + 0.0002973437949549407, + -0.0002842652902472764 + ], + [ + 0.0002986714825965464, + -0.00031158310594037175 + ], + [ + 0.00023330665135290474, + -0.00034147020778618753 + ], + [ + 0.0001232234062626958, + -0.000200206195586361 + ], + [ + 0.00010827897494891658, + -0.0002109388733515516 + ], + [ + 7.912862201919779e-05, + -0.00023569761833641678 + ], + [ + 1.9420291209826246e-05, + -0.00014577705587726086 + ], + [ + 2.2175765479914844e-05, + -0.00015093115507625043 + ], + [ + 1.0946553629764821e-05, + -0.00017988294712267816 + ], + [ + -5.682713890564628e-05, + -9.902214515022933e-05 + ], + [ + -2.8008447770844214e-05, + -7.369084778474644e-05 + ], + [ + -8.447936124866828e-05, + -8.461710240226239e-05 + ], + [ + -7.90214617154561e-05, + -2.7722919185180217e-05 + ], + [ + -0.00013640904217027128, + 1.2732383765978739e-05 + ], + [ + -4.559367152978666e-05, + 3.9127837226260453e-05 + ], + [ + -5.880824028281495e-05, + 0.00011192550300620496 + ], + [ + -7.26397629478015e-05, + 0.0001161419932032004 + ], + [ + -8.240862371167168e-05, + 0.00014300186012405902 + ], + [ + 1.3969714927952737e-05, + 0.00018611563427839428 + ], + [ + 6.407299224520102e-05, + 0.00019589427392929792 + ], + [ + 7.451685814885423e-05, + 0.000252725527388975 + ], + [ + 9.144988871412352e-05, + 0.00020259234588593245 + ], + [ + 0.00011362091026967391, + 0.00030627919477410614 + ], + [ + 0.00019325234461575747, + 0.00029012688901275396 + ], + [ + 0.00024709911667741835, + 0.0002602309104986489 + ], + [ + 0.0002956290845759213, + 0.00027372597833164036 + ], + [ + 0.0002936776145361364, + 0.00027355243219062686 + ], + [ + 0.00035795022267848253, + 0.0002139678254025057 + ], + [ + 0.00043078738963231444, + 0.00032012793235480785 + ], + [ + 0.00048085584421642125, + 0.00015336029173340648 + ], + [ + 0.000589098606724292, + 0.00015453800733666867 + ], + [ + 0.0005681218462996185, + 9.014435636345297e-05 + ], + [ + 0.0006359925610013306, + 2.2904310753801838e-05 + ], + [ + 0.0006132900598458946, + -8.249379607150331e-05 + ], + [ + 0.0005867949803359807, + -0.00015591084957122803 + ], + [ + 0.0006004865281283855, + -0.00023700408928561956 + ], + [ + 0.0005380630609579384, + -0.000286400638287887 + ], + [ + 0.0005392298917286098, + -0.00026807881658896804 + ], + [ + 0.0005338087794370949, + -0.0003748734307009727 + ], + [ + 0.0005018512019887567, + -0.0004336059791967273 + ], + [ + 0.0004887625109404325, + -0.0003738051455002278 + ], + [ + 0.00045990405487827957, + -0.0004919202183373272 + ], + [ + 0.00048376270569860935, + -0.0005382730741985142 + ], + [ + 0.0004282550362404436, + -0.0005859865923412144 + ], + [ + 0.0004445528902579099, + -0.0006528792437165976 + ], + [ + 0.00033796814386732876, + -0.0006539348396472633 + ], + [ + 0.00027883925940841436, + -0.0007119894144125283 + ], + [ + 0.0002244662173325196, + -0.0007393244886770844 + ], + [ + 0.00011762570647988468, + -0.0007493197917938232 + ], + [ + 0.0001740443694870919, + -0.0007197675295174122 + ], + [ + 9.744754061102867e-05, + -0.000783861440140754 + ], + [ + 2.7461175704956986e-05, + -0.000772048719227314 + ], + [ + -4.7966514102881774e-05, + -0.0007769787334837019 + ], + [ + -8.794861059868708e-05, + -0.000874022429343313 + ], + [ + -0.00024072050291579217, + -0.0008386492263525724 + ], + [ + -0.0002213385741924867, + -0.0008427689899690449 + ], + [ + -0.0003123990027233958, + -0.0009363466524519026 + ], + [ + -0.00036433356581255794, + -0.0009331921464763582 + ], + [ + -0.00048447842709720135, + -0.0009026539628393948 + ], + [ + -0.0006423445884138346, + -0.0008892096811905503 + ], + [ + -0.0006757495575584471, + -0.0009007048793137074 + ], + [ + -0.0008611473604105413, + -0.0008237094152718782 + ], + [ + -0.0009041031007654965, + -0.0007587983855046332 + ], + [ + -0.0009493629913777113, + -0.0007164899143390357 + ], + [ + -0.001145874266512692, + -0.0007084931712597609 + ], + [ + -0.0011563661973923445, + -0.000562409171834588 + ], + [ + -0.001296557835303247, + -0.0005692223785445094 + ], + [ + -0.0014258320443332195, + -0.0004641877894755453 + ], + [ + -0.001546657644212246, + -0.00032460116199217737 + ], + [ + -0.0017039728118106723, + -0.00021369470050558448 + ], + [ + -0.0018443451263010502, + -6.459431460825726e-05 + ], + [ + -0.0018520746380090714, + 0.00018967159849125892 + ], + [ + -0.0019878987222909927, + 0.00045014082570560277 + ], + [ + -0.0019928505644202232, + 0.0007631348562426865 + ], + [ + -0.0019690473563969135, + 0.0010029837721958756 + ], + [ + -0.0018843966536223888, + 0.0011996895773336291 + ], + [ + -0.0017389776185154915, + 0.0014192041708156466 + ], + [ + -0.0015790406614542007, + 0.001654022722505033 + ], + [ + -0.0014878775691613555, + 0.0017623030580580235 + ], + [ + -0.0013206013245508075, + 0.0018613998545333743 + ], + [ + -0.0011923579731956124, + 0.0020691968966275454 + ], + [ + -0.001135940896347165, + 0.00224316050298512 + ], + [ + -0.0009574256837368011, + 0.002420656383037567 + ], + [ + -0.0008372007287107408, + 0.0026302821934223175 + ], + [ + -0.0006601745262742043, + 0.0028278962709009647 + ], + [ + -0.0005157461273483932, + 0.0029912805184721947 + ], + [ + -0.00012628623517230153, + 0.0032815251033753157 + ], + [ + 0.00022365794575307518, + 0.0033336977940052748 + ], + [ + 0.0005692169070243835, + 0.0034884673077613115 + ], + [ + 0.0009223063825629652, + 0.00361141306348145 + ], + [ + 0.0013808270450681448, + 0.0036837689112871885 + ], + [ + 0.0018639654153957963, + 0.0036988731008023024 + ], + [ + 0.002348773181438446, + 0.0034809873905032873 + ], + [ + 0.0027361917309463024, + 0.003415763843804598 + ], + [ + 0.0031644958071410656, + 0.0031754658557474613 + ], + [ + 0.003637229558080435, + 0.002918463898822665 + ], + [ + 0.003995364997535944, + 0.002532762475311756 + ], + [ + 0.004334101919084787, + 0.002203035168349743 + ], + [ + 0.004850610624998808, + 0.0016631402540951967 + ], + [ + 0.005072827450931072, + 0.0011588574852794409 + ], + [ + 0.005318751558661461, + 0.0005335030728019774 + ], + [ + 0.005407140124589205, + -3.570552507881075e-05 + ], + [ + 0.00548201147466898, + -0.0006194403977133334 + ], + [ + 0.005531545728445053, + -0.001332649146206677 + ], + [ + 0.005453459452837706, + -0.0019369247602298856 + ], + [ + 0.0052956631407141685, + -0.0025983259547501802 + ], + [ + 0.005005022510886192, + -0.0032398877665400505 + ], + [ + 0.004593656398355961, + -0.003870403626933694 + ], + [ + 0.004234211053699255, + -0.004440168384462595 + ], + [ + 0.0037105632945895195, + -0.005033500492572784 + ], + [ + 0.003208506852388382, + -0.005448874551802874 + ], + [ + 0.0024751098826527596, + -0.00582471676170826 + ], + [ + 0.0017946489388123155, + -0.006109574809670448 + ], + [ + 0.001077044289559126, + -0.006383157800883055 + ], + [ + 0.00030082312878221273, + -0.006365863606333733 + ], + [ + -0.0004249908379279077, + -0.006397368386387825 + ], + [ + -0.0012131640687584877, + -0.006203463766723871 + ], + [ + -0.0018142665503546596, + -0.0060280500911176205 + ], + [ + -0.0025958602782338858, + -0.005687755066901445 + ], + [ + -0.0031702013220638037, + -0.005360099952667952 + ], + [ + -0.0037651832681149244, + -0.0048197610303759575 + ], + [ + -0.004257323686033487, + -0.0042902505956590176 + ], + [ + -0.004569644574075937, + -0.003780297003686428 + ], + [ + -0.004914307035505772, + -0.003157217986881733 + ], + [ + -0.00517620611935854, + -0.0024699359200894833 + ], + [ + -0.00531674362719059, + -0.0018774826312437654 + ], + [ + -0.0052416445687413216, + -0.0011490617180243134 + ], + [ + -0.00528135197237134, + -0.0005910799955017865 + ], + [ + -0.005062784533947706, + -8.35256214486435e-05 + ], + [ + -0.0049721733666956425, + 0.0003254567563999444 + ], + [ + -0.004696845542639494, + 0.0008260696777142584 + ], + [ + -0.004398819524794817, + 0.0012257436756044626 + ], + [ + -0.0041726394556462765, + 0.0015211552381515503 + ], + [ + -0.003944065421819687, + 0.0017711293185129762 + ], + [ + -0.003785887733101845, + 0.0019442425109446049 + ], + [ + -0.0036856536753475666, + 0.0021961817983537912 + ], + [ + -0.0034690487664192915, + 0.002556693973019719 + ], + [ + -0.0034047828521579504, + 0.0027771734166890383 + ], + [ + -0.0030354931950569153, + 0.0031465308275073767 + ], + [ + -0.00276266410946846, + 0.0033844851423054934 + ], + [ + -0.0025657969526946545, + 0.0037770578637719154 + ], + [ + -0.0021673880983144045, + 0.00402472959831357 + ], + [ + -0.001654936233535409, + 0.0042425962164998055 + ], + [ + -0.0012458845740184188, + 0.0043685478158295155 + ], + [ + -0.0007751440280117095, + 0.004379601683467627 + ], + [ + -0.00032984610879793763, + 0.00455935625359416 + ], + [ + 0.00014280409959610552, + 0.0045311665162444115 + ], + [ + 0.0006222891388460994, + 0.0044892458245158195 + ], + [ + 0.0011701947078108788, + 0.004424212500452995 + ], + [ + 0.0015492015518248081, + 0.0042045884765684605 + ], + [ + 0.002080403733998537, + 0.0040412708185613155 + ], + [ + 0.002377883531153202, + 0.0036869198083877563 + ], + [ + 0.002699607517570257, + 0.0032281819730997086 + ], + [ + 0.003138438332825899, + 0.00299041043035686 + ], + [ + 0.003324952907860279, + 0.0026554292999207973 + ], + [ + 0.0034764118026942015, + 0.0023202355951070786 + ], + [ + 0.003729958087205887, + 0.002010140335187316 + ], + [ + 0.003960205242037773, + 0.0015447885962203145 + ], + [ + 0.004142340738326311, + 0.0012226931285113096 + ], + [ + 0.004109266679733992, + 0.000716139969881624 + ], + [ + 0.004151092376559973, + 0.00018323287076782435 + ], + [ + 0.004230131395161152, + -0.0002610654919408262 + ], + [ + 0.004077378194779158, + -0.0007428644457831979 + ], + [ + 0.003918453585356474, + -0.0012593696592375636 + ], + [ + 0.003628278849646449, + -0.0017549226759001613 + ], + [ + 0.0032793686259537935, + -0.0020881930831819773 + ], + [ + 0.0029623594600707293, + -0.002507478930056095 + ], + [ + 0.0024545039050281048, + -0.002647465094923973 + ], + [ + 0.001929387217387557, + -0.002914765616878867 + ], + [ + 0.001500707701779902, + -0.002854525111615658 + ], + [ + 0.0009955584537237883, + -0.0028130284044891596 + ], + [ + 0.0007560228696092963, + -0.00258609838783741 + ], + [ + 0.000482642964925617, + -0.0023440306540578604 + ], + [ + 0.0002654122363310307, + -0.0021048439666628838 + ], + [ + 0.00021220809139776975, + -0.0018645613454282284 + ], + [ + 8.730706031201407e-05, + -0.0015892074443399906 + ], + [ + 0.00021276109328027815, + -0.001475188066251576 + ], + [ + 0.0002836862695403397, + -0.0013455653097480536 + ], + [ + 0.0004234788939356804, + -0.001385681563988328 + ], + [ + 0.0005953687941655517, + -0.001415687263943255 + ], + [ + 0.0006515947170555592, + -0.0014861166710034013 + ], + [ + 0.0007070987485349178, + -0.0017875500489026308 + ], + [ + 0.0006869615172035992, + -0.0019890409894287586 + ], + [ + 0.00063045893330127, + -0.002083569997921586 + ], + [ + 0.00048038357635959983, + -0.0022279073018580675 + ], + [ + 0.0002780589566100389, + -0.0024300541263073683 + ], + [ + 0.00010567779827397317, + -0.002395831048488617 + ], + [ + -0.0001896812318591401, + -0.002356624696403742 + ], + [ + -0.0003625834942795336, + -0.0023527275770902634 + ], + [ + -0.0006790290353819728, + -0.002248177770525217 + ], + [ + -0.00089070393005386, + -0.002165611833333969 + ], + [ + -0.0013105078833177686, + -0.0021862718276679516 + ], + [ + -0.0015919130528345704, + -0.0019140064250677824 + ], + [ + -0.0016207961598411202, + -0.001722109504044056 + ], + [ + -0.0017718692542985082, + -0.0014262535842135549 + ], + [ + -0.0018222469370812178, + -0.0009645056561566889 + ], + [ + -0.0018764700507745147, + -0.0006057857535779476 + ], + [ + -0.0018182742642238736, + -0.0003275701601523906 + ], + [ + -0.0018336836947128177, + 5.217544094193727e-05 + ], + [ + -0.0016921490896493196, + 0.0005166003247722983 + ], + [ + -0.0013514019083231688, + 0.0009085607016459107 + ], + [ + -0.0010962372180074453, + 0.001195287681184709 + ], + [ + -0.0013410457177087665, + 0.00018954511324409395 + ], + [ + -0.0016043463256210089, + -0.0013846526853740215 + ], + [ + -0.002053238218650222, + -0.0021620451007038355 + ], + [ + -0.002424732781946659, + -0.002844167873263359 + ], + [ + -0.0029694519471377134, + -0.002648173365741968 + ], + [ + -0.0033622076734900475, + -0.0026945779100060463 + ], + [ + -0.0035390888806432486, + -0.00220749294385314 + ], + [ + -0.003775915829464793, + -0.0017146519385278225 + ], + [ + -0.0038244202733039856, + -0.001367236371152103 + ], + [ + -0.003591834334656596, + -0.0008124021114781499 + ], + [ + -0.0033850728068500757, + -0.000253344391239807 + ], + [ + -0.003459387458860874, + -0.0003070993407163769 + ], + [ + -0.003293320070952177, + 0.0002465310972183943 + ], + [ + -0.0031654397025704384, + 0.00044238436385057867 + ], + [ + -0.002984812017530203, + 0.0008380924118682742 + ], + [ + -0.0024868298787623644, + 0.0010381686734035611 + ], + [ + -0.0016345401527360082, + 0.0008648940711282194 + ], + [ + -0.0009729854064062238, + 0.0009179685148410499 + ], + [ + -0.0007374249980784953, + 0.0011638379655778408 + ], + [ + -0.0001442100910935551, + 0.0008982082363218069 + ], + [ + 0.00023098311794456095, + 0.0005944918375462294 + ], + [ + 0.0004422886995598674, + 0.0004489018756430596 + ], + [ + 0.000407964747864753, + 0.0005469598108902574 + ], + [ + 0.00039880297845229506, + 0.0003578927426133305 + ], + [ + 0.00022138256463222206, + 0.00038009427953511477 + ], + [ + 0.0002776430919766426, + 0.00037781259743496776 + ], + [ + 6.942393520148471e-05, + 0.0005164769245311618 + ], + [ + 0.0001214842195622623, + 0.0006656485493294895 + ], + [ + -4.6845867473166436e-05, + 0.00098516047000885 + ], + [ + -3.545723666320555e-05, + 0.0012452208902686834 + ], + [ + -3.8208723708521575e-05, + 0.001595101086422801 + ], + [ + -3.081235627178103e-05, + 0.0018937266431748867 + ], + [ + 0.0002390720328548923, + 0.0021387587767094374 + ], + [ + 0.00044591387268155813, + 0.002287230221554637 + ], + [ + 0.000725720776244998, + 0.002383114770054817 + ], + [ + 0.0007451450801454484, + 0.0021875023376196623 + ], + [ + 0.0008874236955307424, + 0.002293162979185581 + ], + [ + 0.0010865154908969998, + 0.0021417606621980667 + ], + [ + 0.0014708341332152486, + 0.002049929928034544 + ], + [ + 0.0017117562238126993, + 0.0019767608027905226 + ], + [ + 0.0019003577763214707, + 0.0016216121148318052 + ], + [ + 0.002149381907656789, + 0.0013521291548386216 + ], + [ + 0.002227253746241331, + 0.0010034976294264197 + ], + [ + 0.00224311207421124, + 0.0005804622778669 + ], + [ + 0.0021946958731859922, + 7.915269816294312e-05 + ], + [ + 0.0022758550476282835, + -0.00025595136685296893 + ], + [ + 0.001893759472295642, + -0.0006542730261571705 + ], + [ + 0.0020663104951381683, + -0.000390540633816272 + ], + [ + 0.0017491370672360063, + -0.0007355610723607242 + ], + [ + 0.0014274646528065205, + -0.000859639432746917 + ], + [ + 0.001093586441129446, + -0.0011411356972530484 + ], + [ + 0.0006013872916810215, + -0.001335851033218205 + ], + [ + 6.628665141761303e-05, + -0.0014241861645132303 + ], + [ + -0.00020805255917366594, + -0.0012399776605889201 + ], + [ + -0.0005785337998531759, + -0.0011361552169546485 + ], + [ + -0.0010347373317927122, + -0.0010781993623822927 + ], + [ + -0.001208476023748517, + -0.0010172168258577585 + ], + [ + -0.00161839893553406, + -0.0007311736117117107 + ], + [ + -0.00179771997500211, + -0.0004890145501121879 + ], + [ + -0.0018201816128566861, + -0.00012963838526047766 + ], + [ + -0.0013476914027705789, + -0.0006077825673855841 + ], + [ + -0.00122696696780622, + -0.00030427120509557426 + ], + [ + -0.0012821301352232695, + -0.0002541834837757051 + ], + [ + -0.0013585323467850685, + 1.136347509600455e-05 + ], + [ + -0.0013137318892404437, + 0.0003843743179459125 + ], + [ + -0.0012883483432233334, + 0.0004176328075118363 + ], + [ + -0.0013227121671661735, + 0.0007888187537901103 + ], + [ + -0.0012472568778321147, + 0.0008821201045066118 + ], + [ + -0.000931473565287888, + 0.0010762122692540288 + ], + [ + -0.0008066066657193005, + 0.0013031312264502048 + ], + [ + -0.000517121225129813, + 0.0012038605054840446 + ], + [ + -0.00030522720771841705, + 0.0014285912038758397 + ], + [ + -6.990133988438174e-05, + 0.0014936444349586964 + ], + [ + -0.0005279051838442683, + 0.0006837082910351455 + ], + [ + -0.00026472844183444977, + 0.00047493213787674904 + ], + [ + -0.00022747581533621997, + 0.0005817258497700095 + ], + [ + -0.0001415418810211122, + 0.0005229487433098257 + ], + [ + 0.00011663800978567451, + 0.00045092974323779345 + ], + [ + 0.0001855646987678483, + 0.00015243489178828895 + ], + [ + 0.0001974313345272094, + -2.4955537810456008e-05 + ], + [ + 0.00020359449263196439, + -0.00041713457903824747 + ], + [ + -0.00025659246603026986, + -0.0007911718566901982 + ], + [ + -0.0007831780822016299, + -0.0010960657382383943 + ], + [ + -0.0013614781200885773, + -0.0010114104952663183 + ], + [ + -0.001902756397612393, + -0.0006080972962081432 + ], + [ + -0.0022918765898793936, + 0.00010909005504800007 + ], + [ + -0.0024400365073233843, + 0.0006598291802220047 + ], + [ + -0.0011775522725656629, + 0.0017845495603978634 + ], + [ + -0.0007714432431384921, + 0.0021597621962428093 + ], + [ + -0.00030527450144290924, + 0.002069564303383231 + ], + [ + -0.0001061166767613031, + 0.0019803503528237343 + ], + [ + 0.00019629133748821914, + 0.0019306006142869592 + ], + [ + 0.00016207284352276474, + 0.0019032696727663279 + ], + [ + 0.00035569461761042476, + 0.001843524631112814 + ], + [ + 0.00047318494762293994, + 0.0018316226778551936 + ], + [ + 0.0005318765761330724, + 0.0019289761548861861 + ], + [ + 0.0006517297588288784, + 0.0019278760300949216 + ], + [ + 0.0007076850160956383, + 0.0019474606961011887 + ], + [ + 0.0011122110299766064, + 0.0018692348385229707 + ], + [ + 0.0013032745337113738, + 0.00202980637550354 + ], + [ + 0.0013893076684325933, + 0.002053869189694524 + ], + [ + 0.0020708185620605946, + 0.0017468621954321861 + ], + [ + 0.0023962974082678556, + 0.0017195255495607853 + ], + [ + 0.0028351806104183197, + 0.0015454493695870042 + ], + [ + 0.0032344863284379244, + 0.001310928026214242 + ], + [ + 0.003654482774436474, + 0.0010868554236367345 + ], + [ + 0.004075161647051573, + 0.0005960080889053643 + ], + [ + 0.004565900191664696, + 0.0002885833091568202 + ], + [ + 0.004861514549702406, + -0.0006952470866963267 + ], + [ + 0.005022099241614342, + -0.0017412642482668161 + ], + [ + 0.004836946725845337, + -0.002722707577049732 + ], + [ + 0.004166370257735252, + -0.004014176782220602 + ], + [ + 0.0030321013182401657, + -0.004852066747844219 + ], + [ + 0.0017686657374724746, + -0.005521794781088829 + ], + [ + 8.641203748993576e-05, + -0.005499151069670916 + ], + [ + -0.0015978565206751227, + -0.0052125658839941025 + ], + [ + -0.002631567418575287, + -0.004328425042331219 + ], + [ + -0.003225103486329317, + -0.003215363249182701 + ], + [ + -0.003473289543762803, + -0.0024634941946715117 + ], + [ + -0.0035921125672757626, + -0.0015938074793666601 + ], + [ + -0.003456552978605032, + -0.000994263798929751 + ], + [ + -0.0032910597510635853, + -0.00042806423152796924 + ], + [ + -0.0031574999447911978, + 6.667552952421829e-05 + ], + [ + -0.0028066090308129787, + 0.00039955429383553565 + ], + [ + -0.002819610759615898, + 0.0008660383173264563 + ], + [ + -0.002470429288223386, + 0.0012281450908631086 + ], + [ + -0.002120903693139553, + 0.0015539658488705754 + ], + [ + -0.0019411566900089383, + 0.0016895440639927983 + ], + [ + -0.001677524414844811, + 0.0019375575939193368 + ], + [ + -0.0015591512201353908, + 0.0022515784949064255 + ], + [ + -0.0011761252535507083, + 0.002425920683890581 + ], + [ + -0.0008249731617979705, + 0.0024903686717152596 + ], + [ + -0.0004165888822171837, + 0.0026020952500402927 + ], + [ + -0.00014581429422833025, + 0.0024407939054071903 + ], + [ + 0.00013339782890398055, + 0.0024557423312216997 + ], + [ + 0.0005679397727362812, + 0.002288720803335309 + ], + [ + 0.0008657831931486726, + 0.0021669829729944468 + ], + [ + 0.0011131465435028076, + 0.0019242246635258198 + ], + [ + 0.0013551597949117422, + 0.001804471481591463 + ], + [ + 0.001566588063724339, + 0.0014207367785274982 + ], + [ + 0.0017535490915179253, + 0.0012370015028864145 + ], + [ + 0.0018014489905908704, + 0.0010414497228339314 + ], + [ + 0.0018568693194538355, + 0.0007211031625047326 + ], + [ + 0.001994681777432561, + 0.0004501917283050716 + ], + [ + 0.0019595231860876083, + 0.00024284828396048397 + ], + [ + 0.001994768390432, + 3.208169437129982e-05 + ], + [ + 0.0018128075171262026, + -7.018769974820316e-05 + ], + [ + 0.0017558317631483078, + -0.0003131918783765286 + ], + [ + 0.0015732278116047382, + -0.00044479576172307134 + ], + [ + 0.0014312512939795852, + -0.0005546298925764859 + ], + [ + 0.0013181263348087668, + -0.00047866636305116117 + ], + [ + 0.001204789150506258, + -0.0007386955549009144 + ], + [ + 0.0009754087659530342, + -0.0007343976758420467 + ], + [ + 0.0009820619598031044, + -0.0007298346026800573 + ], + [ + 0.0007764053880237043, + -0.0007386973593384027 + ], + [ + 0.0008174106478691101, + -0.000760889146476984 + ], + [ + 0.000590657873544842, + -0.0007019112817943096 + ], + [ + 0.0006445570033974946, + -0.0007531022420153022 + ], + [ + 0.0004526291450019926, + -0.0008410505251958966 + ], + [ + 0.0005280107143335044, + -0.0008052968769334257 + ], + [ + 0.00043952613486908376, + -0.000694302492775023 + ], + [ + 0.00041665384196676314, + -0.0006274880724959075 + ], + [ + 0.0002883868000935763, + -0.0005826701526530087 + ], + [ + 0.00024820759426802397, + -0.0006749853491783142 + ], + [ + 0.0002552221994847059, + -0.0006150133558548987 + ], + [ + 0.00017618044512346387, + -0.0006866779876872897 + ], + [ + 0.000307859038002789, + -0.0005807747947983444 + ], + [ + 0.0003053418768104166, + -0.0005293742287904024 + ], + [ + 0.0002378317731199786, + -0.0006460138829424977 + ], + [ + 0.00010030205885414034, + -0.0006070265080779791 + ], + [ + 0.00017959003162104636, + -0.0005950020859017968 + ], + [ + 8.109724149107933e-05, + -0.00044127440196461976 + ], + [ + 5.584103928413242e-05, + -0.00044069619616493583 + ], + [ + 8.76418998814188e-05, + -0.0004456399765331298 + ], + [ + -6.017411214997992e-05, + -0.00046936277067288756 + ], + [ + -2.189207953051664e-05, + -0.0003834740200545639 + ], + [ + -3.362300049047917e-05, + -0.0005098762921988964 + ], + [ + -0.00011200315202586353, + -0.0005075419321656227 + ], + [ + -0.00020652601961046457, + -0.00046324965660460293 + ], + [ + -7.219528924906626e-05, + -0.0005394319305196404 + ], + [ + -8.708934183232486e-05, + -0.0005799748469144106 + ], + [ + -2.1406935957202222e-06, + -0.0005389954894781113 + ], + [ + -0.00021314444893505424, + -0.0005495139630511403 + ], + [ + -0.00027244421653449535, + -0.00045046862214803696 + ], + [ + -0.00033516771509312093, + -0.0004252132785040885 + ], + [ + -0.00023781968047842383, + -0.000406778184697032 + ], + [ + -0.00023754025460220873, + -0.0003762573469430208 + ], + [ + -0.000324506574543193, + -0.00048455639625899494 + ], + [ + -0.00042739190394058824, + -0.0002881475375033915 + ], + [ + -0.0003468068316578865, + -0.0003885903861373663 + ], + [ + -0.0003080523747485131, + -0.0002297303726663813 + ], + [ + -0.0005019990494474769, + -0.00030482799047604203 + ], + [ + -0.00044912664452567697, + -0.00025177322095260024 + ], + [ + -0.0005015407223254442, + -0.00016417793813161552 + ], + [ + -0.0006150594563223422, + -1.813781273085624e-05 + ], + [ + -0.0005031711189076304, + -0.00010821703472174704 + ], + [ + -0.00040161341894418, + 0.00014048667799215764 + ], + [ + -0.0005108199547976255, + 1.2787895684596151e-05 + ], + [ + -0.00040029935189522803, + -4.092103699804284e-05 + ], + [ + -0.0006094624986872077, + -8.611671364633366e-05 + ], + [ + -0.0004448029794730246, + 0.00014519650721922517 + ], + [ + -0.00045765575487166643, + 0.0001521337399026379 + ], + [ + -0.0005361036746762693, + 9.52894042711705e-05 + ], + [ + -0.0009213823941536248, + 0.0003560440381988883 + ], + [ + -0.0007634503999724984, + 0.0004761271411553025 + ], + [ + -0.0006353214848786592, + 0.0006595769082196057 + ], + [ + -0.0006002431036904454, + 0.0007386726210825145 + ], + [ + -0.0006913339602760971, + 0.0006111615221016109 + ], + [ + -0.0007887539686635137, + 0.0008671398973092437 + ], + [ + -0.00018043382442556322, + 0.0007505150861106813 + ], + [ + -0.00014264056517276913, + 0.0006780794938094914 + ], + [ + -0.0002278133324580267, + 0.0008718729950487614 + ], + [ + -0.00018713569443207234, + 0.0006737499497830868 + ], + [ + -0.0003084522904828191, + 0.00077991554280743 + ], + [ + 0.00012096598948119208, + 0.0008259332389570773 + ], + [ + 0.00013654948270414025, + 0.0008557161199860275 + ], + [ + 0.00017244057380594313, + 0.0008144191233441234 + ], + [ + 0.0003749025345314294, + 0.00066823122324422 + ], + [ + 0.00048064737347885966, + 0.0008889849414117634 + ], + [ + 0.0006815152009949088, + 0.0007661478593945503 + ], + [ + 0.0007901094504632056, + 0.0007093139574863017 + ], + [ + 0.0008461232646368444, + 0.0006042234599590302 + ], + [ + 0.0008941953419707716, + 0.0001086964039131999 + ], + [ + 0.0007940008654259145, + 9.746057912707329e-05 + ], + [ + 0.0008708437089808285, + 0.00011003240069840103 + ], + [ + 0.0008139459532685578, + -0.00034559640334919095 + ], + [ + 0.0007710900972597301, + -1.1757900210795924e-05 + ], + [ + 0.0010074408492073417, + -0.00024020408454816788 + ], + [ + 0.0009815695229917765, + -0.0004388171073514968 + ], + [ + 0.0008770121494308114, + -0.00042732208385132253 + ], + [ + 0.0009529864182695746, + -0.0004399226454552263 + ], + [ + 0.0009811280760914087, + -0.000841073109768331 + ], + [ + 0.0009490451775491238, + -0.000960193807259202 + ], + [ + 0.000982578843832016, + -0.0012471472145989537 + ], + [ + 0.0012122844345867634, + -0.0017115395748987794 + ], + [ + 0.0010068658739328384, + -0.001788721652701497 + ], + [ + 0.0002717028255574405, + -0.0015997587470337749 + ], + [ + 0.00014415656914934516, + -0.001613499247469008 + ], + [ + 0.00014908249431755394, + -0.0015163413481786847 + ], + [ + 1.1653095498331822e-05, + -0.001261710305698216 + ], + [ + -0.0001719530118862167, + -0.0014276595320552588 + ], + [ + -0.0003512113762553781, + -0.0013320444850251079 + ], + [ + -0.0004313577082939446, + -0.0010658290702849627 + ], + [ + -0.0005482974811457098, + -0.0012729953741654754 + ], + [ + -0.0007840653997845948, + -0.0012330226600170135 + ], + [ + -0.0009487394709140062, + -0.0009217625483870506 + ], + [ + -0.0009863931918516755, + -0.001256248913705349 + ], + [ + -0.001557216397486627, + -0.0013415820430964231 + ], + [ + -0.001694114995189011, + -0.00111410953104496 + ], + [ + -0.004113976377993822, + -0.0021491763181984425 + ], + [ + -0.003452973673120141, + -0.00014421986998058856 + ], + [ + -0.003239751560613513, + -0.0004443919169716537 + ], + [ + -0.002338154474273324, + 0.00020653945102822036 + ], + [ + -0.002418569987639785, + 0.0006959193851798773 + ], + [ + -0.0023367370013147593, + 0.0008196378475986421 + ], + [ + -0.002172044012695551, + 0.0008944110595621169 + ], + [ + -0.0019299258710816503, + 0.000989638501778245 + ], + [ + -0.0023621513973921537, + 0.0020596315152943134 + ], + [ + -0.0015696721384301782, + 0.00120884261559695 + ], + [ + -0.0018654983723536134, + 0.001523525221273303 + ], + [ + -0.001668537617661059, + 0.0020665826741605997 + ], + [ + -0.002092114882543683, + 0.0021481409203261137 + ], + [ + -0.002095060655847192, + 0.002653721487149596 + ], + [ + -0.0019846800714731216, + 0.002266652649268508 + ], + [ + -0.0026942298281937838, + 0.0035661307629197836 + ], + [ + -7.877813186496496e-05, + 0.002713971072807908 + ], + [ + 0.0009338086238130927, + 0.0033758278004825115 + ], + [ + 0.001159625593572855, + 0.0023089267779141665 + ], + [ + 0.0009807113092392683, + 0.0018183154752478004 + ], + [ + 0.001034518121741712, + 0.0024775397032499313 + ], + [ + 0.0009585795341990888, + 0.0023379491176456213 + ], + [ + 0.0018163482891395688, + 0.001200195518322289 + ], + [ + 0.0017208203207701445, + 0.0012043651659041643 + ], + [ + 0.0015109232626855373, + 0.000787394936196506 + ], + [ + 0.001961054978892207, + 0.0014953172067180276 + ], + [ + 0.0024491914082318544, + 0.0011636695126071572 + ], + [ + 0.002308908384293318, + 0.0014337138272821903 + ], + [ + 0.00280943070538342, + 0.0010802424512803555 + ], + [ + 0.0036356837954372168, + 0.0020418327767401934 + ], + [ + 0.0038531911559402943, + 0.0015820174012333155 + ], + [ + 0.0017521335976198316, + -0.0007026284001767635 + ], + [ + 0.0020949768368154764, + -0.0002264981303596869 + ], + [ + 0.002575383521616459, + -0.000617639278061688 + ], + [ + 0.0022391723468899727, + -0.0007677486282773316 + ], + [ + 0.0026794453151524067, + -0.0009124538628384471 + ], + [ + 0.0017924709245562553, + -0.0006825450109317899 + ], + [ + 0.001323687145486474, + -0.001704483525827527 + ], + [ + 0.0024891714565455914, + -0.0014111953787505627 + ], + [ + 0.0015793434577062726, + -0.0024010096676647663 + ], + [ + 0.0026026240084320307, + -0.0018899986753240228 + ], + [ + 0.0015532532706856728, + -0.0029149861074984074 + ], + [ + 0.0018701571971178055, + -0.0026348591782152653 + ], + [ + 0.0006714987102895975, + -0.002338889054954052 + ], + [ + -0.0003544050268828869, + -0.003070890437811613 + ], + [ + -0.001997266197577119, + -0.001465733745135367 + ] + ], + "total_points": 1000 +} \ No newline at end of file diff --git a/vna_system/web_ui/static/assets/favicon.svg b/vna_system/web_ui/static/assets/favicon.svg index 94949c4..ba9da91 100644 --- a/vna_system/web_ui/static/assets/favicon.svg +++ b/vna_system/web_ui/static/assets/favicon.svg @@ -1,8 +1,54 @@ - \ No newline at end of file + + + + diff --git a/vna_system/web_ui/static/css/acquisition.css b/vna_system/web_ui/static/css/acquisition.css index 6f20a8b..bd40bee 100644 --- a/vna_system/web_ui/static/css/acquisition.css +++ b/vna_system/web_ui/static/css/acquisition.css @@ -1,10 +1,66 @@ /* Acquisition Controls */ .acquisition-controls { display: flex; - gap: var(--space-2); + gap: var(--space-4); + align-items: stretch; + justify-content: space-between; + flex-wrap: wrap; margin-bottom: var(--space-3); } +.acquisition-controls__buttons { + display: flex; + gap: var(--space-2); + flex-wrap: wrap; +} + +.acquisition-controls__buttons .btn { + min-width: 120px; +} + +.acquisition-summary { + flex: 1 1 360px; + display: flex; + align-items: center; + justify-content: space-between; + gap: var(--space-3); + padding: var(--space-2) var(--space-3); + background-color: var(--bg-tertiary); + border: 1px solid var(--border-primary); + border-radius: var(--radius-lg); + box-shadow: var(--shadow-sm); + margin-left: auto; +} + +.acquisition-summary .header-summary__item { + flex: 1 1 auto; +} + +.acquisition-summary .header-summary__divider { + height: 32px; +} + +@media (max-width: 1024px) { + .acquisition-summary { + flex: 1 1 100%; + } +} + +@media (max-width: 640px) { + .acquisition-summary { + flex-wrap: wrap; + row-gap: var(--space-2); + } + + .acquisition-summary .header-summary__divider { + display: none; + } + + .acquisition-summary .header-summary__item { + flex: 1 1 45%; + } +} + .acquisition-status { display: flex; align-items: center; @@ -78,4 +134,4 @@ .btn--accent.btn--bordered:hover { box-shadow: 0 0 0 1px var(--color-accent-500, #8b5cf6), var(--shadow-md); transform: translateY(-1px); -} \ No newline at end of file +} diff --git a/vna_system/web_ui/static/css/components.css b/vna_system/web_ui/static/css/components.css index 93d94da..28d3d5e 100644 --- a/vna_system/web_ui/static/css/components.css +++ b/vna_system/web_ui/static/css/components.css @@ -1,3 +1,11 @@ +/* Icons */ +.icon { + width: 1.5rem; + height: 1.5rem; + flex-shrink: 0; + display: inline-block; +} + /* Buttons */ .btn { display: inline-flex; @@ -71,17 +79,17 @@ color: var(--text-primary); } -.btn i { +.btn .icon { width: 14px; height: 14px; } -.btn--sm i { +.btn--sm .icon { width: 12px; height: 12px; } -.btn--lg i { +.btn--lg .icon { width: 16px; height: 16px; } @@ -267,7 +275,7 @@ opacity: 0.8; } -.chart-card__action i { +.chart-card__action .icon { width: 14px; height: 14px; } @@ -517,7 +525,7 @@ background-color: var(--bg-surface-hover); } -.notification__close i { +.notification__close .icon { width: 16px; height: 16px; } @@ -1092,4 +1100,4 @@ input:checked + .processor-param__toggle-slider:before { background-color: var(--color-surface-accent); border-radius: var(--radius-lg); border: 1px dashed var(--color-border); -} \ No newline at end of file +} diff --git a/vna_system/web_ui/static/css/layout.css b/vna_system/web_ui/static/css/layout.css index fe90a0b..a630c3a 100644 --- a/vna_system/web_ui/static/css/layout.css +++ b/vna_system/web_ui/static/css/layout.css @@ -174,7 +174,7 @@ body { background-color: var(--color-primary-900); } -.nav-btn i { +.nav-btn .icon { width: 16px; height: 16px; } diff --git a/vna_system/web_ui/static/css/settings.css b/vna_system/web_ui/static/css/settings.css index 1a23524..b560da6 100644 --- a/vna_system/web_ui/static/css/settings.css +++ b/vna_system/web_ui/static/css/settings.css @@ -294,7 +294,7 @@ white-space: nowrap; } -.calibration-standard-btn i { +.calibration-standard-btn .icon { margin-right: var(--space-2); } @@ -571,7 +571,7 @@ } .reference-description:empty::before { - content: "No description provided"; + content: "Описание не указано"; opacity: 0.7; } diff --git a/vna_system/web_ui/static/js/main.js b/vna_system/web_ui/static/js/main.js index c7b016c..8fa6f04 100644 --- a/vna_system/web_ui/static/js/main.js +++ b/vna_system/web_ui/static/js/main.js @@ -10,6 +10,7 @@ import { NotificationManager } from './modules/notifications.js'; import { StorageManager } from './modules/storage.js'; import { SettingsManager } from './modules/settings.js'; import { AcquisitionManager } from './modules/acquisition.js'; +import { renderIcons } from './modules/icons.js'; /** * Main Application Class @@ -65,10 +66,8 @@ class VNADashboard { try { console.log('Initializing VNA Dashboard...'); - // Initialize Lucide icons - if (typeof lucide !== 'undefined') { - lucide.createIcons(); - } + // Render SVG icons + renderIcons(); // Initialize modules in correct order await this.initializeModules(); @@ -85,16 +84,16 @@ class VNADashboard { // Show welcome notification this.notifications.show({ type: 'info', - title: 'Dashboard Ready', - message: 'Connected to VNA System. Waiting for sweep data...' + title: 'Панель готова', + message: 'Соединение с системой ВНА установлено. Ожидание данных свипа...' }); } catch (error) { console.error('Failed to initialize VNA Dashboard:', error); this.notifications.show({ type: 'error', - title: 'Initialization Failed', - message: error.message || 'Failed to initialize dashboard' + title: 'Сбой инициализации', + message: error.message || 'Не удалось инициализировать панель' }); } } diff --git a/vna_system/web_ui/static/js/modules/acquisition.js b/vna_system/web_ui/static/js/modules/acquisition.js index fc2c323..d19d5c2 100644 --- a/vna_system/web_ui/static/js/modules/acquisition.js +++ b/vna_system/web_ui/static/js/modules/acquisition.js @@ -56,60 +56,63 @@ export class AcquisitionManager { } async handleStartClick() { + let originalState; try { - const originalState = setButtonLoading(this.elements.startBtn, true); + originalState = setButtonLoading(this.elements.startBtn, true); const result = await apiPost(API.ACQUISITION.START); if (result.success) { - this.notifications.show({ type: SUCCESS, title: 'Acquisition Started', message: result.message }); + this.notifications.show({ type: SUCCESS, title: 'Сбор запущен', message: result.message }); await this.updateStatus(); } else { - this.notifications.show({ type: ERROR, title: 'Start Failed', message: result.error || 'Failed to start acquisition' }); + this.notifications.show({ type: ERROR, title: 'Сбой запуска', message: result.error || 'Не удалось запустить сбор' }); } } catch (error) { console.error('Error starting acquisition:', error); - this.notifications.show({ type: ERROR, title: 'Start Failed', message: 'Failed to start acquisition' }); + this.notifications.show({ type: ERROR, title: 'Сбой запуска', message: 'Не удалось запустить сбор' }); } finally { setButtonLoading(this.elements.startBtn, false, originalState); } } async handleStopClick() { + let originalState; try { - const originalState = setButtonLoading(this.elements.stopBtn, true); + originalState = setButtonLoading(this.elements.stopBtn, true); const result = await apiPost(API.ACQUISITION.STOP); if (result.success) { - this.notifications.show({ type: SUCCESS, title: 'Acquisition Stopped', message: result.message }); + this.notifications.show({ type: SUCCESS, title: 'Сбор остановлен', message: result.message }); await this.updateStatus(); } else { - this.notifications.show({ type: ERROR, title: 'Stop Failed', message: result.error || 'Failed to stop acquisition' }); + this.notifications.show({ type: ERROR, title: 'Сбой остановки', message: result.error || 'Не удалось остановить сбор' }); } } catch (error) { console.error('Error stopping acquisition:', error); - this.notifications.show({ type: ERROR, title: 'Stop Failed', message: 'Failed to stop acquisition' }); + this.notifications.show({ type: ERROR, title: 'Сбой остановки', message: 'Не удалось остановить сбор' }); } finally { setButtonLoading(this.elements.stopBtn, false, originalState); } } async handleSingleSweepClick() { + let originalState; try { - const originalState = setButtonLoading(this.elements.singleSweepBtn, true); + originalState = setButtonLoading(this.elements.singleSweepBtn, true); const result = await apiPost(API.ACQUISITION.SINGLE); if (result.success) { - this.notifications.show({ type: SUCCESS, title: 'Single Sweep', message: result.message }); + this.notifications.show({ type: SUCCESS, title: 'Одиночный свип', message: result.message }); await this.updateStatus(); } else { - this.notifications.show({ type: ERROR, title: 'Single Sweep Failed', message: result.error || 'Failed to trigger single sweep' }); + this.notifications.show({ type: ERROR, title: 'Сбой одиночного свипа', message: result.error || 'Не удалось запустить одиночный свип' }); } } catch (error) { console.error('Error triggering single sweep:', error); - this.notifications.show({ type: ERROR, title: 'Single Sweep Failed', message: 'Failed to trigger single sweep' }); + this.notifications.show({ type: ERROR, title: 'Сбой одиночного свипа', message: 'Не удалось запустить одиночный свип' }); } finally { setButtonLoading(this.elements.singleSweepBtn, false, originalState); } @@ -134,15 +137,15 @@ export class AcquisitionManager { updateUI(status) { // Update status text and indicator - let statusText = 'Idle'; + let statusText = 'Ожидание'; let statusClass = 'status-indicator__dot--idle'; if (status.running) { if (status.paused) { - statusText = 'Stopped'; + statusText = 'Остановлено'; statusClass = 'status-indicator__dot--paused'; } else { - statusText = 'Running'; + statusText = 'Выполняется'; statusClass = 'status-indicator__dot--running'; } } @@ -157,7 +160,7 @@ export class AcquisitionManager { // Update mode text if (this.elements.modeText) { - this.elements.modeText.textContent = status.continuous_mode ? 'Continuous' : 'Single'; + this.elements.modeText.textContent = status.continuous_mode ? 'Непрерывный' : 'Одиночный'; } // Update button states @@ -170,7 +173,7 @@ export class AcquisitionManager { } if (this.elements.singleSweepBtn) { - this.elements.singleSweepBtn.disabled = !status.running; + this.elements.singleSweepBtn.disabled = false; } // Update sweep count in header if available diff --git a/vna_system/web_ui/static/js/modules/charts.js b/vna_system/web_ui/static/js/modules/charts.js index c7e2f70..6db0218 100644 --- a/vna_system/web_ui/static/js/modules/charts.js +++ b/vna_system/web_ui/static/js/modules/charts.js @@ -4,6 +4,7 @@ */ import { formatProcessorName, safeClone, downloadJSON } from './utils.js'; +import { renderIcons } from './icons.js'; import { ChartSettingsManager } from './charts/chart-settings.js'; import { defaultPlotlyLayout, @@ -76,7 +77,9 @@ export class ChartManager { } catch (e) { console.error('Error adding chart result:', e); this.notifications?.show?.({ - type: 'error', title: 'Chart Error', message: `Failed to update chart` + type: 'error', + title: 'Ошибка графика', + message: 'Не удалось обновить график' }); } } @@ -164,18 +167,18 @@ export class ChartManager { card.innerHTML = `