Changeset 34747 for branches/eam_branches/ipp-20120905/ippTools

Timestamp:

Nov 30, 2012, 9:57:42 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (3 diffs, 1 prop)
• ippTools/share/staticskytool_pendingskycalrun.sql (modified) (1 diff)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippTools/src/stacktool.c (modified) (3 diffs)
• ippTools/src/stacktoolConfig.c (modified) (2 diffs)
• ippTools/src/staticskytool.c (modified) (3 diffs)
• ippTools/src/staticskytoolConfig.c (modified) (2 diffs)
• ippTools/src/warptool.c (modified) (3 diffs)
• ippTools/src/warptoolConfig.c (modified) (2 diffs)

branches/eam_branches/ipp-20120905/ippTools/share/pxadmin_create_tables.sql

@@ -996 +996 @@
     maskfrac_magic FLOAT,
     maskfrac_advisory FLOAT,
+    background_model SMALLINT,
     PRIMARY KEY(warp_id, skycell_id, tess_id),
     KEY(good_frac),
@@ -1078 +1079 @@
         good_frac FLOAT,
         mjd_obs DOUBLE,
-        quality SMALLINT NOT NULL DEFAULT 0,
         fault SMALLINT,
         software_ver VARCHAR(16),
+        background_model SMALLINT,
+        quality SMALLINT NOT NULL DEFAULT 0,
         PRIMARY KEY(stack_id),
         KEY(dtime_stack),
@@ -2115 +2117 @@
       sigma_dec FLOAT,
       n_astrom INT,
+      n_detections INT,
+      n_extended INT,
       zpt_obs FLOAT,
       zpt_stdev FLOAT,

branches/eam_branches/ipp-20120905/ippTools/share/staticskytool_pendingskycalrun.sql

@@ -6 +6 @@
     staticskyResult.path_base,
     rawExp.camera,
-    staticskyResult.num_inputs = 1 AS singlefilter
+    0 AS  singlefilter
 FROM skycalRun
 JOIN staticskyRun USING (sky_id)

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

@@ -1006 +1006 @@
     PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false);
 
+    PXOPT_LOOKUP_S16(background_model, config->args, "-background_model", false, false);
+    
     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s ppstack %s streaks %s\n",
             ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_ppstack,ver_streaks);
@@ -1067 +1069 @@
                                fault,
                                software_ver,
+                               background_model,
                                quality
           )) {
@@ -1121 +1124 @@
     PXOPT_COPY_F64(config->args, where, "-mjd_obs_begin", "stackSumSkyfile.mjd_obs", ">=");
     PXOPT_COPY_F64(config->args, where, "-mjd_obs_end", "stackSumSkyfile.mjd_obs", "<=");
-
+    PXOPT_COPY_S16(config->args, where, "-background_model","stackSumSkyfile.background_model", "==");
 
 //  The following three selectors are incompatible with the sql so omit them

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

@@ -190 +190 @@
     psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-ver_streaks", 0, "define streaksremove version", NULL);
 
+    psMetadataAddS16(addsumskyfileArgs, PS_LIST_TAIL, "-background_model", 0, "define background model version", 0);
+    
     // -sumskyfile
     psMetadata *sumskyfileArgs= psMetadataAlloc();
@@ -201 +203 @@
     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-exp_name", 0,          "search by exposure name", NULL);
 #endif
+    psMetadataAddS16(sumskyfileArgs, PS_LIST_TAIL, "-background_model", 0, "search by background model version", 0);
     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK,             "search by stackRun.label", NULL);
     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK,        "search by stackRun.data_group (LIKE comparison)", NULL);

branches/eam_branches/ipp-20120905/ippTools/src/staticskytool.c

@@ -132 +132 @@
     pxAddLabelSearchArgs(config, whereMD, "-select_data_group",    "stackRun.data_group",       "LIKE");
     pxAddLabelSearchArgs(config, whereMD, "-select_filter",        "stackRun.filter",           "LIKE");
+#ifdef notdef
     PXOPT_COPY_F32(config->args, whereMD, "-select_glat_min",      "skycell.glat",              ">=");
     PXOPT_COPY_F32(config->args, whereMD, "-select_glat_max",      "skycell.glat",              "<=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_rahours_min",   "skycell.radeg/15",          ">=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_rahours_max",   "skycell.radeg/15",          "<=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_radeg_min",     "skycell.radeg",             ">=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_radeg_max",     "skycell.radeg",             "<=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_decdeg_min",    "skycell.decdeg",             ">=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_decdeg_max",    "skycell.decdeg",             "<=");
+#endif
+    if (!pxskycellAddWhere(config, whereMD)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
+        return false;
+    }
 
     // find the number of requested filters:
@@ -1263 +1275 @@
 
     PXOPT_LOOKUP_STR(hostname, config->args,    "-hostname", false, false);
-//    PXOPT_LOOKUP_S32(n_stars, config->args,     "-n_stars", false, false);
     PXOPT_LOOKUP_S32(n_astrom, config->args,    "-n_astrom", false, false);
+    PXOPT_LOOKUP_S32(n_detections, config->args,    "-n_detections", false, false);
+    PXOPT_LOOKUP_S32(n_extended, config->args,    "-n_extended", false, false);
 
     PXOPT_LOOKUP_STR(path_base, config->args,   "-path_base", false, false);
@@ -1303 +1316 @@
         sigma_dec,
         n_astrom,
+        n_detections,
+        n_extended,
         zpt_obs,
         zpt_stdev,

branches/eam_branches/ipp-20120905/ippTools/src/staticskytoolConfig.c

@@ -55 +55 @@
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK, "search by stackRun data_group (LIKE comparison, multiple OK)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiple OK)", NULL);
+    pxskycellAddArguments(definebyqueryArgs);
+#ifdef notdef
     psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_glat_min", 0, "define min galactic latitude", NAN);
     psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_glat_max", 0, "define max galactic latitude", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_rahours_min", 0, "define min RA in hours", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_rahours_max", 0, "define max RA in hours", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_radeg_min", 0, "define min RA in degrees", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_radeg_max", 0, "define max RA in degrees", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_decdeg_min", 0, "define min DEC in degrees", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_decdeg_max", 0, "define max DEC in degrees", NAN);
+#endif
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_workdir", 0, "define workdir (required)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_label", 0, "define label (required)", NULL);
@@ -204 +213 @@
     // psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_stars", 0,            "define number of stars", 0);
     psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_astrom", 0,            "define number of astrometry reference objects", 0);
+    psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_detections", 0,        "define number of detections", 0);
+    psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_extended", 0,          "define number of extended detections", 0);
 
     psMetadataAddStr(addskycalresultArgs, PS_LIST_TAIL, "-path_base", 0,            "define base output location", NULL);

branches/eam_branches/ipp-20120905/ippTools/src/warptool.c

@@ -1101 +1101 @@
     PXOPT_LOOKUP_F32(maskfrac_advisory, config->args, "-maskfrac_advisory", false, false);
 
+    PXOPT_LOOKUP_S16(background_model, config->args, "-background_model", false, false);
+    
     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s pswarp %s streaks %s\n",
             ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_pswarp,ver_streaks);
@@ -1159 +1161 @@
                            maskfrac_dynamic,
                            maskfrac_magic,
-                           maskfrac_advisory
+                           maskfrac_advisory,
+                           background_model
         )) {
         if (!psDBRollback(config->dbh)) {
@@ -1392 +1395 @@
     PXOPT_COPY_STR(config->args, where, "-filter",    "rawExp.filter", "LIKE");
     PXOPT_COPY_S64(config->args, where, "-magicked", "warpSkyfile.magicked", "==");
+    PXOPT_COPY_S16(config->args, where, "-background_model", "warpSkyfile.background_model", "==");
     pxAddLabelSearchArgs (config, where, "-label",   "warpRun.label", "LIKE");
     pxAddLabelSearchArgs (config, where, "-data_group",   "warpRun.data_group", "LIKE");

branches/eam_branches/ipp-20120905/ippTools/src/warptoolConfig.c

@@ -237 +237 @@
     psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-maskfrac_advisory", 0, "define advisory mask fraction", NAN);
 
+    psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-background_model", 0, "define background model version", 0);
     
     // -warped
@@ -254 +255 @@
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-data_group",  PS_META_DUPLICATE_OK, "search by warpRun data_group", NULL);
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-dist_group",  PS_META_DUPLICATE_OK, "search by warpRun dist_group", NULL);
+    psMetadataAddS16(warpedArgs, PS_LIST_TAIL,  "-background_model", 0, "search by background model version", 0);
     // add magic related arguments
     pxmagicAddArguments(warpedArgs);