Changeset 7997

Timestamp:

Jul 27, 2006, 2:03:23 PM (20 years ago)

Author:

eugene

Message:

added manual -magrange options

Location:

trunk/Ohana/src/gastro2

Files:

• include/gastro2.h (modified) (1 diff)
• src/gargs.c (modified) (1 diff)
• src/gproject2.c (modified) (1 diff)
• src/grid.c (modified) (1 diff)

trunk/Ohana/src/gastro2/include/gastro2.h

@@ -126 +126 @@
 int TEXTMODE;
 int PTOLEMY_FILL_FACTOR;
+int MAGMANUAL;
+double MAGLIM_MIN;
+double MAGLIM_MAX;
 
 int    FORCE;

trunk/Ohana/src/gastro2/src/gargs.c

@@ -70 +70 @@
     remove_argument (N, argc, argv);
   }
+  if ((N = get_argument (*argc, argv, "-magrange"))) {
+    MAGLIMS = TRUE;
+    MAGMANUAL = TRUE;
+    remove_argument (N, argc, argv);
+    MAGLIM_MIN = atof (argv[N]);
+    remove_argument (N, argc, argv);
+    MAGLIM_MAX = atof (argv[N]);
+    remove_argument (N, argc, argv);
+  }
 
   NMAX_STARS = 300;

trunk/Ohana/src/gastro2/src/gproject2.c

@@ -25 +25 @@
  
   /* need to allow some leeway? use a fixed +/- 0.5 mag for now */
-  MMAX = Target[0].lum.Mmax + 0.5;
-  MMIN = Target[0].lum.Mmin - 0.5;
+  if (MAGLIMS && !MAGMANUAL) {
+      MMAX = Target[0].lum.Mmax + 0.5;
+      MMIN = Target[0].lum.Mmin - 0.5;
 
-  if (MMAX < Ref[0].lum.Mmin + Moff) 
-    fprintf (stderr, "warning: reference catalog probably too faint:  %5.3f < %5.3f\n", Target[0].lum.Mmax, Ref[0].lum.Mmin + Moff);
+      if (MMAX < Ref[0].lum.Mmin + Moff) 
+          fprintf (stderr, "warning: reference catalog probably too faint:  %5.3f < %5.3f\n", Target[0].lum.Mmax, Ref[0].lum.Mmin + Moff);
 
-  if (MMIN > Ref[0].lum.Mmax + Moff) 
-    fprintf (stderr, "warning: reference catalog probably too bright: %5.3f > %5.3f\n", Target[0].lum.Mmin, Ref[0].lum.Mmax + Moff);
+      if (MMIN > Ref[0].lum.Mmax + Moff) 
+          fprintf (stderr, "warning: reference catalog probably too bright: %5.3f > %5.3f\n", Target[0].lum.Mmin, Ref[0].lum.Mmax + Moff);
+  }
+  if (MAGMANUAL) {
+      MMIN = MAGLIM_MIN;
+      MMAX = MAGLIM_MAX;
+      Moff = 0;
+  }
 
   for (N = i = 0; i < Ref[0].N; i++) {

trunk/Ohana/src/gastro2/src/grid.c

@@ -22 +22 @@
   sr = Ref.stars;
   
+  /* NFIELD represents the search box; it is also the extra padding used 
+     to select the reference stars */
   XMIN = -0.5*NFIELD*Target[0].header.Naxis[0];
   XMAX = +0.5*NFIELD*Target[0].header.Naxis[0];