[segyio] 156/376: Align enumerations to established names
Jørgen Kvalsvik
jokva-guest at moszumanska.debian.org
Wed Sep 20 08:04:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
jokva-guest pushed a commit to branch debian
in repository segyio.
commit a3f0f6474a7115f01e82ac5450fddeaf6d46b702
Author: Jørgen Kvalsvik <jokva at statoil.com>
Date: Wed Jan 11 09:08:58 2017 +0100
Align enumerations to established names
Change names to match those in existing code bases so that the Segy
prefixed functions are drop-in compatible.
---
mex/Segy.m | 8 ++++----
mex/TraceField.m | 28 ++++++++++++++--------------
mex/TraceSortingFormat.m | 6 +++---
tests/test_segy_mex.m | 20 ++++++++++----------
tests/test_segyspec_mex.m | 28 ++++++++++++++--------------
5 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/mex/Segy.m b/mex/Segy.m
index fe8f951..0829565 100644
--- a/mex/Segy.m
+++ b/mex/Segy.m
@@ -162,10 +162,10 @@ classdef Segy
t0 = 0;
end
if nargin < 3
- xl_word = TraceField.CROSSLINE_3D;
+ xl_word = TraceField.Crossline3D;
end
if nargin < 2
- il_word = TraceField.INLINE_3D;
+ il_word = TraceField.Inline3D;
end
% for compatibility with old code; if argument is passed as a
@@ -195,9 +195,9 @@ classdef Segy
function data = get_cube(sc)
data = Segy.get_traces(sc.filename);
- if sc.trace_sorting_format == TraceSortingFormat.INLINE
+ if sc.trace_sorting_format == TraceSortingFormat.iline
data = reshape( data, size( sc.sample_indexes, 1 ), size( sc.xline, 1 ), size( sc.iline, 1 ) );
- elseif sc.trace_sorting_format == TraceSortingFormat.XLINE
+ elseif sc.trace_sorting_format == TraceSortingFormat.xline
data = reshape( data, size( sc.sample_indexes, 1 ), size( sc.iline, 1 ), size( sc.xline, 1 ) );
else
warning('Sorting was not set properly. Data returned as single long line');
diff --git a/mex/TraceField.m b/mex/TraceField.m
index 410875a..cef7ec4 100644
--- a/mex/TraceField.m
+++ b/mex/TraceField.m
@@ -1,13 +1,13 @@
classdef TraceField < int32
% add comment here
enumeration
- TRACE_SEQUENCE_LINE (1)
- TRACE_SEQUENCE_FILE (5)
+ TraceSequenceLine (1)
+ TraceSequenceFile (5)
FieldRecord (9)
TraceNumber (13)
EnergySourcePoint (17)
- CDP (21)
- CDP_TRACE (25)
+ cdp (21)
+ cdpTrace (25)
TraceIdentificationCode (29)
NSummedTraces (31)
NStackedTraces (33)
@@ -39,14 +39,14 @@ classdef TraceField < int32
DelayRecordingTime (109)
MuteTimeStart (111)
MuteTimeEND (113)
- TRACE_SAMPLE_COUNT (115)
- TRACE_SAMPLE_INTERVAL (117)
+ ns (115)
+ dt (117)
GainType (119)
InstrumentGainConstant (121)
InstrumentInitialGain (123)
Correlated (125)
- SweepFrequencyStart (127)
- SweepFrequencyEnd (129)
+ SweepFrequenceStart (127)
+ SweepFrequenceEnd (129)
SweepLength (131)
SweepType (133)
SweepTraceTaperLengthStart (135)
@@ -66,16 +66,16 @@ classdef TraceField < int32
MinuteOfHour (163)
SecondOfMinute (165)
TimeBaseCode (167)
- TraceWeightingFactor (169)
+ TraceWeightningFactor (169)
GeophoneGroupNumberRoll1 (171)
GeophoneGroupNumberFirstTraceOrigField (173)
GeophoneGroupNumberLastTraceOrigField (175)
GapSize (177)
OverTravel (179)
- CDP_X (181)
- CDP_Y (185)
- INLINE_3D (189)
- CROSSLINE_3D (193)
+ cdpX (181)
+ cdpY (185)
+ Inline3D (189)
+ Crossline3D (193)
ShotPoint (197)
ShotPointScalar (201)
TraceValueMeasurementUnit (203)
@@ -93,4 +93,4 @@ classdef TraceField < int32
UnassignedInt1 (233)
UnassignedInt2 (237)
end
-end
\ No newline at end of file
+end
diff --git a/mex/TraceSortingFormat.m b/mex/TraceSortingFormat.m
index f26a250..c6ceea7 100644
--- a/mex/TraceSortingFormat.m
+++ b/mex/TraceSortingFormat.m
@@ -1,9 +1,9 @@
classdef TraceSortingFormat < int32
% add comment here
enumeration
- UNKNOWN_SORTING (0)
- XLINE (1)
- INLINE (2)
+ unknown (0)
+ xline (1)
+ iline (2)
end
end
diff --git a/tests/test_segy_mex.m b/tests/test_segy_mex.m
index 7b4dc15..affff32 100644
--- a/tests/test_segy_mex.m
+++ b/tests/test_segy_mex.m
@@ -7,9 +7,9 @@ t0 = 1111.0;
%% Spec is created
try
- spec = Segy.interpret_segycube(filename, 'INLINE_3D', 'CROSSLINE_3D', t0);
- spec = Segy.interpret_segycube(filename, TraceField.INLINE_3D, 'CROSSLINE_3D', t0);
- spec = Segy.interpret_segycube(filename, TraceField.INLINE_3D, 193, t0);
+ spec = Segy.interpret_segycube(filename, 'Inline3D', 'Crossline3D', t0);
+ spec = Segy.interpret_segycube(filename, TraceField.Inline3D, 'Crossline3D', t0);
+ spec = Segy.interpret_segycube(filename, TraceField.Inline3D, 193, t0);
data = Segy.get_cube( spec );
assert(all(size(data) == [50, 5, 5]));
@@ -50,7 +50,7 @@ end
%% Segy.readInLine 4
-spec = Segy.interpret_segycube(filename, 'INLINE_3D', 'CROSSLINE_3D', t0);
+spec = Segy.interpret_segycube(filename, 'Inline3D', 'Crossline3D', t0);
data = Segy.get_line(spec, 'iline', 4);
sample_count = length(spec.sample_indexes);
@@ -83,7 +83,7 @@ assert(abs(data(sample_count,last)-4.24049)<eps);
%% Segy.readCrossLine 1433
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
data = Segy.readCrossLine(spec, 20);
data = Segy.readCrossLine(spec, 21);
data = Segy.readCrossLine(spec, 22);
@@ -123,7 +123,7 @@ filename_write = 'test-data/SEGY-3D_write_mex.sgy';
copyfile(filename, filename_write)
-spec = SegySpec(filename_write, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename_write, TraceField.Inline3D, TraceField.Crossline3D, t0);
data = Segy.get_line(spec, 'xline', 22);
assert(abs(data(1, 1) - 1.22) < eps);
@@ -150,7 +150,7 @@ assert(data(1, 1) == 200);
assert(dt == 4000);
assert(nt == 1);
-[headers, notraces] = Segy.get_header(filename, 'INLINE_3D');
+[headers, notraces] = Segy.get_header(filename, 'Inline3D');
assert(isequal((1:5), unique(headers)));
assert(notraces == 25)
@@ -170,7 +170,7 @@ assert(Segy.get_ntraces(filename) == 25);
%
% function provided by Matteo Ravasi
-Segy_struct_orig = Segy.interpret_segycube(filename,'INLINE_3D','CROSSLINE_3D');
+Segy_struct_orig = Segy.interpret_segycube(filename,'Inline3D','Crossline3D');
data = Segy.get_traces(filename);
data = data + 1000;
@@ -222,8 +222,8 @@ dummy = Segy.get_segy_header( filename );
dummy = Segy.get_trace_header( filename, 0 );
dummy = Segy.get_trace_header( filename, 10 );
-Segy.put_headers( filename, 10, 'CDP' );
-Segy.get_header( filename, 'CDP' );
+Segy.put_headers( filename, 10, 'cdp' );
+Segy.get_header( filename, 'cdp' );
increasing = linspace( 1, notraces, notraces );
Segy.put_headers( filename_copy, increasing, 'offset' );
diff --git a/tests/test_segyspec_mex.m b/tests/test_segyspec_mex.m
index bc20931..bb8669b 100644
--- a/tests/test_segyspec_mex.m
+++ b/tests/test_segyspec_mex.m
@@ -9,7 +9,7 @@ t0 = 1111.0;
no_such_filename = 'no-such-dir/no-such-file.sgy';
assert(exist(no_such_filename,'file')~=2);
try
- spec = SegySpec(no_such_filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+ spec = SegySpec(no_such_filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
%should not reach here
assert(false);
catch
@@ -19,30 +19,30 @@ end
%% Spec is created
try
- spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+ spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
catch
%nothing should be caught
assert(false);
end
%% IBM_FLOAT_4_BYTE
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
assert(spec.sample_format == SegySampleFormat.IBM_FLOAT_4_BYTE);
%% filename is set
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
assert(strcmp(spec.filename,filename));
%% trace_sorting_format
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
-assert(spec.trace_sorting_format == TraceSortingFormat.INLINE);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
+assert(spec.trace_sorting_format == TraceSortingFormat.iline);
%%offset_count
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
assert(length(spec.offset_count) == 1);
%% sample_indexes
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
sample_indexes = spec.sample_indexes;
assert(length(sample_indexes) == 50);
@@ -53,34 +53,34 @@ end
%% first_trace_pos
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
first_trace_pos = spec.first_trace_pos;
assert(first_trace_pos == 3600);
%% il_stride
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
il_stride = spec.il_stride;
assert(il_stride == 1);
%% xl_stride
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
xl_stride = spec.xl_stride;
assert(xl_stride == 5);
%% xl_stride
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
trace_bsize = spec.trace_bsize;
assert(trace_bsize == 50*4);
%% xline
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
assert(length(spec.crossline_indexes)==5)
for xl = spec.crossline_indexes'
assert(xl >= 20 && xl <= 24);
end
%% iline
-spec = SegySpec(filename, TraceField.INLINE_3D, TraceField.CROSSLINE_3D, t0);
+spec = SegySpec(filename, TraceField.Inline3D, TraceField.Crossline3D, t0);
assert(length(spec.inline_indexes)==5)
for il = spec.inline_indexes'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/segyio.git
More information about the debian-science-commits
mailing list