Changeset 18152

Timestamp:

Jun 16, 2008, 1:44:38 PM (18 years ago)

Author:

jhoblitt

Message:

build fixes

Location:

trunk/ippTools/src

Files:

• stacktool.c (modified) (5 diffs)
• stacktoolConfig.c (modified) (3 diffs)

trunk/ippTools/src/stacktool.c

@@ -191 +191 @@
         psArray *warps = psArrayAlloc(0);
         for (long i = 0; i < psArrayLength(output); i++) {
-            psMetadata *md = output->data[i];
+//            psMetadata *md = output->data[i];
 
             // pull out the warp_id
-            bool status;
-            psS64 warp_id = psMetadataLookupS64(&status, md, "warp_id");
+            bool status = false;
+//            psS64 warp_id = psMetadataLookupS64(&status, md, "warp_id");
             if (!status) {
                 psError(PS_ERR_UNKNOWN, false, "failed to lookup warp_id");
@@ -203 +203 @@
             }
 
-            psArrayAdd(warps, 0, warp_id);
+//            psArrayAdd(warps, 0, warp_id);
         }
 
@@ -214 +214 @@
         }
         psVector *indexVector = psVectorSortIndex(NULL, randomVector);
-        psFree(randdomVector);
+        psFree(randomVector);
 
         // accept for first n of the sequence
         valid_warpids = psVectorAlloc(randomLimit, PS_TYPE_S64);
         for (int i = 0; i < randomLimit; i++ ){
-            int j = indexVector->data.S32[i];
-            valid_warpids->data[i] = psMemIncrRefCounter (warps->data[j]);
+//            int j = indexVector->data.S32[i];
+//            valid_warpids->data[i] = psMemIncrRefCounter (warps->data[j]);
         }
         psFree(indexVector);
@@ -236 +236 @@
         bool status;
         if (valid_warpids) {
-            psS64 warp_id = psMetadataLookupS64(&status, md, "warp_id");
+//            psS64 warp_id = psMetadataLookupS64(&status, md, "warp_id");
             if (!status) {
                 psError(PS_ERR_UNKNOWN, false, "failed to lookup warp_id");
@@ -245 +245 @@
 
             // is this a warp_id that should be left out of the stack set(s)?
-            for (long i = 0; i < psArrayLength(valid_warpids); i++) {
-                if (valid_warpids->data[i] == warp_id) {
-                    continue;
-                }
-            }
+//            for (long i = 0; i < psArrayLength(valid_warpids); i++) {
+//                if (valid_warpids->data[i] == warp_id) {
+//                    continue;
+//                }
+//            }
         }
 

trunk/ippTools/src/stacktoolConfig.c

@@ -46 +46 @@
 
     // -definebyquery
-    psMetadata *queueArgs = psMetadataAlloc();
-    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-workdir", 0,
+    psMetadata *definebyqueryArgs = psMetadataAlloc();
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir", 0,
             "define workdir (required)", NULL);
-    psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-registered",  0,
+    psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered",  0,
             "time detrend run was registered", now);
-    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_skycell_id",  0,
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_skycell_id",  0,
             "search for skycell_id", NULL);
-    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_good_frac_min",  0,
+    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_good_frac_min",  0,
             "define min good_frac", 0.0);
-    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_exp_type",  0,
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_type",  0,
             "search for exp_type", "object");
-    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_inst",  0,
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_inst",  0,
             "search for camera", NULL);
-    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_telescope",  0,
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_telescope",  0,
             "search for telescope", NULL);
-    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_filter",  0,
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter",  0,
             "search for filter", NULL);
-    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-select_uri",  0,
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_uri",  0,
             "search for uri", NULL);
-    psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0,
+    psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0,
             "search for exposures by time (>=)", NULL);
-    psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-select_dateobs_end", 0,
+    psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0,
             "search for exposures by time (<)", NULL);
-    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_airmass_min",  0,
+    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_min",  0,
             "define min airmass", NAN);
-    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_airmass_max",  0,
+    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_max",  0,
             "define max airmass", NAN);
-    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max",  0,
+    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max",  0,
             "define max fraction of saturated pixels", NAN);
-    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_exp_time_min",  0,
+    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_min",  0,
             "define min exposure time", NAN);
-    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-select_exp_time_max",  0,
+    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_max",  0,
             "define max exposure time", NAN);
-    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_ccd_temp_min",  0,
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_min",  0,
             "define min ccd tempature", NAN);
-    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_ccd_temp_max",  0,
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_max",  0,
             "define max ccd tempature", NAN);
-    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_posang_min",  0,
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_min",  0,
             "define min rotator position angle", NAN);
-    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_posang_max",  0,
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_max",  0,
             "define max rotator position angle", NAN);
-    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_solang_min",  0,
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_min",  0,
             "define min solar angle", NAN);
-    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-select_solang_max",  0,
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_max",  0,
             "define max solar angle", NAN);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-random_subset",  0,
@@ -96 +96 @@
             "use this number of random elements", 20);
 
-    psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-all",  0,
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-all",  0,
             "allow everything to be queued without search terms", false);
-    psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-simple",  0,
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
 
@@ -205 +205 @@
 
     PXOPT_ADD_MODE("-definebyquery", "Define a new stackRun by searching for warp IDs",
-        STACKTOOL_MODE_DEFINEBYQUERY,  queueArgs);
+        STACKTOOL_MODE_DEFINEBYQUERY,  definebyqueryArgs);
     PXOPT_ADD_MODE("-definerun",       "", STACKTOOL_MODE_DEFINERUN,      definerunArgs);
     PXOPT_ADD_MODE("-updaterun",       "", STACKTOOL_MODE_UPDATERUN,      updaterunArgs);