Code

Set ODS from ids objects#282

Code

Closed

AreWeDreaming wants to merge 69 commits intomastergafusion/omas:masterfrom imas_set_for_ids_objectsgafusion/omas:imas_set_for_ids_objectsCopy head branch name to clipboard

+1,089-436

Commits

Commits on Nov 30, 2022

• Extended magnetic mapping

  Show description for f0e5394
  AreWeDreaming

  committed
  f0e5394

  Copy full SHA for f0e5394

Commits on Jan 5, 2023

• Fixed some horrible math errors from last commit

  Show description for 2f0e0b3
  AreWeDreaming

  committed
  2f0e0b3

  Copy full SHA for 2f0e0b3

Commits on Feb 16, 2023

• Fixed error in rho_tor to rho_pol conversion

  AreWeDreaming

  committed
  a634444

  Copy full SHA for a634444

• Merged master into this branch

  AreWeDreaming

  committed
  1d7ab5e

  Copy full SHA for 1d7ab5e

• Fixed some bugs, but the result is still wrong

  AreWeDreaming

  committed
  a35e79d

  Copy full SHA for a35e79d

• Fixed broken psi <-> conversion

  Show description for df2cf6b
  AreWeDreaming

  committed
  df2cf6b

  Copy full SHA for df2cf6b

Commits on Jul 13, 2023

• Merge remote-tracking branch 'origin/master' into mapping_to_from_rho_tor_norm

  AreWeDreaming

  committed
  989b295

  Copy full SHA for 989b295

Commits on Jul 17, 2023

• Some changes that allow imas_set for ids objects

  AreWeDreaming

  committed
  fbdd940

  Copy full SHA for fbdd940

Commits on Jul 18, 2023

• Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  37fb8f0

  Copy full SHA for 37fb8f0

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  ed3700f

  Copy full SHA for ed3700f

• Merge remote-tracking branch 'origin/imas_set_for_ids_objects' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  bae815f

  Copy full SHA for bae815f

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  d0a7197

  Copy full SHA for d0a7197

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  432a26b

  Copy full SHA for 432a26b

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  97d4aba

  Copy full SHA for 97d4aba

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  537f900

  Copy full SHA for 537f900

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  a71f710

  Copy full SHA for a71f710

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  8bf84e6

  Copy full SHA for 8bf84e6

Commits on Jul 19, 2023

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  b1df43a

  Copy full SHA for b1df43a

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  a8c90d9

  Copy full SHA for a8c90d9

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  699ec70

  Copy full SHA for 699ec70

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  1382e78

  Copy full SHA for 1382e78

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  48371b6

  Copy full SHA for 48371b6

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  8d958d7

  Copy full SHA for 8d958d7

• Cherry picked changes from omas_viewer_dev

  AreWeDreaming

  committed
  d7ad23e

  Copy full SHA for d7ad23e

• Fixed missing raised exception

  AreWeDreaming

  committed
  8bb1966

  Copy full SHA for 8bb1966

• Merge branch 'EFIT_mdsplus_mapping' into cherry_pick_omas_viewer_dev

  AreWeDreaming

  committed
  9a93cb5

  Copy full SHA for 9a93cb5

• How to fix closest_wall_point.distance

  AreWeDreaming

  committed
  ed4dc2b

  Copy full SHA for ed4dc2b

• Fixed extra argument in min)4

  AreWeDreaming

  committed
  97df88f

  Copy full SHA for 97df88f

• Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  be1243f

  Copy full SHA for be1243f

• Fixed missing raised exception

  AreWeDreaming

  committed
  6b0bf16

  Copy full SHA for 6b0bf16

• Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  ada7df0

  Copy full SHA for ada7df0

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into cherry_pick_omas_viewer_dev

  AreWeDreaming

  committed
  ea7fe8a

  Copy full SHA for ea7fe8a

• Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  79fd988

  Copy full SHA for 79fd988

Commits on Jul 20, 2023

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  3d43089

  Copy full SHA for 3d43089

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  19204ba

  Copy full SHA for 19204ba

• Merge efit_mds branch

  AreWeDreaming

  committed
  6a39152

  Copy full SHA for 6a39152

• Merge branch 'EFIT_mdsplus_mapping' into cherry_pick_omas_viewer_dev

  AreWeDreaming

  committed
  82eb8a9

  Copy full SHA for 82eb8a9

• Merge branch 'EFIT_mdsplus_mapping' into cherry_pick_omas_viewer_dev

  AreWeDreaming

  committed
  1ab073b

  Copy full SHA for 1ab073b

• Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  767e7b9

  Copy full SHA for 767e7b9

Commits on Jul 27, 2023

• Changes needed to get ITPA IDA to work

  Show description for ad2dc06
  AreWeDreaming

  committed
  ad2dc06

  Copy full SHA for ad2dc06

Commits on Jul 28, 2023

• Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  98c74dd

  Copy full SHA for 98c74dd

• Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  946b5d0

  Copy full SHA for 946b5d0

• Fix summary plot w. new mapping

  Show description for 914183b
  AreWeDreaming

  committed
  914183b

  Copy full SHA for 914183b

• Fix indenting

  AreWeDreaming

  committed
  241f4bb

  Copy full SHA for 241f4bb

• Exception handling to look at older EFIT MDS+

  AreWeDreaming

  committed
  1ce3cf3

  Copy full SHA for 1ce3cf3

Commits on Jul 29, 2023

• Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  0d9a398

  Copy full SHA for 0d9a398

• Merge branch 'test_new_EFIT_mappings_for_IDA' of github.com:gafusion/omas into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  2470512

  Copy full SHA for 2470512

Commits on Jul 31, 2023

• Merge indentation fixes

  AreWeDreaming

  committed
  d363957

  Copy full SHA for d363957

• Merge branch 'test_new_EFIT_mappings_for_IDA' of github.com:gafusion/omas into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  e12d609

  Copy full SHA for e12d609

• Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  dc92fa9

  Copy full SHA for dc92fa9

• Merge branch 'EFIT_mdsplus_mapping' into cherry_pick_omas_viewer_dev

  AreWeDreaming

  committed
  a7fcf51

  Copy full SHA for a7fcf51

• Fixes for the failing omas_plot regression test

  AreWeDreaming

  committed
  4a3b09e

  Copy full SHA for 4a3b09e

Commits on Aug 1, 2023

• More robustly handle multiple run ids

  AreWeDreaming

  committed
  db70f71

  Copy full SHA for db70f71

• Added density_thermal, begrudgingly

  AreWeDreaming

  committed
  96a5170

  Copy full SHA for 96a5170

Commits on Aug 8, 2023

• Handling mismatched times from profiles and eq

  AreWeDreaming

  committed
  5576428

  Copy full SHA for 5576428

Commits on Aug 10, 2023

• Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into omas_plot_w_new_EFIT_mapping

  AreWeDreaming

  committed
  a0cf687

  Copy full SHA for a0cf687

Commits on Aug 12, 2023

• use_subplot support without manager

  AreWeDreaming

  committed
  0b3ed22

  Copy full SHA for 0b3ed22

Commits on Aug 15, 2023

• Merge branch 'master' into test_new_EFIT_mappings_for_IDA

  AreWeDreaming

  committed
  a613a21

  Copy full SHA for a613a21

• Merge branch 'test_new_EFIT_mappings_for_IDA' into omas_plot_w_new_EFIT_mapping

  AreWeDreaming

  committed
  2b0ff47

  Copy full SHA for 2b0ff47

Commits on Sep 21, 2023

• Fixed error in carbon density and redundant loads

  AreWeDreaming

  committed
  3c19d7b

  Copy full SHA for 3c19d7b

Commits on Oct 10, 2023

• Merge remote-tracking branch 'origin/master' into cherry_pick_omas_viewer_dev

  AreWeDreaming

  committed
  cd09d0d

  Copy full SHA for cd09d0d

• Attempt to fix regression

  AreWeDreaming

  committed
  51dba47

  Copy full SHA for 51dba47

Commits on Dec 4, 2023

• Merge remote-tracking branch 'origin/master' into omas_plot_w_new_EFIT_mapping

  AreWeDreaming

  committed
  8c0f4d7

  Copy full SHA for 8c0f4d7

Commits on Dec 11, 2023

• Merge branch 'master' into cherry_pick_omas_viewer_dev

  AreWeDreaming

  committed
  e0351d1

  Copy full SHA for e0351d1

• electrons.density_~~thermal~~

  AreWeDreaming

  committed
  bef0a6e

  Copy full SHA for bef0a6e

• Fixed density_thermal in sample data

  AreWeDreaming

  committed
  b627204

  Copy full SHA for b627204

• Robustness upgrades to pass omas_test_plot

  AreWeDreaming

  committed
  77bad43

  Copy full SHA for 77bad43

Commits on Dec 12, 2023

• Replace deprecated interp2d->RectBivariateSpline

  Show description for ddaf49d
  AreWeDreaming

  committed
  ddaf49d

  Copy full SHA for ddaf49d

• Merge branch 'cherry_pick_omas_viewer_dev' into omas_plot_w_new_EFIT_mapping

  AreWeDreaming

  committed
  df0ae53

  Copy full SHA for df0ae53