Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/ppSim/src

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppSim/src/Makefile.am (modified) (2 diffs)
• ppSim/src/ppSim.h (modified) (3 diffs)
• ppSim/src/ppSimBadPixels.c (modified) (1 diff)
• ppSim/src/ppSimLoop.c (modified) (1 diff)
• ppSim/src/ppSimSequence.c (modified) (2 diffs)
• ppSim/src/ppSimVersion.c (copied) (copied from trunk/ppSim/src/ppSimVersion.c )

branches/cnb_branches/cnb_branch_20090301/ppSim/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppSim ppSimSequence
 
-ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS)
+# PPSIM_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PPSIM_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PPSIM_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# 
+# # Force recompilation of ppSimVersion.c, since it gets the version information
+# ppSimVersion.c: FORCE
+#       touch ppSimVersion.c
+# FORCE: ;
+
+ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS) -DPPSIM_VERSION=$(SVN_VERSION) -DPPSIM_BRANCH=$(SVN_BRANCH) -DPPSIM_SOURCE=$(SVN_SOURCE)
 ppSim_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS) $(PSASTRO_LIBS)
 ppSim_SOURCES = \
@@ -35 +44 @@
         ppSimMosaicChip.c         \
         ppSimRandomGaussian.c     \
-        ppSimBadPixels.c
+        ppSimBadPixels.c          \
+        ppSimVersion.c
 
 ppSimSequence_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS)

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSim.h

@@ -19 +19 @@
 
 // Compare a value with minimum and maximum values, replacing where required.
-#define COMPARE(VALUE,MIN,MAX) {                \
-        if (VALUE < MIN) { MIN = VALUE; }       \
-        if (VALUE > MAX) { MAX = VALUE; }       \
+#define COMPARE(VALUE,MIN,MAX) {                \
+        if (VALUE < MIN) { MIN = VALUE; }       \
+        if (VALUE > MAX) { MAX = VALUE; }       \
     }
 
@@ -147 +147 @@
 float ppSimMagToFlux (float mag, float zp);
 
-float ppSimArgToRecipeF32(bool *status, 
-                          psMetadata *options,    // Target to which to add value
-                          const char *recipeName, // Name for value in the recipe
-                          psMetadata *arguments,  // Command-line arguments
-                          const char *argName    // Argument name in the command-line arguments
+float ppSimArgToRecipeF32(bool *status,
+                          psMetadata *options,    // Target to which to add value
+                          const char *recipeName, // Name for value in the recipe
+                          psMetadata *arguments,  // Command-line arguments
+                          const char *argName    // Argument name in the command-line arguments
     );
 
 int ppSimArgToRecipeS32(bool *status,
-                        psMetadata *options,    // Target to which to add value
-                        const char *recipeName, // Name for value in the recipe
-                        psMetadata *arguments,  // Command-line arguments
-                        const char *argName      // Argument name in the command-line arguments
+                        psMetadata *options,    // Target to which to add value
+                        const char *recipeName, // Name for value in the recipe
+                        psMetadata *arguments,  // Command-line arguments
+                        const char *argName      // Argument name in the command-line arguments
     );
 
 char *ppSimArgToRecipeStr(bool *status,
-                          psMetadata *options,    // Target to which to add value
-                          const char *recipeName, // Name for value in the recipe
-                          psMetadata *arguments,  // Command-line arguments
-                          const char *argName    // Argument name in the command-line arguments
+                          psMetadata *options,    // Target to which to add value
+                          const char *recipeName, // Name for value in the recipe
+                          psMetadata *arguments,  // Command-line arguments
+                          const char *argName    // Argument name in the command-line arguments
     );
 
 bool ppSimArgToRecipeBool(bool *status,
-                          psMetadata *options,    // Target to which to add value
-                          const char *recipeName, // Name for value in the recipe
-                          psMetadata *arguments,  // Command-line arguments
-                          const char *argName       // Argument name in the command-line arguments
+                          psMetadata *options,    // Target to which to add value
+                          const char *recipeName, // Name for value in the recipe
+                          psMetadata *arguments,  // Command-line arguments
+                          const char *argName       // Argument name in the command-line arguments
     );
 
@@ -198 +198 @@
 bool ppSimDefinePixels (psArray *sources, pmReadout *readout, psMetadata *recipe);
 
+/// Return software version
+psString ppSimVersion(void);
+
+/// Return software source
+psString ppSimSource(void);
+
+/// Return long version information
+psString ppSimVersionLong(void);
+
 #endif

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSimBadPixels.c

@@ -74 +74 @@
     }
 
-    psRandom *pseudoRNG = psRandomAlloc(PS_RANDOM_TAUS, seed); // Pseudo-random number generator
+    psRandom *pseudoRNG = psRandomAllocSpecific(PS_RANDOM_TAUS, seed); // Pseudo-random number generator
 
     psImage *image = readout->image;    // Image of interest

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSimLoop.c

@@ -25 +25 @@
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSIM_RECIPE); // Recipe
 
-    psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0); // Random number generator
+    psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS); // Random number generator
 
     char *typeStr = psMetadataLookupStr(NULL, recipe, "IMAGE.TYPE"); // Type of image to simulate

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSimSequence.c

@@ -133 +133 @@
     if (ppsim_recipe) psStringAppend (&ppSimCommand, " -recipe PPSIM %s", ppsim_recipe);
 
-    unsigned long seed = psMetadataLookupS32 (&status, config, "RND_SEED");
-    if (!status) seed = 0;
-    psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, seed);
+    psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS);
 
     psMetadataItem *item = psMetadataLookup (config, "SEQUENCE");
     if (item == NULL) {
         psLogMsg ("ppSimSequence", PS_LOG_WARN, "missing SEQUENCE description");
-        exit (1);
+        exit (PS_EXIT_CONFIG_ERROR);
     }
 
@@ -170 +168 @@
         }
 
-        // determine the camera for the sequence and define the ppSim command
-        if (camera == NULL) {
-            camera = psMetadataLookupStr (&status, sequence, "CAMERA");
-        }
-
-        psString injectCommandReal = NULL;
-        psString ppSimCommandReal = NULL;
-
-        psStringAppend (&injectCommandReal, "%s --camera %s", injectCommand, camera);
-        psStringAppend (&ppSimCommandReal, "%s -camera %s", ppSimCommand, camera);
+        // determine the camera for the sequence and define the ppSim command
+        if (camera == NULL) {
+            camera = psMetadataLookupStr (&status, sequence, "CAMERA");
+        }
+
+        psString injectCommandReal = NULL;
+        psString ppSimCommandReal = NULL;
+
+        psStringAppend (&injectCommandReal, "%s --camera %s", injectCommand, camera);
+        psStringAppend (&ppSimCommandReal, "%s -camera %s", ppSimCommand, camera);
 
         if (!strcasecmp (type, "BIAS")) {