Changeset 19080

Timestamp:

Aug 14, 2008, 3:36:54 PM (18 years ago)

Author:

eugene

Message:

adding camera option on command line

Location:

trunk/ppSim/src

Files:

• ppSimSequence.c (modified) (2 diffs)
• ppSimSequence.h (modified) (1 diff)
• ppSimSequenceBias.c (modified) (1 diff)
• ppSimSequenceDark.c (modified) (1 diff)
• ppSimSequenceFlat.c (modified) (1 diff)
• ppSimSequenceObject.c (modified) (2 diffs)

trunk/ppSim/src/ppSimSequence.c

@@ -30 +30 @@
         }
         psFree(line);
+    }
+
+    char *camera = NULL;
+    if ((argNum = psArgumentGet (argc, argv, "-camera"))) {
+        psArgumentRemove(argNum, &argc, argv);
+        camera = psStringCopy (argv[argNum]);
+        psArgumentRemove(argNum, &argc, argv);
     }
 
@@ -151 +158 @@
 
         if (!strcasecmp (type, "BIAS")) {
-            ppSimSequenceBias (simfile, inject, sequence, i, rng, path, basename, injectCommand);
+            ppSimSequenceBias (simfile, inject, sequence, i, rng, path, basename, camera, injectCommand);
             continue;
         }
         if (!strcasecmp (type, "DARK")) {
-            ppSimSequenceDark (simfile, inject, sequence, i, rng, path, basename, injectCommand);
+            ppSimSequenceDark (simfile, inject, sequence, i, rng, path, basename, camera, injectCommand);
             continue;
         }
         if (!strcasecmp (type, "FLAT")) {
-            ppSimSequenceFlat (simfile, inject, sequence, i, rng, path, basename, injectCommand);
+            ppSimSequenceFlat (simfile, inject, sequence, i, rng, path, basename, camera, injectCommand);
             continue;
         }
         if (!strcasecmp (type, "OBJECT")) {
-            ppSimSequenceObject (simfile, inject, sequence, i, rng, path, basename, injectCommand);
+            ppSimSequenceObject (simfile, inject, sequence, i, rng, path, basename, camera, injectCommand);
             continue;
         }

trunk/ppSim/src/ppSimSequence.h

@@ -12 +12 @@
 #include <psastro.h>
 
-bool ppSimSequenceBias   (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, const char *injectCommand);
-bool ppSimSequenceDark   (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, const char *injectCommand);
-bool ppSimSequenceFlat   (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, const char *injectCommand);
-bool ppSimSequenceObject (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, const char *injectCommand);
+bool ppSimSequenceBias   (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, char *camera, const char *injectCommand);
+bool ppSimSequenceDark   (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, char *camera, const char *injectCommand);
+bool ppSimSequenceFlat   (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, char *camera, const char *injectCommand);
+bool ppSimSequenceObject (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, char *camera, const char *injectCommand);
 
 #endif

trunk/ppSim/src/ppSimSequenceBias.c

@@ -1 +1 @@
 # include "ppSimSequence.h"
 
-bool ppSimSequenceBias (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, const char *injectCommand) {
+bool ppSimSequenceBias (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, char *camera, const char *injectCommand) {
 
     bool status, setLevel, setRange;
 
-    char *camera = psMetadataLookupStr (&status, sequence, "CAMERA");
+    if (camera == NULL) {
+        camera = psMetadataLookupStr (&status, sequence, "CAMERA");
+    }
 
     // optional details

trunk/ppSim/src/ppSimSequenceDark.c

@@ -1 +1 @@
 # include "ppSimSequence.h"
 
-bool ppSimSequenceDark (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, const char *injectCommand) {
+bool ppSimSequenceDark (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, char *camera, const char *injectCommand) {
 
     bool status, setRate;
     float min, max = 0;
 
-    char *camera = psMetadataLookupStr (&status, sequence, "CAMERA");
+    if (camera == NULL) {
+        camera = psMetadataLookupStr (&status, sequence, "CAMERA");
+    }
 
     setRate = false;

trunk/ppSim/src/ppSimSequenceFlat.c

@@ -1 +1 @@
 # include "ppSimSequence.h"
 
-bool ppSimSequenceFlat (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, const char *injectCommand) {
+bool ppSimSequenceFlat (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, char *camera, const char *injectCommand) {
 
     bool status;
 
-    char *camera = psMetadataLookupStr (&status, sequence, "CAMERA");
+    if (camera == NULL) {
+        camera = psMetadataLookupStr (&status, sequence, "CAMERA");
+    }
 
     // determine the filters & exposure times

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 *injectCommand) {
+bool ppSimSequenceObject (FILE *simfile, FILE *inject, psMetadata *sequence, int nSeq, psRandom *rng, const char *path, const char *basename, char *camera, const char *injectCommand) {
 
     bool status;
@@ -9 +9 @@
     //       -skyrate $sky -ra $ra -dec $dec -pa $pa -scale $scale -zp $zp -seeing $seeing $filename",
 
-    char *camera = psMetadataLookupStr (&status, sequence, "CAMERA");
+    if (camera == NULL) {
+        camera = psMetadataLookupStr (&status, sequence, "CAMERA");
+    }
 
     // sequence reference coordinate