Changeset 31435 for trunk/ippTools/src

Timestamp:

May 4, 2011, 3:59:42 PM (15 years ago)

Author:

watersc1

Message:

LAP code, quick stacking code, and unconvolved diff code.

Location:

trunk/ippTools/src

Files:

• . (modified) (2 props)
• Makefile.am (modified) (3 diffs)
• difftool.c (modified) (1 diff)
• difftoolConfig.c (modified) (1 diff)
• laptool.c (copied) (copied from branches/czw_branch/20110406/ippTools/src/laptool.c )
• laptool.h (copied) (copied from branches/czw_branch/20110406/ippTools/src/laptool.h )
• laptoolConfig.c (copied) (copied from branches/czw_branch/20110406/ippTools/src/laptoolConfig.c )
• magictool.c (modified) (1 prop)

trunk/ippTools/src

@@ -42 +42 @@
 diffphottool
 minidvodbtool
+laptool

@@ -42 +42 @@
 diffphottool
 minidvodbtool
+laptool

trunk/ippTools/src/Makefile.am

@@ -28 +28 @@
         pubtool \
         diffphottool \
-        minidvodbtool
+        minidvodbtool \
+        laptool
 
 pkginclude_HEADERS = \
@@ -76 +77 @@
         pubtool.h \
         diffphottool.h \
-        minidvodbtool.h
+        minidvodbtool.h \
+        laptool.h
 
 lib_LTLIBRARIES = libpxtools.la
@@ -290 +292 @@
     minidvodbtoolConfig.c
 
+laptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+laptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+laptool_SOURCES = \
+    laptool.c \
+    laptoolConfig.c
+
 clean-local:
         -rm -f TAGS

trunk/ippTools/src/difftool.c

@@ -1625 +1625 @@
     PXOPT_COPY_S64(config->args, selectWhere, "-exp_id", "inputRawExp.exp_id", "==");
     PXOPT_COPY_S64(config->args, selectWhere, "-template_exp_id", "templateRawExp.exp_id", "==");
+    PXOPT_COPY_S64(config->args, selectWhere, "-template_warp_id", "templateWarpRun.warp_id", "==");
     PXOPT_COPY_STR(config->args, selectWhere, "-filter", "inputRawExp.filter", "==");
     PXOPT_COPY_STR(config->args, selectWhere, "-obs_mode", "inputRawExp.obs_mode", "==");

trunk/ippTools/src/difftoolConfig.c

@@ -278 +278 @@
     psMetadataAddBool(definewarpwarpArgs, PS_LIST_TAIL, "-not-bothways",  0, "only do the single-direction subtraction?", false);
     psMetadataAddS64(definewarpwarpArgs, PS_LIST_TAIL,  "-template_exp_id",  0,  "search by template exposure ID", 0);
+    psMetadataAddS64(definewarpwarpArgs, PS_LIST_TAIL,  "-template_warp_id",  0,  "search by template warp ID", 0);
     psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL);
     psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-distance", 0, "limit distance between input and template (deg)", NAN);

@@ -42 +42 @@
 diffphottool
 minidvodbtool
+laptool