Changeset 7693

Timestamp:

Jun 26, 2006, 9:43:18 AM (20 years ago)

Author:

eugene

Message:

creating sedstar

Location:

trunk/Ohana/src/addstar

Files:

• include/sedstar.h (modified) (1 diff)
• src/SEDfit.c (added)
• src/SEDops.c (modified) (1 diff)
• src/SEDtableLoad.c (modified) (5 diffs)
• src/args_sedstar.c (modified) (4 diffs)
• src/sedstar.c (modified) (2 diffs)

trunk/Ohana/src/addstar/include/sedstar.h

@@ +1 @@
+
+typedef structu {
+  int Nfilter;
+  float *wavecode;
+  float *vegaToAB;
+  int *hashcode;
+  int codeP;
+  int codeM;
+  SEDtableRow **row;
+  int Nrow;
+} SEDtable;
 
 typedef struct {

trunk/Ohana/src/addstar/src/SEDops.c

@@ +1 @@
+# include "addstar.h"
+# include "sedstar.h"
 
 // fit the data (with errors) to the given table row

trunk/Ohana/src/addstar/src/SEDtableLoad.c

@@ -2 +2 @@
 # include "sedstar.h"
 
-SEDtable *SEDtableLoad (char *filename, int *nrow) {
+// XXX where do the colorP and colorM codes come from?
+SEDtable *SEDtableLoad (char *filename) {
 
   FILE *f;
+  char line[1024], name[64];
+  char colornameP[64], colornameM[64];
+  int colorP, colorM;
+  int i, Nrow, NROW;
+
+  ALLOCATE (table, SEDtable, 1);
 
   // load SED table
@@ -12 +19 @@
   // XXX add error checks for header data
   scan_line (f, line);
-  sscanf (line, "%*s %*s %d", &Nfilter);
+  sscanf (line, "%*s %*s %d", &table[0].Nfilter);
 
   // load SED table photcodes, generate the photcode hashtable
-  ALLOCATE (hashcode, int, 0x10000);
-  ALLOCATE (wavecode, float, Nfilter);
-  ALLOCATE (vegaToAB, float, Nfilter);
+  ALLOCATE (table[0].hashcode, int, 0x10000);
+  ALLOCATE (table[0].wavecode, float, table[0].Nfilter);
+  ALLOCATE (table[0].vegaToAB, float, table[0].Nfilter);
 
-  for (i = 0; i < 0x10000; i++) hashcode[i] = -1;
-  for (i = 0; i < Nfilter; i++) {
+  for (i = 0; i < 0x10000; i++) table[0].hashcode[i] = -1;
+  for (i = 0; i < table[0].Nfilter; i++) {
     scan_line (f, line);
-    sscanf (line, "%*s %s %f %f", name, &wavecode[i], &vegaToAB[i]);
+    sscanf (line, "%*s %s %f %f", name, &table[0].wavecode[i], &table[0].vegaToAB[i]);
     code = GetPhotcodeCodebyName (name);
     if (code == 0) goto code_missing;
-    hashcode[code] = i;
+    table[0].hashcode[code] = i;
   }
-  codeP = hashcode[colorP];
-  codeM = hashcode[colorM];
-  if ((codeP == -1) || (codeM == -1)) goto color_missing;
+
+  // define the selection color codes
+  sscanf (line, "# %s - %s", colornameP, colornameM);
+  colorP = GetPhotcodeCodebyName (colornameP);
+  colorM = GetPhotcodeCodebyName (colornameM);
+  table[0].codeP = table[0].hashcode[colorP];
+  table[0].codeM = table[0].hashcode[colorM];
+  if (table[0].codeP == -1) Shutdown ("missing positive color filter");
+  if (table[0].codeM == -1) Shutdown ("missing positive color filter");
     
   // skip remaining header lines
@@ -37 +50 @@
   scan_line (f, line);
   
-  // load the SED table data
+  // load the SED raw table rows
   Nrow = 0;
   NROW = 100;
@@ -44 +57 @@
     fparse (&SEDtableRaw[Nrow].Temp, 1, line);
     fparse (&SEDtableRaw[Nrow].Av, 2, line);
-    ALLOCATE (SEDtableRaw[Nrow].mags, float, Nfilter);
-    for (i = 0; i < Nfilter; i++) {
+    ALLOCATE (SEDtableRaw[Nrow].mags, float, table[0].Nfilter);
+    for (i = 0; i < table[0].Nfilter; i++) {
       fparse (&SEDtableRaw[Nrow].mags[i], i + 3, line);
     }
@@ -54 +67 @@
 
   // sort the SEDtable by the reference colors
-  SEDtable = sort_SEDtable (SEDtableRaw, Nrow);
+  table[0].row = sort_SEDtable (SEDtableRaw, Nrow);
+  table[0].Nrow = Nrow;
+  return (table);
+}

trunk/Ohana/src/addstar/src/args_sedstar.c

@@ -34 +34 @@
     remove_argument (N, &argc, argv);
   }
-  /* override any header PHOTCODE values */
-  options.photcode = 0;
-  if ((N = get_argument (argc, argv, "-p"))) {
-    remove_argument (N, &argc, argv);
-    options.photcode = GetPhotcodeCodebyName (argv[N]);
-    remove_argument (N, &argc, argv);
-  }
 
-  options.timeref = 0; 
-  options.mosaic = FALSE;
-  options.existing_regions = FALSE;
-  options.skip_missed = FALSE;
-  options.closest = FALSE;
-
-  /* only add to existing objects */
-  options.only_match = FALSE;
-  if ((N = get_argument (argc, argv, "-only-match"))) {
-    options.only_match = TRUE;
-    remove_argument (N, &argc, argv);
-  }
-  /* replace measurement, don't duplicate (ref/cat only) */
-  options.replace = FALSE;
-  if ((N = get_argument (argc, argv, "-replace"))) {
-    options.replace = TRUE;
-    remove_argument (N, &argc, argv);
-  }
-
-  /* select quality flags */
-  SELECT_2MASS_QUALITY = NULL;
-  if ((N = get_argument (argc, argv, "-2massquality"))) {
-    remove_argument (N, &argc, argv);
-    SELECT_2MASS_QUALITY = strcreate (argv[N]);
-    remove_argument (N, &argc, argv);
-  }
   /* extra error messages */
   VERBOSE = FALSE;
@@ -76 +43 @@
 
   /* other defaults */
+  options.timeref = 0; 
+  options.mosaic = FALSE;
+  options.existing_regions = FALSE;
+  options.skip_missed = FALSE;
+  options.closest = FALSE;
+  options.only_match = FALSE;
+  options.replace = FALSE;
   options.nosort = FALSE;
   options.update = FALSE;
@@ -87 +61 @@
   DUMP = NULL;
 
-  if (argc != 1) {
-    fprintf (stderr, "USAGE: load2mass\n");
+  if (argc != 3) {
+    fprintf (stderr, "USAGE: sedstar (sedtable) (outcatalog) [-region Rmin Rmax Dmin Dmax]\n");
     exit (2);
   }
@@ -97 +71 @@
 
   fprintf (stderr, "USAGE\n");
-  fprintf (stderr, "  load2mass");
-  fprintf (stderr, "     add data from 2MASS catalog to fullsky\n\n");
+  fprintf (stderr, "  sedstar (SEDtable)");
+  fprintf (stderr, "     fit objects to stellar SEDs\n\n");
 
   fprintf (stderr, "  optional flags:\n");
-  fprintf (stderr, "  -p (photcode)               : specify photcode (override header)\n");
-  fprintf (stderr, "  -only-match                 : only add measurements to existing objects\n");
-  fprintf (stderr, "  -replace                    : replace time/photcode measurements (no duplication)\n");
+  fprintf (stderr, "  -region Rmin Rmax Dmin Dmax : sky region for analysis\n");
   fprintf (stderr, "  -v                          : verbose mode\n");
   fprintf (stderr, "  -help                       : this list\n");

trunk/Ohana/src/addstar/src/sedstar.c

@@ -7 +7 @@
   SkyTable *sky, *sky2mass;
   AddstarClientOptions options;
+  Catalog incatalog, outcatalog;
 
   // need to construct these options with args_load2mass...
@@ -16 +17 @@
   
   // select regions of interest
+  skylist = SkyListByPatch (sky, -1, &UserPatch);
 
   // load the SED data table
-  sedtable = SEDtableLoad (SEDfile, &Nsedtable);
+  sedtable = SEDtableLoad (argv[1]);
 
+  for (i = 0; i < skylist[0].Nregions; i++) {
+    incatalog.filename = skylist[0].filename[i];
+    load_pt_catalog (&incatalog, skylist[0].regions[i]);
+
+    // create output catalog filename
+    root = strstr (incatalog.filename, CATDIR);
+    if (root == NULL) Shutdown ("error with input catalog name");
+
+    extension = incatalog.filename + strlen(CATDIR);
+    ALLOCATE (outcatalog.filename, char, strlen(argv[2]) + strlen(extension) + 2);
+    sprintf (outcatalog.filename, "%s/%s", argv[2], extension);
+
+    status = lock_catalog (outcatalog, LCK_XCLD);
+    if (status != 2) Shutdown ("error: output catalog exists");
+    mkcatalog (region, catalog); /* fills in new header info */
+
+    SEDfit (&outcatalog, &incatalog, sedtable);
+    
+    wcatalog (outcatalog);
+    unlock_catalog (outcatalog);
+    free (outcatalog.filename);
+  }
 
   exit (0);