Changeset 39254 for trunk

Timestamp:

Dec 11, 2015, 5:03:35 PM (11 years ago)

Author:

watersc1

Message:

Calculate IAU and PSO names for both object and diff objects.

Location:

trunk/Ohana/src/dvopsps/src

Files:

• insert_diffobj_dvopsps_catalog.c (modified) (3 diffs)
• insert_objects_dvopsps_catalog.c (modified) (3 diffs)

trunk/Ohana/src/dvopsps/src/insert_diffobj_dvopsps_catalog.c

@@ -94 +94 @@
                  "CAT_ID        INT,      " 
                  "RA_MEAN       DOUBLE,   "          
-                 "DEC_MEAN      DOUBLE,   "         
+                 "DEC_MEAN      DOUBLE,   "
                  "RA_ERR        FLOAT,    "      
-                 "DEC_ERR       FLOAT,    "     
+                 "DEC_ERR       FLOAT,    "
+                 "IAU_NAME      VARCHAR(32), "
+                 "PSO_NAME      VARCHAR(32), "
                  "FLAGS         INT       "       
                  ")\n", basename);
@@ -167 +169 @@
                  "DEC_MEAN,      "         
                  "RA_ERR,        "      
-                 "DEC_ERR,       "     
+                 "DEC_ERR,       "
+                 "IAU_NAME,      "
+                 "PSO_NAME,      "
                  "FLAGS          "       
                  ") VALUES \n", basename);
@@ -218 +222 @@
   PRINT_FLOAT(ave_buffer, average->dD,       "%.5f, ");  // 0.010 mas precision
 
+  // Add names.
+  int ra_hr,ra_min,ra_sec,ra_fracsec;
+  int dec_deg,dec_min,dec_sec,dec_fracsec;
+  double tmp_ra = average->R;
+  double tmp_dec = average->D;
+  double dec_sign = tmp_dec / fabs(tmp_dec);
+  tmp_dec = fabs(tmp_dec);
+
+  tmp_ra /= 15.0;
+  ra_hr   = (int) floor(tmp_ra);
+
+  tmp_ra -= ra_hr;
+  tmp_ra *= 60.0;
+  ra_min  = (int) floor(tmp_ra);
+  
+  tmp_ra -= ra_min;
+  tmp_ra *= 60.0;
+  ra_sec  = (int) floor(tmp_ra);
+
+  tmp_ra -= ra_sec;
+  tmp_ra *= 1000.0;
+  ra_fracsec = (int) floor(tmp_ra);
+
+  dec_deg = (int) floor(tmp_dec);
+
+  tmp_dec -= dec_deg;
+  tmp_dec *= 60.0;
+  dec_min = (int) floor(tmp_dec);
+
+  tmp_dec -= dec_min;
+  tmp_dec *= 60.0;
+  dec_sec = (int) floor(tmp_dec);
+
+  tmp_dec -= dec_sec;
+  tmp_dec *= 1000.0;
+  dec_fracsec = (int) floor(tmp_dec);
+
+  dec_deg *= (int) dec_sign;
+
+  // IAU NAME
+  PrintIOBuffer(ave_buffer, "'PSO J%02d%02d%02d.%03d%+02d%02d%02d.%03d',  ",
+                ra_hr,ra_min,ra_sec,ra_fracsec,
+                dec_deg,dec_min,dec_sec,dec_fracsec);
+
+  // PSO NAME
+  tmp_ra = average->R;
+  tmp_dec = average->D;
+  PrintIOBuffer(ave_buffer, "'PSO J%.5f%+.5f',  ",
+                tmp_ra,tmp_dec);
+
+  // End names
+  
   PrintIOBuffer (ave_buffer, "%u ",  average->flags);          
   PrintIOBuffer (ave_buffer, "),\n");

trunk/Ohana/src/dvopsps/src/insert_objects_dvopsps_catalog.c

@@ -101 +101 @@
                  "EPOCH_MEAN    DOUBLE,   "         
                  "RA_ERR        FLOAT,    "      
-                 "DEC_ERR       FLOAT,    "     
+                 "DEC_ERR       FLOAT,    "
+                 "IAU_NAME      VARCHAR(32), "
+                 "PSO_NAME      VARCHAR(32), "
                  "CHISQ_POS     FLOAT,    "   
                  "CHISQ_PM      FLOAT,    "    
@@ -208 +210 @@
                  "EPOCH_MEAN,    "         
                  "RA_ERR,        "      
-                 "DEC_ERR,       "     
+                 "DEC_ERR,       "
+                 "IAU_NAME,      "
+                 "PSO_NAME,      "
                  "CHISQ_POS,     "   
                  "CHISQ_PM,      "    
@@ -276 +280 @@
   PRINT_FLOAT(ave_buffer, average->dD,       "%.5f, ");  // 0.010 mas precision
 
+  // Add names.
+  int ra_hr,ra_min,ra_sec,ra_fracsec;
+  int dec_deg,dec_min,dec_sec,dec_fracsec;
+  double tmp_ra,tmp_dec;
+
+  if (secfilt->NstackDet != 0) {
+    tmp_ra = average->Rstk;
+    tmp_dec = average->Dstk;
+  }
+  else {
+    tmp_ra = average->R;
+    tmp_dec = average->D;
+  }
+  
+  double dec_sign = tmp_dec / fabs(tmp_dec);
+  tmp_dec = fabs(tmp_dec);
+
+
+  tmp_ra /= 15.0;
+  ra_hr   = (int) floor(tmp_ra);
+
+  tmp_ra -= ra_hr;
+  tmp_ra *= 60.0;
+  ra_min  = (int) floor(tmp_ra);
+  
+  tmp_ra -= ra_min;
+  tmp_ra *= 60.0;
+  ra_sec  = (int) floor(tmp_ra);
+
+  tmp_ra -= ra_sec;
+  tmp_ra *= 1000.0;
+  ra_fracsec = (int) floor(tmp_ra);
+
+  dec_deg = (int) floor(tmp_dec);
+
+  tmp_dec -= dec_deg;
+  tmp_dec *= 60.0;
+  dec_min = (int) floor(tmp_dec);
+
+  tmp_dec -= dec_min;
+  tmp_dec *= 60.0;
+  dec_sec = (int) floor(tmp_dec);
+
+  tmp_dec -= dec_sec;
+  tmp_dec *= 1000.0;
+  dec_fracsec = (int) floor(tmp_dec);
+
+  dec_deg *= (int) dec_sign;
+
+  // IAU NAME
+  PrintIOBuffer(ave_buffer, "'PSO J%02d%02d%02d.%03d%+02d%02d%02d.%03d',  ",
+                ra_hr,ra_min,ra_sec,ra_fracsec,
+                dec_deg,dec_min,dec_sec,dec_fracsec);
+
+  // PSO NAME
+  if (secfilt->NstackDet != 0) {
+    tmp_ra = average->Rstk;
+    tmp_dec = average->Dstk;
+  }
+  else {
+    tmp_ra = average->R;
+    tmp_dec = average->D;
+  }
+
+  PrintIOBuffer(ave_buffer, "'PSO J%.5f%+.5f',  ",
+                tmp_ra,tmp_dec);
+
+  // End names
+  
   PRINT_FLOAT(ave_buffer, average->ChiSqAve, "%.4f, ");
   PRINT_FLOAT(ave_buffer, average->ChiSqPM,  "%.4f, ");