Merge branch '29-col_num-col_sigma-col_sel' into 'master'

Resolve "COL_NUM COL_SIGMA COL_SEL"

Closes #29

See merge request Galaxies/LEPHARE!12

source/zphota.cpp

@@ -67,7 +67,7 @@ int main (int argc, char *argv[])
 
   
   //List of the keywords to be found in the config file/command line
-  string list_keywords[] =  {"CAT_IN","INP_TYPE","CAT_MAG","CAT_FMT","CAT_LINES","ZPHOTLIB","PARA_OUT","CAT_OUT","CAT_TYPE","ERR_SCALE","ERR_FACTOR","BD_SCALE","GLB_CONTEXT","FORB_CONTEXT","CHI2_RM_BD","MASS_SCALE","MAG_ABS","MAG_ABS_AGN","MAG_REF","NZ_PRIOR","Z_RANGE","EBV_RANGE","ZFORM_MIN","LIR_PRIOR","LIR_PRIOR_NEW","ZFIX","MULTIPLEZ","MULTIPLEZ_FILE","MULTIPLEZ_NMAX","Z_INTERP","Z_METHOD","DZ_WIN","MIN_THRES","PROB_INTZ","SPEC_OUT","CHI2_OUT","FIR_LIB","FIR_LMIN","FIR_CONT","FIR_SCALE","FIR_FREESCALE","FIR_SUBSTELLAR","PHYS_LIB","PHYS_CONT","PHYS_SCALE","PHYS_NMAX","MABS_METHOD","MABS_CONTEXT","MABS_REF","MABS_FILT","MABS_ZBIN","RF_COLORS","M_REF","APPLY_SYSSHIFT","AUTO_ADAPT","ERROR_ADAPT","ADAPT_BAND","ADAPT_LIM","ADAPT_CONTEXT","ADAPT_ZBIN","ADAPT_MODBIN","PDZ_OUT","PDZ_TYPE","PDZ_MABS_FILT","ADD_EMLINES","FAST_MODE","COL_NUM","COL_SIGMA","COL_SEL","ADDITIONAL_MAG","LIMITS_ZBIN","LIMITS_MAPP_REF","LIMITS_MAPP_SEL","LIMITS_MAPP_CUT"};
+  string list_keywords[] =  {"CAT_IN","INP_TYPE","CAT_MAG","CAT_FMT","CAT_LINES","ZPHOTLIB","PARA_OUT","CAT_OUT","CAT_TYPE","ERR_SCALE","ERR_FACTOR","BD_SCALE","GLB_CONTEXT","FORB_CONTEXT","CHI2_RM_BD","MASS_SCALE","MAG_ABS","MAG_ABS_AGN","MAG_REF","NZ_PRIOR","Z_RANGE","EBV_RANGE","ZFORM_MIN","LIR_PRIOR","LIR_PRIOR_NEW","ZFIX","MULTIPLEZ","MULTIPLEZ_FILE","MULTIPLEZ_NMAX","Z_INTERP","Z_METHOD","DZ_WIN","MIN_THRES","PROB_INTZ","SPEC_OUT","CHI2_OUT","FIR_LIB","FIR_LMIN","FIR_CONT","FIR_SCALE","FIR_FREESCALE","FIR_SUBSTELLAR","PHYS_LIB","PHYS_CONT","PHYS_SCALE","PHYS_NMAX","MABS_METHOD","MABS_CONTEXT","MABS_REF","MABS_FILT","MABS_ZBIN","RF_COLORS","M_REF","APPLY_SYSSHIFT","AUTO_ADAPT","ERROR_ADAPT","ADAPT_BAND","ADAPT_LIM","ADAPT_CONTEXT","ADAPT_ZBIN","ADAPT_MODBIN","PDZ_OUT","PDZ_TYPE","PDZ_MABS_FILT","ADD_EMLINES","ADDITIONAL_MAG","LIMITS_ZBIN","LIMITS_MAPP_REF","LIMITS_MAPP_SEL","LIMITS_MAPP_CUT"};
   //Number of keywords
   int nb_ref_key= (int)(sizeof(list_keywords)/sizeof(list_keywords[0]));
 
@@ -377,20 +377,6 @@ int main (int argc, char *argv[])
   emMod.push_back(((key_analysed[keyInd]).split_int("-9999",2))[1]);
   keyInd++;
 
-  /*   FAST MODE By sorting in color space the library */
-  // FAST_MODE
-  string fastmod = ((key_analysed[keyInd]).split_string("NO",1))[0];
-  keyInd++;
-  // COL_NUM
-  //int numcol = ((key_analysed[keyInd]).split_int("3",1))[0];
-  keyInd++;
-  // COL_SIGMA
-  //double sigcol = ((key_analysed[keyInd]).split_double("3.",1))[0];
-  keyInd++;
-  // COL_SEL
-  //string sel = ((key_analysed[keyInd]).split_string("OR",1))[0];
-  keyInd++;
-
   // ADDITIONAL FILTER IN WHICH TO COMPUTE THE MAGNITUDE
   string filtNameAdd = (key_analysed[keyInd]).one_string("NOM");
   keyInd++;

test/COSMOS.para

@@ -167,13 +167,6 @@ PDZ_OUT         NONE             # pdz output file name [def-NONE]
                                  # add automatically PDZ_OUT[.pdz/.mabsx/.mod/.zph] 
 PDZ_MABS_FILT   2,10,14           # MABS for REF FILTERS to be extracted  
 # 
-#########   FAST MODE : color-space reduction        #####
-#
-FAST_MODE	NO 		 # Fast computation                [NO-def] 
-COL_NUM		3 		 # Number of colors used           [3-def]
-COL_SIGMA	3		 # Enlarge of the obs. color-errors[3-def]
-COL_SEL		AND		 # Combination between used colors [AND/OR-def]
-#
 
 #########   MAGNITUDE SHIFTS applied to libraries   ######
 #