Changeset 31155 for trunk/ppImage

Timestamp:

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

Author:

eugene

Message:

minor fixes from eam branch

Location:

trunk/ppImage

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/ppImageAddNoise.c (modified) (1 diff)
• src/ppImageArguments.c (modified) (3 diffs)

trunk/ppImage

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

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

trunk/ppImage/src/ppImageAddNoise.c

@@ -90 +90 @@
   // Update the metadata about exposure time
   psMetadataAddF32(inReadout->parent->concepts, PS_LIST_TAIL, "CELL.EXPOSURE", PS_META_REPLACE, "the modified exposure time", expTimes3Pi[band]);
+  psMetadataAddF32(inReadout->parent->concepts, PS_LIST_TAIL, "FPA.EXPOSURE", PS_META_REPLACE, "the modified exposure time", expTimes3Pi[band]);
   psMetadataAddF32(fpa->concepts, PS_LIST_TAIL, "EXPTIME", PS_META_REPLACE, "the modified exposure time", expTimes3Pi[band]);
   ppImageRandomGaussianFree();

trunk/ppImage/src/ppImageArguments.c

@@ -55 +55 @@
     }
 
+    // generic arguments (version -- ignored in this case, dumpconfig)
+    PS_ARGUMENTS_GENERIC( psphot, config, argc, argv );
+
+    // thread arguments
+    PS_ARGUMENTS_THREADS( psphot, config, argc, argv )
+
     // save the following additional recipe values based on command-line options
     // these options override the PPIMAGE recipe values loaded from recipe files
@@ -84 +90 @@
         psArgumentRemove(argnum, &argc, argv);
         pmVisualSetVisual(true);
-    }
-
-    // Number of threads
-    if ((argnum = psArgumentGet(argc, argv, "-threads"))) {
-        psArgumentRemove(argnum, &argc, argv);
-        int nThreads = atoi(argv[argnum]);
-        psMetadataAddS32(config->arguments, PS_LIST_TAIL, "NTHREADS", 0, "number of warp threads", nThreads);
-        psArgumentRemove(argnum, &argc, argv);
-
-        // create the thread pool with number of desired threads, supplying our thread launcher function
-        // XXX need to determine the number of threads from the config data
-        psThreadPoolInit (nThreads);
     }
 
@@ -152 +146 @@
     }
 
-    if ((argnum = psArgumentGet(argc, argv, "-dumpconfig"))) {
-        psArgumentRemove(argnum, &argc, argv);
-        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "DUMP_CONFIG", PS_META_REPLACE,
-                         "Filename for configuration dump", argv[argnum]);
-        psArgumentRemove(argnum, &argc, argv);
-    }
-
     if (argc != 2) usage ();
 

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