Changeset 28003 for branches/pap/ppSim/src/ppSimSequenceFlat.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ppSim/src/ppSimSequenceFlat.c (modified) (3 diffs)

branches/pap/ppSim/src/ppSimSequenceFlat.c

@@ -1 +1 @@
 # include "ppSimSequence.h"
 
-bool ppSimSequenceFlat (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, const char *ppSimCommand, const char *injectCommand) {
+bool ppSimSequenceFlat (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, const char *ppSimCommand, const char *injectCommand, psArray *files) {
 
     bool status;
@@ -26 +26 @@
         // loop over the filters & exposure times
         for (int j = 0; j < nSetup; j++) {
-            
+                
             // define the output filename
             psString filename = NULL;
@@ -50 +50 @@
             // define the inject command
             // path should be dirname/filename
-            command = psStringCopy (injectCommand);
-            psStringAppend (&command, " %s*.fits",    filename);
-            fprintf (inject, "%s\n", command);
-            psFree (command);
-            psFree (filename);
+        
+            // we use the filename above (really the file root) to construct the filenames
+            for (int i = 0; i < files->n; i++) {
+                command = psStringCopy (injectCommand);
+                psStringAppend (&command, " %s.%s", filename, (char *) files->data[i]);
+                fprintf (inject, "%s\n", command);
+                psFree (command);
+            }
 
-            nImage ++;
+            psFree (filename);
+            nImage ++;
         }
     }