Changeset 31632

Timestamp:

Jun 15, 2011, 5:36:06 PM (15 years ago)

Author:

watersc1

Message:

committing changes from the trunk into the branch so the branch->trunk merge will go cleanly

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• Ohana/src/addstar/src/GetFileMode.c (modified) (1 diff)
• ippMonitor/raw/site.php.in (modified) (1 diff)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippTools/src/stacktool.c (modified) (1 diff)
• ippTools/src/stacktoolConfig.c (modified) (1 diff)
• ippconfig/isp/ppImage.config (modified) (1 diff)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)

branches/czw_branch/20110406/Ohana/src/addstar/src/GetFileMode.c

@@ -4 +4 @@
 int GetFileMode (Header *header) {
 
-  char ctype[81], ctmp[80];
+  char ctype[81], ctmp[81];
+
   int Naxis;
   int simple, extend, haveNaxis, haveCTYPE;

branches/czw_branch/20110406/ippMonitor/raw/site.php.in

@@ -37 +37 @@
 $REPL_DBNAME_PSTAMP = "ippRequestServer";
 
-$REPL_HOST_GPC1 = "ippc02.IfA.Hawaii.Edu";
+$REPL_HOST_GPC1 = "ippdb03.IfA.Hawaii.Edu";
 $REPL_USER_GPC1 = "ippMonitor";
 $REPL_PASSWORD_GPC1 = "ippMonitor";

branches/czw_branch/20110406/ippTools/src/stacktool.c

@@ -243 +243 @@
     PXOPT_COPY_STR(config->args,  where, "-select_exp_type",           "rawExp.exp_type", "==");
     PXOPT_COPY_F32(config->args,  where, "-select_good_frac_min",      "warpSkyfile.good_frac", ">=");
-    PXOPT_COPY_STR(config->args,  where, "-select_skycell_id",         "warpSkyfile.skycell_id", "LIKE");
-    PXOPT_COPY_STR(config->args,  where, "-select_data_group",         "warpRun.data_group", "==");
+    pxAddLabelSearchArgs(config,  where, "-select_skycell_id",         "warpSkyfile.skycell_id", "LIKE");
+    pxAddLabelSearchArgs(config,  where, "-select_data_group",         "warpRun.data_group", "LIKE");
     pxAddLabelSearchArgs (config, where, "-select_label",              "warpRun.label", "LIKE"); // define using warp label
     pxAddLabelSearchArgs (config, where, "-warp_id",                   "warpRun.warp_id", "==");

branches/czw_branch/20110406/ippTools/src/stacktoolConfig.c

@@ -55 +55 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define dvodb", NULL);
     psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-set_registered", 0, "time detrend run was registered", now);
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_skycell_id", 0, "search for skycell_id", NULL);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_skycell_id", PS_META_DUPLICATE_OK, "search for skycell_id (LIKE comparison, multiple ok)", NULL);
     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_good_frac_min", 0, "define min good_frac", 0.0);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_type", 0, "search for exp_type", "object");
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_label", PS_META_DUPLICATE_OK, "search by warpRun label (LIKE comparison, multiple OK)", NULL);
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_data_group", 0 , "search by warpRun data_group", NULL);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK , "search by warpRun data_group (LIKE comparison, multiple ok)", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_comment", 0, "search for comment (LIKE)", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_inst", 0, "search for camera", NULL);

branches/czw_branch/20110406/ippconfig/isp/ppImage.config

@@ -3 +3 @@
 # Inherit everything from the top-level recipe file, except for what's below.
 
-FRINGE.FILTERS  MULTI
-FRINGE.FILTERS  STR z
-FRINGE.FILTERS  STR y
+#FRINGE.FILTERS  MULTI
+#FRINGE.FILTERS STR z
+#FRINGE.FILTERS STR y
 
 # apply the following constraints when selecting a detrend image