Skip to content

Commit 52a8754

Browse files
committed
Merge branch 'metams-compatibility' into 'master'
Update GCMSBase class `parameters` property Closes #189 See merge request mass-spectrometry/corems!147
2 parents 581da35 + 21fbc73 commit 52a8754

1 file changed

Lines changed: 16 additions & 4 deletions

File tree

corems/mass_spectra/factory/GC_Class.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,18 @@ def set_scans_number_from_data(self):
201201

202202
self.scans_number = sorted(self._ms.keys())
203203

204+
@property
205+
def parameters(self):
206+
"""GCMS Parameters"""
207+
return self._parameters
208+
209+
@parameters.setter
210+
def parameters(self, gcms_parameters_instance):
211+
self._parameters = gcms_parameters_instance
212+
213+
# Note: maintaining `parameter` for backwards compatibility,
214+
# but proper usage would reference `parameters` to conform
215+
# to other classes.
204216
@property
205217
def parameter(self):
206218
"""GCMS Parameters"""
@@ -213,20 +225,20 @@ def parameter(self, gcms_parameters_instance):
213225
@property
214226
def molecular_search_settings(self):
215227
"""Molecular Search Settings"""
216-
return self.parameter.molecular_search
228+
return self.parameters.molecular_search
217229

218230
@molecular_search_settings.setter
219231
def molecular_search_settings(self, settings_class_instance):
220-
self.parameter.molecular_search = settings_class_instance
232+
self.parameters.molecular_search = settings_class_instance
221233

222234
@property
223235
def chromatogram_settings(self):
224236
"""Chromatogram Settings"""
225-
return self.parameter.gc_ms
237+
return self.parameters.gc_ms
226238

227239
@chromatogram_settings.setter
228240
def chromatogram_settings(self, settings_class_instance):
229-
self.parameter.gc_ms = settings_class_instance
241+
self.parameters.gc_ms = settings_class_instance
230242

231243
@property
232244
def scans_number(self):

0 commit comments

Comments
 (0)