Changeset 40291 for trunk/Ohana/src/getstar

Timestamp:

Dec 13, 2017, 10:53:48 AM (9 years ago)

Author:

eugene

Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:

trunk/Ohana

Files:

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

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

@@ -127 +127 @@
 
   /* secz is in units milli-airmass */
-  image[0].Mcal = 0.0;
-  image[0].Xm   = NAN_S_SHORT;
+  image[0].McalPSF   = 0.0;
+  image[0].McalAPER  = 0.0;
+  image[0].McalChiSq = NAN;
   image[0].flags = 0;
 

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

@@ -78 +78 @@
         }
       } else {
-        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
+        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].MpsfChp;
       }
       if (isnan(mag)) continue;
@@ -131 +131 @@
         }
       } else {
-        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
+        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].MpsfChp;
       }
       if (isnan(mag) || (mag > MagLimitValue)) continue;

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

@@ -55 +55 @@
     // find primary magnitude
     if (Nsec_c0 != -1) {
-      output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].M;
+      output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].MpsfChp;
     } else {
       output[i].mag = NAN;
@@ -69 +69 @@
     // find color term 1
     if (Nsec_c1 != -1) {
-      output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].M;
+      output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].MpsfChp;
     } else {
       output[i].c1 = NAN;
@@ -83 +83 @@
     // find color term 2
     if (Nsec_c2 != -1) {
-      output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].M;
+      output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].MpsfChp;
     } else {
       output[i].c2 = NAN;

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

@@ -58 +58 @@
     // find primary magnitude
     if (Nsec_c0 != -1) {
-      output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].M;
+      output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].MpsfChp;
     } else {
       output[i].mag = NAN;
@@ -72 +72 @@
     // find color term 1
     if (Nsec_c1 != -1) {
-      output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].M;
+      output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].MpsfChp;
     } else {
       output[i].c1 = NAN;
@@ -86 +86 @@
     // find color term 2
     if (Nsec_c2 != -1) {
-      output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].M;
+      output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].MpsfChp;
     } else {
       output[i].c2 = NAN;

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

@@ -64 +64 @@
     // find primary magnitude
     if (Nsec_c0 != -1) {
-      output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].M;
+      output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].MpsfChp;
     } else {
       output[i].mag = NAN;
@@ -78 +78 @@
     // find color term 1
     if (Nsec_c1 != -1) {
-      output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].M;
+      output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].MpsfChp;
     } else {
       output[i].c1 = NAN;
@@ -92 +92 @@
     // find color term 2
     if (Nsec_c2 != -1) {
-      output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].M;
+      output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].MpsfChp;
     } else {
       output[i].c2 = NAN;