Changeset 38441 for trunk/Ohana/src/getstar

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/getstar/src/WriteImageFITS.c (modified) (1 diff)
• src/getstar/src/dvoImageExtract.c (modified) (2 diffs)
• src/getstar/src/dvoImageOverlaps.c (modified) (2 diffs)
• src/getstar/src/dvoImagesAtCoords.c (modified) (2 diffs)
• src/getstar/src/getstar.c (modified) (5 diffs)
• src/getstar/src/select_by_region.c (modified) (1 diff)
• src/getstar/src/write_getstar_ps1_dev_0.c (modified) (1 diff)
• src/getstar/src/write_getstar_ps1_dev_1.c (modified) (1 diff)
• src/getstar/src/write_getstar_ps1_dev_2.c (modified) (1 diff)

trunk/Ohana/src/getstar/src/WriteImageFITS.c

@@ -36 +36 @@
 
   table.header = &theader;
-  gfits_table_set_SMPData (&table, NULL, Nstars);
+  gfits_table_set_SMPData (&table, NULL, Nstars, TRUE);
   gfits_fwrite_Theader (f, &theader);
   gfits_fwrite_table   (f, &table);

trunk/Ohana/src/getstar/src/dvoImageExtract.c

@@ -14 +14 @@
   /*** update the image table ***/
   /* setup image table format and lock */
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
@@ -31 +32 @@
 
   // convert database table to internal structure
-  images = gfits_table_get_Image (&db.ftable, &Nimages, &db.swapped);
+  images = gfits_table_get_Image (&db.ftable, &Nimages, &db.scaledValue, &db.nativeOrder);
   if (!images) {
     fprintf (stderr, "ERROR: failed to read images\n");

trunk/Ohana/src/getstar/src/dvoImageOverlaps.c

@@ -17 +17 @@
   /*** update the image table ***/
   /* setup image table format and lock */
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
@@ -34 +35 @@
 
   // convert database table to internal structure
-  dbImages = gfits_table_get_Image (&db.ftable, &NdbImages, &db.swapped);
+  dbImages = gfits_table_get_Image (&db.ftable, &NdbImages, &db.scaledValue, &db.nativeOrder);
   if (!dbImages) {
     fprintf (stderr, "ERROR: failed to read images\n");

trunk/Ohana/src/getstar/src/dvoImagesAtCoords.c

@@ -43 +43 @@
     /*** update the image table ***/
     /* setup image table format and lock */
+    gfits_db_init (&db);
     db.mode   = dvo_catalog_catmode (CATMODE);
     db.format = dvo_catalog_catformat (CATFORMAT);
@@ -60 +61 @@
 
     // convert database table to internal structure
-    dbImages = gfits_table_get_Image (&db.ftable, &NdbImages, &db.swapped);
+    dbImages = gfits_table_get_Image (&db.ftable, &NdbImages, &db.scaledValue, &db.nativeOrder);
     if (!dbImages) {
       fprintf (stderr, "ERROR: failed to read images\n");

trunk/Ohana/src/getstar/src/getstar.c

@@ -28 +28 @@
   output.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
   output.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
-  output.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+  output.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
   output.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -63 +63 @@
         catalog.filename = skylist[0].filename[i];
         catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-        catalog.catflags = LOAD_AVES | LOAD_SECF;
-        catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
+        catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
+        catalog.catflags |= needMeas ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
 
         // an error exit status here is a significant error
@@ -71 +71 @@
           exit (2);
         }
-        if (!catalog.Naves_disk) {
+        if (!catalog.Naverage_disk) {
           dvo_catalog_unlock (&catalog);
           dvo_catalog_free (&catalog);
@@ -95 +95 @@
         catalog.filename = skylist[0].filename[i];
         catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-        catalog.catflags = LOAD_AVES | LOAD_SECF;
-        catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
+        catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
+        catalog.catflags |= needMeas ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
 
         // an error exit status here is a significant error
@@ -104 +104 @@
         }
         /* skip empty catalogs */
-        if (!catalog.Naves_disk) continue;
+        if (!catalog.Naverage_disk) continue;
         stars = select_by_image (&catalog, &image, 0, 0, stars, &Nstars);
       }

trunk/Ohana/src/getstar/src/select_by_region.c

@@ -162 +162 @@
   output[0].Naverage = Nave;
   output[0].Nmeasure = Nmeas;
-  output[0].Nsecf_mem = Nave*Nsecfilt;
+  output[0].Nsecfilt_mem = Nave*Nsecfilt;
 
   fprintf (stderr, "output catalog has "OFF_T_FMT" stars ("OFF_T_FMT" measures, %d secfilt)\n",

trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_0.c

@@ -111 +111 @@
 
   ftable.header = &theader;
-  gfits_table_set_Getstar_PS1_DEV_0 (&ftable, output, Noutput);
+  gfits_table_set_Getstar_PS1_DEV_0 (&ftable, output, Noutput, TRUE);
 
   gfits_fwrite_header  (f, &header);

trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_1.c

@@ -114 +114 @@
 
   ftable.header = &theader;
-  gfits_table_set_Getstar_PS1_DEV_1 (&ftable, output, Noutput);
+  gfits_table_set_Getstar_PS1_DEV_1 (&ftable, output, Noutput, TRUE);
 
   gfits_fwrite_header  (f, &header);

trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_2.c

@@ -120 +120 @@
 
   ftable.header = &theader;
-  gfits_table_set_Getstar_PS1_DEV_2 (&ftable, output, Noutput);
+  gfits_table_set_Getstar_PS1_DEV_2 (&ftable, output, Noutput, TRUE);
 
   gfits_fwrite_header  (f, &header);