Changeset 42385 for trunk/ppSim/src/ppSimSequence.c

Timestamp:

Feb 8, 2023, 12:11:27 PM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. add fpcamera, add option in ppSim to define reference catalog, add allow-multiple-definition in gcc, simtest improvements

File:

• trunk/ppSim/src/ppSimSequence.c (modified) (3 diffs)

trunk/ppSim/src/ppSimSequence.c

@@ -48 +48 @@
         psArgumentRemove(argNum, &argc, argv);
         ppsim_recipe = psStringCopy (argv[argNum]);
+        psArgumentRemove(argNum, &argc, argv);
+    }
+
+    char *refcat = NULL;
+    if ((argNum = psArgumentGet (argc, argv, "-refcat"))) {
+        psArgumentRemove(argNum, &argc, argv);
+        refcat = psStringCopy (argv[argNum]);
         psArgumentRemove(argNum, &argc, argv);
     }
@@ -96 +103 @@
         fprintf (stderr, " -label (label)\n");
         fprintf (stderr, " -dvodb (dvodb)\n");
+        fprintf (stderr, " -refcat (catdir)\n");
         fprintf (stderr, " -tess_id (tess_id)\n");
         exit (2);
@@ -242 +250 @@
         }
         if (!strcasecmp (type, "OBJECT")) {
-            ppSimSequenceObject (simfile, inject, sequence, i, rng, path, basename, ppSimCommandReal, injectCommandReal, files);
+            ppSimSequenceObject (simfile, inject, sequence, i, rng, path, basename, refcat, ppSimCommandReal, injectCommandReal, files);
             psFree (injectCommandReal);
             psFree (ppSimCommandReal);