Changeset 34394

Timestamp:

Sep 5, 2012, 3:48:04 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120805

Files:

• ippTasks/survey.pro (modified) (4 diffs)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• 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) (1 diff)
• ippTools/src/stacktoolConfig.c (modified) (1 diff)
• ppStack/src/ppStackConvolve.c (modified) (1 diff)
• psvideophot (modified) (1 prop)

branches/eam_branches/ipp-20120805/ippTasks/survey.pro

@@ -144 +144 @@
 # user functions to manipulate warp/stack diff labels
 macro survey.add.WSdiff
-  if ($0 != 5)
-    echo "USAGE: survey.add.WSdiff (warp label) (stack label) (dist_group) (workdir base)"
+  if ($0 != 6)
+    echo "USAGE: survey.add.WSdiff (warp label) (stack label) (dist_group) (workdir base) (target label)"
     break
   end
@@ -152 +152 @@
   book setword SURVEY_DIFF_WARPSTACK $1 DIST_GROUP $3
   book setword SURVEY_DIFF_WARPSTACK $1 WORKDIR $4
+  book setword SURVEY_DIFF_WARPSTACK $1 TARGET_LABEL $5
   book setword SURVEY_DIFF_WARPSTACK $1 STATE PENDING
 end
@@ -583 +584 @@
     book getword SURVEY_DIFF_WARPSTACK $label WORKDIR -var workdir
     book getword SURVEY_DIFF_WARPSTACK $label DIST_GROUP -var dist_group
+    book getword SURVEY_DIFF_WARPSTACK $label TARGET_LABEL -var target_label
 
     $year = `date +%Y`
@@ -593 +595 @@
     $run = $run -stack_label $stack_label
     $run = $run -set_dist_group $dist_group
-    $run = $run -set_label $label
-    $run = $run -set_workdir $workdir/$label/$year/$month/$day
+    $run = $run -set_label $target_label
+    $run = $run -set_workdir $workdir/$target_label/$year/$month/$day
     $run = $run -set_reduction WARPSTACK
     $run = $run -available

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

@@ -1109 +1109 @@
     PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "==");
     PXOPT_COPY_STR(config->args, where, "-filter", "stackRun.filter", "LIKE");
-    PXOPT_COPY_STR(config->args, where, "-label", "stackRun.label", "==");
-    PXOPT_COPY_STR(config->args, where, "-data_group", "stackRun.data_group", "LIKE");
+    pxAddLabelSearchArgs(config, where, "-label", "stackRun.label", "LIKE");
+    pxAddLabelSearchArgs(config, where, "-data_group", "stackRun.data_group", "LIKE");
     PXOPT_COPY_S16(config->args, where, "-fault", "stackSumSkyfile.fault", "==");
     PXOPT_COPY_F64(config->args, where, "-mjd_obs_begin", "stackSumSkyfile.mjd_obs", ">=");

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

@@ -200 +200 @@
     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-exp_name", 0,          "search by exposure name", NULL);
 #endif
-    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-label", 0,             "search by stackRun.label", NULL);
-    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-data_group", 0,        "search by stackRun.data_group (LIKE comparison)", NULL);
+    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);
     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-filter", 0,            "search by filter (LIKE comparison)", NULL);
     psMetadataAddF64(sumskyfileArgs, PS_LIST_TAIL, "-mjd_obs_begin",  0,      "search by mjd_obs (average mjd_obs of inputs <=)", NAN);

branches/eam_branches/ipp-20120805/ppStack/src/ppStackConvolve.c

@@ -403 +403 @@
                     continue;
                 }
-                if (options->matchChi2->data.F32[i] > thresh) {
+                if ((options->matchChi2->data.F32[i] > thresh) || ! isfinite(options->matchChi2->data.F32[i])) {
                     numRej++;
                     options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] |= PPSTACK_MASK_CHI2;