Skip to content

Commit 4a5ecfe

Browse files
torrinbatorrinba
authored
Merge pull request #382 from gafusion/d3d_rip_mapping
Add mapping for DIII-D RIP diagnostic
2 parents c20e829 + 01828da commit 4a5ecfe

File tree

4 files changed

+397
-28
lines changed

4 files changed

+397
-28
lines changed

‎omas/machine_mappings/d3d.json‎

Lines changed: 104 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
"default_tree": "D3D",
1616
"fast_ece": false,
1717
"get_all": true,
18+
"include_CO2": true,
19+
"include_RIP": true,
1820
"nref": 0,
1921
"revision": "BLESSED",
2022
"store_differential": false
@@ -444,52 +446,82 @@
444446
"PYTHON": "gas_injection_hardware(ods, {pulse})"
445447
},
446448
"interferometer.channel.:": {
447-
"PYTHON": "interferometer_hardware(ods, {pulse})"
449+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
448450
},
449451
"interferometer.channel.:.identifier": {
450-
"PYTHON": "interferometer_hardware(ods, {pulse})"
452+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
451453
},
452454
"interferometer.channel.:.line_of_sight.first_point.phi": {
453455
"COCOSIO": 11,
454-
"PYTHON": "interferometer_hardware(ods, {pulse})"
456+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
455457
},
456458
"interferometer.channel.:.line_of_sight.first_point.r": {
457-
"PYTHON": "interferometer_hardware(ods, {pulse})"
459+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
458460
},
459461
"interferometer.channel.:.line_of_sight.first_point.z": {
460-
"PYTHON": "interferometer_hardware(ods, {pulse})"
462+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
461463
},
462464
"interferometer.channel.:.line_of_sight.second_point.phi": {
463465
"COCOSIO": 11,
464-
"PYTHON": "interferometer_hardware(ods, {pulse})"
466+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
465467
},
466468
"interferometer.channel.:.line_of_sight.second_point.r": {
467-
"PYTHON": "interferometer_hardware(ods, {pulse})"
469+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
468470
},
469471
"interferometer.channel.:.line_of_sight.second_point.z": {
470-
"PYTHON": "interferometer_hardware(ods, {pulse})"
472+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
471473
},
472474
"interferometer.channel.:.line_of_sight.third_point.phi": {
473475
"COCOSIO": 11,
474-
"PYTHON": "interferometer_hardware(ods, {pulse})"
476+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
475477
},
476478
"interferometer.channel.:.line_of_sight.third_point.r": {
477-
"PYTHON": "interferometer_hardware(ods, {pulse})"
479+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
478480
},
479481
"interferometer.channel.:.line_of_sight.third_point.z": {
480-
"PYTHON": "interferometer_hardware(ods, {pulse})"
482+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
481483
},
482484
"interferometer.channel.:.n_e_line.data": {
483-
"PYTHON": "interferometer_data(ods, {pulse})"
485+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
486+
},
487+
"interferometer.channel.:.n_e_line.data_error_upper": {
488+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
484489
},
485490
"interferometer.channel.:.n_e_line.time": {
486-
"PYTHON": "interferometer_data(ods, {pulse})"
491+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
492+
},
493+
"interferometer.channel.:.n_e_line.validity": {
494+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
487495
},
488496
"interferometer.channel.:.n_e_line.validity_timed": {
489-
"PYTHON": "interferometer_data(ods, {pulse})"
497+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
490498
},
491499
"interferometer.channel.:.name": {
492-
"PYTHON": "interferometer_hardware(ods, {pulse})"
500+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
501+
},
502+
"interferometer.channel.:.wavelength.:": {
503+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
504+
},
505+
"interferometer.channel.:.wavelength.:.fringe_jump_correction": {
506+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
507+
},
508+
"interferometer.channel.:.wavelength.:.fringe_jump_correction_times": {
509+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
510+
},
511+
"interferometer.channel.:.wavelength.:.phase_corrected.data": {
512+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
513+
},
514+
"interferometer.channel.:.wavelength.:.phase_corrected.data_error_upper": {
515+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
516+
},
517+
"interferometer.channel.:.wavelength.:.phase_corrected.time": {
518+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
519+
},
520+
"interferometer.channel.:.wavelength.:.phase_to_n_e_line": {
521+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
522+
},
523+
"interferometer.channel.:.wavelength.:.value": {
524+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
493525
},
494526
"langmuir_probes.embedded.:": {
495527
"PYTHON": "langmuir_probes_hardware(ods, {pulse})"
@@ -723,6 +755,63 @@
723755
"pf_active.coil.:.name": {
724756
"PYTHON": "pf_active_hardware(ods, {pulse})"
725757
},
758+
"polarimeter.channel.:": {
759+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
760+
},
761+
"polarimeter.channel.:.faraday_angle.data": {
762+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
763+
},
764+
"polarimeter.channel.:.faraday_angle.data_error_upper": {
765+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
766+
},
767+
"polarimeter.channel.:.faraday_angle.time": {
768+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
769+
},
770+
"polarimeter.channel.:.faraday_angle.validity": {
771+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
772+
},
773+
"polarimeter.channel.:.faraday_angle.validity_timed": {
774+
"PYTHON": "interferometer_polarimeter_data(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
775+
},
776+
"polarimeter.channel.:.identifier": {
777+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
778+
},
779+
"polarimeter.channel.:.line_of_sight.first_point.phi": {
780+
"COCOSIO": 11,
781+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
782+
},
783+
"polarimeter.channel.:.line_of_sight.first_point.r": {
784+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
785+
},
786+
"polarimeter.channel.:.line_of_sight.first_point.z": {
787+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
788+
},
789+
"polarimeter.channel.:.line_of_sight.second_point.phi": {
790+
"COCOSIO": 11,
791+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
792+
},
793+
"polarimeter.channel.:.line_of_sight.second_point.r": {
794+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
795+
},
796+
"polarimeter.channel.:.line_of_sight.second_point.z": {
797+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
798+
},
799+
"polarimeter.channel.:.line_of_sight.third_point.phi": {
800+
"COCOSIO": 11,
801+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
802+
},
803+
"polarimeter.channel.:.line_of_sight.third_point.r": {
804+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
805+
},
806+
"polarimeter.channel.:.line_of_sight.third_point.z": {
807+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
808+
},
809+
"polarimeter.channel.:.name": {
810+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
811+
},
812+
"polarimeter.channel.:.wavelength": {
813+
"PYTHON": "interferometer_polarimeter_hardware(ods, {pulse}, {include_CO2!r}, {include_RIP!r})"
814+
},
726815
"summary.global_quantities.power_radiated_inside_lcfs.value": {
727816
"PYTHON": "summary(ods, {pulse})"
728817
},

0 commit comments

Comments
 (0)