Changeset 15963

Timestamp:

Dec 30, 2007, 5:04:48 PM (18 years ago)

Author:

eugene

Message:

used PSASTRO.FIELD.PADDING to extend field range

Location:

trunk/psastro/src

Files:

• psastroChooseRefstars.c (modified) (2 diffs)
• psastroLoadRefstars.c (modified) (1 diff)

trunk/psastro/src/psastroChooseRefstars.c

@@ -22 +22 @@
     }
 
-    float fieldExtra = psMetadataLookupS32 (&status, recipe, "PSASTRO.FIELD.EXTRA");
-    if (!status) fieldExtra = 0.0;
+    // extra field fraction to add
+    double fieldPadding = psMetadataLookupF32 (&status, recipe, "PSASTRO.FIELD.PADDING");
+    if (!status) fieldPadding = 0.0;
 
     bool matchLumFunc = psMetadataLookupBool (&status, recipe, "PSASTRO.MATCH.LUMFUNC");
@@ -55 +56 @@
                 int Ny = psMetadataLookupS32 (&status, hdu->header, "NAXIS2");
 
-                float minX = -fieldExtra*Nx;
-                float maxX = (1+fieldExtra)*Nx;
-                float minY = -fieldExtra*Ny;
-                float maxY = (1+fieldExtra)*Ny;
+                float minX = -fieldPadding*Nx;
+                float maxX = (1+fieldPadding)*Nx;
+                float minY = -fieldPadding*Ny;
+                float maxY = (1+fieldPadding)*Ny;
 
                 // the refstars is a subset within range of this chip

trunk/psastro/src/psastroLoadRefstars.c

@@ -15 +15 @@
     float DECmin = DEG_RAD*psMetadataLookupF32(NULL, recipe, "DEC_MIN");
     float DECmax = DEG_RAD*psMetadataLookupF32(NULL, recipe, "DEC_MAX");
+
+    // extra field fraction to add
+    double fieldPadding = psMetadataLookupF32 (&status, recipe, "PSASTRO.FIELD.PADDING");
+    PS_ASSERT (status, NULL);
+
+    float dRA = RAmax - RAmin;
+    RAmin -= dRA * fieldPadding;
+    RAmax += dRA * fieldPadding;
+
+    float dDEC = DECmax - DECmin;
+    DECmin -= dDEC * fieldPadding;
+    DECmax += dDEC * fieldPadding;
 
     // XXX CATDIR needs to look up abstracted name from psastro.config