Add parameter nrings to LCB acquisition (fixes #234)

megaradrp/recipes/auxiliary/acquisitionlcb.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2018 Universidad Complutense de Madrid
+# Copyright 2011-2019 Universidad Complutense de Madrid
 #
 # This file is part of Megara DRP
 #
@@ -16,6 +16,7 @@
 from scipy.spatial import KDTree
 
 from numina.core import Product, Parameter
+from numina.core.validator import range_validator
 from numina.constants import FWHM_G
 
 from megaradrp.recipes.scientific.base import ImageRecipe
@@ -65,6 +66,8 @@ class AcquireLCBRecipe(ImageRecipe):
 
     # Requirements are defined in base class
     points = Parameter([(0, 0)], "Coordinates")
+    nrings = Parameter(3, "Number of rings to extract the star",
+                       validator=range_validator(minval=1))
     extraction_region = Parameter(
         [1000, 3000],
         description='Region used to compute a mean flux',
@@ -130,11 +133,10 @@ def run(self, rinput):
         # query using radius instead
         # radius = 1.2
         # kdtree.query_ball_point(points, k=7, r=radius)
+        self.logger.debug('adding %d nrings', rinput.nrings)
+        npoints = 1 + 3 * rinput.nrings * (rinput.nrings + 1)
+        self.logger.debug('adding %d fibers', npoints)
 
-        npoints = 19 + 18
-        # 1 + 6  for first ring
-        # 1 + 6  + 12  for second ring
-        # 1 + 6  + 12  + 18 for third ring
         dis_p, idx_p = kdtree.query(points, k=npoints)
 
         self.logger.info('Using %d nearest fibers', npoints)