Merge pull request #666 from VChristiaens/master

Bug fix for max ncomp allowed in PCA RDI or ARDI

Author: VChristiaens

Makefile

@@ -9,6 +9,7 @@ help:
 	@echo "clean - remove artifacts"
 
 pypi:
+	rm dist/*
 	python setup.py sdist bdist_wheel
 	twine upload dist/*
 

setup.py

@@ -74,7 +74,6 @@ def resource(*args):
             'vip_hci.fm',
             'vip_hci.greedy',
             'vip_hci.invprob',
-            'vip_hci.greedy',
             'vip_hci.metrics',
             'vip_hci.objects',
             'vip_hci.preproc',

vip_hci/psfsub/pca_fullfr.py

@@ -837,11 +837,15 @@ def _adi_rdi_pca(
             raise TypeError(msg)
 
         if np.isscalar(ncomp):
-            if isinstance(ncomp, int) and ncomp > n:
-                ncomp = min(ncomp, n)
+            if cube_ref is not None:
+                nref = cube_ref.shape[0]
+            else:
+                nref = n
+            if isinstance(ncomp, int) and ncomp > nref:
+                ncomp = min(ncomp, nref)
                 print(
                     "Number of PCs too high (max PCs={}), using {} PCs "
-                    "instead.".format(n, ncomp)
+                    "instead.".format(nref, ncomp)
                 )
             if mask_rdi is None:
                 if source_xy is None: