[gnuastro-commits] master b9c3d30 1/6: envseed as a conf. option in MakeNoise and MakeProfiles

[Mohammad Akhlaghi]

branch: master
commit b9c3d30e89736ae0d2186a89edbfa5fc904c13ca
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>

    envseed as a conf. option in MakeNoise and MakeProfiles
    
    The `--envseed' option in MakeNoise and MakeProfiles was only used as a
    command-line option until now. With this commit it is now also possible to
    set it in the configuration files. However, it is not a mandatory option,
    so if it isn't present, the program won't abort.
---
 bin/mknoise/args.h |    1 +
 bin/mknoise/main.h |    1 +
 bin/mknoise/ui.c   |    9 +++++++++
 bin/mkprof/args.h  |    1 +
 bin/mkprof/main.h  |    1 +
 bin/mkprof/ui.c    |    9 +++++++++
 6 files changed, 22 insertions(+)

diff --git a/bin/mknoise/args.h b/bin/mknoise/args.h
index 9b492c5..c558ba9 100644
--- a/bin/mknoise/args.h
+++ b/bin/mknoise/args.h
@@ -195,6 +195,7 @@ parse_opt(int key, char *arg, struct argp_state *state)
       break;
     case 'e':
       p->envseed=1;
+      p->up.envseedset=1;
       break;
 
 
diff --git a/bin/mknoise/main.h b/bin/mknoise/main.h
index 879b116..52c751d 100644
--- a/bin/mknoise/main.h
+++ b/bin/mknoise/main.h
@@ -47,6 +47,7 @@ struct uiparams
   int      zeropointset;
   int         stdaddset;
   int       randseedset;
+  int        envseedset;
 };
 
 
diff --git a/bin/mknoise/ui.c b/bin/mknoise/ui.c
index 806fb8e..309f678 100644
--- a/bin/mknoise/ui.c
+++ b/bin/mknoise/ui.c
@@ -125,6 +125,13 @@ readconfig(char *filename, struct mknoiseparams *p)
                                    filename, lineno);
           up->stdaddset=1;
         }
+      else if(strcmp(name, "envseed")==0)
+        {
+          if(up->envseedset) continue;
+          gal_checkset_int_zero_or_one(value, &p->envseed, name, key,
+                                       SPACK, filename, lineno);
+          up->envseedset=1;
+        }
 
 
 
@@ -170,6 +177,8 @@ printvalues(FILE *fp, struct mknoiseparams *p)
     fprintf(fp, CONF_SHOWFMT"%f\n", "zeropoint", p->zeropoint);
   if(up->stdaddset)
     fprintf(fp, CONF_SHOWFMT"%f\n", "stdadd", p->stdadd);
+  if(up->envseedset)
+    fprintf(fp, CONF_SHOWFMT"%d\n", "envseed", p->envseed);
 
 
   fprintf(fp, "\n# Output parameters:\n");
diff --git a/bin/mkprof/args.h b/bin/mkprof/args.h
index 119a664..26d274c 100644
--- a/bin/mkprof/args.h
+++ b/bin/mkprof/args.h
@@ -548,6 +548,7 @@ parse_opt(int key, char *arg, struct argp_state *state)
       break;
     case 'e':
       p->envseed=1;
+      p->up.envseedset=1;
       break;
 
    /* Catalog */
diff --git a/bin/mkprof/main.h b/bin/mkprof/main.h
index b56a6ba..c8cb692 100644
--- a/bin/mkprof/main.h
+++ b/bin/mkprof/main.h
@@ -102,6 +102,7 @@ struct uiparams
   int          naxis2set;
   int      oversampleset;
   int     circumwidthset;
+  int         envseedset;
   int         replaceset;
   int            typeset;
   int   inputascanvasset;
diff --git a/bin/mkprof/ui.c b/bin/mkprof/ui.c
index 60d4d87..3abee05 100644
--- a/bin/mkprof/ui.c
+++ b/bin/mkprof/ui.c
@@ -216,6 +216,13 @@ readconfig(char *filename, struct mkprofparams *p)
                                       lineno);
           up->circumwidthset=1;
         }
+      else if(strcmp(name, "envseed")==0)
+        {
+          if(up->envseedset) continue;
+          gal_checkset_int_zero_or_one(value, &p->envseed, name, key,
+                                       SPACK, filename, lineno);
+          up->envseedset=1;
+        }
 
 
 
@@ -405,6 +412,8 @@ printvalues(FILE *fp, struct mkprofparams *p)
     fprintf(fp, CONF_SHOWFMT"%.2f\n", "zeropoint", p->zeropoint);
   if(up->circumwidthset)
     fprintf(fp, CONF_SHOWFMT"%.2f\n", "circumwidth", p->circumwidth);
+  if(up->envseedset)
+    fprintf(fp, CONF_SHOWFMT"%d\n", "envseed", p->envseed);
 
   fprintf(fp, "\n# Catalog:\n");
   if(up->xcolset)