Commit 8a331f5
adding shotlists
1 parent 4a8c23c commit 8a331f5
1 file changed
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,7 +6,6 @@ | |||
| 6 | 6 | ''' | |
| 7 | 7 | from __future__ import print_function | |
| 8 | 8 | from MDSplus import * | |
| 9 | - from data_processing import ShotList | ||
| 10 | 9 | from pylab import * | |
| 11 | 10 | import numpy as np | |
| 12 | 11 | import sys | |
@@ -18,6 +17,8 @@ | |||
| 18 | 17 | ||
| 19 | 18 | import gadata | |
| 20 | 19 | ||
| 20 | + from plasma.primitives.shots import ShotList | ||
| 21 | + | ||
| 21 | 22 | #print("Importing numpy version"+np.__version__) | |
| 22 | 23 | ||
| 23 | 24 | prepath = '/cscratch/share/frnn' | |
@@ -40,7 +41,7 @@ | |||
| 40 | 41 | elif machine == 'd3d': | |
| 41 | 42 | # shot_numbers_files = ['shotlist_JaysonBarr_clear.txt'] | |
| 42 | 43 | # shot_numbers_files = ['shotlist_JaysonBarr_disrupt.txt'] | |
| 43 | - shot_numbers_files = ['d3d_single_clear.txt']# ,'d3d_clear.txt', 'd3d_disrupt.txt'] | ||
| 44 | + shot_numbers_files = ['d3d_short_clear.txt']# ,'d3d_clear.txt', 'd3d_disrupt.txt'] | ||
| 44 | 45 | server_path = 'atlas.gat.com' | |
| 45 | 46 | import d3d_signals | |
| 46 | 47 | # signal_paths = ['PINJ','IP','Q95','DENSITY','WMHD'] #,'PRAD'] #PRAD returns a 2D xdata | |
0 commit comments