Changeset 40964

Timestamp:

Oct 24, 2019, 10:51:45 AM (7 years ago)

Author:

cclin33

Message:

add astrometry codes related

Location:

branches/ccl_branches/ipp-20190806

Files:

• dbconfig/add.md (modified) (2 diffs)
• dbconfig/minidvodb.md (modified) (2 diffs)
• ippTools/src/addtool.c (modified) (2 diffs)
• ippTools/src/camtool.c (modified) (2 diffs)
• ippdb/src/ippdb.c (modified) (1 diff)
• ippdb/src/ippdb.h (modified) (1 diff)

branches/ccl_branches/ipp-20190806/dbconfig/add.md

@@ -3 +3 @@
     add_id          S64     0       # Primary Key AUTO_INCREMENT
     stage           STR     64      # what the stage is (warp, cam, diff,
-    stage_id          S64     0       # Key INDEX(add_id,cam_id) fkey(cam_id)    ref camRun(cam_id)
+    stage_id        S64     0       # Key INDEX(add_id,cam_id) fkey(cam_id)    ref camRun(cam_id)
     stage_extra1    S32     0       
     state           STR     64      # Key
@@ -17 +17 @@
     minidvodb_group STR     64
     minidvodb_name  STR     64
-    hostname       STR      64
+    hostname        STR     64
 END
 

branches/ccl_branches/ipp-20190806/dbconfig/minidvodb.md

@@ -6 +6 @@
     state           STR    64
     creation_date   UTC    0001-01-01T00:00:00Z
+    hostname        STR    64
 END 
 
@@ -15 +16 @@
     epoch           UTC    0001-01-01T00:00:00Z
     fault           S16    0
-    hostname        STR    64
 END
 

branches/ccl_branches/ipp-20190806/ippTools/src/addtool.c

@@ -1668 +1668 @@
   PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", false, false);
   PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
+  PXOPT_LOOKUP_STR(hostname, config->args,"-hostname", false, false);
+ 
 
   if (!psDBTransaction(config->dbh)) {
@@ -1690 +1692 @@
                           minidvodbpath,
                           "new",
-                          0
+                          0,
+                          hostname
                           )) {
     psError(PS_ERR_UNKNOWN, false, "database error");

branches/ccl_branches/ipp-20190806/ippTools/src/camtool.c

@@ -702 +702 @@
         quality,
         background_model,
-        astrom_chips
+        astrom_chips,
+
         ast_r0,
         ast_d0,
@@ -708 +709 @@
         ast_s0,
         ast_rs,
-        ast_ds,
+        ast_ds
         );
 

branches/ccl_branches/ipp-20190806/ippdb/src/ippdb.c

@@ -9298 +9298 @@
 static void camProcessedExpRowFree(camProcessedExpRow *object);
 
-camProcessedExpRow *camProcessedExpRowAlloc(psS64 cam_id, const char *uri, psF32 bg, psF32 bg_stdev, psF32 bg_mean_stdev, psF32 bias, psF32 bias_stdev, psF32 fringe_0, psF32 fringe_1, psF32 fringe_2, psF32 sigma_ra, psF32 sigma_dec, psF32 ap_resid, psF32 ap_resid_stdev, psF32 zp_mean, psF32 zp_stdev, psF32 fwhm_major, psF32 fwhm_minor, psF32 iq_m2, psF32 iq_m2_err, psF32 iq_m2_lq, psF32 iq_m2_uq, psF32 iq_m2c, psF32 iq_m2c_err, psF32 iq_m2c_lq, psF32 iq_m2c_uq, psF32 iq_m2s, psF32 iq_m2s_err, psF32 iq_m2s_lq, psF32 iq_m2s_uq, psF32 iq_m3, psF32 iq_m3_err, psF32 iq_m3_lq, psF32 iq_m3_uq, psF32 iq_m4, psF32 iq_m4_err, psF32 iq_m4_lq, psF32 iq_m4_uq, psF32 dtime_script, psF32 dtime_astrom, psF32 dtime_addstar, const char *hostname, psS32 n_stars, psS32 n_psfstars, psS32 n_iqstars, psS32 n_extended, psS32 n_cr, psS32 n_astrom, const char *path_base, psS16 fault)
+camProcessedExpRow *camProcessedExpRowAlloc(psS64 cam_id, const char *uri, psF32 bg, psF32 bg_stdev, psF32 bg_mean_stdev, psF32 bias, psF32 bias_stdev, psF32 fringe_0, psF32 fringe_1, psF32 fringe_2, psF32 sigma_ra, psF32 sigma_dec, psF32 ap_resid, psF32 ap_resid_stdev, psF32 zp_mean, psF32 zp_stdev, psF32 fwhm_major, psF32 fwhm_minor, psF32 iq_m2, psF32 iq_m2_err, psF32 iq_m2_lq, psF32 iq_m2_uq, psF32 iq_m2c, psF32 iq_m2c_err, psF32 iq_m2c_lq, psF32 iq_m2c_uq, psF32 iq_m2s, psF32 iq_m2s_err, psF32 iq_m2s_lq, psF32 iq_m2s_uq, psF32 iq_m3, psF32 iq_m3_err, psF32 iq_m3_lq, psF32 iq_m3_uq, psF32 iq_m4, psF32 iq_m4_err, psF32 iq_m4_lq, psF32 iq_m4_uq, psF32 dtime_script, psF32 dtime_astrom, psF32 dtime_addstar, const char *hostname, psS32 n_stars, psS32 n_psfstars, psS32 n_iqstars, psS32 n_extended, psS32 n_cr, psS32 n_astrom, const char *path_base, psS16 fault, psF32 ast_r0, psF32 ast_d0, psF32 ast_t0, psF32 ast_s0, psF32 ast_rs, psF32 ast_ds)
 {
     camProcessedExpRow *_object;

branches/ccl_branches/ipp-20190806/ippdb/src/ippdb.h

@@ -3685 +3685 @@
     psS32           n_astrom,
     const char      *path_base,
-    psS16           fault
+    psS16           fault,
+    psF32           ast_r0,
+    psF32           ast_d0,
+    psF32           ast_t0,
+    psF32           ast_s0,
+    psF32           ast_rs,
+    psF32           ast_ds
 );