diff --git a/src/icartt/dataset.py b/src/icartt/dataset.py index d49ceaf7d7379a577edba30d88f905b60ab44714..e4a685b40448815a114f984c735bdad31768acd4 100644 --- a/src/icartt/dataset.py +++ b/src/icartt/dataset.py @@ -8,7 +8,7 @@ from enum import IntEnum import numpy as np -from . import ictutils as utl +from . import utils DEFAULT_NUM_FORMAT = "%g" """Default number format for output. Provides the `fmt` parameter of :func:`numpy.savetxt` internally.""" @@ -504,7 +504,7 @@ class Dataset: if self.inputFhandle: if self.inputFhandle.closed: self.inputFhandle = open(self.inputFhandle.name, encoding="utf-8") - f = utl.FilehandleWithLinecounter(self.inputFhandle, delimiter) + f = utils.FilehandleWithLinecounter(self.inputFhandle, delimiter) self._readHeader(f) self.inputFhandle.close() @@ -569,7 +569,7 @@ class Dataset: if self.format == Formats.FFI2110: dmp = f.readline() - shortname, units, standardname, longname = utl.extractVardesc(dmp) + shortname, units, standardname, longname = utils.extractVardesc(dmp) self.independentBoundedVariable = Variable( shortname, units, @@ -579,7 +579,7 @@ class Dataset: ) dmp = f.readline() - shortname, units, standardname, longname = utl.extractVardesc(dmp) + shortname, units, standardname, longname = utils.extractVardesc(dmp) self.independentVariable = Variable( shortname, units, @@ -612,7 +612,7 @@ class Dataset: # the name used for that variable as a column header, i.e., the last header # line prior to start of data.). dmp = f.readline() - shortname, units, standardname, longname = utl.extractVardesc(dmp) + shortname, units, standardname, longname = utils.extractVardesc(dmp) vshortname = [shortname] vunits = [units] vstandardname = [standardname] @@ -620,7 +620,7 @@ class Dataset: for _ in range(1, nvar): dmp = f.readline() - shortname, units, standardname, longname = utl.extractVardesc(dmp) + shortname, units, standardname, longname = utils.extractVardesc(dmp) vshortname += [shortname] vunits += [units] vstandardname += [standardname] diff --git a/src/icartt/ictutils.py b/src/icartt/utils.py similarity index 100% rename from src/icartt/ictutils.py rename to src/icartt/utils.py