Skip to content

Commit 5f1d12c

Browse files
committed
remove jemris
1 parent 30cdbcf commit 5f1d12c

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

src/pypulseq/Sequence/read_seq.py

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ def read(self, path: str, detect_rf_use: bool = False, remove_duplicates: bool =
6060
self.extension_string_idx = []
6161
self.extension_numeric_idx = []
6262

63-
jemris_generated = False
6463
version_combined = 0
6564

6665
# Load data from file
@@ -89,8 +88,6 @@ def read(self, path: str, detect_rf_use: bool = False, remove_duplicates: bool =
8988
else:
9089
warnings.warn(f'No BlockDurationRaster found in file. Using default of {self.block_duration_raster}.')
9190

92-
elif section == '[JEMRIS]':
93-
jemris_generated = True
9491
elif section == '[SIGNATURE]':
9592
temp_sign_defs = __read_definitions(input_file)
9693
if 'Type' in temp_sign_defs:
@@ -128,27 +125,21 @@ def read(self, path: str, detect_rf_use: bool = False, remove_duplicates: bool =
128125
)
129126
self.block_events, self.block_durations, delay_ind_temp = result
130127
elif section == '[RF]':
131-
if jemris_generated:
132-
self.rf_library = __read_events(input_file, (1, 1, 1, 1, 1), event_library=self.rf_library)
133-
else:
134-
if version_combined >= 1004000: # 1.4.x format
135-
self.rf_library = __read_events(
136-
input_file,
137-
(1, 1, 1, 1, 1e-6, 1, 1),
138-
event_library=self.rf_library,
139-
)
140-
else: # 1.3.x and below
141-
self.rf_library = __read_events(input_file, (1, 1, 1, 1e-6, 1, 1), event_library=self.rf_library)
128+
if version_combined >= 1004000: # 1.4.x format
129+
self.rf_library = __read_events(
130+
input_file,
131+
(1, 1, 1, 1, 1e-6, 1, 1),
132+
event_library=self.rf_library,
133+
)
134+
else: # 1.3.x and below
135+
self.rf_library = __read_events(input_file, (1, 1, 1, 1e-6, 1, 1), event_library=self.rf_library)
142136
elif section == '[GRADIENTS]':
143137
if version_combined >= 1004000: # 1.4.x format
144138
self.grad_library = __read_events(input_file, (1, 1, 1, 1e-6), 'g', self.grad_library)
145139
else: # 1.3.x and below
146140
self.grad_library = __read_events(input_file, (1, 1, 1e-6), 'g', self.grad_library)
147141
elif section == '[TRAP]':
148-
if jemris_generated:
149-
self.grad_library = __read_events(input_file, (1, 1e-6, 1e-6, 1e-6), 't', self.grad_library)
150-
else:
151-
self.grad_library = __read_events(input_file, (1, 1e-6, 1e-6, 1e-6, 1e-6), 't', self.grad_library)
142+
self.grad_library = __read_events(input_file, (1, 1e-6, 1e-6, 1e-6, 1e-6), 't', self.grad_library)
152143
elif section == '[ADC]':
153144
self.adc_library = __read_events(
154145
input_file, (1, 1e-9, 1e-6, 1, 1), event_library=self.adc_library, append=self.system.adc_dead_time

0 commit comments

Comments
 (0)