Changeset 39207

Timestamp:

Dec 1, 2015, 3:16:03 PM (11 years ago)

Author:

eugene

Message:

add limits to distance modulus and error

Location:

branches/eam_branches/ipp-20151113/Ohana/src/relastro

Files:

• include/relastro.h (modified) (1 diff)
• src/ConfigInit.c (modified) (1 diff)
• src/load_catalogs.c (modified) (1 diff)

branches/eam_branches/ipp-20151113/Ohana/src/relastro/include/relastro.h

@@ -254 +254 @@
 int SRC_MEAS_TOOFEW; //catalog objects wich fewer detections then this are ignored
 double MIN_ERROR;
+
+double MIN_DISTANCE_MOD;  
+double MAX_DISTANCE_MOD;  
+double MAX_DISTANCE_MOD_ERR;
 
 int    IMFIT_TOO_FEW; // need more than this number of stars to fit an image

branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/ConfigInit.c

@@ -35 +35 @@
   if (!ScanConfig (config, "RELASTRO_DPOS_MAX",      "%lf", 0, &DPOS_MAX))         DPOS_MAX = 6.0;    
   if (!ScanConfig (config, "ADDSTAR_RADIUS",         "%lf", 0, &ADDSTAR_RADIUS))   ADDSTAR_RADIUS = 1.0;
+
+  if (!ScanConfig (config, "RELASTRO_MIN_DISTANCE_MOD",     "%lf", 0, &MIN_DISTANCE_MOD))     MIN_DISTANCE_MOD     =  7.5;
+  if (!ScanConfig (config, "RELASTRO_MAX_DISTANCE_MOD",     "%lf", 0, &MAX_DISTANCE_MOD))     MAX_DISTANCE_MOD     = 15.0;
+  if (!ScanConfig (config, "RELASTRO_MAX_DISTANCE_MOD_ERR", "%lf", 0, &MAX_DISTANCE_MOD_ERR)) MAX_DISTANCE_MOD_ERR =  1.0;
 
   if (!ScanConfig (config, "USE_FIXED_PIXCOORDS", "%d", 0, &USE_FIXED_PIXCOORDS))  USE_FIXED_PIXCOORDS = FALSE;

branches/eam_branches/ipp-20151113/Ohana/src/relastro/src/load_catalogs.c

@@ -171 +171 @@
     strextend (&command, " -minerror %f", MIN_ERROR);
     strextend (&command, " -D RELASTRO_SIGMA_LIM %f", SIGMA_LIM);
+    strextend (&command, " -D RELASTRO_MIN_DISTANCE_MOD %f",     MIN_DISTANCE_MOD);
+    strextend (&command, " -D RELASTRO_MAX_DISTANCE_MOD %f",     MAX_DISTANCE_MOD);
+    strextend (&command, " -D RELASTRO_MAX_DISTANCE_MOD_ERR %f", MAX_DISTANCE_MOD_ERR);
 
     if (FIT_MODE == FIT_PM_ONLY)         strextend (&command, "-pm");