Skip to content

Commit

Permalink
BICAS: Never use ASID.s
Browse files Browse the repository at this point in the history
  • Loading branch information
@ErikPGJ
ErikPGJ committed Sep 6, 2024
1 parent 9c79b86 commit dc7dc2f
Show file tree
Hide file tree
Showing 8 changed files with 112 additions and 103 deletions.
2 changes: 1 addition & 1 deletion mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/Saturation.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ function assert_positive_float(x)
Ssid = RoutingAr(iBlts).Ssid;

if Ssid.is_ASR()
bltsSamplesAVolt = AsrSamplesAVoltSrm(Ssid.Asid.s);
bltsSamplesAVolt = AsrSamplesAVoltSrm(Ssid.Asid);
ssBltsSamplesAVolt = bltsSamplesAVolt(iRec1:iRec2, :);

% Set ssBltsBitAr=bits for the current subsequence and
Expand Down
52 changes: 26 additions & 26 deletions mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/Saturation___UTEST.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ function test(V, expIsSaturatedAr)
V.thresholdAVoltAchg = 4;
%
V.tt2000Ar = zeros(0, 1);
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap('string', 0, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid.s, zeros(0, 1))
V.AsrSamplesAVoltSrm.add(C.DC_V2.Asid.s, zeros(0, 1))
V.AsrSamplesAVoltSrm.add(C.DC_V3.Asid.s, zeros(0, 1))
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap("bicas.proc.L1L2.AntennaSignalId", 0, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid, zeros(0, 1))
V.AsrSamplesAVoltSrm.add(C.DC_V2.Asid, zeros(0, 1))
V.AsrSamplesAVoltSrm.add(C.DC_V3.Asid, zeros(0, 1))
V.zvNValidSamplesPerRecord = zeros(0, 1);
V.bdm = zeros(0, 1);
V.dlr = zeros(0, 1);
Expand All @@ -271,10 +271,10 @@ function test(V, expIsSaturatedAr)
V.thresholdAVoltAchg = 4;
%
V.tt2000Ar = [10 11 12]' * 1e9;
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap('string', 3, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid.s, [2 0 2]')
V.AsrSamplesAVoltSrm.add(C.DC_V12.Asid.s, [2 0 2]'+1)
V.AsrSamplesAVoltSrm.add(C.DC_V23.Asid.s, [2 0 2]'+1)
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap("bicas.proc.L1L2.AntennaSignalId", 3, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid, [2 0 2]')
V.AsrSamplesAVoltSrm.add(C.DC_V12.Asid, [2 0 2]'+1)
V.AsrSamplesAVoltSrm.add(C.DC_V23.Asid, [2 0 2]'+1)
V.zvNValidSamplesPerRecord = [1 1 1]';
V.bdm = [0 0 0]';
V.dlr = [0 0 0]';
Expand All @@ -298,10 +298,10 @@ function test(V, expIsSaturatedAr)
V.thresholdAVoltAchg = 4;
%
V.tt2000Ar = [10:19]' * 1e9;
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap('string', 10, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid.s, [2 2 0 0 0 0 0 0 0 0]')
V.AsrSamplesAVoltSrm.add(C.AC_V12.Asid.s, [0 0 0 2 2 0 0 0 0 0]'+2)
V.AsrSamplesAVoltSrm.add(C.AC_V23.Asid.s, [0 0 0 0 0 0 2 2 0 0]'+2)
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap("bicas.proc.L1L2.AntennaSignalId", 10, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid, [2 2 0 0 0 0 0 0 0 0]')
V.AsrSamplesAVoltSrm.add(C.AC_V12.Asid, [0 0 0 2 2 0 0 0 0 0]'+2)
V.AsrSamplesAVoltSrm.add(C.AC_V23.Asid, [0 0 0 0 0 0 2 2 0 0]'+2)
V.zvNValidSamplesPerRecord = [1 1 1 1 1 1 1 1 1 1]';
V.bdm = [0 0 0 0 0 0 0 0 0 0]';
V.dlr = [0 0 0 0 0 0 0 0 0 0]';
Expand All @@ -325,12 +325,12 @@ function test(V, expIsSaturatedAr)
V.thresholdAVoltAchg = 4;
%
V.tt2000Ar = [10:17]' * 1e9;
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap('string', 8, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid.s, [0 0 2 2 0 0 0 0]')
V.AsrSamplesAVoltSrm.add(C.DC_V12.Asid.s, [0 0 0 0 0 0 2 2]'+2)
V.AsrSamplesAVoltSrm.add(C.DC_V23.Asid.s, [0 0 0 0 0 0 0 0]'+2)
V.AsrSamplesAVoltSrm.add(C.DC_V2.Asid.s, [2 2 0 0 0 0 0 0]')
V.AsrSamplesAVoltSrm.add(C.DC_V3.Asid.s, [0 0 0 0 2 2 0 0]')
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap("bicas.proc.L1L2.AntennaSignalId", 8, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid, [0 0 2 2 0 0 0 0]')
V.AsrSamplesAVoltSrm.add(C.DC_V12.Asid, [0 0 0 0 0 0 2 2]'+2)
V.AsrSamplesAVoltSrm.add(C.DC_V23.Asid, [0 0 0 0 0 0 0 0]'+2)
V.AsrSamplesAVoltSrm.add(C.DC_V2.Asid, [2 2 0 0 0 0 0 0]')
V.AsrSamplesAVoltSrm.add(C.DC_V3.Asid, [0 0 0 0 2 2 0 0]')
V.zvNValidSamplesPerRecord = [1 1 1 1 1 1 1 1]';
V.bdm = [0 0 0 0 4 4 4 4]';
V.dlr = [0 0 0 0 0 0 0 0]';
Expand All @@ -357,18 +357,18 @@ function test(V, expIsSaturatedAr)
V.thresholdAVoltAchg = 7;
%
V.tt2000Ar = [10 11]' * 1e9;
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap('string', 2, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid.s, ...
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap("bicas.proc.L1L2.AntennaSignalId", 2, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid, ...
[
[2 2 2 0 0 0 0] + 0; ... % Saturated
[0 0 0 2 2 2 2] + 0;
])
V.AsrSamplesAVoltSrm.add(C.AC_V12.Asid.s, ...
V.AsrSamplesAVoltSrm.add(C.AC_V12.Asid, ...
[
[0 0 0 0 0 0 0] + 4; ...
[0 0 0 2 2 2 2] + 6;
]+1)
V.AsrSamplesAVoltSrm.add(C.AC_V23.Asid.s, ...
V.AsrSamplesAVoltSrm.add(C.AC_V23.Asid, ...
[
[0 0 0 0 0 0 0] + 4; ...
[0 0 0 2 2 2 2] + 6;
Expand Down Expand Up @@ -397,22 +397,22 @@ function test(V, expIsSaturatedAr)
V.thresholdAVoltAchg = 7;
%
V.tt2000Ar = [10:13]' * 1e9;
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap('string', 4, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid.s, ...
V.AsrSamplesAVoltSrm = bicas.utils.SameRowsMap("bicas.proc.L1L2.AntennaSignalId", 4, 'EMPTY');
V.AsrSamplesAVoltSrm.add(C.DC_V1.Asid, ...
[
[0 0 0 0 0 0 0] + 0; ...
[0 2 2 2 2 2 2] + 0; ...
[0 0 0 0 0 0 0] + 0; ...
[0 0 0 2 2 2 2] + 0;
])
V.AsrSamplesAVoltSrm.add(C.AC_V12.Asid.s, ...
V.AsrSamplesAVoltSrm.add(C.AC_V12.Asid, ...
[
[2 0 0 0 0 0 0] + 4; ... % Saturated.
[0 2 2 2 2 2 2] + 4; ...
[2 2 2 0 0 0 0] + 6; ... % Saturated.
[0 0 0 2 2 2 2] + 6;
]+1)
V.AsrSamplesAVoltSrm.add(C.AC_V23.Asid.s, ...
V.AsrSamplesAVoltSrm.add(C.AC_V23.Asid, ...
[
[0 0 0 0 0 0 0] + 4; ...
[0 2 2 2 2 2 2] + 4; ...
Expand Down
4 changes: 2 additions & 2 deletions mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/dc.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@
% IMPLEMENTATION NOTE: Preallocation is very important for speeding
% up LFR-SWF which tends to be broken into subsequences of 1 record.
AsrSamplesAVoltSrm = bicas.utils.SameRowsMap(...
'string', nRecords, 'CONSTANT', ...
"bicas.proc.L1L2.AntennaSignalId", nRecords, 'CONSTANT', ...
nan(nRecords, nSamplesPerRecordChannel), ...
bicas.proc.L1L2.AntennaSignalId.C.ALL_ASID_NAMES_CA);
bicas.proc.L1L2.AntennaSignalId.C.ALL_ASID_CA);

iCalibLZv = Cal.get_BIAS_calibration_time_L(Dcip.Zv.Epoch);
iCalibHZv = Cal.get_BIAS_calibration_time_H(Dcip.Zv.Epoch);
Expand Down
32 changes: 17 additions & 15 deletions mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/demuxer.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,10 @@ function complement_ASR(AsrSamplesAVoltSrm)
% using a future bicas.utils.SameSizeTypeMap instead.
tempNaN = nan(size(AsrSamplesAVoltSrm(keysCa{1})));

for asidNameCa = bicas.proc.L1L2.AntennaSignalId.C.ALL_ASID_NAMES_CA'
asidName = asidNameCa{1};
if ~AsSrm.isKey(asidName)
AsSrm.add(asidName, tempNaN);
for asidCa = bicas.proc.L1L2.AntennaSignalId.C.ALL_ASID_CA'
Asid = asidCa{1};
if ~AsSrm.isKey(Asid)
AsSrm.add(Asid, tempNaN);
end
end

Expand Down Expand Up @@ -332,21 +332,23 @@ function complement_ASR(AsrSamplesAVoltSrm)
irf.assert.sizes(bltsSamplesAVolt, [-1, -2, bicas.const.N_BLTS])

nRows = size(bltsSamplesAVolt, 1);
AsrSamplesSrm = bicas.utils.SameRowsMap('string', nRows, 'EMPTY');
AsrSamplesSrm = bicas.utils.SameRowsMap( ...
"bicas.proc.L1L2.AntennaSignalId", nRows, 'EMPTY');
for iBlts = 1:bicas.const.N_BLTS
if ~SdidArray(iBlts).isNowhere
AsrSamplesSrm.add(...
SdidArray(iBlts).Asid.s, ...
SdidArray(iBlts).Asid, ...
bltsSamplesAVolt(:, :, iBlts));
end
end
end



% Utility function. Derive missing ASR fields from other fields. If
% exactly two of the Map keys exist in S, then derive the third using
% the relationship AsSrm(Asid1.s) == AsSrm(Asid2.s) + AsSrm(Asid3.s).
% Utility function. Derive missing ASR fields/channels from other
% fields/channels. If exactly two of the SRM keys exist in AsrSrm, then
% derive the third one using the relationship
% AsSrm(Asid1) == AsSrm(Asid2) + AsSrm(Asid3).
%
% ARGUMENTS
% =========
Expand All @@ -360,13 +362,13 @@ function complement_ASR(AsrSamplesAVoltSrm)
function AsSrm = complete_relation(AsSrm, Asid1, Asid2, Asid3)
assert(isa(AsSrm, 'bicas.utils.SameRowsMap'))

e1 = AsSrm.isKey(Asid1.s);
e2 = AsSrm.isKey(Asid2.s);
e3 = AsSrm.isKey(Asid3.s);
e1 = AsSrm.isKey(Asid1);
e2 = AsSrm.isKey(Asid2);
e3 = AsSrm.isKey(Asid3);

if ~e1 && e2 && e3 AsSrm.add(Asid1.s, AsSrm(Asid2.s) + AsSrm(Asid3.s));
elseif e1 && ~e2 && e3 AsSrm.add(Asid2.s, AsSrm(Asid1.s) - AsSrm(Asid3.s));
elseif e1 && e2 && ~e3 AsSrm.add(Asid3.s, AsSrm(Asid1.s) - AsSrm(Asid2.s));
if ~e1 && e2 && e3 AsSrm.add(Asid1, AsSrm(Asid2) + AsSrm(Asid3));
elseif e1 && ~e2 && e3 AsSrm.add(Asid2, AsSrm(Asid1) - AsSrm(Asid3));
elseif e1 && e2 && ~e3 AsSrm.add(Asid3, AsSrm(Asid1) - AsSrm(Asid2));
end
end

Expand Down
77 changes: 40 additions & 37 deletions mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/demuxer___UTEST.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,25 @@
% channels).
A = bicas.proc.L1L2.AntennaSignalId.C;
TEST_DATA_CA = { ...
A.DC_V1.s, 10; ...
A.DC_V2.s, 11; ...
A.DC_V3.s, 13; ...
A.DC_V12.s, 10-11; ...
A.DC_V13.s, 10-13; ...
A.DC_V23.s, 11-13; ...
A.AC_V12.s, 45-56; ...
A.AC_V13.s, 45-69; ...
A.AC_V23.s, 56-69 ...
A.DC_V1, 10; ...
A.DC_V2, 11; ...
A.DC_V3, 13; ...
A.DC_V12, 10-11; ...
A.DC_V13, 10-13; ...
A.DC_V23, 11-13; ...
A.AC_V12, 45-56; ...
A.AC_V13, 45-69; ...
A.AC_V23, 56-69 ...
};

% Multiply the sample values with matrix to test multiple records
% with "snapshots" (SPR>1).
TEST_DATA_CA(:, 2) = cellfun(@(x) (x * ones(sampleSize)), TEST_DATA_CA(:, 2), 'UniformOutput', false);
TEST_DATA_CA(:, 2) = cellfun( ...
@(x) (x * ones(sampleSize)), TEST_DATA_CA(:, 2), ...
'UniformOutput', false);

AsidTestSamplesSrm = bicas.utils.SameRowsMap('string', sampleSize(1), 'EMPTY');
AsidTestSamplesSrm = bicas.utils.SameRowsMap( ...
"bicas.proc.L1L2.AntennaSignalId", sampleSize(1), 'EMPTY');
for i = 1:size(TEST_DATA_CA, 1)
AsidTestSamplesSrm.add( ...
TEST_DATA_CA{i, 1}, ...
Expand Down Expand Up @@ -103,7 +106,7 @@ function test(bdmFloatNan, dlrFloatNan, bltsSamplesAVolt, ExpRoutingArray, ExpAs
% Function for testing BDM 0-4. All those all those map (route) ASR
% to ASR (no GNS, no 2.5V REF, no "unknown", no "nowhere").
function test_BDM01234(bdmFloatNan, dlrFloatNan, ExpRoutingArray, ExpAsrSamplesAVoltSrm)
assert(isa(ExpAsrSamplesAVoltSrm, 'bicas.utils.SameRowsMap'))
assert(isa(ExpAsrSamplesAVoltSrm, "bicas.utils.SameRowsMap"))
assert(ismember(bdmFloatNan, [0:4]))

% Autogenerate bltsSamplesCa (test argument) using
Expand All @@ -121,7 +124,7 @@ function test_BDM01234(bdmFloatNan, dlrFloatNan, ExpRoutingArray, ExpAsrSamplesA
for i = 1:numel(RoutingArray)
Routing = RoutingArray(i);
if Routing.Ssid.is_ASR()
tempBltsSamplesAVolt(:, :, i) = AsidTestSamplesSrm(Routing.Ssid.Asid.s);
tempBltsSamplesAVolt(:, :, i) = AsidTestSamplesSrm(Routing.Ssid.Asid);
else
tempBltsSamplesAVolt(:, :, i) = TEST_DATA_UNKNOWN;
end
Expand All @@ -144,10 +147,10 @@ function test_BDM01234(bdmFloatNan, dlrFloatNan, ExpRoutingArray, ExpAsrSamplesA
A.DC_V12, A.DC_V13, A.DC_V23, ...
A.AC_V12, A.AC_V13, A.AC_V23 ...
};
AsSrm = bicas.utils.SameRowsMap('string', nRows, 'EMPTY');
AsSrm = bicas.utils.SameRowsMap("bicas.proc.L1L2.AntennaSignalId", nRows, 'EMPTY');

for iAsid = 1:9
asidName = ASID_CA{iAsid}.s;
asidName = ASID_CA{iAsid};

samplesAVolt = AsidTestSamplesSrm(asidName);
if ~varargin{iAsid}
Expand Down Expand Up @@ -205,11 +208,11 @@ function test_BDM01234(bdmFloatNan, dlrFloatNan, ExpRoutingArray, ExpAsrSamplesA
% ==============
% BDM = 5, DLR 1
% ==============
bltsSamplesAVolt(:, :, 1) = AsidTestSamplesSrm(A.DC_V1.s);
bltsSamplesAVolt(:, :, 2) = AsidTestSamplesSrm(A.DC_V2.s);
bltsSamplesAVolt(:, :, 3) = AsidTestSamplesSrm(A.DC_V3.s);
bltsSamplesAVolt(:, :, 4) = AsidTestSamplesSrm(A.AC_V13.s);
bltsSamplesAVolt(:, :, 5) = AsidTestSamplesSrm(A.AC_V23.s);
bltsSamplesAVolt(:, :, 1) = AsidTestSamplesSrm(A.DC_V1);
bltsSamplesAVolt(:, :, 2) = AsidTestSamplesSrm(A.DC_V2);
bltsSamplesAVolt(:, :, 3) = AsidTestSamplesSrm(A.DC_V3);
bltsSamplesAVolt(:, :, 4) = AsidTestSamplesSrm(A.AC_V13);
bltsSamplesAVolt(:, :, 5) = AsidTestSamplesSrm(A.AC_V23);
test(5, 1, ...
bltsSamplesAVolt, ...
[R.REF25V_TO_DC_V1, R.REF25V_TO_DC_V2, R.REF25V_TO_DC_V3, R.AC_V13, R.AC_V23], ...
Expand All @@ -218,11 +221,11 @@ function test_BDM01234(bdmFloatNan, dlrFloatNan, ExpRoutingArray, ExpAsrSamplesA
% ==============
% BDM = 6, DLR 0
% ==============
bltsSamplesAVolt(:, :, 1) = AsidTestSamplesSrm(A.DC_V1.s);
bltsSamplesAVolt(:, :, 2) = AsidTestSamplesSrm(A.DC_V2.s);
bltsSamplesAVolt(:, :, 3) = AsidTestSamplesSrm(A.DC_V3.s);
bltsSamplesAVolt(:, :, 4) = AsidTestSamplesSrm(A.AC_V12.s);
bltsSamplesAVolt(:, :, 5) = AsidTestSamplesSrm(A.AC_V23.s);
bltsSamplesAVolt(:, :, 1) = AsidTestSamplesSrm(A.DC_V1);
bltsSamplesAVolt(:, :, 2) = AsidTestSamplesSrm(A.DC_V2);
bltsSamplesAVolt(:, :, 3) = AsidTestSamplesSrm(A.DC_V3);
bltsSamplesAVolt(:, :, 4) = AsidTestSamplesSrm(A.AC_V12);
bltsSamplesAVolt(:, :, 5) = AsidTestSamplesSrm(A.AC_V23);
test(6, 0, ...
bltsSamplesAVolt, ...
[R.GND_TO_DC_V1, R.GND_TO_DC_V2, R.GND_TO_DC_V3, R.AC_V12, R.AC_V23], ...
Expand All @@ -231,11 +234,11 @@ function test_BDM01234(bdmFloatNan, dlrFloatNan, ExpRoutingArray, ExpAsrSamplesA
% ==============
% BDM = Unknwon, DLR Unknown
% ==============
bltsSamplesAVolt(:, :, 1) = AsidTestSamplesSrm(A.DC_V1.s);
bltsSamplesAVolt(:, :, 2) = AsidTestSamplesSrm(A.DC_V2.s);
bltsSamplesAVolt(:, :, 3) = AsidTestSamplesSrm(A.DC_V3.s);
bltsSamplesAVolt(:, :, 4) = AsidTestSamplesSrm(A.AC_V12.s);
bltsSamplesAVolt(:, :, 5) = AsidTestSamplesSrm(A.AC_V23.s);
bltsSamplesAVolt(:, :, 1) = AsidTestSamplesSrm(A.DC_V1);
bltsSamplesAVolt(:, :, 2) = AsidTestSamplesSrm(A.DC_V2);
bltsSamplesAVolt(:, :, 3) = AsidTestSamplesSrm(A.DC_V3);
bltsSamplesAVolt(:, :, 4) = AsidTestSamplesSrm(A.AC_V12);
bltsSamplesAVolt(:, :, 5) = AsidTestSamplesSrm(A.AC_V23);
test(NaN, NaN, ...
bltsSamplesAVolt, ...
[R.UNKNOWN_TO_NOWHERE, ...
Expand Down Expand Up @@ -269,11 +272,11 @@ function assert_relation(A, B, C)
% BUG/NOTE: Will fail if function returns NaN when it should not!
function test(inputFieldsCa)
nRows = size(inputFieldsCa{2}, 1);
AsSrm = bicas.utils.SameRowsMap('string', nRows, 'EMPTY');
AsSrm = bicas.utils.SameRowsMap("bicas.proc.L1L2.AntennaSignalId", nRows, 'EMPTY');
for i = 1:(numel(inputFieldsCa)/2)
Asid = inputFieldsCa{2*i-1};
sample = inputFieldsCa{2*i };
AsSrm.add(Asid.s, sample)
AsSrm.add(Asid, sample)
end

% RUN FUNCTION TO BE TESTED
Expand All @@ -285,15 +288,15 @@ function test(inputFieldsCa)
% NOTE: Implicitly asserts that all fields are present.
% NOTE: Must account for that some fields may be NaN, and
% therefore can not be checked against relations.
assert_relation(ActAsSrm(C.DC_V1.s), ActAsSrm(C.DC_V12.s), ActAsSrm(C.DC_V2.s))
assert_relation(ActAsSrm(C.DC_V2.s), ActAsSrm(C.DC_V23.s), ActAsSrm(C.DC_V3.s))
assert_relation(ActAsSrm(C.DC_V1.s), ActAsSrm(C.DC_V13.s), ActAsSrm(C.DC_V3.s))
assert_relation(ActAsSrm(C.DC_V1), ActAsSrm(C.DC_V12), ActAsSrm(C.DC_V2))
assert_relation(ActAsSrm(C.DC_V2), ActAsSrm(C.DC_V23), ActAsSrm(C.DC_V3))
assert_relation(ActAsSrm(C.DC_V1), ActAsSrm(C.DC_V13), ActAsSrm(C.DC_V3))

% DC. All diffs
assert_relation(ActAsSrm(C.DC_V13.s), ActAsSrm(C.DC_V12.s), ActAsSrm(C.DC_V23.s))
assert_relation(ActAsSrm(C.DC_V13), ActAsSrm(C.DC_V12), ActAsSrm(C.DC_V23))

% AC. All diffs
assert_relation(ActAsSrm(C.AC_V13.s), ActAsSrm(C.AC_V12.s), ActAsSrm(C.AC_V23.s))
assert_relation(ActAsSrm(C.AC_V13), ActAsSrm(C.AC_V12), ActAsSrm(C.AC_V23))
end


Expand Down
2 changes: 1 addition & 1 deletion mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/qual.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
iUfv = find(zvUfv);
nanArray = NaN(size(iUfv, 1), nSpr);
tempSrm = bicas.utils.SameRowsMap(...
'string', size(nanArray, 1), ...
"bicas.proc.L1L2.AntennaSignalId", size(nanArray, 1), ...
'CONSTANT', nanArray, zvAsrSamplesAVoltSrm.keys);
zvAsrSamplesAVoltSrm.set_rows(tempSrm, iUfv);
end
Expand Down
4 changes: 2 additions & 2 deletions mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/qual___UTEST.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ function test(zv_Epoch, zvBdm, isLfr, bdmRemoveArray, lfrBdmMarginSec, tdsBdmMar
function AsrSamplesAVoltSrm = AsSrm(v)
assert(iscolumn(v))
AsrSamplesAVoltSrm = bicas.utils.SameRowsMap(...
'string', size(v, 1), 'CONSTANT', v, ...
bicas.proc.L1L2.AntennaSignalId.C.ALL_ASID_NAMES_CA(:));
"bicas.proc.L1L2.AntennaSignalId", size(v, 1), 'CONSTANT', v, ...
bicas.proc.L1L2.AntennaSignalId.C.ALL_ASID_CA(:));
end


Expand Down
Loading

0 comments on commit dc7dc2f

Please sign in to comment.