Changeset 29904 for branches/eam_branches/ipp-20101103/psphot/src/psphotStackImageLoop.c

Timestamp:

Dec 3, 2010, 2:28:34 AM (16 years ago)

Author:

eugene

Message:

modify psphotReadout and equivalent to accept a filerule argument (allow filerules other than PSPHOT.INPUT)

File:

• branches/eam_branches/ipp-20101103/psphot/src/psphotStackImageLoop.c (modified) (3 diffs)

branches/eam_branches/ipp-20101103/psphot/src/psphotStackImageLoop.c

@@ -105 +105 @@
 bool GetAstrometryFPA (pmConfig *config, pmFPAview *view) {
 
-    bool status = false;
-
     bool foundAstrometry = false;
     bool bilevelAstrometry = false;
 
-    int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
-    psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
+    int num = psphotFileruleCount(config, "PSPHOT.INPUT");
 
     // loop over the available readouts
@@ -158 +155 @@
 bool GetAstrometryChip (pmConfig *config, pmFPAview *view, bool bilevelAstrometry) {
 
-    bool status = false;
-
-    int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
-    psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
+    int num = psphotFileruleCount(config, "PSPHOT.INPUT");
 
     // loop over the available readouts
@@ -220 +214 @@
 bool SetAstrometryFPA (pmConfig *config, pmFPAview *view, bool bilevelAstrometry) {
 
-    bool status = false;
-
     if (!bilevelAstrometry) return true;
 
-    int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
-    psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
+    int num = psphotFileruleCount(config, "PSPHOT.INPUT");
 
     // loop over the available readouts