Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/Ohana/src/getstar

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/getstar (modified) (1 prop)
• Ohana/src/getstar/src/GetFileMode.c (modified) (1 diff)
• Ohana/src/getstar/src/ReadImageFiles.c (modified) (1 diff)
• Ohana/src/getstar/src/getstar.c (modified) (1 diff)
• Ohana/src/getstar/src/select_by_region.c (modified) (2 diffs)
• Ohana/src/getstar/src/write_getstar_ps1_dev_0.c (modified) (3 diffs)
• Ohana/src/getstar/src/write_getstar_ps1_dev_1.c (modified) (3 diffs)
• Ohana/src/getstar/src/write_getstar_ps1_dev_2.c (modified) (3 diffs)

branches/eam_branches/ps2-tc3-20130727/Ohana/src/getstar/src/GetFileMode.c

@@ -8 +8 @@
   int simple, extend, haveNaxis, haveCTYPE;
 
+  // NOTE target of %t must be int length
   gfits_scan_alt (header, "SIMPLE", "%t", 1, &simple);
   haveNaxis = gfits_scan (header, "NAXIS",  "%d", 1, &Naxis);

branches/eam_branches/ps2-tc3-20130727/Ohana/src/getstar/src/ReadImageFiles.c

@@ -138 +138 @@
           !strcmp (tmpword, "PS1_V1") ||  
           !strcmp (tmpword, "PS1_V2") ||  
-          !strcmp (tmpword, "PS1_V3")) {
+          !strcmp (tmpword, "PS1_V3") ||  
+          !strcmp (tmpword, "PS1_V4") ||  
+          !strcmp (tmpword, "PS1_V5")) {
 
           exttype[Nimage] = strcreate (tmpword);

branches/eam_branches/ps2-tc3-20130727/Ohana/src/getstar/src/getstar.c

@@ -14 +14 @@
   set_db (&db);
 
-  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, TRUE, SKY_DEPTH, VERBOSE);
+  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, FALSE, SKY_DEPTH, VERBOSE);
   if (!sky) exit (1);
     

branches/eam_branches/ps2-tc3-20130727/Ohana/src/getstar/src/select_by_region.c

@@ -73 +73 @@
         for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
           if (catalog[0].measure[offset + m].photcode == code) {
-            mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
+            mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt], MAG_CLASS_PSF);
             break;
           }
@@ -126 +126 @@
         for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
           if (catalog[0].measure[offset + m].photcode == code) {
-            mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
+            mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt], MAG_CLASS_PSF);
             break;
           }

branches/eam_branches/ps2-tc3-20130727/Ohana/src/getstar/src/write_getstar_ps1_dev_0.c

@@ -61 +61 @@
       for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c0) {
-          output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
+          output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
           break;
         }
@@ -75 +75 @@
       for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c1) {
-          output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
+          output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
           break;
         }
@@ -89 +89 @@
       for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c2) {
-          output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
+          output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
           break;
         }

branches/eam_branches/ps2-tc3-20130727/Ohana/src/getstar/src/write_getstar_ps1_dev_1.c

@@ -64 +64 @@
       for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c0) {
-          output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
+          output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
           break;
         }
@@ -78 +78 @@
       for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c1) {
-          output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
+          output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
           break;
         }
@@ -92 +92 @@
       for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c2) {
-          output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
+          output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
           break;
         }

branches/eam_branches/ps2-tc3-20130727/Ohana/src/getstar/src/write_getstar_ps1_dev_2.c

@@ -70 +70 @@
       for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c0) {
-          output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
+          output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
           break;
         }
@@ -84 +84 @@
       for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c1) {
-          output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
+          output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
           break;
         }
@@ -98 +98 @@
       for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c2) {
-          output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
+          output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
           break;
         }