Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/ppBackground/src

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ppBackground/src (modified) (1 prop)
• ppBackground/src/ppBackgroundStackCamera.c (modified) (1 diff)
• ppBackground/src/ppBackgroundStackMath.c (modified) (1 diff)

branches/eam_branches/ps2-tc3-20130727/ppBackground/src

@@ -1 +1 @@
 ppBackground
+ppBackgroundStack
 Makefile.in
 config.h
@@ -9 +10 @@
 stamp-h1
 config.h.in
+

@@ -1 +1 @@
 ppBackground
+ppBackgroundStack
 Makefile.in
 config.h
@@ -9 +10 @@
 stamp-h1
 config.h.in
+

branches/eam_branches/ps2-tc3-20130727/ppBackground/src/ppBackgroundStackCamera.c

@@ -267 +267 @@
             psString solutionFileName = psStringCopy(data->OTApath);
             psStringAppend(&solutionFileName, ".%s.fits",chipName);
-            psFits *solutionFits = psFitsOpen(solutionFileName,"r");
+            psString resolvedFileName = pmConfigConvertFilename(solutionFileName,config,false,false);
+            psFits *solutionFits = psFitsOpen(resolvedFileName,"r");
             psImage *solution = psFitsReadImage(solutionFits,psRegionSet(0,0,0,0),0);
             psMetadataAddImage(data->OTA_solutions,PS_LIST_TAIL,

branches/eam_branches/ps2-tc3-20130727/ppBackground/src/ppBackgroundStackMath.c

@@ -204 +204 @@
   
   pmFPAview *view    = pmFPAviewAlloc(0);
-  psStats *stats     = psStatsAlloc( PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV );
+  psStats *stats     = psStatsAlloc( PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_STDEV );
 
   psMetadataIterator *expIter = psMetadataIteratorAlloc(data->models, PS_LIST_HEAD, NULL);

@@ -1 +1 @@
 ppBackground
+ppBackgroundStack
 Makefile.in
 config.h
@@ -9 +10 @@
 stamp-h1
 config.h.in
+