Changeset 39389

Timestamp:

Feb 24, 2016, 12:01:00 PM (10 years ago)

Author:

eugene

Message:

loop-weights are getting a space in the re-generated command line option: save and pass the user string

Location:

trunk/Ohana/src/relastro

Files:

• include/relastro.h (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/launch_region_hosts.c (modified) (1 diff)

trunk/Ohana/src/relastro/include/relastro.h

@@ -348 +348 @@
 float *LoopWeight2MASS;
 float *LoopWeightTycho;
+char *LoopWeight2MASSstr;
+char *LoopWeightTychostr;
 
 int ImagSelect;

trunk/Ohana/src/relastro/src/args.c

@@ -538 +538 @@
   // NOTE: this must come after -nloop above
   LoopWeight2MASS = NULL;
+  LoopWeight2MASSstr = NULL;
   if ((N = get_argument (argc, argv, "-loop-weights-2mass"))) {
     remove_argument (N, &argc, argv);
+    LoopWeight2MASSstr = strcreate(argv[N]);
     LoopWeight2MASS = ParseLoopWeights (argv[N]);
     remove_argument (N, &argc, argv);
@@ -546 +548 @@
   if ((N = get_argument (argc, argv, "-loop-weights-tycho"))) {
     remove_argument (N, &argc, argv);
+    LoopWeightTychostr = strcreate(argv[N]);
     LoopWeightTycho = ParseLoopWeights (argv[N]);
     remove_argument (N, &argc, argv);

trunk/Ohana/src/relastro/src/launch_region_hosts.c

@@ -134 +134 @@
     if (MaxMeanOffset != 10.0) strextend (&command, "-max-mean-offset  %f", MaxMeanOffset);
 
-    if (LoopWeight2MASS) {
-      char *weightline = NULL;
-      for (i = 0; i < NLOOP; i++) {
-        strextend (&weightline, "%f,", LoopWeight2MASS[i]);
-      }
-      strextend (&command, "-loop-weights-2mass %s", weightline);
-      free (weightline);
-    }
-    if (LoopWeightTycho) {
-      char *weightline = NULL;
-      for (i = 0; i < NLOOP; i++) {
-        strextend (&weightline, "%f,", LoopWeightTycho[i]);
-      }
-      strextend (&command, "-loop-weights-tycho %s", weightline);
-      free (weightline);
-    }
+    if (LoopWeight2MASS) {  strextend (&command, "-loop-weights-2mass %s", LoopWeight2MASSstr); }
+    if (LoopWeightTycho) {  strextend (&command, "-loop-weights-tycho %s", LoopWeightTychostr); }
 
     strextend (&command, "-D RELASTRO_SRC_MEAS_TOOFEW %d", SRC_MEAS_TOOFEW);