From db2a7ca00af4f3744de6df87e79d05589650684c Mon Sep 17 00:00:00 2001 From: cedwardson2 Date: Wed, 21 Jan 2026 10:24:00 -0600 Subject: [PATCH] Updated machine mappings for pegasus.json. Added support files for fit weights. Added updated mhdin for p3. --- omas/machine_mappings/pegasus.json | 23 ++-- .../support_files/pegasus/FitWeights.csv | 99 ++++++++++++++ .../support_files/pegasus/mhdin_p3.dat | 122 ++++++++++++++++++ 3 files changed, 236 insertions(+), 8 deletions(-) create mode 100644 omas/machine_mappings/support_files/pegasus/FitWeights.csv create mode 100644 omas/machine_mappings/support_files/pegasus/mhdin_p3.dat diff --git a/omas/machine_mappings/pegasus.json b/omas/machine_mappings/pegasus.json index ced7e1b66..99e0108c1 100644 --- a/omas/machine_mappings/pegasus.json +++ b/omas/machine_mappings/pegasus.json @@ -83,6 +83,13 @@ ,"pf_active.coil.:.name" : { "PYTHON":"pegasus_pf_hardware(ods)" } + ,"pf_active.coil.:.current.data" : { + "PYTHON":"pegasus_equil_data(ods, {pulse})" + ,"COCOSIO":1 + } + ,"pf_active.coil.:.current.time" : { + "PYTHON":"pegasus_equil_data(ods, {pulse})" + } ,"pf_active.coil.:.element.:" : { "PYTHON":"pegasus_pf_hardware(ods)" } @@ -125,25 +132,25 @@ ,"pf_active.coil.:.element.:.geometry.oblique.length_beta" : { "PYTHON":"pegasus_pf_hardware(ods)" } - "wall.description_2d.:": { + ,"wall.description_2d.:": { "VALUE": 1 }, "wall.description_2d.:.limiter.type.description": { - "PYTHON": "pegasus_limiter" + "PYTHON": "pegasus_limiter(ods)" }, "wall.description_2d.:.limiter.type.index": { - "PYTHON": "pegasus_limiter" + "PYTHON": "pegasus_limiter(ods)" }, "wall.description_2d.:.limiter.type.name": { - "PYTHON": "pegasus_limiter" + "PYTHON": "pegasus_limiter(ods)" }, "wall.description_2d.:.limiter.unit.:": { "VALUE": 1 }, "wall.description_2d.:.limiter.unit.:.outline.r": { - "PYTHON": "pegasus_limiter" + "PYTHON": "pegasus_limiter(ods)" }, "wall.description_2d.:.limiter.unit.:.outline.z": { - "PYTHON": "pegasus_limiter" - }, -} + "PYTHON": "pegasus_limiter(ods)" + } +} \ No newline at end of file diff --git a/omas/machine_mappings/support_files/pegasus/FitWeights.csv b/omas/machine_mappings/support_files/pegasus/FitWeights.csv new file mode 100644 index 000000000..9c9de8ab3 --- /dev/null +++ b/omas/machine_mappings/support_files/pegasus/FitWeights.csv @@ -0,0 +1,99 @@ +Diagnostic,StdDev,Fit Weight +Ip,2,1 +CFL01,0.5,1 +CFL02,0.5,1 +CFL03,0.5,1 +CFL04,0.5,1 +CFL05,0.5,1 +CFL06,0.5,1 +CFL07,0.5,1 +CFL08,0.5,1 +CFL09,0.5,1 +CFL10,0.5,1 +CFL11,0.5,1 +CFL12,0.5,1 +CFL13,0.5,1 +CPA01,1,1 +CPA02,1,1 +CPA03,1,1 +CPA04,1,1 +CPA05,1,1 +CPA06,1,1 +CPA07,1,1 +CPA08,1,1 +CPA09,1,1 +CPA10,1,1 +CPA11,1,1 +CPA12,1,1 +CPA13,1,1 +CPA14,1,1 +CPA15,1,1 +CPA16,1,1 +CPA17,1,1 +CPA18,1,1 +CPA19,1,1 +CPA20,1,1 +CPA21,1,1 +CTOR1,1,1 +CTOR2,1,1 +CTOR3,1,1 +CTOR4,1,1 +CTOR5,1,1 +CTOR6,1,1 +NCFL01,1,1 +NCFL02,1,1 +NCFL03,1,1 +NCFL04,1,1 +NCFL05,1,1 +NCFL06,1,1 +NCFL07,1,1 +NCFL08,1,1 +NCFL09,1,1 +NCFL10,1,1 +NCFL11,1,1 +NCFL12,1,1 +NCFL13,1,1 +NCFL14,1,1 +NCFL15,1,1 +NCFL16,1,1 +NCFL17,1,1 +NCFL18,1,1 +NCFL19,1,1 +NCFL20,1,1 +OTOR1,1,1 +OTOR2,1,1 +OTOR3,1,1 +OTOR4,1,1 +OTOR5,1,1 +OTOR6,1,1 +PDX01,1,1 +PDX02,1,1 +PDX03,1,1 +PDX04,1,1 +PDX05,1,1 +PDX06,1,1 +PDX07,1,1 +PDX08,1,1 +PDX09,1,1 +PDX10,1,1 +PDX11,1,1 +PDX12,1,1 +PDX13,1,1 +WFL01,0.5,1 +WFL02,0.5,1 +WFL03,0.5,1 +WFL04,0.5,1 +WFL05,0.5,1 +WFL06,0.5,1 +WFL07,0.5,1 +WFL08,0.5,1 +WFL09,0.5,1 +WFL10,0.5,1 +WFL11,0.5,1 +WFL12,0.5,1 +WFL13,0.5,1 +WFL14,0.5,1 +WFL15,0.5,1 +WFL16,0.5,1 +diamag,5,1 +MonotonicQ,0.01,1 diff --git a/omas/machine_mappings/support_files/pegasus/mhdin_p3.dat b/omas/machine_mappings/support_files/pegasus/mhdin_p3.dat new file mode 100644 index 000000000..ccec5b7ce --- /dev/null +++ b/omas/machine_mappings/support_files/pegasus/mhdin_p3.dat @@ -0,0 +1,122 @@ + &IN3 + RF = 0.1038085 0.1222415 0.1038085 0.1222415 0.1038085 0.1222415 0.1038085 + 0.1222415 0.1038085 0.1222415 0.1404925 0.1589255 0.1773585 0.1957915 + 0.1404925 0.1589255 0.1773585 0.1957915 0.1404925 0.1589255 0.1773585 + 0.1957915 0.1404925 0.1589255 0.1773585 0.1957915 0.1404925 0.1589255 + 0.1773585 0.1957915 0.2625585 0.2801915 0.2625585 0.2801915 0.2625585 + 0.2801915 0.2978245 0.3154575 0.3330905 0.3507235 0.2978245 0.3154575 + 0.3330905 0.3507235 0.2978245 0.3154575 0.3330905 0.3507235 0.2625585 + 0.2794595 0.2625585 0.2794595 0.2625585 0.2794595 0.2999825 0.3168835 + 0.3337845 0.3506855 0.2999825 0.3168835 0.3337845 0.3506855 0.2999825 + 0.3168835 0.3337845 0.3506855 0.1038085 0.1222415 0.1038085 0.1222415 + 0.1038085 0.1222415 0.1038085 0.1222415 0.1038085 0.1222415 0.1404925 + 0.1589255 0.1773585 0.1957915 0.1404925 0.1589255 0.1773585 0.1957915 + 0.1404925 0.1589255 0.1773585 0.1957915 0.1404925 0.1589255 0.1773585 + 0.1957915 0.1404925 0.1589255 0.1773585 0.1957915 0.4406265 0.4458589 + 0.4510913 0.4563237 0.4615561 0.4731385 0.4783709 0.4836033 0.4888357 + 0.4940681 0.4993005 0.5045329 0.5097654 0.5149978 3*0.90007 20*1.14823 + 3*0.90007 4*1.14823 1.0423 8*1.00318 0.99604702 0.96476698 0.90642601 + 0.83239502 0.748945 0.65957499 0.56644601 0.470874 0.37367 0.27525 3*0.22925 + 0.081428 0.123663 0.165898 0.208133 1.0423 8*1.00318 0.99604702 0.96476698 + 0.90642601 0.83239502 0.748945 0.659575 0.566446 0.470874 0.37367 0.27525 + 3*0.22925 0.081428 0.123663 0.165898 0.208133 17*0.0603 0.227 0.295 0.363 + 0.432 0.5 0.568 0.637 0.705 0.227 0.295 0.363 0.432 0.5 0.568 0.637 0.705 + 0.227 0.295 0.363 0.432 0.5 0.568 0.637 0.705 0.227 0.295 0.363 0.432 0.5 + 0.568 0.637 0.705 + ZF = 2*0.89506501 2*0.91653299 2*0.93800098 2*0.95946896 2*0.98093694 + 4*0.89506501 4*0.91653299 4*0.93800098 4*0.95946896 4*0.98093694 2*1.027808 + 2*1.049276 2*1.070744 4*1.027808 4*1.049276 4*1.070744 2*-1.027808 + 2*-1.049276 2*-1.070744 4*-1.027808 4*-1.049276 4*-1.070744 2*-0.89506501 + 2*-0.91653299 2*-0.93800098 2*-0.95946896 2*-0.98093694 4*-0.89506501 + 4*-0.91653299 4*-0.93800098 4*-0.95946896 4*-0.98093694 14*1.067 1.0807 + 1.0599999 1.03943 0.77582997 0.75481999 0.73382002 0.71280998 0.69181001 + 0.35124001 0.33059999 0.30996001 0.28992999 0.26868999 -0.35123 -0.33059001 + -0.30996001 -0.28992 -0.26868001 -0.77582997 -0.75481999 -0.73382002 + -0.71280998 -0.69181001 -1.0807 -1.0599999 -1.03943 0.81260997 0.65503001 + -0.81260997 -0.65503001 0.2776 0.05191 0.15573 0.25955 0.31146 0.36337 + 0.41528 0.46719 0.50918001 0.55118299 0.62824702 0.70854598 0.775204 + 0.829916 0.87447399 0.91069001 0.93990898 0.96324599 0.9806 0.958709 + 0.912121 0.86553401 4*0.836 -0.2776 -0.05191 -0.15573 -0.25955 -0.31146 + -0.36337 -0.41528 -0.46719 -0.50918 -0.551183 -0.628247 -0.708546 -0.775204 + -0.829916 -0.874474 -0.91069 -0.93990898 -0.963246 -0.9806 -0.958709 + -0.912121 -0.865534 4*-0.836 0.8 0.7 0.6 0.5 0.4 0.3 0.2 0.1 0.0 -0.1 -0.2 + -0.3 -0.4 -0.5 -0.6 -0.7 -0.8 8*1.14 8*-1.14 8*1.44 8*-1.44 + WF = 96*0.0161 14*0.004953 26*0.01905 4*0.01445 0.0786 12*0.00625 6*0.1 + 3*0.0042 4*0.042235 0.0786 11*0.00625 7*0.1 3*0.0042 4*0.042235 17*0.002 + 32*0.068 + HF = 96*0.021468 14*0.08255 26*0.01905 4*0.01445 0.006 2*0.10382 6*0.05191 + 0.0678 3*0.1 6*0.00625 3*0.0577 4*0.0159 0.006 2*0.10382 6*0.05191 0.0678 + 2*0.1 7*0.00625 0.0577 0.035475 0.0577 4*0.0159 17*0.1 32*0.013 + AF = 153*0.0 -29.0 -23.0 -19.0 -15.0 -12.0 20*0.0 37.0 29.0 23.0 19.0 15.0 + 12.0 8.0 56*0.0 + AF2 = 148*0.0 -84.42920367320511 -79.42920367320511 -59.4292036732051 + -45.4292036732051 -35.4292036732051 5*-88.42920367320511 -96.42920367320511 + 15*0.0 87.57079632679489 82.57079632679489 62.5707963267949 48.5707963267949 + 7*-88.42920367320511 56*0.0 + FCTURN = 138*1.0 2*-1.0 1.0 1.41 1.49 0.83 0.68 0.76 0.87 1.0 1.1 1.0 1.64 + 1.65 1.53 1.35 1.13 0.9 1.0 0.69 0.44 0.11 2*0.12 0.11 0.17 0.23 0.31 1.0 + 1.58 1.59 0.85 0.69 0.77 0.88 1.01 1.12 1.0 2*1.65 1.52 1.34 1.12 0.88 1.0 + 0.68 0.42 0.11 0.07 0.12 0.1 0.16 0.23 0.31 1.0 1.18 1.23 1.22 1.17 1.11 + 1.05 1.01 2*0.98 1.0 1.03 1.06 1.09 1.08 1.02 0.82 1.0 1.39 1.9 2.53 3.32 + 4.3 5.38 6.59 1.0 1.41 1.98 2.73 3.69 4.89 6.35 8.06 1.0 1.35 1.79 2.33 2.98 + 3.73 4.57 5.42 1.0 1.36 1.83 2.43 3.17 4.07 5.11 6.22 + FCID = 10*1 20*2 6*3 12*4 6*5 12*6 10*7 20*8 5*9 9*10 3*11 5*12 5*13 5*14 + 5*15 3*16 4*17 9*18 7*19 10*20 9*21 7*22 10*23 17*24 8*25 8*26 8*27 8*28 + RSI = 6*0.0606 4*0.06058 3*0.0606 0.2444 0.3415 0.3953 0.4589 0.5229 0.7262 + 0.7714 0.8191 0.8671 0.9167 0.9168 0.8681 0.8198 0.7715 0.7233 0.5228 0.4598 + 0.3955 0.3417 0.2432 0.0955 2*0.222 0.223 0.3925 0.737 0.973 2*1.01 0.974 + 0.737 0.3925 0.224 2*0.222 0.0794 + ZSI = 0.696 0.6275 0.557 0.347 0.1355 0.064 -0.0025 -0.0773 -0.1425 -0.3508 + -0.5615 -0.6305 -0.6995 0.8438 0.8435 0.8436 0.8438 0.8431 0.7074 0.6574 + 0.6074 0.5564 0.5064 -0.5116 -0.5626 -0.6116 -0.6646 -0.7136 -0.8492 -0.8485 + -0.8479 2*-0.8473 2*0.8571 0.9215 0.9892 0.9016 0.814 0.64 0.277 -0.275 + -0.64 -0.84 -0.9146 -0.9892 -0.9215 2*-0.8571 + XMP2 = 21*0.06755 0.0682 0.067 0.0682 0.0677 0.0674 0.067 0.9173 0.9148 + 0.9153 0.9088 0.9173 0.9153 0.205 0.3734 0.5471 0.8 5*0.9 0.8 0.531 0.357 + 0.189 + YMP2 = 0.6945 0.625 0.5555 0.486 0.4163 0.3466 0.277 0.2079 0.1365 0.067 + -0.0023 -0.0725 -0.1428 -0.2125 -0.2815 -0.3515 -0.4215 -0.492 -0.5613 + -0.6308 -0.7 -0.28 -0.88 -1.04 -0.935 -0.96 -0.8 -0.1455 -0.1485 -0.1455 + -0.153 -0.1485 -0.147 3*0.8034 0.6 0.35 0.2 0.0 -0.2 -0.35 -0.6 3*-0.803 + SMP2 = 33*0.018 13*0.027 + AMP2 = 33*-90.0 3*-0.0 7*-90.0 3*-180.0 + MPNAM2 = 'CPA01' 'CPA02' 'CPA03' 'CPA04' 'CPA05' 'CPA06' 'CPA07' 'CPA08' + 'CPA09' 'CPA10' 'CPA11' 'CPA12' 'CPA13' 'CPA14' 'CPA15' 'CPA16' 'CPA17' + 'CPA18' 'CPA19' 'CPA20' 'CPA21' 'CTOR1' 'CTOR2' 'CTOR3' 'CTOR4' 'CTOR5' + 'CTOR6' 'OTOR1' 'OTOR2' 'OTOR3' 'OTOR4' 'OTOR5' 'OTOR6' 'PDX01' 'PDX02' + 'PDX03' 'PDX04' 'PDX05' 'PDX06' 'PDX07' 'PDX08' 'PDX09' 'PDX10' 'PDX11' + 'PDX12' 'PDX13' + LPNAME = 'CFL01' 'CFL02' 'CFL03' 'CFL04' 'CFL05' 'CFL06' 'CFL07' 'CFL08' + 'CFL09' 'CFL10' 'CFL11' 'CFL12' 'CFL13' 'NCFL01' 'NCFL02' 'NCFL03' 'NCFL04' + 'NCFL05' 'NCFL06' 'NCFL07' 'NCFL08' 'NCFL09' 'NCFL10' 'NCFL11' 'NCFL12' + 'NCFL13' 'NCFL14' 'NCFL15' 'NCFL16' 'NCFL17' 'NCFL18' 'NCFL19' 'NCFL20' + 'WFL01' 'WFL02' 'WFL03' 'WFL04' 'WFL05' 'WFL06' 'WFL07' 'WFL08' 'WFL09' + 'WFL10' 'WFL11' 'WFL12' 'WFL13' 'WFL14' 'WFL15' 'WFL16' + / + &MACHINEIN + device = 'pegasus' + nfcoil = 241 + nfsum = 28 + nsilop = 49 + magpri = 46 + necoil = 0 + nesum = 0 + nvesel = 0 + nvsum = 0 + nacoil = 0 + / + &IN5 + IGRID = 1 + RLEFT = 0.01525 + RRIGHT = 0.8897499999999999 + ZBOTTO = -0.8800000000000001 + ZTOP = 0.8800000000000001 + IFCOIL = 1 + ISLPFC = 0 + NSMP2 = 25 + IECOIL = 0 + IVESEL = 0 + IACOIL = 0 + mgaus1 = 8 + mgaus2 = 12 + /