Changeset 41170 for branches/eam_branches/ipp-20191011/ippTools/src

Timestamp:

Nov 27, 2019, 11:39:38 AM (7 years ago)

Author:

eugene

Message:

merge changes from trunk (mostly Ohana & ippMonitor improvements, some work on ippTools)

Location:

branches/eam_branches/ipp-20191011

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/addtool.c (modified) (1 diff)
• ippTools/src/camtool.c (modified) (2 diffs)
• ippTools/src/camtoolConfig.c (modified) (1 diff)
• ippTools/src/pxcam.c (modified) (1 diff)
• ippTools/src/stacktool.c (modified) (1 diff)
• ippTools/src/stacktoolConfig.c (modified) (1 diff)

branches/eam_branches/ipp-20191011/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)) {

branches/eam_branches/ipp-20191011/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
         );
 

branches/eam_branches/ipp-20191011/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();

branches/eam_branches/ipp-20191011/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

branches/eam_branches/ipp-20191011/ippTools/src/stacktool.c

@@ -1211 +1211 @@
     PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.stack_id", "==");
     PXOPT_COPY_STR(config->args, where, "-tess_id", "stackRun.tess_id", "LIKE");
-    PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-filter", "stackRun.filter", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-state", "stackRun.state", "==");

branches/eam_branches/ipp-20191011/ippTools/src/stacktoolConfig.c

@@ -207 +207 @@
     psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,            "search by stack ID", 0);
     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-tess_id", 0,            "search by tess ID (LIKE comparison)", 0);
-    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0,         "search by skycell ID", 0);
+    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0,         "search by skycell ID (LIKE comparison)", 0);
 #ifdef notdef
     // These don't work so omit (for now) We probably should create a different mode for this type of search.