Changeset 16810 for trunk/Ohana/src/getstar

Timestamp:

Mar 4, 2008, 12:39:41 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080223 : updates to DVO output format, addstar (SDSS and 2MASS flags), relastro (FitChip)

Location:

trunk/Ohana/src/getstar/src

Files:

• ReadImageHeader.c (modified) (1 diff)
• select_by_region.c (modified) (3 diffs)
• write_getstar_ps1_dev_0.c (modified) (3 diffs)
• write_getstar_ps1_dev_1.c (modified) (3 diffs)
• write_getstar_ps1_dev_2.c (modified) (3 diffs)

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

@@ -98 +98 @@
   image[0].Xm   = NAN_S_SHORT;
   image[0].code = 0;
-  bzero (image[0].dummy, sizeof(image[0].dummy));
 
   return (TRUE);

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

@@ -54 +54 @@
         mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
       } else {
-        offset = catalog[0].average[i].offset;
-        for (m = 0; m < catalog[0].average[i].Nm; m++) {
+        offset = catalog[0].average[i].measureOffset;
+        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]);
@@ -66 +66 @@
 
     output[0].average[Nave] = catalog[0].average[i];
-    output[0].average[Nave].offset = Nmeas;
+    output[0].average[Nave].measureOffset = Nmeas;
     for (j = 0; j < Nsecfilt; j++) {
       output[0].secfilt[Nsecfilt*Nave + j] = catalog[0].secfilt[Nsecfilt*i + j];
@@ -72 +72 @@
 
     Nm = 0;
-    offset = catalog[0].average[i].offset;
+    offset = catalog[0].average[i].measureOffset;
 
-    for (j = 0; j < catalog[0].average[i].Nm; j++) {
+    for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
       output[0].measure[Nmeas] = catalog[0].measure[offset + j];
       output[0].measure[Nmeas].averef = Nave;

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

@@ -58 +58 @@
     } else {
       output[i].mag = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      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]);
@@ -72 +72 @@
     } else {
       output[i].c1 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      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]);
@@ -86 +86 @@
     } else {
       output[i].c2 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      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]);

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

@@ -61 +61 @@
     } else {
       output[i].mag = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      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]);
@@ -75 +75 @@
     } else {
       output[i].c1 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      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]);
@@ -89 +89 @@
     } else {
       output[i].c2 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      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]);

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

@@ -67 +67 @@
     } else {
       output[i].mag = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      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]);
@@ -81 +81 @@
     } else {
       output[i].c1 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      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]);
@@ -95 +95 @@
     } else {
       output[i].c2 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      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]);