Merge branch 'devel' into SOdevel

+model/igrf.m

@@ -56,7 +56,9 @@
     g11 = interp1(yearsIGRF,gIGRF(2,3:end),year,'linear','extrap');
     h11 = interp1(yearsIGRF,hIGRF(1,3:end),year,'linear','extrap');
     lambda = atand(h11./g11);
-    phi = 90-asind((g11.*cosd(lambda)+h11.*sind(lambda))./g01);
+    % There is a correction (Hapgood 1997) to the Hapgood 1992 model, which
+    % replaces the previous arcsin with an arctan.
+    phi = 90-atand((g11.*cosd(lambda)+h11.*sind(lambda))./g01); % latitude
     if nargout == 2
       out1 = lambda;
       out2 = phi;

.github/workflows/ci-build.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Set up MATLAB
         uses: matlab-actions/setup-matlab@v2
         with:
-          products: MATLAB Parallel_Computing_Toolbox Image_Processing_Toolbox Financial_Toolbox
+          products: MATLAB Parallel_Computing_Toolbox Image_Processing_Toolbox Financial_Toolbox Signal_Processing_Toolbox
 
       # Install required runtime lib for Fortan (whamp mex file)
       - name: Install libgfortran5

.gitignore

@@ -1,14 +1,20 @@
 *.m~
 *.DS_Store
-*.asv
 *.swp
 fort.6
 .caa.log
 
-# Path for automatically generated test reports (created by tests_before_release*.m).
+# MATLAB's autosaved files
+*.asv
+
+# Path for automatically generated test reports (created by
+# tests_before_release*.m).
 ciPath/
 
-# IRF logo needed by mission/solar_orbiter/+solo/quicklook_main.m etc.
-# Not included in irfu-matlab to prevent non-IRFU people from (automatically)
-# creating quicklooks with IRF logo.
+# IRF logo needed by irfu-matlab/mission/solar_orbiter/+solo/+qli/ for official
+# quicklooks. Not included in irfu-matlab git repo to prevent non-IRFU people
+# from (automatically) creating quicklooks with IRF logo. Specified in
+# .gitignore since it is stil convenient to manually place the logo file in
+# irfu-matlab directory for actual processing of quicklooks (e.g. for official
+# generation of quicklooks).
 irf_logo.png

.pre-commit-config.yaml

@@ -21,5 +21,5 @@ repos:
       - id: check-yaml
       # In Matlab files remove trailing whitespace, excluding contributed code
       - id: trailing-whitespace
-        files: '.*.m$'
+        files: '.*\.(m|txt|TXT)$'
         exclude: 'contrib/'

@dataobj/get_variable.m

@@ -3,8 +3,8 @@
 %
 %  var = get_variable(dobj,varName)
 %
-%  Exctracts a varibale from dataobj by recurcively pulling in all
-%  dependent variables so that the resulting VAR is self consistent.
+%  Extracts a variable from dataobj by recursively pulling in all
+%  dependent variables so that the resulting VAR is selfconsistent.
 %
 % See also: dataobj/getv
 
@@ -49,8 +49,8 @@
   attr = varAtts.(varAttNames{iName}){iattr,2};
   res.(varAttNames{iName}) = attr;
 
-  % Char attr may be a dependence on another variable, so we pull it in
-  % Some buggy files may have identical key/value pairs, we ignore those
+  % Char attr may be a dependence on another variable, so we pull it in.
+  % Some buggy files may have identical key/value pairs, we ignore those.
   if ~ischar(attr) || strcmp(attr,varName) || ...
       isempty(intersect(allVars,attr))
     continue
@@ -62,7 +62,7 @@
       ['Cyclic dependency: ' parent ' <-> ' varName]]);
     continue
   end
-  varTmp = get_variable(dobj,attr,varName);
+  varTmp = get_variable(dobj,attr,varName);   % RECURSIVE CALL
   if ~isempty(varTmp), res.(varAttNames{iName}) = varTmp; end
 end % for