Changeset 41072 for trunk/ippTools/src

Timestamp:

Nov 7, 2019, 3:57:35 PM (7 years ago)

Author:

cclin33

Message:

let astrometry statistic results added into mysql database from smf file

Location:

trunk/ippTools/src

Files:

• . (modified) (1 prop)
• addtool.c (modified) (1 diff)
• camtool.c (modified) (2 diffs)
• camtoolConfig.c (modified) (1 diff)
• pxcam.c (modified) (1 diff)

trunk/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);
+ 
 
   if (!psDBTransaction(config->dbh)) {

trunk/ippTools/src/camtool.c

@@ -524 +524 @@
     PXOPT_LOOKUP_F32(maskfrac_max_advisory, config->args, "-maskfrac_max_advisory", false, false);
     
+    PXOPT_LOOKUP_F32(ast_r0, config->args, "-ast_r0", false, false);
+    PXOPT_LOOKUP_F32(ast_d0, config->args, "-ast_d0", false, false);
+    PXOPT_LOOKUP_F32(ast_t0, config->args, "-ast_t0", false, false);
+    PXOPT_LOOKUP_F32(ast_s0, config->args, "-ast_s0", false, false);
+    PXOPT_LOOKUP_F32(ast_rs, config->args, "-ast_rs", false, false);
+    PXOPT_LOOKUP_F32(ast_ds, config->args, "-ast_ds", false, false);
+
     // we store actual detection efficiency by adding in zpt_obs
     PXOPT_LOOKUP_F32(deteff_inst, config->args, "-deteff_inst", false, false);
@@ -695 +702 @@
         quality,
         background_model,
-        astrom_chips
+        astrom_chips,
+
+        ast_r0,
+        ast_d0,
+        ast_t0,
+        ast_s0,
+        ast_rs,
+        ast_ds
         );
 

trunk/ippTools/src/camtoolConfig.c

@@ -207 +207 @@
     psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-astrom_chips", 0, "chips with successful astrom", 0);
 
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_r0", 0,   "define boresite offset in RA", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_d0", 0,   "define boresite offset in DEC", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_t0", 0,   "define boresite angle", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_s0", 0,   "define bosite scale", NAN); 
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_rs", 0,   "define bosite scatter in RA", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_ds", 0,   "define bosite scatter in DEC", NAN);
+
     // -processedexp
     psMetadata *processedexpArgs = psMetadataAlloc();

trunk/ippTools/src/pxcam.c

@@ -186 +186 @@
                          // Here follows the software version and mask statistics which shouldn't be propagated
                          "NULL",
-                         "NULL",
-                         "NULL",
-                         "NULL",
-                         "NULL",
-                         "NULL",
-                         "NULL",
-                         "NULL",
-                         "NULL",
-                         "NULL",
-                         "NULL",
+                         "0",
+                         "0",
+                         "0",
+                         "0",
+                         "0",
+                         "0",
+                         "0",
+                         "0",
+                         "0",
+                         "0",
                 note     ? note     : "NULL",
                 (long long)chip_id