Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
040723d
Add EfitTimeSettting.d3d_times, and SignalTimeSetting parameter use_e…
yumouwei Apr 9, 2025
cb562f0
D3D timebase unit conversion
yumouwei Apr 9, 2025
5c385fa
unwind np.where outputs in time_settings.py
yumouwei Apr 23, 2025
2060a0c
fix bug from previous commit
yumouwei Apr 23, 2025
f9d9a15
Add CMOD & EAST IpTimeSetting
yumouwei Apr 23, 2025
c819a50
Add use_efit_time_range option (default to False) to IpTimeSetting
yumouwei Apr 23, 2025
5a20e6e
Add wrapper in SignalTimeSetting to allow using tree_name='ptdata'. M…
yumouwei Apr 23, 2025
eb265de
Correct D3D IpTimeSetting tree_name
yumouwei Apr 23, 2025
99dce63
minor
yumouwei Apr 24, 2025
8ad26aa
Get the unit of the signal timebase and then perform unit conversion;…
yumouwei Apr 24, 2025
ddb8e5a
Create machine-independent get_efit_times. Tested it on D3D.
yumouwei Apr 24, 2025
7fc92b4
Create MDSConnection.get_unit and get_unit_of_dim methods
yumouwei Apr 24, 2025
8e4d3d7
fix line-too-long
yumouwei Apr 24, 2025
1a808a9
Tested get_efit_times on EAST
yumouwei Apr 25, 2025
711f26e
Remove EfitTimeSetting d3d & east_times
yumouwei Apr 25, 2025
b04f25e
drop the now-unused max_shot_time
gtrevisan Apr 28, 2025
d74e013
Remove get_unit and get_unit_of_dim methods
yumouwei Apr 29, 2025
0549132
Remove duplicated time points in SignalTimeSetting. Need more general…
yumouwei Apr 29, 2025
90e14da
Make get_efit_times the default method in EfitTImeSetting. Tested on …
yumouwei Apr 29, 2025
650e825
improve ugly line-too-long fix
yumouwei Apr 29, 2025
791069b
Skip unnecessary [s]->[s] unit conversion
yumouwei Apr 29, 2025
754a1c9
base class returns unique and ordered times
gtrevisan Apr 29, 2025
ef3661e
fixup! base class returns unique and ordered times
gtrevisan Apr 29, 2025
9753b3b
call unique for overridden methods, too
gtrevisan Apr 29, 2025
c4ab0f6
add SharedTimeSetting
gtrevisan Apr 29, 2025
6fd9619
add SharedTimeSetting logic to resolver
gtrevisan Apr 29, 2025
e32388b
remove use_efit_time_range
gtrevisan Apr 29, 2025
2c848c7
add ip_efit as shortcut for a SharedTimeSetting
gtrevisan Apr 29, 2025
8679d8d
minor tweaks
gtrevisan Apr 29, 2025
d4fdcfb
add _postprocess utility for times
gtrevisan Apr 29, 2025
6958a0e
add typing for SharedTimeSetting
gtrevisan Apr 29, 2025
dd17f7f
Implement unit test for time_setting
yumouwei Apr 29, 2025
80f6b20
fix pylint errors
yumouwei Apr 29, 2025
1794c96
read tokamak from pytest fixtures
gtrevisan Apr 29, 2025
5c4a542
avoid unnecessary ValueErrors
gtrevisan Apr 29, 2025
47c7ba0
skip DisruptionTimeSetting for C-MOD
gtrevisan Apr 29, 2025
709e3ed
revamp time setting setups with keyed dicts
gtrevisan Apr 29, 2025
354981f
fix test_disruption_time_setting bug
yumouwei Apr 30, 2025
752b9f0
remove confusing disruption time setting
gtrevisan May 5, 2025
c86ec9e
refactor time parameters into machine configs
gtrevisan May 5, 2025
54bf4ef
remove test_disruption_time_setting
gtrevisan May 5, 2025
4ef37eb
move other time parameters into machine configs
gtrevisan May 5, 2025
ec18661
refactor time settings into time section
gtrevisan May 5, 2025
27f7ad8
move time_const into time section
gtrevisan May 5, 2025
5198928
Merge remote-tracking branch 'origin/dev' into wei/improve-signal-tim…
gtrevisan May 5, 2025
d3a587e
revamp test_time_setting to use test folders
gtrevisan May 5, 2025
127cf5a
Merge branch 'dev' into wei/improve-signal-time-setting
gtrevisan May 5, 2025
f4ad738
minor bug fix
yumouwei May 6, 2025
f8b4420
Refactor DisruptionTimeSetting
yumouwei May 6, 2025
5a0533f
Merge branch 'dev' into wei/improve-signal-time-setting
yumouwei May 6, 2025
4a3f14a
Update test_time_setting.py docstrings
yumouwei May 6, 2025
5ddf6c8
refactor time config into method, add some type hints
gtrevisan May 6, 2025
776f539
remove cruft from settings
gtrevisan May 6, 2025
79290cd
make _calculate_disruption_times a class method, tweak docstrings
gtrevisan May 6, 2025
0537912
shorten long docstring line
gtrevisan May 6, 2025
66efc59
fixup! shorten long docstring line
gtrevisan May 6, 2025
9053102
other minor type hints
gtrevisan May 6, 2025
b136b22
Merge branch 'dev' into wei/improve-signal-time-setting
gtrevisan May 7, 2025
cd28c53
do not complain if .ssh exists
gtrevisan May 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:

- name: Setup SSH key
run: |
mkdir ~/.ssh
mkdir -p ~/.ssh
echo "${{ secrets.SSH_TUNNEL }}" \
| tee ~/.ssh/id_rsa \
| sha256sum
Expand Down
7 changes: 3 additions & 4 deletions disruption_py/config.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[default]
max_shot_time = 7.0 # [s]
time_const = 1e-6

[default.tests]
match_fraction = 0.95 # Fraction of signals that must match between MDSplus and SQL
val_tolerance = 0.01 # Tolerance for comparing values between MDSplus and SQL
verbose_output = true

[default.time]
time_const = 1e-6
9 changes: 9 additions & 0 deletions disruption_py/machine/d3d/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,12 @@ disrup1_fast = 161228
disrup2_full = 161237
no_disrup1_full = 166177
no_disrup2_full = 166253

[d3d.time]
disruption_time_start = 0.1
disruption_time_step = 0.025
dt_before_disruption = 0.002
duration_before_disruption = 0.10
end_of_current_threshold = 100e3
minimum_duration = 0.1
minimum_ip = 400e3
12 changes: 9 additions & 3 deletions disruption_py/machine/east/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[east]
max_shot_time = 0 # disabled

[east.inout.mds]
mdsplus_connection_string = "mds.ipp.ac.cn"

Expand Down Expand Up @@ -108,3 +105,12 @@ disrup1_fast = 55012
disrup2_full = 56020
disrup3_full = 56549
disrup4_full = 57508

[east.time]
disruption_time_start = 0.2
disruption_time_step = 0.1
dt_before_disruption = 0.010
duration_before_disruption = 0.25
end_of_current_threshold = 200e3
minimum_duration = 0.6
minimum_ip = 200e3
Loading