Changeset 21422 for trunk/psastro/src/psastroUtils.c

Timestamp:

Feb 9, 2009, 11:25:34 AM (17 years ago)

Author:

Paul Price

Message:

Merging cnb_branch_20090113. No major conflicts. Compiles, but not tested.

File:

• trunk/psastro/src/psastroUtils.c (modified) (3 diffs)

trunk/psastro/src/psastroUtils.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-07 02:03:34 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-09 21:25:34 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -54 +54 @@
             if (!chip->toFPA) { continue; }
 
-            if (chip->cells->n == 0) { continue; }
-            pmCell *cell = chip->cells->data[0];
+            if (chip->cells->n == 0) { continue; }
+            pmCell *cell = chip->cells->data[0];
             if (!cell->process || !cell->file_exists) { continue; }
 
-            if (cell->readouts->n == 0) { continue; }
-            pmReadout *readout = cell->readouts->data[0];
-            if (! readout->data_exists) { continue; }
+            if (cell->readouts->n == 0) { continue; }
+            pmReadout *readout = cell->readouts->data[0];
+            if (! readout->data_exists) { continue; }
 
             pixelScale1 = hypot (chip->toFPA->x->coeff[1][0], chip->toFPA->x->coeff[0][1]);
@@ -100 +100 @@
     psastroMosaicSetAstrom (fpa);
     if (!useExternal) {
-        psastroVisualPlotCommonScale (fpa, oldScale);
+        pmAstromVisualPlotCommonScale (fpa, oldScale);
     }
     psFree (oldScale);