Changeset 38518 for branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/loadgalphot_readstars.c

Timestamp:

Jun 23, 2015, 6:50:35 AM (11 years ago)

Author:

eugene

Message:

loadgalphot mostly done

File:

• branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/loadgalphot_readstars.c (modified) (10 diffs)

branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/loadgalphot_readstars.c

@@ -22 +22 @@
   if (f == NULL) Shutdown ("can't read stellar parameter file: %s", filename);
 
-  int i, Ncol, Nsample;
+  int i, j, Ncol, Nsample;
   off_t Nrow = 0;
   off_t NrowNew;
@@ -35 +35 @@
     fclose (f);
     return NULL;
-  }
-
-  // in xgal, we have numerical values to specify the model types
-  // in xfit, we have strings.  these are listed with their numerical 
-  // match in the PHU.  I need to read the list of names and set up a string hash
-
-  if (!gfits_scan (PHU, "MTNUM", "%d", 1, &ModelTypeN)) { myAbort ("fail"); }
-  ALLOCATE (ModelTypeName, char *, ModelTypeN);
-  ALLOCATE (ModelTypeNum,  int, ModelTypeN);
-  ALLOCATE (ModelTypeHash, int, ModelTypeN);
-
-  int tmpnumber, namehash[256][3];
-  for (i = 0; i < 256; i++) {
-    namehash[i][0] = -1;
-    namehash[i][1] = -1;
-    namehash[i][2] = -1;
-  }
-
-  char name[256], tmpname[256];
-  for (i = 0; i < ModelTypeN; i++) {
-    snprintf (name, 64, "MTNAM%02d", i);
-    if (!gfits_scan (PHU, name, "%s", 1, tmpname)) { myAbort ("fail"); }
-    ModelTypeName[i] = strcreate (tmpname);
-    int found = FALSE;
-    int myHash = strhash (tmpname);
-    ModelTypeHash[i] = myHash;
-    for (j = 0; (j < 3) && !found; j++) {
-      if (namehash[myHash][j] != -1) continue;
-      found = TRUE;
-      namehash[myHash][j] = i;
-    }
-    myAssert (found, "hash conflict");
-    snprintf (name, 64, "MTVAL%02d", i);
-    if (!gfits_scan (PHU, name, "%d", 1, &tmpnumber)) { myAbort ("fail"); }
-    ModelTypeNum[i] = tmpnumber;
   }
 
@@ -81 +46 @@
     return NULL;
   }
-
   ftable_xfit.header = &header_xfit;
+
+  // in xgal, we have numerical values to specify the model types
+  // in xfit, we have strings.  these are listed with their numerical 
+  // match in the PHU.  I need to read the list of names and set up a string hash
+
+  int ModelTypeN;
+  char **ModelTypeName;
+  int *ModelTypeNum;
+  int *ModelTypeHash;
+  if (!gfits_scan (&header_xfit, "MTNUM", "%d", 1, &ModelTypeN)) { myAbort ("fail"); }
+  ALLOCATE (ModelTypeName, char *, ModelTypeN);
+  ALLOCATE (ModelTypeNum,  int, ModelTypeN);
+  ALLOCATE (ModelTypeHash, int, ModelTypeN);
+
+  int tmpnumber, namehash[256][3];
+  for (i = 0; i < 256; i++) {
+    namehash[i][0] = -1;
+    namehash[i][1] = -1;
+    namehash[i][2] = -1;
+  }
+
+  char name[256], tmpname[256];
+  for (i = 0; i < ModelTypeN; i++) {
+    snprintf (name, 64, "MTNAM%02d", i);
+    if (!gfits_scan (&header_xfit, name, "%s", 1, tmpname)) { myAbort ("fail"); }
+    ModelTypeName[i] = strcreate (tmpname);
+    int found = FALSE;
+    int myHash = strhash (tmpname, 0xff);
+    fprintf (stderr, "model %s, hash: %d\n", tmpname, myHash);
+    ModelTypeHash[i] = myHash;
+    for (j = 0; (j < 3) && !found; j++) {
+      if (namehash[myHash][j] != -1) continue;
+      found = TRUE;
+      namehash[myHash][j] = i;
+    }
+    myAssert (found, "hash conflict");
+    snprintf (name, 64, "MTVAL%02d", i);
+    if (!gfits_scan (&header_xfit, name, "%d", 1, &tmpnumber)) { myAbort ("fail"); }
+    ModelTypeNum[i] = tmpnumber;
+  }
 
   if (!gfits_fread_ftable_data (f, &ftable_xfit, FALSE)) {
@@ -94 +98 @@
   firstCol = TRUE;
   GET_COLUMN (xfit, ID_fit,         "IPP_IDET",      int);
-  GET_COLUMN (xfit, MODEL_TYPE_str, "MODEL_TYPE",    char); NcharModel = Ncol;
+  GET_COLUMN (xfit, MODEL_TYPE_str, "MODEL_TYPE",    char);  int NcharModel = Ncol;
   GET_COLUMN (xfit, EXT_WIDTH_MAJ,  "EXT_WIDTH_MAJ", float);
   GET_COLUMN (xfit, EXT_WIDTH_MIN,  "EXT_WIDTH_MIN", float);
@@ -102 +106 @@
   int Nfit = Nrow;
 
+  myAssert (NcharModel < 256, "max model type name is very long: %d", NcharModel);
+
   // free the memory associated with the FITS files
   gfits_free_header (&header_xfit);
   gfits_free_table (&ftable_xfit);
 
+  char string[256];
+
   // convert MODEL_TYPE_str to MODEL_TYPE_fit (transforming strings to values)
+  int *MODEL_TYPE_fit;
   ALLOCATE (MODEL_TYPE_fit, int, Nfit);
   for (i = 0; i < Nfit; i++) {
-    int myHash = strhash (MODEL_TYPE_str[i]);
+    memset (string, 0, 256);
+    memcpy (string, &MODEL_TYPE_str[i*NcharModel], NcharModel); string[NcharModel] = 0;
+    stripwhite (string);
+    int myHash = strhash (string, 0xff);
     int found = FALSE;
     for (j = 0; !found && (j < 3); j++) {
       int n = namehash[myHash][j];
-      if (strcmp(ModelTypeName[n], MODEL_TYPE_str[i])) continue;
+      if (strcmp(ModelTypeName[n], string)) continue;
       MODEL_TYPE_fit[i] = ModelTypeNum[n];
       found = TRUE;
     }
-    myAssert (found, "unknown model name? %s", MODEL_TYPE_str[i]);
+    myAssert (found, "unknown model name? %s", string);
   }
 
@@ -155 +167 @@
   GET_COLUMN (xgal, FR_MINOR_MAX,  "FR_MINOR_MAX", float);
   GET_COLUMN (xgal, FR_MINOR_DEL,  "FR_MINOR_DEL", float);
-  Ngal = Nrow;
+  int Ngal = Nrow;
 
   // i need to match the two lists based on (ID_gal == ID_fit), (MODEL_TYPE_gal == MODEL_TYPE_fit)
-  GalPhotIDset fit, gal;
-  fit.ID   = ID_fit;
-  fit.type = MODEL_TYPE_fit;
-  fit.N    = Nfit;
-  gal.ID   = ID_gal;
-  gal.type = MODEL_TYPE_gal;
-  gal.N    = Ngal;
-  int *index = join_IDs (&gal, &fit);
+  GalPhotIDset fitSet, galSet;
+  fitSet.ID   = ID_fit;
+  fitSet.type = MODEL_TYPE_fit;
+  fitSet.N    = Nfit;
+  galSet.ID   = ID_gal;
+  galSet.type = MODEL_TYPE_gal;
+  galSet.N    = Ngal;
+  int *idx_gal = join_IDs (&galSet, &fitSet);
 
   // free the memory associated with the FITS files
@@ -192 +204 @@
   for (i = 0; i < Nrow; i++) {
 
+    int ifit = idx_gal[i];
+
     double R, D;
     XY_to_RD (&R, &D, X_FIT[i], Y_FIT[i], &coords);
@@ -208 +222 @@
     // theta, theta_err, index, 
     // note that FR_MAJOR, etc are the fractions of the stack fit value
-    stars[i].galphot.theta = NAN;
-    stars[i].galphot.thetaErr = NAN;
+    stars[i].galphot.theta     = EXT_THETA[ifit];
+    stars[i].galphot.thetaErr  = EXT_THETA_ERR[ifit];
+    stars[i].galphot.index     = INDEX[ifit];
+    stars[i].galphot.Npix      = NPIX[i];
+    stars[i].galphot.modelType = MODEL_TYPE_gal[i];
+    stars[i].galphot.detID     = ID_gal[i];
 
     // I have a grid of measurements with (Flux, dFlux, Chisq) at each point
@@ -217 +235 @@
       Nbad ++;
     }
+
+    // I could either multiply FR_MAJOR_MIN, etc above or the fitted values below
+    stars[i].galphot.majorAxis    *= EXT_WIDTH_MAJ[ifit];
+    stars[i].galphot.majorAxisErr *= EXT_WIDTH_MAJ[ifit];
+    stars[i].galphot.minorAxis    *= EXT_WIDTH_MIN[ifit];
+    stars[i].galphot.minorAxisErr *= EXT_WIDTH_MIN[ifit];
   }
 
@@ -347 +371 @@
   // use bilinear interpolation to choose Flux @ (Xmin,Ymin)?
   galphot->mag    = -2.5*log10(flux[iMin]); // correct for exptime?
-  galphot->magErr = -2.5*log10(fluxErr[iMin]); // correct for exptime?
+  galphot->magErr = fluxErr[iMin] / flux[iMin];
   galphot->chisq  = chisqMin;