Changeset 36677 for branches/eam_branches/ipp-20140402/ppBackground/src/ppBackgroundStackCamera.c

Timestamp:

Apr 20, 2014, 5:52:37 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140402

Files:

• . (modified) (1 prop)
• ppBackground/src/ppBackgroundStackCamera.c (modified) (4 diffs)

branches/eam_branches/ipp-20140402/ppBackground/src/ppBackgroundStackCamera.c

@@ -114 +114 @@
         }
       }
-
-/*       psMemStats(0,&A,&P); */
-/*       fprintf(stderr,"fpa %ld %ld\n",A,P); */
+      
+      psF32 exptime = 1.0;
+      exptime = psMetadataLookupF32(NULL, phu->header, "EXPTIME");
 
       pmChip *chip;                       // Chip from FPA
@@ -197 +197 @@
             decim->data.F32[v][u] = tp->y;
             model->data.F32[v][u] = 0.0;
-
+            image->data.F32[v][u] /= exptime;
             // Check the bounds so we'll know how large of an area to model in the map
             if (tp->x < data->ra_min) { data->ra_min = tp->x; }
@@ -277 +277 @@
           }
         }
-
-        
-/*      psMemStats(0,&A,&P); */
-/*      fprintf(stderr,"chip2 %ld %ld\n",A,P); */
       } // end chip loop
 
@@ -290 +286 @@
                        "N", PS_META_REPLACE,
                        "counter", i);
-      // data->models->name->XY__->{image/ra/dec/calibrated/offset/scale}
-      // data->models->counter->XY__->{image/ra/dec/calibrated/offset/scale}
-
-      
       
       if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {