Changeset 12712

Timestamp:

Mar 31, 2007, 5:21:26 PM (19 years ago)

Author:

eugene

Message:

various low-level fixes

Location:

trunk/psastro/src

Files:

• psastroChipAstrom.c (modified) (1 diff)
• psastroLuminosityFunction.c (modified) (2 diffs)
• psastroMosaicGradients.c (modified) (1 diff)
• psastroOneChip.c (modified) (1 diff)
• psastroRefstarSubset.c (modified) (1 diff)
• psastroUtils.c (modified) (2 diffs)

trunk/psastro/src/psastroChipAstrom.c

@@ -55 +55 @@
                 char *chipname = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
 
-                psStringAppend (&filename, "rawstars.ch.%s.dat", chipname);
-                psastroDumpStars (rawstars, filename);
-                psFree (filename);
-                filename = NULL;
+                if (psTraceGetLevel("psastro.dump") > 0) {
+                    psStringAppend (&filename, "rawstars.ch.%s.dat", chipname);
+                    psastroDumpStars (rawstars, filename);
+                    psFree (filename);
+                    filename = NULL;
 
-                psStringAppend (&filename, "refstars.ch.%s.dat", chipname);
-                psastroDumpStars (refstars, filename);
-                psFree (filename);
-                filename = NULL;
+                    psStringAppend (&filename, "refstars.ch.%s.dat", chipname);
+                    psastroDumpStars (refstars, filename);
+                    psFree (filename);
+                    filename = NULL;
+                }
 
                 // save WCS and analysis metadata in update header

trunk/psastro/src/psastroLuminosityFunction.c

@@ -37 +37 @@
   int nBin = 1 + (mMax - mMin) / dMag;
   if (nBin <= 1) {
-    psError(PSASTRO_ERR_DATA, true, "magnitude range of 0.0\n");
+    psLogMsg ("psastro", 4, "insufficient valid stars for this readout\n");
     return NULL;
   }
@@ -92 +92 @@
 
   if (!psVectorClipFitPolynomial1D(line, stats, mask, 0xff, lnMag, NULL, Mag)) {
-      psError(PS_ERR_UNKNOWN, false, "Failed the fit the luminosity function\n");
+      psLogMsg ("psastro", 4, "Failed to fit the luminosity function\n");
       return(NULL);
   }

trunk/psastro/src/psastroMosaicGradients.c

@@ -15 +15 @@
         psTrace ("psastro", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
+        if (!chip->toFPA) { continue; }
         
         psRegion *region = pmChipExtent (chip);

trunk/psastro/src/psastroOneChip.c

@@ -141 +141 @@
     
     // XXX check if we correctly applied the new transformation:
-    psastroDumpRawstars (rawstars, fpa, chip);
+    if (psTraceGetLevel("psastro.dump") > 0) {
+        psastroDumpRawstars (rawstars, fpa, chip);
+    }
 
     if (psTraceGetLevel("psastro.plot") > 0) {

trunk/psastro/src/psastroRefstarSubset.c

@@ -23 +23 @@
   pmLumFunc *rawfunc = psastroLuminosityFunction (rawstars);
   if (rawfunc == NULL) {
-    psError(PSASTRO_ERR_DATA, false, "error measuring rawstar luminosity function\n");
-    return false;
+    psLogMsg ("psastro", 4, "giving up on rawstars for this readout\n");
+    return true;
   }
   psLogMsg ("psastro", 4, "measuring luminosity function for refstars\n");
   pmLumFunc *reffunc = psastroLuminosityFunction (refstars);
   if (reffunc == NULL) {
-    psError(PSASTRO_ERR_DATA, false, "error measuring refstar luminosity function\n");
-    return false;
+    psLogMsg ("psastro", 4, "giving up on refstars for this readout\n");
+    return true;
   }
 

trunk/psastro/src/psastroUtils.c

@@ -38 +38 @@
             pmChip *chip = fpa->chips->data[i];
             if (!chip->process || !chip->file_exists) { continue; }
-            
+            if (!chip->toFPA) { continue; }
+
             pixelScale1 = hypot (chip->toFPA->x->coeff[1][0], chip->toFPA->x->coeff[0][1]);
             pixelScale2 = hypot (chip->toFPA->y->coeff[1][0], chip->toFPA->y->coeff[0][1]);
@@ -52 +53 @@
         pmChip *chip = fpa->chips->data[i];
         if (!chip->process || !chip->file_exists) { continue; }
+        if (!chip->toFPA) { continue; }
 
         psPlaneTransform *toFPA = chip->toFPA;