diff --git a/omas/machine_mappings/_common.py b/omas/machine_mappings/_common.py index 4d2c8909..bd690a18 100644 --- a/omas/machine_mappings/_common.py +++ b/omas/machine_mappings/_common.py @@ -49,14 +49,14 @@ def get_support_file(object_type, filename): def MDS_gEQDSK_COCOS_identify(machine, pulse, EFIT_tree, EFIT_run_id): """ - Python function that queries MDS+ EFIT tree to figure + Python function that queries MDSplus EFIT tree to figure out COCOS convention used for a particular reconstruction :param machine: machine name :param pulse: pulse number - :param EFIT_tree: MDS+ EFIT tree name + :param EFIT_tree: MDSplus EFIT tree name :param EFIT_run_id: with id extension for non-standard shot numbers. E.g. 19484401 for EFIT tree @@ -87,7 +87,7 @@ def MDS_gEQDSK_psi(ods, machine, pulse, EFIT_tree): :param pulse: pulse - :param EFIT_tree: MDS+ EFIT tree name + :param EFIT_tree: MDSplus EFIT tree name :return: integer cocos convention """ @@ -200,9 +200,9 @@ def fetch_assign( :param validity: location in `ods` where to set the validity flag - :param mds_server: MDS+ server to connect to + :param mds_server: MDSplus server to connect to - :param mds_tree: MDS+ tree from where to get the data + :param mds_tree: MDSplus tree from where to get the data :param tdi_expression: string with tdi_expression to use diff --git a/omas/machine_mappings/d3d.py b/omas/machine_mappings/d3d.py index c9f44430..23dc7a3b 100644 --- a/omas/machine_mappings/d3d.py +++ b/omas/machine_mappings/d3d.py @@ -802,7 +802,7 @@ def electron_cyclotron_emission_data(ods, pulse=133221, fast_ece=False, _measure ece_uncertainty[key] = np.sqrt(np.abs(ece_data[key] * 1.e3)) + 70 * np.abs(ece_data[key]) ods['ece.ids_properties.homogeneous_time'] = 0 - # Not in mds+ + # Not in MDSplus if not _measurements: points = [{}, {}] points[0]['r'] = 2.5 @@ -1386,8 +1386,8 @@ def equilibrium_special(ods, pulse, EFIT_tree="EFIT", get_all=True): from omfit_classes.omfit_eqdsk import from_mds_plus, OMFITkeqdsk times = mdsvalue('d3d', treename=EFIT_tree, pulse=pulse, TDI="\\TOP.RESULTS.GEQDSK.GTIME").raw() if times is None: - print("No mds+ data") - raise ValueError(f"Could not find any data in MDS+ for {pulse} and {EFIT_tree}") + print("No MDSplus data") + raise ValueError(f"Could not find any data in MDSplus for {pulse} and {EFIT_tree}") ods["equilibrium.ids_properties.homogeneous_time"] = 1 ods["equilibrium.time"]= times / 1.e3 if get_all == False: @@ -1477,8 +1477,8 @@ def core_profiles_profile_1d(ods, pulse, PROFILES_tree="OMFIT_PROFS", PROFILES_r query[entry + "_error_upper"] = "error_of(" + query[entry] + ")" data = mdsvalue('d3d', treename=PROFILES_tree, pulse=pulse_id, TDI=query).raw() if data is None: - print("No mds+ data") - raise ValueError(f"Could not find any data in MDS+ for {pulse} and {PROFILES_tree}") + print("No MDSplus data") + raise ValueError(f"Could not find any data in MDSplus for {pulse} and {PROFILES_tree}") dim_info = mdsvalue('d3d', treename=PROFILES_tree, pulse=pulse_id, TDI="\\TOP.n_e") data['time'] = dim_info.dim_of(1) * 1.e-3 diff --git a/omas/machine_mappings/nstxu.py b/omas/machine_mappings/nstxu.py index 912233b5..e1718e5b 100644 --- a/omas/machine_mappings/nstxu.py +++ b/omas/machine_mappings/nstxu.py @@ -11,7 +11,7 @@ import glob # NOTES: -# List of MDS+ signals +# List of MDSplus signals # https://nstx.pppl.gov/nstx/Software/FAQ/signallabels.html # magnetics: # https://nstx.pppl.gov/DragNDrop/Operations/Physics_Operations_Course/11%20OpsCourse_EquilibriumMagnetics_Rev1.pdf @@ -272,7 +272,7 @@ def MDS_gEQDSK_bbbs_nstx(ods, pulse, EFIT_tree='EFIT01'): :param pulse: shot number - :param EFIT_tree: MDS+ EFIT tree + :param EFIT_tree: MDSplus EFIT tree """ TDIs = { 'r': f'\\{EFIT_tree}::TOP.RESULTS.GEQDSK.RBBBS', @@ -353,7 +353,7 @@ def mse_data(ods, pulse, MSE_revision="ANALYSIS", MSE_Er_correction=True): Omega is +90 degrees for a radial sightline, assuming MSE port is on the outboard midplane Omega is 180 degrees for a tangential sightline that is pointed toward -phi - NOTE: In this coordinate system, the omega = om_nstx + 180 degrees where om_nstx is the omega recorded in the MDS+ Tree + NOTE: In this coordinate system, the omega = om_nstx + 180 degrees where om_nstx is the omega recorded in the MDSplus Tree **NOTE: The signs of the A1, A4, A5 and A7 coefficients are reversed compared to DIII-D to reflect the NSTX definition of omega In NSTX, standard operation is BT<0 (CCW) and Ip>0 (CW) ... identical to standard DIII-D operation @@ -361,12 +361,12 @@ def mse_data(ods, pulse, MSE_revision="ANALYSIS", MSE_Er_correction=True): Gamma is the pitch of the local electric field relative to the MSE sightline vector (sigma polization component) GA EFIT assumes pitch angle (gamma) is the measured polarization angle - NSTX MSE data is saved on the MDS+ tree as the actual field pitch angle = (A2/A1)*tan(gamma) - The MSE data from MDS+ is multiplied by A1/A2 to convert the actual field pitch angle into the measured polization angle to be consistent with GA EFIT + NSTX MSE data is saved on the MDSplus tree as the actual field pitch angle = (A2/A1)*tan(gamma) + The MSE data from MDSplus is multiplied by A1/A2 to convert the actual field pitch angle into the measured polization angle to be consistent with GA EFIT A2 and A1 are positive in the NSTX geometry For a co-Ip beam (+phi) with CCW BT, EZ = vb x Bphi is positive (+Z), Ephi = vb x Bz is negative (-phi) at outboard midplane Thus, on NSTX, with MSE sightline vectors pointing in -phi, postive R, gamma should be positive outboard of the magnetic axis - This is consistent with the tan_alpha recorded in MDS+ + This is consistent with the tan_alpha recorded in MDSplus The A coefficients modified from for the NSTX convention are A1>0, A2>0, A5>0 for alpha and omega between 0 and 90 degrees At outboard midplane, BZ<0, Bphi<0, ER>0 diff --git a/omas/machine_mappings/sample.json b/omas/machine_mappings/sample.json index 189e3797..dcf42ba1 100644 --- a/omas/machine_mappings/sample.json +++ b/omas/machine_mappings/sample.json @@ -22,13 +22,13 @@ "treename": "{EFIT_tree}" }, "equilibrium.time_slice.:.global_quantities.ip": { - "COMMENT": "TDI functions to access MDS+", + "COMMENT": "TDI functions to access MDSplus", "TDI": "data(\\{EFIT_tree}::TOP.RESULTS.GEQDSK.CPASMA)", "treename": "{EFIT_tree}" }, "equilibrium.time_slice.:.profiles_1d.psi": { - "COMMENT": "eval2TDI allows defining python functions can be evaluated on the MDS+ server side. These functions are defined in python_tdi.py", + "COMMENT": "eval2TDI allows defining python functions can be evaluated on the MDSplus server side. These functions are defined in python_tdi.py", "eval2TDI": "py2tdi(geqdsk_psi,'\\{EFIT_tree}::TOP.RESULTS.GEQDSK.SSIMAG','\\{EFIT_tree}::TOP.RESULTS.GEQDSK.SSIBRY','\\{EFIT_tree}::TOP.RESULTS.GEQDSK.PSIN')", "treename": "{EFIT_tree}" } -} \ No newline at end of file +} diff --git a/omas/machine_mappings/support_files/mast/0/signals.dat b/omas/machine_mappings/support_files/mast/0/signals.dat index 0bd6153c..d3734348 100644 --- a/omas/machine_mappings/support_files/mast/0/signals.dat +++ b/omas/machine_mappings/support_files/mast/0/signals.dat @@ -245,7 +245,7 @@ P1LEVEL RL none 1 - c 0.000 0.00 0.00 n 1.00 1.0 1.0 ;map indx: Used to index multiple map vars and two-dimensional signals ; - negative value: Interpolate FE data to MD position in time plots ; *** pending - negative value: Swap X and Y axes of MD data in profile plots -;MDS tree: Designation for MDS+ tree name from which to read signal. Using an +;MDS tree: Designation for MDSplus tree name from which to read signal. Using an ; identifier that is not in the DBsignaldesig.pro file (such as '-') ; will result in the code using the default tree name in maincontrol.dat ;Read sig?: y: read signal, n: skip signal, c: compute signal diff --git a/omas/machine_mappings/support_files/mast/40000/signals.dat b/omas/machine_mappings/support_files/mast/40000/signals.dat index 15414299..2ddd9e80 100644 --- a/omas/machine_mappings/support_files/mast/40000/signals.dat +++ b/omas/machine_mappings/support_files/mast/40000/signals.dat @@ -648,7 +648,7 @@ P1LEVEL RL none 1 - c 0.000 0.00 0.00 n 1.00 1.0 1.0 ;map indx: Used to index multiple map vars and two-dimensional signals ; - negative value: Interpolate FE data to MD position in time plots ; *** pending - negative value: Swap X and Y axes of MD data in profile plots -;MDS tree: Designation for MDS+ tree name from which to read signal. Using an +;MDS tree: Designation for MDSplus tree name from which to read signal. Using an ; identifier that is not in the DBsignaldesig.pro file (such as '-') ; will result in the code using the default tree name in maincontrol.dat ;Read sig?: y: read signal, n: skip signal, c: compute signal diff --git a/omas/machine_mappings/support_files/nstx/02072002Av1_0/signals_040904o.dat b/omas/machine_mappings/support_files/nstx/02072002Av1_0/signals_040904o.dat index 1a88856c..663e958b 100644 --- a/omas/machine_mappings/support_files/nstx/02072002Av1_0/signals_040904o.dat +++ b/omas/machine_mappings/support_files/nstx/02072002Av1_0/signals_040904o.dat @@ -370,26 +370,26 @@ MSCPA8 PA pabzz0 -8 E2 n 0.050 5.0e-3 1.0e-3 y 1.7453e-2 1.0 1.0 MSCPA9 PA pabzz0 -9 E2 n 0.050 5.0e-3 1.0e-3 y 1.7453e-2 1.0 1.0 1 0 \\PABZBTZ0 - MSCPA10 PA pabzz0 -10 E2 n 0.050 5.0e-3 1.0e-3 y 1.7453e-2 1.0 1.0 1 0 \\PABZBTZ0 - P1LEVEL RL none 1 - c 0.000 0.00 0.00 n 1.00 1.0 1.0 1 0 NONE - ; Process 1 run level at each time -;TRPT1 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT2 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT3 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT4 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT5 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT6 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT7 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT8 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT9 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT10 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT11 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT12 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT13 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT14 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT15 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT16 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT17 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT18 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT19 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT20 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - +;TRPT1 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT2 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT3 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT4 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT5 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT6 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT7 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT8 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT9 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT10 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT11 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT12 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT13 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT14 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT15 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT16 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT17 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT18 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT19 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT20 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - ;===================================================================================================================================================================== ; Stated errors ;-------------- @@ -430,7 +430,7 @@ P1LEVEL RL none 1 - c 0.000 0.00 0.00 n 1.00 1.0 1.0 ;map indx: Used to index multiple map vars and two-dimensional signals ; - negative value: Interpolate FE data to MD position in time plots ; *** pending - negative value: Swap X and Y axes of MD data in profile plots -;MDS tree: Designation for MDS+ tree name from which to read signal +;MDS tree: Designation for MDSplus tree name from which to read signal ;Read sig?: y: read signal, n: skip signal, c: compute signal ; m: read multiple dimensional signal, p: process previous multi-dim signal ;Error rel: Relative error diff --git a/omas/machine_mappings/support_files/nstx/04122005Av1_0/signals_062104.dat b/omas/machine_mappings/support_files/nstx/04122005Av1_0/signals_062104.dat index 3120806b..d374f97a 100644 --- a/omas/machine_mappings/support_files/nstx/04122005Av1_0/signals_062104.dat +++ b/omas/machine_mappings/support_files/nstx/04122005Av1_0/signals_062104.dat @@ -433,26 +433,26 @@ MSCPA8 PA pabzz0 -8 E2 n 0.050 5.0e-3 1.0e-3 y 1.7453e-2 1.0 1.0 MSCPA9 PA pabzz0 -9 E2 n 0.050 5.0e-3 1.0e-3 y 1.7453e-2 1.0 1.0 1 0 \\PABZBTZ0 - MSCPA10 PA pabzz0 -10 E2 n 0.050 5.0e-3 1.0e-3 y 1.7453e-2 1.0 1.0 1 0 \\PABZBTZ0 - P1LEVEL RL none 1 - c 0.000 0.00 0.00 n 1.00 1.0 1.0 1 0 NONE - ; Process 1 run level at each time -;TRPT1 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT2 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT3 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT4 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT5 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT6 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT7 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT8 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT9 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT10 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT11 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT12 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT13 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT14 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT15 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT16 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT17 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT18 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT19 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT20 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - +;TRPT1 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT2 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-mdsplus-TREE-PATH-GOES-HERE - +;TRPT3 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT4 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT5 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT6 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT7 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT8 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT9 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT10 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT11 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT12 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT13 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT14 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT15 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT16 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT17 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT18 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT19 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT20 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - ;===================================================================================================================================================================== ; Stated errors ;-------------- @@ -493,7 +493,7 @@ P1LEVEL RL none 1 - c 0.000 0.00 0.00 n 1.00 1.0 1.0 ;map indx: Used to index multiple map vars and two-dimensional signals ; - negative value: Interpolate FE data to MD position in time plots ; *** pending - negative value: Swap X and Y axes of MD data in profile plots -;MDS tree: Designation for MDS+ tree name from which to read signal +;MDS tree: Designation for MDSplus tree name from which to read signal ;Read sig?: y: read signal, n: skip signal, c: compute signal ; m: read multiple dimensional signal, p: process previous multi-dim signal ;Error rel: Relative error diff --git a/omas/machine_mappings/support_files/nstx/04202005Av1_0/signals_072710pf4.dat b/omas/machine_mappings/support_files/nstx/04202005Av1_0/signals_072710pf4.dat index 0b47a65f..e1c42e6d 100644 --- a/omas/machine_mappings/support_files/nstx/04202005Av1_0/signals_072710pf4.dat +++ b/omas/machine_mappings/support_files/nstx/04202005Av1_0/signals_072710pf4.dat @@ -456,26 +456,26 @@ MSCPA8 PA pabzz0 -8 E2 n 0.050 5.0e-3 1.0e-3 y 1.7453e-2 1.0 1.0 MSCPA9 PA pabzz0 -9 E2 n 0.050 5.0e-3 1.0e-3 y 1.7453e-2 1.0 1.0 1 0 \\PABZBTZ0 - MSCPA10 PA pabzz0 -10 E2 n 0.050 5.0e-3 1.0e-3 y 1.7453e-2 1.0 1.0 1 0 \\PABZBTZ0 - P1LEVEL RL none 1 - c 0.000 0.00 0.00 n 1.00 1.0 1.0 1 0 NONE - ; Process 1 run level at each time -;TRPT1 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT2 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT3 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT4 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT5 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT6 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT7 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT8 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT9 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT10 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT11 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT12 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT13 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT14 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT15 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT16 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT17 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT18 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT19 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - -;TRPT20 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDS+-TREE-PATH-GOES-HERE - +;TRPT1 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT2 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT3 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT4 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT5 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT6 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT7 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT8 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT9 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT10 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT11 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT12 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT13 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT14 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT15 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT16 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT17 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT18 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT19 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - +;TRPT20 TP ptvsrz0 -3 - n 0.000 0.000 0.000 y 1.0 1.0 1.0 1 0 \\TRANSP-MDSplus-TREE-PATH-GOES-HERE - ;===================================================================================================================================================================== ; Stated errors ;-------------- @@ -516,7 +516,7 @@ P1LEVEL RL none 1 - c 0.000 0.00 0.00 n 1.00 1.0 1.0 ;map indx: Used to index multiple map vars and two-dimensional signals ; - negative value: Interpolate FE data to MD position in time plots ; *** pending - negative value: Swap X and Y axes of MD data in profile plots -;MDS tree: Designation for MDS+ tree name from which to read signal +;MDS tree: Designation for MDSplus tree name from which to read signal ;Read sig?: y: read signal, n: skip signal, c: compute signal ; m: read multiple dimensional signal, p: process previous multi-dim signal ;Error rel: Relative error diff --git a/omas/machine_mappings/support_files/nstxu/01152015Av1_0/signals_020916_PF4.dat b/omas/machine_mappings/support_files/nstxu/01152015Av1_0/signals_020916_PF4.dat index 0f51de20..1e7b5476 100644 --- a/omas/machine_mappings/support_files/nstxu/01152015Av1_0/signals_020916_PF4.dat +++ b/omas/machine_mappings/support_files/nstxu/01152015Av1_0/signals_020916_PF4.dat @@ -372,7 +372,7 @@ P1LEVEL RL none 1 - c 0.000 0.00 0.00 n 1.00 1.0 1.0 ;map indx: Used to index multiple map vars and two-dimensional signals ; - negative value: Interpolate FE data to MD position in time plots ; *** pending - negative value: Swap X and Y axes of MD data in profile plots -;MDS tree: Designation for MDS+ tree name from which to read signal +;MDS tree: Designation for MDSplus tree name from which to read signal ;Read sig?: y: read signal, n: skip signal, c: compute signal ; m: read multiple dimensional signal, p: process previous multi-dim signal ;Error rel: Relative error diff --git a/omas/omas_imas.py b/omas/omas_imas.py index bb9687d1..03432f63 100644 --- a/omas/omas_imas.py +++ b/omas/omas_imas.py @@ -719,10 +719,10 @@ def browse_imas( imasdb[username] = {} imasdbdir = user_imasdbdir.replace('/%s/' % os.environ.get('USER', 'default_user'), '/%s/' % username).strip() - # find MDS+ datafiles + # find MDSplus datafiles files = list(recursive_glob('*datafile', imasdbdir)) - # extract machine/pulse/run from filename of MDS+ datafiles + # extract machine/pulse/run from filename of MDSplus datafiles for file in files: tmp = file.split(os.sep) if not re.match('ids_[0-9]{5,}.datafile', tmp[-1]): diff --git a/omas/omas_machine.py b/omas/omas_machine.py index 4fabfc98..591fe783 100644 --- a/omas/omas_machine.py +++ b/omas/omas_machine.py @@ -245,7 +245,7 @@ def resolve_mapped(ods, machine, pulse, mappings, location, idm, options_with_d else: return ods, {'raw_data': ods, 'processed_data': ods, 'cocosio': cocosio, 'branch': mappings['__branch__']} - # MDS+ + # MDSplus elif 'TDI' in mapped: try: if 'treename' in mapped: @@ -288,10 +288,10 @@ def resolve_mapped(ods, machine, pulse, mappings, location, idm, options_with_d ods[location] = data else: with omas_environment(ods, cocosio=cocosio): - dsize = len(data.shape) # size of the data fetched from MDS+ + dsize = len(data.shape) # size of the data fetched from MDSplus csize = len(mapped.get('COORDINATES', [])) # number of coordinates osize = len([c for c in mapped.get('COORDINATES', []) if c != '1...N']) # number of named coordinates - asize = location.count(':') + csize # data size required from MDS+ to make the assignement + asize = location.count(':') + csize # data size required from MDSplus to make the assignement if asize != dsize: raise Exception( f"Experiment data {data.shape} does not fit in `{location}` [{', '.join([':'] * location.count(':') + mapped.get('COORDINATES', []))}]" diff --git a/omas/tests/test_omas_machine.py b/omas/tests/test_omas_machine.py index 658758a9..9129f6c9 100644 --- a/omas/tests/test_omas_machine.py +++ b/omas/tests/test_omas_machine.py @@ -90,6 +90,6 @@ def test_python(self): ods, info = machine_to_omas(ODS(), self.machine, self.pulse, location) def test_tdi(self): - # make sure all machines have a MDS+ server assigned + # make sure all machines have a MDSplus server assigned for machine in machines(): machine_mappings(self.machine, '')['__mdsserver__'] diff --git a/omas/utilities/omas_mds.py b/omas/utilities/omas_mds.py index 9bb577a2..3cce1bdf 100644 --- a/omas/utilities/omas_mds.py +++ b/omas/utilities/omas_mds.py @@ -10,7 +10,7 @@ def get_pulse_id(pulse, run_id=None): """ - Converts the pulse number into a MDS+ run_id + Converts the pulse number into a MDSplus run_id :param pulse: Regular shot number @@ -44,18 +44,18 @@ def check_for_pulse_id(pulse, treename, options_with_defaults): _mds_connection_cache = {} # =================== -# MDS+ functions +# MDSplus functions # =================== def tunnel_mds(server, treename): """ - Resolve MDS+ server - NOTE: This function makes use of the optional `omfit_classes` dependency to establish a SSH tunnel to the MDS+ server. + Resolve MDSplus server + NOTE: This function makes use of the optional `omfit_classes` dependency to establish a SSH tunnel to the MDSplus server. - :param server: MDS+ server address:port + :param server: MDSplus server address:port :param treename: treename (in case treename affects server to be used) - :return: string with MDS+ server and port to be used + :return: string with MDSplus server and port to be used """ try: import omfit_classes.omfit_mds @@ -74,7 +74,7 @@ def tunnel_mds(server, treename): class mdsvalue(dict): """ - Execute MDS+ TDI functions + Execute MDSplus TDI functions """ def __init__(self, server, treename, pulse, TDI, old_MDS_server=False): @@ -122,10 +122,10 @@ def size(self, dim): def raw(self, TDI=None): """ - Fetch data from MDS+ with connection caching + Fetch data from MDSplus with connection caching :param TDI: string, list or dict of strings - MDS+ TDI expression(s) (overrides the one passed when the object was instantiated) + MDSplus TDI expression(s) (overrides the one passed when the object was instantiated) :return: result of TDI expression, or dictionary with results of TDI expressions """ @@ -137,7 +137,7 @@ def raw(self, TDI=None): def mdsk(value): """ - Translate strings to MDS+ bytes + Translate strings to MDSplus bytes """ return str(str(value).encode('utf8')) @@ -169,7 +169,7 @@ def mdsk(value): # dictionary of TDI expressions if isinstance(TDI, dict): - # old versions of MDS+ server do not support getMany + # old versions of MDSplus server do not support getMany if self.old_MDS_server: results = {} for tdi in TDI: @@ -179,7 +179,7 @@ def mdsk(value): results[tdi] = Exception(str(_excp)) out_results = results - # more recent MDS+ server + # more recent MDSplus server else: conns = conn.getMany() for name, expr in TDI.items(): @@ -229,7 +229,7 @@ def mdsk(value): class mdstree(dict): """ - Class to handle the structure of an MDS+ tree. + Class to handle the structure of an MDSplus tree. Nodes in this tree are mdsvalue objects """ @@ -247,4 +247,4 @@ def __init__(self, server, treename, pulse): if path[-1] not in h: h[path[-1]] = mdsvalue(server, treename, pulse, TDI) else: - h[path[-1]].TDI = TDI \ No newline at end of file + h[path[-1]].TDI = TDI