Changeset 1385 for trunk/psLib/src/astronomy/psAstrometry.c

Timestamp:

Aug 4, 2004, 1:37:39 PM (22 years ago)

Author:

desonia

Message:

found the server astyle upgrade was faulty, so the format was reset.

File:

• trunk/psLib/src/astronomy/psAstrometry.c (modified) (14 diffs)

trunk/psLib/src/astronomy/psAstrometry.c

@@ -8 +8 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-04 22:11:09 $
+*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-04 23:37:39 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 {
     psExposure * exp = psAlloc( sizeof( psExposure ) );
-    
+
     *( double* ) & exp->ra = ra;
     *( double* ) & exp->dec = dec;
@@ -43 +43 @@
     *( float* ) & exp->humidity = humidity;
     *( float* ) & exp->exposureTime = exposureTime;
-    
+
     return exp;
-    
+
 }
 
@@ -85 +85 @@
     *( double* ) & grommit->longitudeOffset = exp->ra;             // XXX Is this correct?
     *( double* ) & grommit->siderealTime = 0.0;
-    
+
     psFree( slaGrommit );
     return ( grommit );
@@ -101 +101 @@
     psChip * tmpChip = NULL;
     psCell *tmpCell = NULL;
-    
+
     tmpChip = psChipinFPA( tmpChip, coord, FPA );
     tmpCell = psCellinChip( tmpCell, coord, tmpChip );
@@ -120 +120 @@
     int nChips = chips->n;
     psPlane* tmpCoord = NULL;
-    
+
     for ( int i = 0; i < nChips; i++ ) {
-            psChip* tmpChip = chips->data[ i ];
-            tmpCoord = psPlaneTransformApply( tmpCoord, tmpChip->fromFPA, coord );
-            if ( checkValidChipCoords( tmpCoord->x, tmpCoord->y,
-                                       tmpChip ) ) {
-                    psFree( tmpCoord );
-                    // XXX: George, you didn't use the out parameter!
-                    return ( tmpChip );
-                }
+        psChip* tmpChip = chips->data[ i ];
+        tmpCoord = psPlaneTransformApply( tmpCoord, tmpChip->fromFPA, coord );
+        if ( checkValidChipCoords( tmpCoord->x, tmpCoord->y,
+                                   tmpChip ) ) {
             psFree( tmpCoord );
+            // XXX: George, you didn't use the out parameter!
+            return ( tmpChip );
         }
+        psFree( tmpCoord );
+    }
     psFree( tmpCoord );
     return ( NULL );
@@ -142 +142 @@
             ( y < 0.0 ) ||
             ( y > ( double ) tmpImage->numRows ) ) {
-            return ( 0 );
-        }
+        return ( 0 );
+    }
     return ( 1 );
 }
@@ -166 +166 @@
     psPlane * tmpCoord = NULL;
     psArray* cells;
-    
+
     if ( chip == NULL ) {
-            return NULL;
+        return NULL;
+    }
+
+    cells = chip->cells;
+
+    if ( cells == NULL ) {
+        return NULL;
+    }
+
+    for ( int i = 0; i < cells->n; i++ ) {
+        psCell* tmpCell = ( psCell* ) cells->data[ i ];
+        psArray* readouts = tmpCell->readouts;
+        if ( readouts != NULL ) {
+            for ( int j = 0; j < readouts->n; j++ ) {
+                psReadout* tmpReadout = readouts->data[ j ];
+                tmpCoord = psPlaneTransformApply( tmpCoord, tmpCell->fromChip, coord );
+                if ( checkValidImageCoords( tmpCoord->x, tmpCoord->y,
+                                            tmpReadout->image ) ) {
+                    return ( tmpCell );
+                }
+            }
         }
-        
-    cells = chip->cells;
-    
-    if ( cells == NULL ) {
-            return NULL;
-        }
-        
-    for ( int i = 0; i < cells->n; i++ ) {
-            psCell* tmpCell = ( psCell* ) cells->data[ i ];
-            psArray* readouts = tmpCell->readouts;
-            if ( readouts != NULL ) {
-                    for ( int j = 0; j < readouts->n; j++ ) {
-                            psReadout* tmpReadout = readouts->data[ j ];
-                            tmpCoord = psPlaneTransformApply( tmpCoord, tmpCell->fromChip, coord );
-                            if ( checkValidImageCoords( tmpCoord->x, tmpCoord->y,
-                                                        tmpReadout->image ) ) {
-                                    return ( tmpCell );
-                                }
-                        }
-                }
-        }
+    }
     return ( NULL );
 }
@@ -229 +229 @@
         sla_OAPQK(TYPE, OB1, OB2, *grommit, &RAP, &DAP);
     */
-    
+
     return ( out );
 }
@@ -253 +253 @@
     psFPA *parFPA = ( cell->parent ) ->parent;
     psGrommit *tmpGrommit = NULL;
-    
+
     tmp1 = psPlaneTransformApply( tmp1, cell->toFPA, in );
     tmp2 = psPlaneTransformApply( tmp2, parFPA->toTangentPlane, tmp1 );
     tmpGrommit = psGrommitAlloc( parFPA->exposure );
     tmp3 = psCoordTPtoSky( out, tmp2, psGrommit );
-    
+
     psFree( tmp1 );
     psFree( tmp2 );
     psFree( tmpGrommit );
-    
+
     return ( psCoordTPtoSky( out, tmp2, psGrommit ) );
-    
+
 }
 
@@ -272 +272 @@
 {
     psPlane * tmp1 = NULL;
-    
+
     tmp1 = psPlaneTransformApply( tmp1, cell->toSky, in );
-    
+
     //XXX: Do something to convert the linear coords in tmp1 to spherical
     // coords in out.
-    
+
     psFree( tmp1 );
-    
+
     return ( out );
 }
@@ -294 +294 @@
     double DOB;
     double ROB;
-    
+
     if ( out == NULL ) {
-            out = ( psPlane * ) psAlloc( sizeof( psPlane ) );
-        }
-        
+        out = ( psPlane * ) psAlloc( sizeof( psPlane ) );
+    }
+
     sla_AOPQK( psSphere->r, psSphere->d, *grommit, &AOB, &ZOB, &HOB, &DOB, &ROB );
     out->x = XXX;
@@ -335 +335 @@
     out = psCoordFPAtoChip( out, out, whichChip );
     out = psCoordChiptoCell( out, out, whichCell );
-    
+
     return ( out );
 }
@@ -344 +344 @@
 {
     if ( out == NULL ) {
-            out = ( psPlane * ) psAlloc( sizeof( psPlane ) );
-        }
-        
-    return ( out );
-}
-
-
-
-
+        out = ( psPlane * ) psAlloc( sizeof( psPlane ) );
+    }
+
+    return ( out );
+}
+
+
+
+