Changeset 31156

Timestamp:

Apr 4, 2011, 1:13:59 PM (15 years ago)

Author:

eugene

Message:

minor fixes from eam branch

Location:

trunk/ppSub

Files:

• . (modified) (1 prop)
• src/ppSub.h (modified) (2 diffs)
• src/ppSubArguments.c (modified) (4 diffs)
• src/ppSubConvolve.c (modified) (5 diffs)
• src/ppSubDefineOutput.c (modified) (1 diff)
• src/ppSubFlagNeighbors.c (modified) (3 diffs)
• src/ppSubMakePSF.c (modified) (1 diff)
• src/ppSubMatchPSFs.c (modified) (1 diff)

trunk/ppSub

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM

trunk/ppSub/src/ppSub.h

@@ -128 +128 @@
 void ppSubVersionPrint(void);
 
+/// write the version info to a string
+psString ppSubVersionLong(void);
+
 /// Mark the data quality as bad and prepare to suspend processing
 void ppSubDataQuality(ppSubData *data,  ///< Processing data
@@ -185 +188 @@
 bool ppSubSetSourceImageIDs (psArray *sources, int imageID);
 
+void ppSubSetThreads (void);
+
 ///@}
 #endif

trunk/ppSub/src/ppSubArguments.c

@@ -57 +57 @@
 }
 
+void ppSubSetThreads (void) {
+    // ppSub does not have any of its own thread handlers
+    return;
+}
+
 bool ppSubArguments(int argc, char *argv[], ppSubData *data)
 {
@@ -62 +67 @@
     pmConfig *config = data->config;
     assert(config);
+
+    // generic arguments (version, dumpconfig)
+    PS_ARGUMENTS_GENERIC( ppSub, config, argc, argv );
+
+    // thread arguments
+    PS_ARGUMENTS_THREADS( ppSub, config, argc, argv )
 
     int argNum = psArgumentGet(argc, argv, "-debug"); // Debugging argument number
@@ -82 +93 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-stats", 0, "Statistics file", NULL);
     psMetadataAddStr(arguments,  PS_LIST_TAIL, "-stamps", 0, "Stamps filename; x,y on each line", NULL);
-    psMetadataAddS32(arguments, PS_LIST_TAIL, "-threads", 0, "Number of threads", 0);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-dumpconfig", 0, "file to dump configuration to", NULL);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-convolve", 0, "Image to convolve [1 or 2]", 0);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-photometry", 0, "Perform photometry?", NULL);
@@ -166 +175 @@
     }
 
-    int threads = psMetadataLookupS32(NULL, arguments, "-threads"); // Number of threads
-    if (threads > 0) {
-        if (!psThreadPoolInit(threads)) {
-            psError(psErrorCodeLast(), false, "Unable to setup %d threads", threads);
-            return false;
-        }
-    }
-
     psTrace("ppSub", 1, "Done reading command-line arguments\n");
 

trunk/ppSub/src/ppSubConvolve.c

@@ -39 +39 @@
 }
 
+void ppSubSetThreads (void) {
+    // ppSub does not have any of its own thread handlers
+    return;
+}
 
 int main(int argc, char *argv[])
@@ -49 +53 @@
         goto die;
     }
+
+    // generic arguments (version, dumpconfig)
+    PS_ARGUMENTS_GENERIC( ppSub, config, argc, argv );
+
+    // thread arguments
+    PS_ARGUMENTS_THREADS( ppSub, config, argc, argv )
 
     bool reference = false;             // Input is actually the reference image?
@@ -59 +69 @@
         psMetadataAddStr(arguments, PS_LIST_TAIL, "-kernel", 0, "Convolution kernel", NULL);
         psMetadataAddBool(arguments, PS_LIST_TAIL, "-reference", 0, "Input is actually reference?", false);
-        psMetadataAddS32(arguments, PS_LIST_TAIL, "-threads", 0, "Threads to use", 0);
         psMetadataAddBool(arguments, PS_LIST_TAIL, "-save-all", 0, "Save all outputs?", false);
 
@@ -75 +84 @@
 
         reference = psMetadataLookupBool(NULL, arguments, "-reference");
-        threads = psMetadataLookupS32(NULL, arguments, "-threads");
+        threads = psMetadataLookupS32(NULL, arguments, "NTHREADS");
         fileList("PPSUB.INPUT", inImage, "Input image", config);
         fileList("PPSUB.INPUT.MASK", inMask, "Input mask", config);
@@ -239 +248 @@
         if (threads > 0) {
             pmSubtractionThreadsInit();
-            psThreadPoolInit(threads);
         }
 

trunk/ppSub/src/ppSubDefineOutput.c

@@ -73 +73 @@
     pmFPAfile *inFile = psMetadataLookupPtr(NULL, config->files, "PPSUB.INPUT"); // Input file
 
-    // We should be using the GNU version of basename() which doesn't modify its argument, but just in case,
-    // we'll copy the string.
-    psString refName = psStringCopy(refFile->filename); // Filename of reference
-    const char *refBase = basename(refName);            // Basename of reference
-    psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.REFERENCE", 0,
-                     "Subtraction reference", refBase);
-    psFree(refName);
-    psString inName = psStringCopy(inFile->filename);   // Filename of input
-    const char *inBase = basename(inName);              // Basename of input
-    psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.INPUT", 0,
-                     "Subtraction input", inBase);
-    psFree(inName);
+    // save the names of the input and reference image in the header
+    psString refBase = psStringFileBasename(refFile->origname);            // Basename of reference
+    psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.REFERENCE", 0, "Subtraction reference", refBase);
+    psFree(refBase);
+
+    psString inBase = psStringFileBasename(inFile->origname);              // Basename of input
+    psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.INPUT", 0, "Subtraction input", inBase);
+    psFree(inBase);
 
     ppSubVersionHeader(outHDU->header);

trunk/ppSub/src/ppSubFlagNeighbors.c

@@ -189 +189 @@
         if (!src) NEXT1; 
         if (!src->peak) NEXT1; 
-        if (!finite(src->peak->xf)) NEXT1; 
-        if (!finite(src->peak->yf)) NEXT1; 
-        if (!finite(src->peak->SN)) NEXT1; 
-        if (src->peak->SN < MIN_SN) NEXT1; 
+        if (!isfinite(src->peak->xf)) NEXT1; 
+        if (!isfinite(src->peak->yf)) NEXT1; 
+        if (!isfinite(src->peak->detValue)) NEXT1; 
+        if (sqrt(src->peak->detValue) < MIN_SN) NEXT1; 
  
         if (!obj) NEXT2; 
-        if (!finite(obj->x)) NEXT2; 
-        if (!finite(obj->y)) NEXT2; 
+        if (!isfinite(obj->x)) NEXT2; 
+        if (!isfinite(obj->y)) NEXT2; 
  
         dx = src->peak->xf - obj->x; 
@@ -211 +211 @@
             if (!src) NEXT1; 
             if (!src->peak) NEXT1; 
-            if (!finite(src->peak->xf)) NEXT1; 
-            if (!finite(src->peak->yf)) NEXT1; 
-            if (!finite(src->peak->SN)) NEXT1; 
-            if (src->peak->SN < MIN_SN) NEXT1; 
+            if (!isfinite(src->peak->xf)) NEXT1; 
+            if (!isfinite(src->peak->yf)) NEXT1; 
+            if (!isfinite(src->peak->detValue)) NEXT1; 
+            if (sqrt(src->peak->detValue) < MIN_SN) NEXT1; 
 
             dx = src->peak->xf - obj->x; 
@@ -235 +235 @@
         src = sources->data[Imin]; 
 
-        // fprintf (stderr, "j: %d, Imin: %d, obj x,y: %f, %f  src x,y: %f, %f, SN: %f, ID: %d\n", j, Imin, obj->x, obj->y, src->peak->xf, src->peak->yf, src->peak->SN, src->id);
+        // fprintf (stderr, "j: %d, Imin: %d, obj x,y: %f, %f  src x,y: %f, %f, SN: %f, ID: %d\n", j, Imin, obj->x, obj->y, src->peak->xf, src->peak->yf, sqrt(src->peak->detValue), src->id);
 
         // add source to object

trunk/ppSub/src/ppSubMakePSF.c

@@ -158 +158 @@
 psArray *ppSubSelectPSFSources(psArray *sources){
 
-    sources = psArraySort (sources, pmSourceSortBySN);
+    sources = psArraySort (sources, pmSourceSortByFlux);
 
     psArray *subset = psArrayAllocEmpty(MAX_NPSF);

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -374 +374 @@
     }
 
-    int threads = psMetadataLookupS32(NULL, config->arguments, "-threads"); // Number of threads
+    int threads = psMetadataLookupS32(NULL, config->arguments, "NTHREADS"); // Number of threads
     if (threads > 0) {
         pmSubtractionThreadsInit();

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM