BICAS: Abolish bicas.sconst.C.ASID_ARRAY

irfu · Sep 20, 2024 · c196156 · c196156
1 parent 251afda
commit c196156
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/dc.m b/mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/dc.m
@@ -184,7 +184,7 @@
       AsrSamplesAVoltSrm = bicas.utils.SameRowsMap(...
         "bicas.proc.L1L2.AntennaSignalId", nRecords, 'CONSTANT', ...
         nan(nRecords, nSamplesPerRecordChannel), ...
-        bicas.sconst.C.ASID_ARRAY);
+        bicas.sconst.C.S_ASID_DICT.values);
 
       iCalibLZv = Cal.get_BIAS_calibration_time_L(Dcip.Zv.Epoch);
       iCalibHZv = Cal.get_BIAS_calibration_time_H(Dcip.Zv.Epoch);

diff --git a/mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/demuxer.m b/mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/demuxer.m
@@ -296,7 +296,7 @@ function complement_ASR(AsrSamplesAVoltSrm)
       % using a future bicas.utils.SameSizeTypeMap instead.
       tempNaN = nan(size(AsrSamplesAVoltSrm(keyArray)));
 
-      for Asid = bicas.sconst.C.ASID_ARRAY'
+      for Asid = bicas.sconst.C.S_ASID_DICT.values'
         if ~AsSrm.isKey(Asid)
           AsSrm.add(Asid, tempNaN);
         end

diff --git a/mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/demuxer___UTEST.m b/mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/demuxer___UTEST.m
@@ -141,22 +141,25 @@ function test_BDM01234(bdmFloatNan, dlrFloatNan, ExpRoutingArray, ExpAsrSamplesA
       function AsSrm = get_ASR_samples(varargin)
         assert(nargin == 9)
 
-        % Define which varargin{i} corresponds to which ASID.
-        ASID_ARRAY = A([
+        % Define which varargin{i} corresponds to which ASID
+        % --------------------------------------------------
+        % NOTE: This is not (necessarily) the same as
+        % bicas.sconst.C.S_ASID_DICT.values.
+        ARGS_ASID_ARRAY = A([
           "DC_V1",  "DC_V2",  "DC_V3",  ...
           "DC_V12", "DC_V13", "DC_V23", ...
           "AC_V12", "AC_V13", "AC_V23" ...
           ]);
         AsSrm = bicas.utils.SameRowsMap("bicas.proc.L1L2.AntennaSignalId", nRows, 'EMPTY');
 
         for iAsid = 1:9
-          asidName = ASID_ARRAY(iAsid);
+          Asid = ARGS_ASID_ARRAY(iAsid);
 
-          samplesAVolt = AsidTestSamplesSrm(asidName);
+          samplesAVolt = AsidTestSamplesSrm(Asid);
           if ~varargin{iAsid}
             samplesAVolt = samplesAVolt * NaN;
           end
-          AsSrm.add(asidName, samplesAVolt);
+          AsSrm.add(Asid, samplesAVolt);
         end
       end
 

diff --git a/mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/qual___UTEST.m b/mission/solar_orbiter/bicas/src/+bicas/+proc/+L1L2/qual___UTEST.m
@@ -189,7 +189,7 @@ function test(zv_Epoch, zvBdm, isLfr, bdmRemoveArray, lfrBdmMarginSec, tdsBdmMar
       assert(iscolumn(v))
       AsrSamplesAVoltSrm = bicas.utils.SameRowsMap(...
         "bicas.proc.L1L2.AntennaSignalId", size(v, 1), 'CONSTANT', v, ...
-        bicas.sconst.C.ASID_ARRAY);
+        bicas.sconst.C.S_ASID_DICT.values);
     end
 
 

diff --git a/mission/solar_orbiter/bicas/src/+bicas/sconst.m b/mission/solar_orbiter/bicas/src/+bicas/sconst.m
@@ -120,8 +120,6 @@ function main()
         C.S_ROUTING_DICT("GND_TO_DC_V3")       = bicas.proc.L1L2.Routing(C.S_SSID_DICT("GND"),     C.S_SDID_DICT("DC_V3"));
         C.S_ROUTING_DICT("UNKNOWN_TO_NOWHERE") = bicas.proc.L1L2.Routing(C.S_SSID_DICT("UNKNOWN"), C.S_SDID_DICT("NOWHERE"));
 
-        C.ASID_ARRAY = C.S_ASID_DICT.values;
-
         assert(~ismember(255, kGlobalArray))
         assert(~ismember(0,   kGlobalArray))
       end