Changeset 42385 for trunk/ppSim/src/ppSimSequenceObject.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/ppSimSequenceObject.c (modified) (2 diffs)

trunk/ppSim/src/ppSimSequenceObject.c

@@ -1 +1 @@
 # include "ppSimSequence.h"
 
-bool ppSimSequenceObject (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 ppSimSequenceObject (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, const char *refcat, const char *ppSimCommand, const char *injectCommand, psArray *files) {
 
     bool status;
@@ -97 +97 @@
                             psStringAppend (&command, " -obs_mode OBJECT.%s", (char *) filters->data[i]);
 
+                            if (refcat) { psStringAppend (&command, " -D PSASTRO:PSASTRO.CATDIR %s", refcat); }
+
                             double frnd = psRandomUniform(rng);
                             float seeing = IQmin + (IQmax - IQmin)*frnd;