Changeset 43081 for branches/eam_branches/ipp-pstamp-20260421/ppSim/src/ppSimSequenceFlat.c

Timestamp:

Sep 7, 2026, 4:51:13 PM (3 weeks ago)

Author:

eugene

Message:

add option to pass expname to ipp_inject_fileset.pl, small code refactor

File:

• branches/eam_branches/ipp-pstamp-20260421/ppSim/src/ppSimSequenceFlat.c (modified) (2 diffs)

branches/eam_branches/ipp-pstamp-20260421/ppSim/src/ppSimSequenceFlat.c

@@ -27 +27 @@
         for (int j = 0; j < nSetup; j++) {
                 
-            // define the output filename
-            psString filename = NULL;
-            if (path) {
-                psStringAppend (&filename, "%s/%s.%03d.%03d", path, basename, nSeq, nImage);
-            } else {
-                psStringAppend (&filename, "%s.%03d.%03d", basename, nSeq, nImage);
-            }
-
             // define the ppSim comand
             psString command = NULL;
 
             psStringAppend (&command, "%s -type FLAT", ppSimCommand);
-
             psStringAppend (&command, " -filter %s", (char *) filters->data[i]);
             psStringAppend (&command, " -exptime %f", exptimes->data.F32[i]);
+
+            // define the exposure name and output filename
+            psString expname = ppSimDefineExpname (basename, nSeq, nImage);
+            psString filename = ppSimDefineFilename (path, expname);
 
             psStringAppend (&command, " %s", filename);
@@ -54 +49 @@
             for (int i = 0; i < files->n; i++) {
                 command = psStringCopy (injectCommand);
-                psStringAppend (&command, " %s.%s", filename, (char *) files->data[i]);
+                psStringAppend (&command, " --exp_name %s %s.%s", expname, filename, (char *) files->data[i]);
                 fprintf (inject, "%s\n", command);
                 psFree (command);
             }
 
+            psFree (expname);
             psFree (filename);
             nImage ++;