Changeset 43081 for branches/eam_branches/ipp-pstamp-20260421/ppSim/src/ppSimSequenceBias.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/ppSimSequenceBias.c (modified) (4 diffs)

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

@@ -15 +15 @@
     for (int i = 0; i < nImages; i++) {
                 
-        // 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 command
         psString command = NULL;
@@ -30 +22 @@
         if (setLevel) psStringAppend (&command, " -biaslevel %f", level);
         if (setRange) psStringAppend (&command, " -biasrange %f", range);
-          
+
+        // define the exposure name and output filename
+        psString expname = ppSimDefineExpname (basename, nSeq, nImage);
+        psString filename = ppSimDefineFilename (path, expname);
+
+        // add output filename to the end of the full command
         psStringAppend (&command, " %s", filename);
 
@@ -42 +39 @@
         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 ++;
@@ -52 +50 @@
     return true;
 }
+
+psString ppSimDefineExpname (const char *basename, int nSeq, int nImage) {
+  
+  // define the exposure name
+  psString expname = NULL;
+  psStringAppend (&expname, "%s.%03d.%03d", basename, nSeq, nImage);
+  return expname;
+}
+  
+psString ppSimDefineFilename (const char *path, const char *expname) {
+
+  // define the output filename
+  psString filename = NULL;
+  if (path) {
+    psStringAppend (&filename, "%s/%s", path, expname);
+  } else {
+    psStringAppend (&filename, "%s", expname);
+  }
+  return filename;
+}