Changeset 42209 for branches/eam_branches/ipp-20220316

Timestamp:

May 17, 2022, 3:32:29 PM (4 years ago)

Author:

eugene

Message:

add option to supply ppSimSequence with a reference catalog to define sources

Location:

branches/eam_branches/ipp-20220316/ppSim/src

Files:

• ppSimSequence.c (modified) (3 diffs)
• ppSimSequence.h (modified) (1 diff)
• ppSimSequenceObject.c (modified) (2 diffs)

branches/eam_branches/ipp-20220316/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);

branches/eam_branches/ipp-20220316/ppSim/src/ppSimSequence.h

@@ -15 +15 @@
 bool ppSimSequenceDark   (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 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 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);
 
 #endif

branches/eam_branches/ipp-20220316/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;