Changeset 37395

Timestamp:

Sep 18, 2014, 3:46:32 PM (12 years ago)

Author:

eugene

Message:

updates

Location:

branches/eam_branches/ipp-20140904/Ohana/src

Files:

• addstar/include/addstar.h (modified) (1 diff)
• addstar/include/loadstarpar.h (added)
• addstar/src/args_loadstarpar.c (modified) (2 diffs)
• addstar/src/find_matches_starpar.c (added)
• addstar/src/loadstarpar.c (modified) (2 diffs)
• addstar/src/loadstarpar_catalog.c (added)
• addstar/src/loadstarpar_client.c (added)
• addstar/src/loadstarpar_io.c (added)
• addstar/src/loadstarpar_make_subset.c (added)
• addstar/src/loadstarpar_rawdata.c (modified) (2 diffs)
• addstar/src/loadstarpar_readstars.c (added)
• addstar/src/loadstarpar_remote_hosts.c (added)
• addstar/src/loadstarpar_save_remote.c (added)
• libautocode/def/average-ps1-v5.d (modified) (2 diffs)
• libautocode/def/average.d (modified) (2 diffs)
• libautocode/def/starpar.d (modified) (1 diff)
• libdvo/include/dvo.h (modified) (1 diff)
• libdvo/src/coordops.c (modified) (2 diffs)
• libdvo/src/dvo_catalog.c (modified) (3 diffs)
• libdvo/src/dvo_convert_PS1_V5.c (modified) (5 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/addstar/include/addstar.h

@@ -20 +20 @@
 # define IN_REGION(R,D) ( \
 ((D) >= region[0].Dmin) && ((D) < region[0].Dmax) && \
-((R) >= region[0].Rmin)  && ((R) < region[0].Rmax))
+((R) >= region[0].Rmin) && ((R) < region[0].Rmax))
 
 /* grab named photcode */

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/args_loadstarpar.c

@@ -85 +85 @@
 }
 
+AddstarClientOptions args_loadstarpar_client (int argc, char **argv, AddstarClientOptions options) {
+  
+  int N;
+
+  /* check for help request */
+  if (get_argument (argc, argv, "-help") ||
+      get_argument (argc, argv, "-h")) {
+    help ();
+  }
+
+  PARALLEL = FALSE;
+  PARALLEL_MANUAL = FALSE;
+  PARALLEL_SERIAL = FALSE;
+
+  HOST_ID = 0;
+  if ((N = get_argument (argc, argv, "-hostID"))) {
+    remove_argument (N, &argc, argv);
+    HOST_ID = atoi (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  if (!HOST_ID) help_client();
+
+  HOSTDIR = NULL;
+  if ((N = get_argument (argc, argv, "-hostdir"))) {
+    remove_argument (N, &argc, argv);
+    HOSTDIR = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  if (!HOSTDIR) help_client();
+
+  CPT_FILE = NULL;
+  if ((N = get_argument (argc, argv, "-cpt"))) {
+    remove_argument (N, &argc, argv);
+    CPT_FILE = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  if (!CPT_FILE) help_client();
+  
+  INPUT = NULL;
+  if ((N = get_argument (argc, argv, "-input"))) {
+    remove_argument (N, &argc, argv);
+    INPUT = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  if (!INPUT) help_client();
+
+  /* we do not allow a subset to be extracted -- all or nothing, babe */
+  UserPatch.Rmin = 0;
+  UserPatch.Rmax= 360;
+  UserPatch.Dmin = -90;
+  UserPatch.Dmax = +90;
+
+  /* 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);
+  }
+
+  /* extra error messages */
+  VERBOSE = FALSE;
+  if ((N = get_argument (argc, argv, "-v"))) {
+    VERBOSE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  /* other addstar options which cannot be used in loadstarpar */
+  options.photcode = 0;
+  options.timeref = 0; 
+  options.mosaic = FALSE;
+  options.skip_missed = FALSE;
+  options.closest = FALSE;
+  options.nosort = FALSE;
+  options.update = FALSE;
+  options.only_images = FALSE;
+  options.calibrate = FALSE;
+  options.quality_airmass = FALSE;
+  ACCEPT_ASTROM = FALSE;
+  FORCE_READ = FALSE;
+  TEXTMODE = FALSE;
+  SUBPIX = FALSE;
+  DUMP = NULL;
+
+  if (argc != 1) {
+    fprintf (stderr, "USAGE: loadstarpar_client -cpt (file) -input (file)\n");
+    exit (2);
+  }
+  return (options);
+}
+
 static void help () {
 
@@ -98 +194 @@
   exit (2);
 }
+
+static void help_client () {
+
+  fprintf (stderr, "USAGE: loadstarpar_client -D CATDIR catdir -hostID ID -hostdir (dir) -cpt (filename) -input (input) [options]\n");
+  fprintf (stderr, "  add data from stellar parameter file to DVO\n\n");
+
+  fprintf (stderr, "  optional flags:\n");
+  fprintf (stderr, "  -only-match                 : only add measurements to existing objects\n");
+  fprintf (stderr, "  -replace                    : replace time/photcode measurements (no duplication)\n");
+  fprintf (stderr, "  -v                          : verbose mode\n");
+  fprintf (stderr, "  -help                       : this list\n");
+  fprintf (stderr, "  -h                          : this list\n\n");
+  exit (2);
+}

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar.c

@@ -14 +14 @@
 
   int i;
-  SkyTable *sky;
-  SkyList *skylist = NULL;
   AddstarClientOptions options;
 
@@ -23 +21 @@
 
   // load the full sky description table (dvodb must exist)
-  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, FALSE, SKY_DEPTH, VERBOSE);
+  SkyTable *sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, FALSE, SKY_DEPTH, VERBOSE);
   SkyTableSetFilenames (sky, CATDIR, "cpt");
   
+  // load the list of hosts
+  HostTable *hosts = HostTableLoad (CATDIR, sky->hosts);
+  if (!hosts) {
+    fprintf (stderr, "ERROR: failure reading Host Table %s for database %s\n", sky->hosts, CATDIR);
+    exit (1);
+  }    
+
   // generate the subset matching the user-selected region
-  skylist = SkyListByPatch (sky, -1, &UserPatch);
-
-  // if we only match to existing (already populated) regions, limit the select to those regions:
-  if (options.existing_regions) {
-    SkyList *tmp;
-    tmp = SkyListExistingSubset (skylist, CATDIR);
-    SkyListFree (skylist);
-    skylist = tmp;
-  }
+  SkyList *skylist = SkyListByPatch (sky, -1, &UserPatch);
 
   for (i = 1; i < argc; i++) {
       fprintf (stderr, "loading %s\n", argv[i]);
-      loadstarpar_rawdata (skylist, argv[i], options, ALLSKY);
+      loadstarpar_rawdata (skylist, hosts, argv[i], options);
   }
   exit (0);

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_rawdata.c

@@ -1 +1 @@
 # include "addstar.h"
-# include "WISE.h"
-
-/* WISE raw data tables are not fixed bytes per row.  split lines at the RETURN char.
- * handle fractional lines at the end of each read block
- */
+# include "loadstarpar.h"
 
 # define GET_COLUMN(OUT,NAME,TYPE) \
@@ -10 +6 @@
   myAssert (!strcmp(type, #TYPE), "wrong column type");
 
-int loadstarpar_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options, int ALLSKY) {
+int loadstarpar_foobar (SkyList *skylistInput, HostTable *hosts, char *filename, AddstarClientOptions options) {
   
-  int i, j, verbose;
-  int Nstars, NSTARS, Ntstars, NTSTARS;
-  int Nbyte, Nextra, offset;
+  SkyRegion *region;
 
-  double Rmin, Rmax, Dmin, Dmax;
+  StarPar_Stars *stars = loadstarpar_readstars (filename, &Nstars);
 
-  FILE *f;
-  char *buffer, *p, *q;
+  // sort the stars by RA
+  loadstarpar_sortStars (stars, Nstars);
 
-  Stars **stars; // this is an array of pointers to be consistent with input to find_match_refstars
-  WISE_Stars *tstars;
-  SkyList *skylist;
-  SkyRegion *region;
-  Catalog catalog;
+  // scan through the stars, loading the containing catalogs
+  // skip through table for unsaved stars
+  for (i = 0; i < Nstars; i++) {
+    if (stars[i].flag) continue;
 
-  // read in the full FITS files ('cause I don't have a partial read option)
-  f = fopen (filename, "r");
-  if (f == NULL) Shutdown ("can't read stellar parameter file: %s", filename);
+    // scan forward until we read the UserPatch
+    if (stars[i].R < UserPatch.Rmin) continue;
+    if (stars[i].R > UserPatch.Rmax) break;
+    if (stars[i].D < UserPatch.Dmin) continue;
+    if (stars[i].D > UserPatch.Dmax) continue;
 
-  Header header;
-  Matrix matrix;
-  Header theader;
-  FTable ftable;
-  
-  // load in PHU segment (ignore)
-  if (!gfits_fread_header (f, &header)) {
-    if (VERBOSE) fprintf (stderr, "can't read image subset header\n");
-    fclose (f);
-    return NULL;
-  }
-  if (!gfits_fread_matrix (f, &matrix, &header)) {
-    if (VERBOSE) fprintf (stderr, "can't read image subset matrix\n");
-    gfits_free_header (&header);
-    fclose (f);
-    return NULL;
+    // identify the relevant catalog
+    skylist = SkyRegionByPoint_List (skylistInput, -1, stars[i].R, stars[i].D);
+    if (skylist[0].Nregions == 0) {
+      SkyListFree (skylist);
+      continue;
+    }
+    region = skylist[0].regions[0];
+
+    // select stars matching this region
+    StarPar_Stars *subset = loadstarpar_make_subset (stars, Nstars, i, region, &Nsubset);
+
+    // In parallel mode, write out the subset to a disk file.  Block until a remote host
+    // is available.  In serial mode, just match against the appropriate region and save
+    loadstarpar_save_remote (subset, Nsubset, hosts, region);
   }
 
-  ftable.header = &theader;
+  // wait for last remote clients to finish
+  harvest_all ();
 
-  // load data for this header 
-  if (!gfits_load_header (f, &theader)) {
-    fclose (f);
-    return NULL;
-  }
-  if (!gfits_fread_ftable_data (f, &ftable, FALSE)) {
-    fclose (f);
-    return (NULL);
-  }
-  fclose (f);
-
-  // we read the entire block of data, then extract the columns, then set the image structure values.
-  // I free the FITS table data after extracting the colums to avoid having 3 copies in memory.
-
-  char type[16];
-
-  GET_COLUMN (glat, "l", float);
-  GET_COLUMN (glon, "b", float);
-
-  // free the memory associated with the FITS files
-  gfits_free_header (&header);
-  gfits_free_matrix (&matrix);
-  gfits_free_header (&theader);
-  gfits_free_table (&ftable);
-
-  Rmin = 360.0;
-  Rmax = 360.0;
-  Dmin = 360.0;
-  Dmax = 360.0;
-
-  for (i = 0; i < Nrow; i++) {
-    galactic_to_celestial (&R, &D, glat[i], glon[i]);
-
-    Rmin = MIN (Rmin, R);
-    Rmax = MAX (Rmax, R);
-    Dmin = MIN (Dmin, D);
-    Dmax = MAX (Dmax, D);
-
-      Ntstars ++;
-      CHECK_REALLOCATE (tstars, WISE_Stars, NTSTARS, Ntstars, 10000);
-  }
-
-    // sort the tstars by RA
-    getWISE_sortStars (tstars, Ntstars);
-
-    // scan through the stars, loading the containing catalogs
-    // skip through table for unsaved stars
-    for (i = 0; i < Ntstars; i++) {
-      if (tstars[i].flag) continue;
-
-      // scan forward until we read the UserPatch
-      if (tstars[i].R < UserPatch.Rmin) continue;
-      if (tstars[i].R > UserPatch.Rmax) break;
-      if (tstars[i].D < UserPatch.Dmin) continue;
-      if (tstars[i].D > UserPatch.Dmax) continue;
-
-      // identify the relevant catalog
-      skylist = SkyRegionByPoint_List (skytable, -1, tstars[i].R, tstars[i].D);
-      if (skylist[0].Nregions == 0) {
-          SkyListFree (skylist);
-          continue;
-      }
-      region = skylist[0].regions[0];
-      if (DEBUG) fprintf (stderr, "writing to %s\n", skylist[0].filename[0]);
-
-      // collect array of (Stars *) stars in a new output catalog
-      Nstars = 0;
-      NSTARS = 3000;
-      ALLOCATE (stars, Stars *, NSTARS);
-
-      // loop over stars in this WISE region that are also in this output region
-      for (j = i; j < Ntstars; j++) {
-        if (tstars[j].flag) continue;
-
-        // check if in skyregion
-        if (tstars[j].R < region[0].Rmin) continue;
-        if (tstars[j].R > region[0].Rmax) break;
-        if (tstars[j].D < region[0].Dmin) continue;
-        if (tstars[j].D > region[0].Dmax) continue;
-          
-        // check if in UserPatch
-        if (tstars[j].R < UserPatch.Rmin) continue;
-        if (tstars[j].R > UserPatch.Rmax) break;
-        if (tstars[j].D < UserPatch.Dmin) continue;
-        if (tstars[j].D > UserPatch.Dmax) continue;
-          
-        offset = tstars[j].offset;
-
-        ALLOCATE (stars[Nstars+0], Stars, 1);
-        ALLOCATE (stars[Nstars+1], Stars, 1);
-        ALLOCATE (stars[Nstars+2], Stars, 1);
-        ALLOCATE (stars[Nstars+3], Stars, 1);
-
-        InitStar (stars[Nstars+0]);
-        InitStar (stars[Nstars+1]);
-        InitStar (stars[Nstars+2]);
-        InitStar (stars[Nstars+3]);
-
-        stars[Nstars+0][0].average.R = tstars[j].R;
-        stars[Nstars+0][0].average.D = tstars[j].D;
-        stars[Nstars+1][0].average.R = tstars[j].R;
-        stars[Nstars+1][0].average.D = tstars[j].D;
-        stars[Nstars+2][0].average.R = tstars[j].R;
-        stars[Nstars+2][0].average.D = tstars[j].D;
-        stars[Nstars+3][0].average.R = tstars[j].R;
-        stars[Nstars+3][0].average.D = tstars[j].D;
-        
-        if (ALLSKY) {
-          loadwise_star_allsky (&stars[Nstars], &buffer[offset], Nbyte - offset);
-        } else {
-          loadwise_star_prelim (&stars[Nstars], &buffer[offset], Nbyte - offset);
-        }
-
-        tstars[j].flag = TRUE;
-
-        Nstars += 4;
-        if (Nstars >= NSTARS - 4) {
-          NSTARS += 4000;
-          REALLOCATE (stars, Stars *, NSTARS);
-        }
-      }
-
-      if (!Nstars) {
-        free (stars);
-        continue;
-      }
-
-      if (DEBUG) fprintf (stderr, "selected %d stars (%10.6f - %10.6f, %10.6f - %10.6f)\n", Nstars, 
-                          region[0].Rmin, region[0].Rmax, region[0].Dmin, region[0].Dmax);
-
-      if (1) {
-        verbose = VERBOSE;
-        VERBOSE = FALSE;
-
-        // now we have all of the loaded stars in this catalog
-        catalog.filename = skylist[0].filename[0];
-        catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
-        catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
-        catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-
-        // an error exit status here is a significant error
-        if (!dvo_catalog_open (&catalog, skylist[0].regions[0], VERBOSE, "w")) {
-          fprintf (stderr, "ERROR: failure to open/create catalog file %s\n", catalog.filename);
-          exit (2);
-        }
-
-        // assume no input star matches an existing star 
-        // simply add to the existing table
-        // loadWISE_catalog (&catalog, stars, Nstars);
-        find_matches_refstars (skylist[0].regions[0], stars, Nstars, &catalog, options);
-        // loadWISE_catalog (&catalog, stars, Nstars);
-
-        dvo_catalog_save (&catalog, VERBOSE);
-        dvo_catalog_unlock (&catalog);
-        dvo_catalog_free (&catalog);
-        // free (catalog.filename);
-        // XXX don't free this! it points to an element of the skytable
-      }
-
-      SkyListFree (skylist);
-      for (j = 0; j < Nstars; j++) free (stars[j]);
-      free (stars);
-      VERBOSE = verbose;
-    }
-    free (tstars);
-    if (VERBOSE) fprintf (stderr, "done\n");
-
-    // at end, p points at the start of last, partial line
-    if (Nextra) memmove (buffer, p, Nextra);
-  }
-
-  if (VERBOSE) fprintf (stderr, "\n");
-  
-  fclose (f);
-  free (buffer);
-  return (TRUE);
+  return TRUE;
 }
 
-/*
-  for each WISE file:
-  for each data block
-  generate a table of: R, D, byte, flag
-  for each unsaved star
-  find containing catalog
-  load catalog
-  find all contained stars
-  add to catalog
-  save catalog 
-  mark all contained stars
-*/
-

branches/eam_branches/ipp-20140904/Ohana/src/libautocode/def/average-ps1-v5.d

@@ -47 +47 @@
 FIELD lensingOffset,  OFF_LENSING, int,             offset to first lensing obs
 FIELD lensobjOffset,  OFF_LENSOBJ, int,             offset to mean lensing data
+FIELD starparOffset,  OFF_STARPAR, int,             offset to stellar parameter data
 FIELD extendOffset,   OFF_EXTEND,  int,             offset to extended object entry
-FIELD paramsOffset,   OFF_PARAMS,  int,             offset to stellar parameter data
 
 FIELD refColorBlue,   REF_COLOR_BLUE, float,        color of astrometry ref stars
@@ -57 +57 @@
 FIELD projectionID,   PROJECTION_ID, short,         ID of projection for primary skycell
 
-FIELD dummy,          DUMMY,         int,           unassigned bytes
+FIELD Nstarpar,       DUMMY,         short,         number of stellar parameter entries
+FIELD dummy,          DUMMY,         short,         unassigned bytes
 
 # 'flags' was called 'code' prior to 2009.02.07

branches/eam_branches/ipp-20140904/Ohana/src/libautocode/def/average.d

@@ -47 +47 @@
 FIELD lensingOffset,  OFF_LENSING, int,             offset to first lensing obs
 FIELD lensobjOffset,  OFF_LENSOBJ, int,             offset to mean lensing data
+FIELD starparOffset,  OFF_STARPAR, int,             offset to stellar parameter data
 FIELD extendOffset,   OFF_EXTEND,  int,             offset to extended object entry
-FIELD paramsOffset,   OFF_PARAMS,  int,             offset to stellar parameter data
 
 FIELD refColorBlue,   REF_COLOR_BLUE, float,        color of astrometry ref stars
@@ -57 +57 @@
 FIELD projectionID,   PROJECTION_ID, short,         ID of projection for primary skycell
 
-FIELD dummy,          DUMMY,         int,           unassigned bytes
+FIELD Nstarpar,       DUMMY,         short,         number of stellar parameter entries
+FIELD dummy,          DUMMY,         short,         unassigned bytes
 
 # 'flags' was called 'code' prior to 2009.02.07

branches/eam_branches/ipp-20140904/Ohana/src/libautocode/def/starpar.d

@@ -7 +7 @@
 FIELD galLat,         GAL_LAT,       double,         galactic latitude
 FIELD galLon,         GAL_LON,       double,         galactic longitude
-FIELD MKtype,         MK_TYPE,       float,          O0 = 0.0?
-FIELD Par,            PARALLAX,      float,          1/pc
-FIELD dPar,           PARALLAX_ERR,  float,          1/pc
+FIELD Ebv,            E_BV,          float,          extinction
+FIELD dEbv,           E_BV_ERR,      float,          extinction error
+FIELD DistMag,        DISTANCE_MOD,     float,       mag
+FIELD dDistMag,       DISTANCE_MOD_ERR, float,       mag
+FIELD M_r,            M_R_ABS,       float,          r-band abs magnitude
+FIELD dM_r,           M_R_ABS_ERR,   float,          r-band abs magnitude error
+FIELD FeH,            F_E_H,         float,          metallicity
+FIELD dFeH,           F_E_H_ERR,     float,          metallicity error
 FIELD uRA,            U_RA,          float,          model guess for proper motion
 FIELD uDEC,           U_DEC,         float,          model guess for proper motion

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/include/dvo.h

@@ -620 +620 @@
   int              lensobjOffset;        // offset to mean lensing data
   int              extendOffset;         // offset to extended object entry
-  int              paramsOffset;         // offset to stellar parameter data
+  int              starparOffset;        // offset to stellar parameter data
   float            refColorBlue;         // color of astrometry ref stars
   float            refColorRed;          // color of astrometry ref stars

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/coordops.c

@@ -655 +655 @@
 
   if (status) {
-    if (!gfits_scan (header, "EQUINOX", "%lf", 1, &equinox)) {
-      if (!gfits_scan (header, "EPOCH", "%lf", 1, &equinox)) {
-        equinox = 2000.0;
+    char equinoxString[80];
+    int haveEquinox = gfits_scan (header, "EQUINOX", "%s", 1, &equinoxString);
+    if (haveEquinox) {
+      // is the string a valid number (it is bad to interpret an error message as year 0.0)
+      char *endptr;
+      equinox = strtod (equinoxString, &endptr);
+      if (endptr == equinoxString) haveEquinox = FALSE;
+    }
+    if (!haveEquinox) {
+      haveEquinox = gfits_scan (header, "EPOCH", "%s", 1, &equinoxString);
+      if (haveEquinox) {
+        // is the string a valid number (it is bad to interpret an error message as year 0.0)
+        char *endptr;
+        equinox = strtod (equinoxString, &endptr);
+        if (endptr == equinoxString) haveEquinox = FALSE;
+        if (!haveEquinox) {
+          equinox = 2000.0;
+        }
       }
     }
@@ -664 +679 @@
     } 
   }
-
+  
   if (!status) {
     // fprintf (stderr, "error getting all elements for coordinate mode %s\n", coords[0].ctype);

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_catalog.c

@@ -129 +129 @@
   average->Nlensing        = 0;
   average->Nlensobj        = 0;
+  average->Nstarpar        = 0;
   average->Nextend         = 0;
 
@@ -135 +136 @@
   average->lensingOffset   = -1;
   average->lensobjOffset   = -1;
+  average->starparOffset   = -1;
   average->extendOffset    = -1;
-  average->paramsOffset    = -1;
 
   average->refColorBlue    = NAN;
@@ -144 +145 @@
   average->skycellID       = 0;
   average->projectionID    = 0;
+
   average->dummy           = 0;
 

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

@@ -191 +191 @@
     out[i].Nlensing      = in[i].Nlensing;     
     out[i].Nlensobj      = in[i].Nlensobj;     
+    out[i].Nstarpar      = in[i].Nstarpar;     
     out[i].Nextend       = in[i].Nextend;     
 
@@ -197 +198 @@
     out[i].lensingOffset = in[i].lensingOffset;
     out[i].lensobjOffset = in[i].lensobjOffset;
+    out[i].starparOffset = in[i].starparOffset;
     out[i].extendOffset  = in[i].extendOffset;
-    out[i].paramsOffset  = in[i].paramsOffset;
 
     out[i].refColorBlue  = in[i].refColorBlue;
@@ -258 +259 @@
     out[i].Nlensing       = in[i].Nlensing;     
     out[i].Nlensobj       = in[i].Nlensobj;     
+    out[i].Nstarpar       = in[i].Nstarpar;     
     out[i].Nextend        = in[i].Nextend;     
                           
@@ -264 +266 @@
     out[i].lensingOffset  = in[i].lensingOffset;
     out[i].lensobjOffset  = in[i].lensobjOffset;
+    out[i].starparOffset  = in[i].starparOffset;
     out[i].extendOffset   = in[i].extendOffset;
-    out[i].paramsOffset   = in[i].paramsOffset;
                           
     out[i].refColorBlue   = in[i].refColorBlue;
@@ -975 +977 @@
     out[i].lensingOffset  = in[i].lensingOffset;
     out[i].lensobjOffset  = in[i].lensobjOffset;
+    out[i].starparOffset  = in[i].starparOffset;
     out[i].extendOffset   = in[i].extendOffset;
-    out[i].paramsOffset   = in[i].paramsOffset;
                           
     out[i].refColorBlue   = in[i].refColorBlue;